cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 23:48:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tarot statue time fix, no longer can emote or pda as a statue (#25461)

Browse Source 
* 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>
This commit is contained in:
Qwertytoforty
2024-05-16 19:23:25 +00:00
committed by GitHub
co-authored by DGamerL
parent 902dc169c9
commit be44430c83
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/statue.dm
+4 -1
View File
@@ -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