cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Hand labelers are no longer eaten by storage containers (#10312)

Browse Source
This commit is contained in:
JohnWildkins
2020-10-21 23:34:11 +02:00
committed by GitHub
parent 3f4e3190b8
commit 5230fcde5e
6 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets.dm
+6
View File
@@ -336,6 +336,12 @@
)
else
attack_hand(user)
else if(istype(W, /obj/item/hand_labeler))
var/obj/item/hand_labeler/HL = W
if (HL.mode == 1)
return
else
attack_hand(user)
else
attack_hand(user)
return
code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+6
View File
@@ -148,6 +148,12 @@
playsound(loc, W.usesound, 50, 1)
wrenched = 1
anchored = 1
else if(istype(W, /obj/item/hand_labeler))
var/obj/item/hand_labeler/HL = W
if (HL.mode == 1)
return
else
togglelock(user)
else if(!opened)
if(!broken && istype(W,/obj/item/material/twohanded/chainsaw))
var/obj/item/material/twohanded/chainsaw/ChainSawVar = W
code/game/objects/structures/crates_lockers/crates.dm
+14 -1
View File
@@ -115,6 +115,12 @@
playsound(loc, 'sound/items/wirecutter.ogg', 100, 1)
rigged = 0
return
else if(istype(W, /obj/item/hand_labeler))
var/obj/item/hand_labeler/HL = W
if (HL.mode == 1)
return
else
attack_hand(user)
else return attack_hand(user)
/obj/structure/closet/crate/ex_act(severity)
@@ -340,7 +346,14 @@
return ..()
if(istype(W, /obj/item/melee/energy/blade))
emag_act(INFINITY, user)
if(!opened)
if(istype(W, /obj/item/hand_labeler))
var/obj/item/hand_labeler/HL = W
if (HL.mode == 1)
return
else if(!opened)
togglelock(user)
return
else if(!opened)
togglelock(user)
return
return ..()