Skip to content

Commit 09568e2

Browse files
Arcane tampered closet escape balance hotfix (#37472)
* Arcane tampered locker balance hotfix * consistency with regular blessing
1 parent a349421 commit 09568e2

File tree

2 files changed

+11
-15
lines changed

2 files changed

+11
-15
lines changed

code/game/objects/structures/crates_lockers/closets.dm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,8 @@
484484
return
485485
src.welded =! src.welded
486486
src.update_icon()
487+
if(!welded && arcanetampered)
488+
bless()
487489
for(var/mob/M in viewers(src))
488490
M.show_message("<span class='warning'>[src] has been [welded?"welded shut":"unwelded"] by [user.name].</span>", 1, "You hear welding.", 2)
489491
else if(istype(W, /obj/item/weapon/circuitboard/airlock) && src.has_lock_type) //testing with crowbars for now, will use circuits later

code/modules/mob/living/living.dm

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,21 +1065,15 @@ Thanks.
10651065
sleep(10)
10661066
SC.broken = SC.locked // If it's only welded just break the welding, dont break the lock.
10671067
SC.locked = 0
1068-
SC.welded = 0
1069-
L.visible_message("<span class='danger'>[L] successfully breaks out of [SC]!</span>",
1070-
"<span class='notice'>You successfully break out!</span>")
1071-
if(istype(SC.loc, /obj/item/delivery/large)) //Do this to prevent contents from being opened into nullspace (read: bluespace)
1072-
var/obj/item/delivery/large/BD = SC.loc
1073-
BD.attack_hand(usr)
1074-
SC.open()
1075-
else
1076-
C.welded = 0
1077-
L.visible_message("<span class='danger'>[L] successfully breaks out of [C]!</span>",
1078-
"<span class='notice'>You successfully break out!</span>")
1079-
if(istype(C.loc, /obj/item/delivery/large)) //nullspace ect.. read the comment above
1080-
var/obj/item/delivery/large/BD = C.loc
1081-
BD.attack_hand(usr)
1082-
C.open()
1068+
C.welded = 0
1069+
if(C.arcanetampered)
1070+
C.bless() // so it doesn't just close again, fairness on the user
1071+
L.visible_message("<span class='danger'>[L] successfully breaks out of [C]!</span>",
1072+
"<span class='notice'>You successfully break out!</span>")
1073+
if(istype(C.loc, /obj/item/delivery/large)) //Do this to prevent contents from being opened into nullspace (read: bluespace)
1074+
var/obj/item/delivery/large/BD = C.loc
1075+
BD.attack_hand(usr)
1076+
C.open()
10831077

10841078
//Removing a headcrab
10851079
if(ishuman(L))

0 commit comments

Comments
 (0)