diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index ce37afd0b33..1206ddc8486 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -14108,8 +14108,8 @@ c_tag = "Vault"; dir = 4 }, -/obj/structure/closet/crate{ - name = "Gold Crate" +/obj/structure/closet/crate/nanotrasen{ + name = "gold crate" }, /obj/item/radio/intercom{ name = "west bump"; @@ -14137,8 +14137,8 @@ /turf/simulated/floor/plasteel, /area/station/public/storage/tools) "aXR" = ( -/obj/structure/closet/crate{ - name = "Silver Crate" +/obj/structure/closet/crate/nanotrasen{ + name = "silver crate" }, /obj/item/stack/sheet/mineral/silver, /obj/item/stack/sheet/mineral/silver, diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index 8317ed8914d..e8963621771 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -60218,8 +60218,8 @@ }, /area/station/engineering/hardsuitstorage) "liI" = ( -/obj/structure/closet/crate{ - name = "Silver Crate" +/obj/structure/closet/crate/nanotrasen{ + name = "silver crate" }, /obj/item/stack/sheet/mineral/silver, /obj/item/stack/sheet/mineral/silver, @@ -60722,8 +60722,8 @@ }, /area/station/science/robotics) "lmO" = ( -/obj/structure/closet/crate{ - name = "Silver Crate" +/obj/structure/closet/crate/nanotrasen{ + name = "gold crate" }, /obj/item/storage/belt/champion, /obj/item/stack/sheet/mineral/gold, diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index c15ce987745..8ccaf708f42 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -18120,7 +18120,9 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/structure/closet/crate, +/obj/structure/closet/crate/nanotrasen{ + name = "silver crate" + }, /obj/item/stack/sheet/mineral/silver, /obj/item/stack/sheet/mineral/silver, /obj/item/stack/sheet/mineral/silver, @@ -19556,7 +19558,9 @@ "bAI" = ( /obj/machinery/alarm/directional/south, /obj/machinery/light/small, -/obj/structure/closet/crate, +/obj/structure/closet/crate/nanotrasen{ + name = "gold crate" + }, /obj/item/storage/belt/champion, /obj/item/stack/sheet/mineral/gold, /obj/item/stack/sheet/mineral/gold, diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm index b7265aa79eb..da5f548f129 100644 --- a/_maps/map_files/stations/emeraldstation.dmm +++ b/_maps/map_files/stations/emeraldstation.dmm @@ -29925,8 +29925,8 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/structure/closet/crate{ - name = "Silver Crate" +/obj/structure/closet/crate/nanotrasen{ + name = "silver crate" }, /obj/item/stack/sheet/mineral/silver, /obj/item/stack/sheet/mineral/silver, @@ -114157,8 +114157,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "wHI" = ( -/obj/structure/closet/crate{ - name = "Gold Crate" +/obj/structure/closet/crate/nanotrasen{ + name = "gold crate" }, /obj/item/storage/belt/champion, /obj/machinery/status_display{ diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index 6f4a1524a45..a9f392bcf15 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -4065,8 +4065,8 @@ }, /area/station/maintenance/fpmaint) "aEX" = ( -/obj/structure/closet/crate{ - name = "Gold Crate" +/obj/structure/closet/crate/nanotrasen{ + name = "gold crate" }, /obj/item/stack/sheet/mineral/gold{ pixel_x = -1; @@ -4096,10 +4096,10 @@ }, /area/station/command/vault) "aFb" = ( -/obj/effect/turf_decal/delivery/white/hollow/left, -/obj/structure/closet/crate{ - name = "Silver Crate" +/obj/structure/closet/crate/nanotrasen{ + name = "silver crate" }, +/obj/effect/turf_decal/delivery/white/hollow/left, /obj/item/stack/sheet/mineral/silver, /obj/item/stack/sheet/mineral/silver, /obj/item/stack/sheet/mineral/silver, @@ -42081,13 +42081,6 @@ icon_state = "darkgrey" }, /area/station/maintenance/aft) -"gEr" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "caution" - }, -/area/station/engineering/atmos) "gEt" = ( /obj/structure/table/glass, /obj/item/paper/crumpled, @@ -72094,6 +72087,13 @@ icon_state = "darkbluecorners" }, /area/station/medical/storage/secondary) +"roR" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "caution" + }, +/area/station/engineering/atmos) "rpt" = ( /turf/simulated/floor/carpet, /area/station/security/detective) @@ -132245,7 +132245,7 @@ uJI xBg xoS bYt -gEr +roR kcr jOr kuW diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 0f58bd3d588..639f59dae6b 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -575,6 +575,20 @@ icon_opened = "electricalcrate_open" icon_closed = "electricalcrate" +/obj/structure/closet/crate/nanotrasen + name = "corporate crate" + desc = "A Nanotrasen crate." + icon_state = "nanotrasen" + icon_opened = "nanotrasen_open" + icon_closed = "nanotrasen" + +/obj/structure/closet/crate/secure/nanotrasen + name = "secure corporate crate" + desc = "A crate with a lock on it, painted in the scheme of Nanotrasen. Whatever's in here is probably above your pay grade." + icon_state = "nanotrasensecure" + icon_opened = "nanotrasensecure_open" + icon_closed = "nanotrasensecure" + /obj/structure/closet/crate/mail name = "mail crate" desc = "A plastic crate for mail delivery." diff --git a/code/modules/supply/supply_packs/pack_miscellaneous.dm b/code/modules/supply/supply_packs/pack_miscellaneous.dm index 86c4638f164..396300abb93 100644 --- a/code/modules/supply/supply_packs/pack_miscellaneous.dm +++ b/code/modules/supply/supply_packs/pack_miscellaneous.dm @@ -116,6 +116,7 @@ /obj/item/clipboard, /obj/item/clipboard) cost = 100 + containertype = /obj/structure/closet/crate/nanotrasen containername = "bureaucracy crate" /datum/supply_packs/misc/artscrafts @@ -153,6 +154,7 @@ /obj/item/poster/random_official, /obj/item/poster/random_official) cost = 50 + containertype = /obj/structure/closet/crate/nanotrasen containername = "corporate posters crate" ///////////// Janitor Supplies @@ -543,7 +545,7 @@ cost = 10 special = TRUE containername = "empty station goal crate" - containertype = /obj/structure/closet/crate/engineering + containertype = /obj/structure/closet/crate/nanotrasen /datum/supply_packs/misc/station_goal/bsa name = "Bluespace Artillery Parts" @@ -832,7 +834,7 @@ /obj/item/flag/command ) cost = 250 - containertype = /obj/structure/closet/crate/secure + containertype = /obj/structure/closet/crate/secure/nanotrasen containername = "command flag crate" access = ACCESS_HEADS diff --git a/icons/obj/crates.dmi b/icons/obj/crates.dmi index 2089060cd12..9d3473c969b 100644 Binary files a/icons/obj/crates.dmi and b/icons/obj/crates.dmi differ