cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Arcane tampered closet escape balance hotfix (#37472)

Browse Source 
* Arcane tampered locker balance hotfix

* consistency with regular blessing
This commit is contained in:
SECBATON GRIFFON
2025-03-18 10:25:04 +00:00
committed by GitHub
parent a34942181a
commit 09568e2f03
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/structures/crates_lockers/closets.dm
View File

@@ -484,6 +484,8 @@
return
src.welded =! src.welded
src.update_icon()
if(!welded && arcanetampered)
bless()
for(var/mob/M in viewers(src))
M.show_message("<span class='warning'>[src] has been [welded?"welded shut":"unwelded"] by [user.name].</span>", 1, "You hear welding.", 2)
else if(istype(W, /obj/item/weapon/circuitboard/airlock) && src.has_lock_type) //testing with crowbars for now, will use circuits later

24
code/modules/mob/living/living.dm
View File

@@ -1065,21 +1065,15 @@ Thanks.
sleep(10)
SC.broken = SC.locked // If it's only welded just break the welding, dont break the lock.
SC.locked = 0
SC.welded = 0
L.visible_message("<span class='danger'>[L] successfully breaks out of [SC]!</span>",
"<span class='notice'>You successfully break out!</span>")
if(istype(SC.loc, /obj/item/delivery/large)) //Do this to prevent contents from being opened into nullspace (read: bluespace)
var/obj/item/delivery/large/BD = SC.loc
BD.attack_hand(usr)
SC.open()
else
C.welded = 0
L.visible_message("<span class='danger'>[L] successfully breaks out of [C]!</span>",
"<span class='notice'>You successfully break out!</span>")
if(istype(C.loc, /obj/item/delivery/large)) //nullspace ect.. read the comment above
var/obj/item/delivery/large/BD = C.loc
BD.attack_hand(usr)
C.open()
C.welded = 0
if(C.arcanetampered)
C.bless() // so it doesn't just close again, fairness on the user
L.visible_message("<span class='danger'>[L] successfully breaks out of [C]!</span>",
"<span class='notice'>You successfully break out!</span>")
if(istype(C.loc, /obj/item/delivery/large)) //Do this to prevent contents from being opened into nullspace (read: bluespace)
var/obj/item/delivery/large/BD = C.loc
BD.attack_hand(usr)
C.open()
//Removing a headcrab
if(ishuman(L))