Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Fix whale #14615

Merged
ToasterBiome merged 3 commits into from
Jun 27, 2022
Merged

Fix whale #14615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e353a50
Fixes whale spawning
adamsong Jun 27, 2022
684fe08
Forgot to add bugfixes
adamsong Jun 27, 2022
7410545
Adds map change (maybe)
adamsong Jun 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _maps/map_files/GaxStation/GaxStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16777,7 +16777,7 @@
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"iYZ" = (
/obj/effect/landmark/stationroom/gax/ai_whale,
/obj/effect/landmark/stationroom/limited_spawn/gax/ai_whale,
/turf/open/space/basic,
/area/space)
"iZa" = (
Expand Down
25 changes: 22 additions & 3 deletions yogstation/code/game/objects/effects/landmarks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,28 @@ GLOBAL_LIST_EMPTY(chosen_station_templates)
template_names = list("Maint aquarium", "Maint bigconstruction", "Maint bigtheatre", "Maint deltalibrary", "Maint graffitiroom", "Maint junction", "Maint podrepairbay", "Maint pubbybar", "Maint roosterdome", "Maint sanitarium", "Maint snakefighter", "Maint vault", "Maint ward", "Maint assaultpod", "Maint maze", "Maint maze2", "Maint boxfactory",
"Maint sixsectorsdown", "Maint advbotany", "Maint beach", "Maint botany_apiary", "Maint gamercave", "Maint ladytesla_altar", "Maint olddiner", "Maint smallmagician", "Maint fourshops")

/obj/effect/landmark/stationroom/gax/ai_whale
unique = TRUE
template_names = list("AI Whale",EMPTY_SPAWN,EMPTY_SPAWN,EMPTY_SPAWN)
/// Type of landmark that find all others of the same type, and only spawns count number of ruins at them
/obj/effect/landmark/stationroom/limited_spawn
var/choose_result = ""
var/count = 1

/obj/effect/landmark/stationroom/limited_spawn/choose()
if(choose_result != "")
return choose_result
var/list/landmarks = list()
for(var/obj/effect/landmark/stationroom/limited_spawn/L in GLOB.stationroom_landmarks)
if(L.type == src.type)
landmarks |= L

for(var/i = 0, i < count, i++)
var/obj/effect/landmark/stationroom/limited_spawn/L = pick_n_take(landmarks)
L.choose_result = pick(L.template_names)

for(var/obj/effect/landmark/stationroom/limited_spawn/L in landmarks)
L.choose_result = EMPTY_SPAWN

/obj/effect/landmark/stationroom/limited_spawn/gax/ai_whale
template_names = list("AI Whale")

/obj/effect/landmark/start/infiltrator
name = "infiltrator"
Expand Down