cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 15:38:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Polaris Merge Sync

Browse Source
This commit is contained in:
Arokha Sieyes
2017-03-26 20:12:34 -04:00
parent b48853fb95 565fea9648
commit 9edf3a6629
105 changed files with 484 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/job_closets.dm
+1 -1
View File
@@ -45,7 +45,7 @@
/obj/structure/closet/chefcloset/New()
..()
new /obj/item/clothing/under/sundress(src)
new /obj/item/clothing/under/dress/sundress(src)
new /obj/item/clothing/under/waiter(src)
new /obj/item/clothing/under/waiter(src)
new /obj/item/device/radio/headset/headset_service(src)
code/game/objects/structures/inflatable.dm
-1
View File
@@ -256,7 +256,6 @@
name = "inflatable barrier box"
desc = "Contains inflatable walls and doors."
icon_state = "inf_box"
item_state = "syringe_kit"
w_class = ITEMSIZE_NORMAL
max_storage_space = ITEMSIZE_COST_NORMAL * 7
can_hold = list(/obj/item/inflatable)