shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'citadel/master' into mobility_flags

Browse Source
This commit is contained in:
kevinz000
2020-03-03 03:08:41 -07:00
parent c21bd60929 fde24492b9
commit 1e99cd0bfe
485 changed files with 2456 additions and 2614 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -216,7 +216,7 @@
for(var/i in 1 to 3)
new /obj/item/clothing/suit/toggle/labcoat(src)
for(var/i in 1 to 3)
new /obj/item/clothing/suit/toggle/labcoat/emt(src)
new /obj/item/clothing/suit/toggle/labcoat/paramedic(src)
for(var/i in 1 to 3)
new /obj/item/clothing/shoes/sneakers/white(src)
for(var/i in 1 to 3)

9
code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
View File

@@ -4,10 +4,10 @@
/obj/structure/closet/secure_closet/freezer/Destroy()
recursive_organ_check(src)
..()
return ..()
/obj/structure/closet/secure_closet/freezer/Initialize()
..()
. = ..()
recursive_organ_check(src)
/obj/structure/closet/secure_closet/freezer/open(mob/living/user)
@@ -17,14 +17,15 @@
return ..()
/obj/structure/closet/secure_closet/freezer/close(mob/living/user)
if(..()) //if we actually closed the locker
. = ..()
if(.) //if we actually closed the locker
recursive_organ_check(src)
/obj/structure/closet/secure_closet/freezer/ex_act()
if(!jones)
jones = TRUE
else
..()
return ..()
/obj/structure/closet/secure_closet/freezer/kitchen
name = "kitchen Cabinet"