diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index a422153bbb..d945d49116 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -11754,22 +11754,8 @@ /turf/open/floor/circuit, /area/ai_monitored/nuke_storage) "aEN" = ( -/obj/structure/closet/crate{ - name = "Gold Crate" - }, -/obj/item/stack/sheet/mineral/gold{ - pixel_x = -1; - pixel_y = 5 - }, -/obj/item/stack/sheet/mineral/gold{ - pixel_y = 2 - }, -/obj/item/stack/sheet/mineral/gold{ - pixel_x = 1; - pixel_y = -2 - }, -/obj/item/storage/belt/champion, /obj/effect/turf_decal/bot_white/right, +/obj/structure/closet/crate/goldcrate, /turf/open/floor/plasteel/vault{ dir = 1 }, @@ -11781,30 +11767,8 @@ /turf/open/floor/circuit, /area/ai_monitored/nuke_storage) "aEP" = ( -/obj/item/coin/silver{ - pixel_x = 7; - pixel_y = 12 - }, -/obj/item/coin/silver{ - pixel_x = 12; - pixel_y = 7 - }, -/obj/item/coin/silver{ - pixel_x = 4; - pixel_y = 8 - }, -/obj/item/coin/silver{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/coin/silver{ - pixel_x = 5; - pixel_y = -8 - }, -/obj/structure/closet/crate{ - name = "Silver Crate" - }, /obj/effect/turf_decal/bot_white/left, +/obj/structure/closet/crate/silvercrate, /turf/open/floor/plasteel/vault{ dir = 4 }, @@ -45382,28 +45346,10 @@ /turf/open/floor/plasteel, /area/engine/engineering) "ckG" = ( -/obj/structure/closet/crate{ - name = "solar pack crate" - }, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/circuitboard/computer/solar_control, -/obj/item/electronics/tracker, -/obj/item/paper/guides/jobs/engi/solars, /obj/effect/turf_decal/bot{ dir = 1 }, +/obj/structure/closet/crate/solarpanel_small, /turf/open/floor/plasteel, /area/engine/engineering) "ckH" = ( diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index c0c19dc87b..bb6a58bb77 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -32288,23 +32288,10 @@ }, /area/security/nuke_storage) "bvQ" = ( -/obj/structure/closet/crate{ - name = "Silver Crate" - }, /obj/machinery/light/small{ dir = 1 }, -/obj/item/coin/silver{ - pixel_x = -6 - }, -/obj/item/coin/silver{ - pixel_x = 6 - }, -/obj/item/coin/silver{ - pixel_x = 6 - }, -/obj/item/coin/silver, -/obj/item/coin/silver, +/obj/structure/closet/crate/silvercrate, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -35277,17 +35264,12 @@ }, /area/security/nuke_storage) "bBU" = ( -/obj/structure/closet/crate{ - name = "Gold Crate" - }, -/obj/item/storage/belt/champion, /obj/machinery/airalarm{ dir = 1; pixel_y = -22 }, /obj/machinery/light/small, -/obj/item/stack/sheet/mineral/gold, -/obj/item/stack/sheet/mineral/gold, +/obj/structure/closet/crate/goldcrate, /turf/open/floor/plasteel/vault{ dir = 8 }, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 12893085bc..e6ef58c9af 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -12521,25 +12521,11 @@ /turf/open/floor/plasteel/floorgrime, /area/quartermaster/warehouse) "aAP" = ( -/obj/structure/closet/crate{ - name = "Gold Crate" - }, -/obj/item/stack/sheet/mineral/gold{ - pixel_x = -1; - pixel_y = 5 - }, -/obj/item/stack/sheet/mineral/gold{ - pixel_y = 2 - }, -/obj/item/stack/sheet/mineral/gold{ - pixel_x = 1; - pixel_y = -2 - }, -/obj/item/storage/belt/champion, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, /obj/effect/turf_decal/bot_white/right, +/obj/structure/closet/crate/goldcrate, /turf/open/floor/plasteel/vault{ dir = 1 }, @@ -12573,30 +12559,8 @@ }, /area/security/nuke_storage) "aAT" = ( -/obj/item/coin/silver{ - pixel_x = 7; - pixel_y = 12 - }, -/obj/item/coin/silver{ - pixel_x = 12; - pixel_y = 7 - }, -/obj/item/coin/silver{ - pixel_x = 4; - pixel_y = 8 - }, -/obj/item/coin/silver{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/coin/silver{ - pixel_x = 5; - pixel_y = -8 - }, -/obj/structure/closet/crate{ - name = "Silver Crate" - }, /obj/effect/turf_decal/bot_white/left, +/obj/structure/closet/crate/silvercrate, /turf/open/floor/plasteel/vault{ dir = 1 }, @@ -15500,28 +15464,10 @@ }, /area/engine/engineering) "aGT" = ( -/obj/structure/closet/crate{ - name = "solar pack crate" - }, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/circuitboard/computer/solar_control, -/obj/item/electronics/tracker, -/obj/item/paper/guides/jobs/engi/solars, /obj/effect/turf_decal/bot{ dir = 1 }, +/obj/structure/closet/crate/solarpanel_small, /turf/open/floor/plasteel{ dir = 1 }, diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 7bac99a37c..1390460fd2 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -33236,28 +33236,10 @@ }, /area/maintenance/starboard) "sFp" = ( -/obj/structure/closet/crate{ - name = "solar pack crate" - }, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/circuitboard/computer/solar_control, -/obj/item/electronics/tracker, -/obj/item/paper/guides/jobs/engi/solars, /obj/effect/turf_decal/bot{ dir = 1 }, +/obj/structure/closet/crate/solarpanel_small, /turf/open/floor/plasteel/vault/side{ dir = 5 }, diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 573dc2c707..ac4d2a12dc 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -6985,21 +6985,7 @@ /turf/closed/wall/r_wall, /area/bridge) "asV" = ( -/obj/structure/closet/crate{ - name = "Gold Crate" - }, -/obj/item/stack/sheet/mineral/gold{ - pixel_x = -1; - pixel_y = 5 - }, -/obj/item/stack/sheet/mineral/gold{ - pixel_y = 2 - }, -/obj/item/stack/sheet/mineral/gold{ - pixel_x = 1; - pixel_y = -2 - }, -/obj/item/storage/belt/champion, +/obj/structure/closet/crate/goldcrate, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, @@ -7036,29 +7022,7 @@ }, /area/ai_monitored/nuke_storage) "asZ" = ( -/obj/item/coin/silver{ - pixel_x = 7; - pixel_y = 12 - }, -/obj/item/coin/silver{ - pixel_x = 12; - pixel_y = 7 - }, -/obj/item/coin/silver{ - pixel_x = 4; - pixel_y = 8 - }, -/obj/item/coin/silver{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/coin/silver{ - pixel_x = 5; - pixel_y = -8 - }, -/obj/structure/closet/crate{ - name = "Silver Crate" - }, +/obj/structure/closet/crate/silvercrate, /turf/open/floor/plasteel/vault{ dir = 4 }, @@ -39901,25 +39865,6 @@ /turf/open/floor/plasteel/darkgreen, /area/storage/tech) "bTB" = ( -/obj/structure/closet/crate{ - name = "solar pack crate" - }, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/circuitboard/computer/solar_control, -/obj/item/electronics/tracker, -/obj/item/paper/guides/jobs/engi/solars, /obj/machinery/power/apc{ dir = 2; name = "Tech Storage APC"; @@ -39927,6 +39872,7 @@ pixel_y = -24 }, /obj/structure/cable, +/obj/structure/closet/crate/solarpanel_small, /turf/open/floor/plasteel/darkgreen, /area/storage/tech) "bTC" = ( diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 2889a10e1d..63d700d3ce 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -148,3 +148,32 @@ name = "science crate" desc = "A science crate." icon_state = "scicrate" + +/obj/structure/closet/crate/solarpanel_small + name = "budget solar panel crate" + icon_state = "engi_e_crate" + +/obj/structure/closet/crate/solarpanel_small/PopulateContents() + ..() + for(var/i in 1 to 13) + new /obj/item/solar_assembly(src) + new /obj/item/circuitboard/computer/solar_control(src) + new /obj/item/paper/guides/jobs/engi/solars(src) + new /obj/item/electronics/tracker(src) + +/obj/structure/closet/crate/goldcrate + name = "gold crate" + +/obj/structure/closet/crate/goldcrate/PopulateContents() + ..() + for(var/i in 1 to 3) + new /obj/item/stack/sheet/mineral/gold(src, 1, FALSE) + new /obj/item/storage/belt/champion(src) + +/obj/structure/closet/crate/silvercrate + name = "silver crate" + +/obj/structure/closet/crate/silvercrate/PopulateContents() + ..() + for(var/i in 1 to 5) + new /obj/item/coin/silver(src)