From c7fda16033f03a9a7fbb838b2aa6fd83b7575b10 Mon Sep 17 00:00:00 2001 From: warriorstar-orion Date: Mon, 21 Oct 2024 11:32:22 -0400 Subject: [PATCH] fix: dupe corpse nullspace spawning (#27145) * fix: dupe corpse nullspace spawning * remove unused defines too --- code/modules/awaymissions/mob_spawn.dm | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/code/modules/awaymissions/mob_spawn.dm b/code/modules/awaymissions/mob_spawn.dm index 4e2f23fe7bc..5f320a7ab22 100644 --- a/code/modules/awaymissions/mob_spawn.dm +++ b/code/modules/awaymissions/mob_spawn.dm @@ -4,11 +4,6 @@ // To do: Allow customizing the bodies appearance (they're all bald and white right now). -/// this mob spawn creates the corpse instantly -#define CORPSE_INSTANT 1 -/// this mob spawn creates the corpse during GAME_STATE_PLAYING -#define CORPSE_ROUNDSTART 2 - /obj/effect/mob_spawn name = "Unknown" density = TRUE @@ -697,25 +692,11 @@ /// these mob spawn subtypes trigger immediately (New or Initialize) and are not player controlled... since they're dead, you know? /obj/effect/mob_spawn/corpse - /// when this mob spawn should auto trigger. - var/spawn_when = CORPSE_INSTANT - /// what environmental storytelling script should this corpse have var/corpse_description = "" /// optionally different text to display if the target is a clown var/naive_corpse_description = "" -/obj/effect/mob_spawn/corpse/Initialize(mapload, no_spawn) - . = ..() - if(no_spawn) - return - switch(spawn_when) - if(CORPSE_INSTANT) - INVOKE_ASYNC(src, PROC_REF(create)) - if(CORPSE_ROUNDSTART) - if(mapload || (SSticker && SSticker.current_state > GAME_STATE_SETTING_UP)) - INVOKE_ASYNC(src, PROC_REF(create)) - /obj/effect/mob_spawn/corpse/special(mob/living/spawned_mob) . = ..() spawned_mob.death(TRUE) @@ -737,7 +718,3 @@ icon = 'icons/mob/lavaland/lavaland_monsters.dmi' icon_state = "goliath_dead" pixel_x = -12 - - -#undef CORPSE_INSTANT -#undef CORPSE_ROUNDSTART