From 7a7f00bdd15d5e7c99f16fd2d6fabc337c7de2d1 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 5 Jun 2017 04:35:22 -0500 Subject: [PATCH] THE DEVIL --- code/modules/events/devil.dm | 2 +- code/modules/events/devil.dm.rej | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 code/modules/events/devil.dm.rej diff --git a/code/modules/events/devil.dm b/code/modules/events/devil.dm index e155e6c558..0b49f38343 100644 --- a/code/modules/events/devil.dm +++ b/code/modules/events/devil.dm @@ -28,7 +28,7 @@ var/datum/mind/Mind = create_devil_mind(key) Mind.active = 1 - var/mob/living/carbon/human/devil = create_event_devil(spawn_loc) + var/mob/living/carbon/human/devil = create_event_devil() Mind.transfer_to(devil) add_devil(devil, ascendable = FALSE) diff --git a/code/modules/events/devil.dm.rej b/code/modules/events/devil.dm.rej deleted file mode 100644 index 460aca4f5a..0000000000 --- a/code/modules/events/devil.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/modules/events/devil.dm b/code/modules/events/devil.dm (rejected hunks) -@@ -30,7 +28,7 @@ - var/datum/mind/Mind = create_devil_mind(key) - Mind.active = 1 - -- var/mob/living/carbon/human/devil = create_event_devil(spawn_loc) -+ var/mob/living/carbon/human/devil = create_event_devil() - Mind.transfer_to(devil) - SSticker.mode.finalize_devil(Mind, FALSE) - SSticker.mode.add_devil_objectives(src, 2)