Merge pull request #15310 from keronshb/jaqincinerator

No Frollo you can't burn Jacq in the cremator with hellfire (plus two other grief prevention additions)
This commit is contained in:
Lin
2021-10-28 21:29:50 -07:00
committed by GitHub
3 changed files with 12 additions and 7 deletions
+7 -1
View File
@@ -247,7 +247,13 @@ GLOBAL_LIST_EMPTY(crematoriums)
locked = TRUE
update_icon()
for(var/mob/living/simple_animal/jacq/J in conts)
visible_message("<b>[src]</b> cackles, <span class='spooky'>\"You'll nae get rid a me that easily!\"</span>")
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)
M.emote("scream")
@@ -8,14 +8,9 @@
anchored = TRUE
var/items_list = list()
speech_span = "spooky"
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!")
@@ -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