cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'server/master' into map

Browse Source
This commit is contained in:
Hawk_v3
2019-10-05 23:10:09 +01:00
parent b7eb09bd0e 02fc3c4a83
commit 74cc210e21
1632 changed files with 246785 additions and 713803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
code/game/objects/structures/crates_lockers/crates.dm
View File

@@ -3,7 +3,7 @@
/obj/structure/closet/crate
name = "crate"
desc = "A rectangular steel crate."
icon = 'icons/obj/storage.dmi'
icon = 'icons/obj/storage_vr.dmi' //VOREStation edit
icon_state = "crate"
icon_opened = "crateopen"
icon_closed = "crate"
@@ -293,6 +293,9 @@
/obj/structure/closet/crate/solar
name = "solar pack crate"
icon_state = "engi_crate" //VOREStation Edit
icon_opened = "engi_crateopen" //VOREStation Edit
icon_closed = "engi_crate" //VOREStation Edit
starts_with = list(
/obj/item/solar_assembly = 21,
@@ -349,7 +352,7 @@
desc = "A crate of emergency rations."
starts_with = list(
/obj/item/weapon/reagent_containers/food/snacks/liquidfood = 4)
/obj/random/mre = 6)
/obj/structure/closet/crate/freezer/meat //Fpr use in the escape shuttle
name = "Bonfire storage"
@@ -362,6 +365,7 @@
/obj/structure/closet/crate/bin
name = "large bin"
desc = "A large bin."
icon = 'icons/obj/storage.dmi' //VOREStation edit
icon_state = "largebin"
icon_opened = "largebinopen"
icon_closed = "largebin"
@@ -430,6 +434,7 @@
/obj/structure/closet/crate/secure/bin
name = "secure bin"
desc = "A secure bin."
icon = 'icons/obj/storage.dmi' //VOREStation edit
icon_state = "largebins"
icon_opened = "largebinsopen"
icon_closed = "largebins"
@@ -442,7 +447,7 @@
/obj/structure/closet/crate/large
name = "large crate"
desc = "A hefty metal crate."
icon = 'icons/obj/storage.dmi'
icon = 'icons/obj/storage_vr.dmi' //VOREStation Edit
icon_state = "largemetal"
icon_opened = "largemetalopen"
icon_closed = "largemetal"
@@ -470,10 +475,10 @@
/obj/structure/closet/crate/secure/large
name = "large crate"
desc = "A hefty metal crate with an electronic locking system."
icon = 'icons/obj/storage.dmi'
icon_state = "largemetal"
icon_opened = "largemetalopen"
icon_closed = "largemetal"
icon = 'icons/obj/storage_vr.dmi' //VOREStation Edit
icon_state = "largemetalsecure" //VOREStation Edit
icon_opened = "largemetalsecureopen" //VOREStation Edit
icon_closed = "largemetalsecure" //VOREStation Edit
redlight = "largemetalr"
greenlight = "largemetalg"