From e8c56c07ee025c4b7e2bc041b0219e68524011ca Mon Sep 17 00:00:00 2001 From: keronshb Date: Thu, 28 Oct 2021 00:43:02 -0400 Subject: [PATCH 1/5] No burning the spirit of halloween --- code/game/objects/structures/morgue.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 4980981574..9578dcdfb9 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -247,7 +247,11 @@ GLOBAL_LIST_EMPTY(crematoriums) locked = TRUE update_icon() - + for(var/mob/living/simple_animal/jacq/J in conts) + visible_message("[src] cackles, \"You'll nae get rid a me that easily!\"") + playsound(loc, 'sound/spookoween/ahaha.ogg', 100, 0.25) + J.poof() + return for(var/mob/living/M in conts) if (M.stat != DEAD) M.emote("scream") From 468b4a11ff84fb79919c5b5ca5f1ed9c9c2c5eea Mon Sep 17 00:00:00 2001 From: keronshb Date: Thu, 28 Oct 2021 11:26:18 -0400 Subject: [PATCH 2/5] More buffs --- code/modules/holiday/halloween/bartholomew.dm | 1 + code/modules/holiday/halloween/jacqueen.dm | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/code/modules/holiday/halloween/bartholomew.dm b/code/modules/holiday/halloween/bartholomew.dm index 31cfb1f26a..9fd9e51308 100644 --- a/code/modules/holiday/halloween/bartholomew.dm +++ b/code/modules/holiday/halloween/bartholomew.dm @@ -8,6 +8,7 @@ anchored = TRUE var/items_list = list() speech_span = "spooky" + resistance_flags = INDESTRUCTIBLE //Barth is immortal you know var/active = TRUE /obj/item/barthpot/Destroy() diff --git a/code/modules/holiday/halloween/jacqueen.dm b/code/modules/holiday/halloween/jacqueen.dm index ed7453ad3e..f76255d9e8 100644 --- a/code/modules/holiday/halloween/jacqueen.dm +++ b/code/modules/holiday/halloween/jacqueen.dm @@ -65,6 +65,10 @@ cached_z = z poof() +/mob/living/simple_animal/jacq/ComponentInitialize() //she just wants to bring halloween to the station + . = ..() + AddComponent(/datum/component/stationloving) + /mob/living/simple_animal/jacq/BiologicalLife(seconds, times_fired) if(!(. = ..())) return From 29a39ed9eac346de9e1940e9091ace0b7bd41c0a Mon Sep 17 00:00:00 2001 From: keronshb Date: Thu, 28 Oct 2021 15:30:00 -0400 Subject: [PATCH 3/5] Indestructable change --- code/modules/holiday/halloween/bartholomew.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/holiday/halloween/bartholomew.dm b/code/modules/holiday/halloween/bartholomew.dm index 9fd9e51308..4fa7d65e8a 100644 --- a/code/modules/holiday/halloween/bartholomew.dm +++ b/code/modules/holiday/halloween/bartholomew.dm @@ -8,7 +8,7 @@ anchored = TRUE var/items_list = list() speech_span = "spooky" - resistance_flags = INDESTRUCTIBLE //Barth is immortal you know + resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF //Barth is immortal you know var/active = TRUE /obj/item/barthpot/Destroy() From b2a890269accb399780849db700f6933f0b44083 Mon Sep 17 00:00:00 2001 From: keronshb Date: Thu, 28 Oct 2021 15:44:08 -0400 Subject: [PATCH 4/5] Fixes destroy --- code/modules/holiday/halloween/bartholomew.dm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/code/modules/holiday/halloween/bartholomew.dm b/code/modules/holiday/halloween/bartholomew.dm index 4fa7d65e8a..12a0858b8d 100644 --- a/code/modules/holiday/halloween/bartholomew.dm +++ b/code/modules/holiday/halloween/bartholomew.dm @@ -8,15 +8,9 @@ anchored = TRUE var/items_list = list() speech_span = "spooky" - resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF //Barth is immortal you know + resistance_flags = INDESTRUCTIBLE var/active = TRUE -/obj/item/barthpot/Destroy() - var/obj/item/barthpot/n = new src(loc) - n.items_list = items_list - ..() - - /obj/item/barthpot/attackby(obj/item/I, mob/user, params) if(!active) say("Meow!") From e531c7b452901a87042e42aa6b014d666a1d962a Mon Sep 17 00:00:00 2001 From: keronshb Date: Thu, 28 Oct 2021 18:48:26 -0400 Subject: [PATCH 5/5] Fix --- code/game/objects/structures/morgue.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 9578dcdfb9..6a588a61cd 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -251,6 +251,8 @@ GLOBAL_LIST_EMPTY(crematoriums) visible_message("[src] cackles, \"You'll nae get rid a me that easily!\"") playsound(loc, 'sound/spookoween/ahaha.ogg', 100, 0.25) J.poof() + locked = FALSE + update_icon() return for(var/mob/living/M in conts) if (M.stat != DEAD)