From be44430c83d7163a6ac993b9c2338ac1ff57ada1 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Thu, 16 May 2024 15:23:25 -0400 Subject: [PATCH] Tarot statue time fix, no longer can emote or pda as a statue (#25461) * Tarot statue time fix, no longer can emote or pda as a statue * oops * Update code/game/objects/structures/crates_lockers/closets/statue.dm Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --- .../game/objects/structures/crates_lockers/closets/statue.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm index 0be43090cc9..9d177ce3576 100644 --- a/code/game/objects/structures/crates_lockers/closets/statue.dm +++ b/code/game/objects/structures/crates_lockers/closets/statue.dm @@ -20,6 +20,7 @@ L.unbuckle_mob() L.forceMove(src) ADD_TRAIT(L, TRAIT_MUTE, STATUE_MUTE) + ADD_TRAIT(L, TRAIT_EMOTE_MUTE, STATUE_MUTE) max_integrity = max(L.health + 100, 100) //stoning damaged mobs will result in easier to shatter statues intialTox = L.getToxLoss() intialFire = L.getFireLoss() @@ -50,6 +51,7 @@ M.adjustFireLoss(intialFire - M.getFireLoss()) M.adjustBruteLoss(intialBrute - M.getBruteLoss()) M.setOxyLoss(intialOxy) + M.Stun(2.5 SECONDS) // No using items inside a statue if(timer <= 0) dump_contents() STOP_PROCESSING(SSobj, src) @@ -69,6 +71,7 @@ for(var/mob/living/M in src) M.forceMove(loc) REMOVE_TRAIT(M, TRAIT_MUTE, STATUE_MUTE) + REMOVE_TRAIT(M, TRAIT_EMOTE_MUTE, STATUE_MUTE) M.take_overall_damage((M.health - obj_integrity - 100),0) //any new damage the statue incurred is transfered to the mob ..() @@ -120,7 +123,7 @@ /obj/structure/closet/statue/indestructible resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF - timer = 240 SECONDS_TO_LIFE_CYCLES + timer = 120 SECONDS_TO_LIFE_CYCLES /obj/structure/closet/statue/indestructible/ex_act(severity) return //No delimbing them