mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Fixed issue 222.
Improved closet/secure closet/crate code a bit. (Updated the paths on the map.) git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2585 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -717,7 +717,7 @@ var/list/sacrificed = list()
|
||||
cultist.handcuffed || \
|
||||
istype(cultist.wear_mask, /obj/item/clothing/mask/muzzle) || \
|
||||
(istype(cultist.loc, /obj/structure/closet)&&cultist.loc:welded) || \
|
||||
(istype(cultist.loc, /obj/structure/secure_closet)&&cultist.loc:locked) || \
|
||||
(istype(cultist.loc, /obj/structure/closet/secure_closet)&&cultist.loc:locked) || \
|
||||
(istype(cultist.loc, /obj/machinery/dna_scannernew)&&cultist.loc:locked) \
|
||||
))
|
||||
user << "\red The [cultist] is already free."
|
||||
@@ -730,7 +730,7 @@ var/list/sacrificed = list()
|
||||
cultist.u_equip(cultist.wear_mask)
|
||||
if(istype(cultist.loc, /obj/structure/closet)&&cultist.loc:welded)
|
||||
cultist.loc:welded = 0
|
||||
if(istype(cultist.loc, /obj/structure/secure_closet)&&cultist.loc:locked)
|
||||
if(istype(cultist.loc, /obj/structure/closet/secure_closet)&&cultist.loc:locked)
|
||||
cultist.loc:locked = 0
|
||||
if(istype(cultist.loc, /obj/machinery/dna_scannernew)&&cultist.loc:locked)
|
||||
cultist.loc:locked = 0
|
||||
|
||||
Reference in New Issue
Block a user