From 891060c7f229e5e5ab9dea37ee4a3842a75474aa Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 5 Jun 2017 22:43:49 -0500 Subject: [PATCH] cleanup --- code/modules/awaymissions/corpse.dm | 3 ++- code/modules/awaymissions/corpse.dm.rej | 15 --------------- 2 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 code/modules/awaymissions/corpse.dm.rej diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 9e3695d83e..780d872847 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -117,12 +117,13 @@ var/id = -1 /obj/effect/mob_spawn/human/Initialize() - . = ..() if(ispath(outfit)) outfit = new outfit() if(!outfit) outfit = new /datum/outfit + return ..() + /obj/effect/mob_spawn/human/equip(mob/living/carbon/human/H) if(mob_species) diff --git a/code/modules/awaymissions/corpse.dm.rej b/code/modules/awaymissions/corpse.dm.rej deleted file mode 100644 index 920234d7c2..0000000000 --- a/code/modules/awaymissions/corpse.dm.rej +++ /dev/null @@ -1,15 +0,0 @@ -diff a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm (rejected hunks) -@@ -117,12 +117,11 @@ - var/id = -1 - - /obj/effect/mob_spawn/human/Initialize() -- . = ..() - if(ispath(outfit)) - outfit = new outfit() - if(!outfit) - outfit = new /datum/outfit -- -+ return ..() - - /obj/effect/mob_spawn/human/equip(mob/living/carbon/human/H) - if(mob_species)