diff --git a/code/game/gamemodes/miniantags/revenant/revenant_spawn_event.dm b/code/game/gamemodes/miniantags/revenant/revenant_spawn_event.dm index 783cfdd9307..fb0bdfb6f93 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant_spawn_event.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant_spawn_event.dm @@ -34,17 +34,13 @@ var/list/spawn_locs = list() - for(var/obj/effect/landmark/L in GLOB.landmarks_list) + for(var/obj/effect/landmark/revenantspawn/L in GLOB.landmarks_list) if(isturf(L.loc)) - switch(L.name) - if("revenantspawn") - spawn_locs += L.loc + spawn_locs += L.loc if(!spawn_locs.len) //If we can't find any revenant spawns, try the carp spawns - for(var/obj/effect/landmark/L in GLOB.landmarks_list) + for(var/obj/effect/landmark/carpspawn/L in GLOB.landmarks_list) if(isturf(L.loc)) - switch(L.name) - if("carpspawn") - spawn_locs += L.loc + spawn_locs += L.loc if(!spawn_locs.len) //If we can't find either, just spawn the revenant at the player's location spawn_locs += get_turf(selected) if(!spawn_locs.len) //If we can't find THAT, then just give up and cry diff --git a/code/game/gamemodes/miniantags/slaughter/slaughterevent.dm b/code/game/gamemodes/miniantags/slaughter/slaughterevent.dm index 888a10669e7..4d85744738a 100644 --- a/code/game/gamemodes/miniantags/slaughter/slaughterevent.dm +++ b/code/game/gamemodes/miniantags/slaughter/slaughterevent.dm @@ -23,11 +23,9 @@ player_mind.active = 1 var/list/spawn_locs = list() - for(var/obj/effect/landmark/L in GLOB.landmarks_list) + for(var/obj/effect/landmark/carpspawn/L in GLOB.landmarks_list) if(isturf(L.loc)) - switch(L.name) - if("carpspawn") - spawn_locs += L.loc + spawn_locs += L.loc if(!spawn_locs) message_admins("No valid spawn locations found, aborting...") diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 997aeb0d135..e354d26ab08 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -391,9 +391,8 @@ Traitors and the like can also be revived with the previous role mostly intact. call(/datum/game_mode/proc/equip_syndicate)(new_character) if("Space Ninja") var/list/ninja_spawn = list() - for(var/obj/effect/landmark/L in GLOB.landmarks_list) - if(L.name=="carpspawn") - ninja_spawn += L + for(var/obj/effect/landmark/carpspawn/L in GLOB.landmarks_list) + ninja_spawn += L var/datum/antagonist/ninja/ninjadatum = new_character.mind.has_antag_datum(ANTAG_DATUM_NINJA) ninjadatum.equip_space_ninja() if(ninja_spawn.len) diff --git a/code/modules/events/carp_migration.dm b/code/modules/events/carp_migration.dm index 774dbee461a..961a5e5a8e4 100644 --- a/code/modules/events/carp_migration.dm +++ b/code/modules/events/carp_migration.dm @@ -18,11 +18,10 @@ /datum/round_event/carp_migration/start() - for(var/obj/effect/landmark/C in GLOB.landmarks_list) - if(C.name == "carpspawn") - if(prob(95)) - new /mob/living/simple_animal/hostile/carp(C.loc) - else - new /mob/living/simple_animal/hostile/carp/megacarp(C.loc) + for(var/obj/effect/landmark/carpspawn/C in GLOB.landmarks_list) + if(prob(95)) + new /mob/living/simple_animal/hostile/carp(C.loc) + else + new /mob/living/simple_animal/hostile/carp/megacarp(C.loc) diff --git a/code/modules/events/electrical_storm.dm b/code/modules/events/electrical_storm.dm index 3034f1c8f55..a10e42d7549 100644 --- a/code/modules/events/electrical_storm.dm +++ b/code/modules/events/electrical_storm.dm @@ -20,8 +20,8 @@ for(var/i=1, i <= lightsoutAmount, i++) var/list/possibleEpicentres = list() - for(var/obj/effect/landmark/newEpicentre in GLOB.landmarks_list) - if(newEpicentre.name == "lightsout" && !(newEpicentre in epicentreList)) + for(var/obj/effect/landmark/lightsout/newEpicentre in GLOB.landmarks_list) + if(!(newEpicentre in epicentreList)) possibleEpicentres += newEpicentre if(possibleEpicentres.len) epicentreList += pick(possibleEpicentres) diff --git a/code/modules/events/holiday/halloween.dm b/code/modules/events/holiday/halloween.dm index 3dd8ff90ff2..5415eab386b 100644 --- a/code/modules/events/holiday/halloween.dm +++ b/code/modules/events/holiday/halloween.dm @@ -35,9 +35,8 @@ earliest_start = 0 /datum/round_event/carp_migration/eyeballs/start() - for(var/obj/effect/landmark/C in GLOB.landmarks_list) - if(C.name == "carpspawn") - new /mob/living/simple_animal/hostile/carp/eyeball(C.loc) + for(var/obj/effect/landmark/carpspawn/C in GLOB.landmarks_list) + new /mob/living/simple_animal/hostile/carp/eyeball(C.loc) //Pumpking meteors waves /datum/round_event_control/meteor_wave/spooky diff --git a/code/modules/events/operative.dm b/code/modules/events/operative.dm index 4db2029ce7d..0841a2fdbb3 100644 --- a/code/modules/events/operative.dm +++ b/code/modules/events/operative.dm @@ -16,9 +16,8 @@ var/mob/dead/selected = pick_n_take(candidates) var/list/spawn_locs = list() - for(var/obj/effect/landmark/L in GLOB.landmarks_list) - if(L.name in list("ninjaspawn","carpspawn")) - spawn_locs += L.loc + for(var/obj/effect/landmark/carpspawn/L in GLOB.landmarks_list) + spawn_locs += L.loc if(!spawn_locs.len) return MAP_ERROR diff --git a/code/modules/events/wizard/magicarp.dm b/code/modules/events/wizard/magicarp.dm index cc632d9c87d..5cebc55cbdd 100644 --- a/code/modules/events/wizard/magicarp.dm +++ b/code/modules/events/wizard/magicarp.dm @@ -16,12 +16,11 @@ priority_announce("Unknown magical entities have been detected near [station_name()], please stand-by.", "Lifesign Alert") /datum/round_event/wizard/magicarp/start() - for(var/obj/effect/landmark/C in GLOB.landmarks_list) - if(C.name == "carpspawn") - if(prob(5)) - new /mob/living/simple_animal/hostile/carp/ranged/chaos(C.loc) - else - new /mob/living/simple_animal/hostile/carp/ranged(C.loc) + for(var/obj/effect/landmark/carpspawn/C in GLOB.landmarks_list) + if(prob(5)) + new /mob/living/simple_animal/hostile/carp/ranged/chaos(C.loc) + else + new /mob/living/simple_animal/hostile/carp/ranged(C.loc) /mob/living/simple_animal/hostile/carp/ranged name = "magicarp" diff --git a/code/modules/mob/dead/new_player/login.dm b/code/modules/mob/dead/new_player/login.dm index b684e1ef287..26d05c6ff05 100644 --- a/code/modules/mob/dead/new_player/login.dm +++ b/code/modules/mob/dead/new_player/login.dm @@ -21,15 +21,6 @@ sight |= SEE_TURFS -/* - var/list/watch_locations = list() - for(var/obj/effect/landmark/landmark in landmarks_list) - if(landmark.tag == "landmark*new_player") - watch_locations += landmark.loc - - if(watch_locations.len>0) - loc = pick(watch_locations) -*/ new_player_panel() client.playtitlemusic() if(SSticker.current_state < GAME_STATE_SETTING_UP) diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index a543e0825b7..dc87736e5df 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -329,16 +329,14 @@ continue loc_landmark = sloc.loc if(!loc_landmark) - for(var/obj/effect/landmark/tripai in GLOB.landmarks_list) - if(tripai.name == "tripai") - if(locate(/mob/living/silicon/ai) in tripai.loc) - continue - loc_landmark = tripai.loc + for(var/obj/effect/landmark/tripai/L in GLOB.landmarks_list) + if(locate(/mob/living/silicon/ai) in L.loc) + continue + loc_landmark = L.loc if(!loc_landmark) to_chat(src, "Oh god sorry we can't find an unoccupied AI spawn location, so we're spawning you on top of someone.") - for(var/obj/effect/landmark/start/sloc in GLOB.landmarks_list) - if (sloc.name == "AI") - loc_landmark = sloc.loc + for(var/obj/effect/landmark/start/ai/sloc in GLOB.landmarks_list) + loc_landmark = sloc.loc if(!transfer_after) mind.active = FALSE diff --git a/code/modules/ninja/ninja_event.dm b/code/modules/ninja/ninja_event.dm index a3184cbb20e..1656a435050 100644 --- a/code/modules/ninja/ninja_event.dm +++ b/code/modules/ninja/ninja_event.dm @@ -39,11 +39,9 @@ Contents: //selecting a spawn_loc if(!spawn_loc) var/list/spawn_locs = list() - for(var/obj/effect/landmark/L in GLOB.landmarks_list) + for(var/obj/effect/landmark/carpspawn/L in GLOB.landmarks_list) if(isturf(L.loc)) - switch(L.name) - if("ninjaspawn","carpspawn") - spawn_locs += L.loc + spawn_locs += L.loc if(!spawn_locs.len) return kill() spawn_loc = pick(spawn_locs)