diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index 4e52a43519..3e23296bdb 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -49,6 +49,8 @@ /obj/item/storage/fancy/egg_box = 4, /obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose = 2) +/obj/structure/closet/secure_closet/freezer/fridge/empty + starts_with = null /obj/structure/closet/secure_closet/freezer/money name = "freezer" diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 876c401913..5acf656b00 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -22,21 +22,25 @@ /obj/item/clothing/accessory/holster/waist = 3) /obj/structure/closet/wardrobe/red/Initialize(mapload) - if(prob(50)) - starts_with += /obj/item/storage/backpack/security - else - starts_with += /obj/item/storage/backpack/satchel/sec - if(prob(50)) - starts_with += /obj/item/storage/backpack/security - else - starts_with += /obj/item/storage/backpack/satchel/sec - if(prob(50)) - starts_with += /obj/item/storage/backpack/security - else - starts_with += /obj/item/storage/backpack/satchel/sec + if(islist(starts_with)) + if(prob(50)) + starts_with += /obj/item/storage/backpack/security + else + starts_with += /obj/item/storage/backpack/satchel/sec + if(prob(50)) + starts_with += /obj/item/storage/backpack/security + else + starts_with += /obj/item/storage/backpack/satchel/sec + if(prob(50)) + starts_with += /obj/item/storage/backpack/security + else + starts_with += /obj/item/storage/backpack/satchel/sec return ..() +/obj/structure/closet/wardrobe/red/empty + starts_with = null + /obj/structure/closet/wardrobe/detective name = "detective wardrobe" closet_appearance = /decl/closet_appearance/cabinet @@ -70,6 +74,9 @@ /obj/item/clothing/under/color/pink = 3, /obj/item/clothing/shoes/brown = 3) +/obj/structure/closet/wardrobe/pink/empty + starts_with = null + /obj/structure/closet/wardrobe/black name = "black wardrobe" closet_appearance = /decl/closet_appearance/wardrobe/black @@ -82,6 +89,23 @@ /obj/item/clothing/mask/bandana = 3, /obj/item/storage/backpack/messenger/black) +/obj/structure/closet/wardrobe/black/empty + starts_with = null + +/obj/structure/closet/wardrobe/black/talon + starts_with = list( + /obj/item/clothing/under/color/black = 4, + /obj/item/clothing/accessory/storage/black_vest = 4, + /obj/item/clothing/accessory/storage/black_drop_pouches = 4, + /obj/item/clothing/gloves/black = 4, + /obj/item/clothing/head/soft/black = 4, + /obj/item/clothing/mask/balaclava = 4, + /obj/item/clothing/mask/bandana = 4, + /obj/item/clothing/mask/gas/commando = 4, + /obj/item/storage/backpack/messenger/black = 4, + /obj/item/storage/backpack/dufflebag = 4, + /obj/item/clothing/shoes/black = 4, + /obj/item/clothing/shoes/boots/duty = 4) /obj/structure/closet/wardrobe/chaplain_black name = "chapel wardrobe" @@ -128,6 +152,9 @@ /obj/item/clothing/head/soft/green = 3, /obj/item/clothing/mask/bandana/green = 3) +/obj/structure/closet/wardrobe/green/empty + starts_with = null + /obj/structure/closet/wardrobe/xenos name = "xenos wardrobe" closet_appearance = /decl/closet_appearance/wardrobe/xenos @@ -150,6 +177,8 @@ /obj/item/clothing/under/color/prison = 3, /obj/item/clothing/shoes/orange = 3) +/obj/structure/closet/wardrobe/orange/empty + starts_with = null /obj/structure/closet/wardrobe/yellow name = "yellow wardrobe" @@ -161,6 +190,8 @@ /obj/item/clothing/head/soft/yellow = 3, /obj/item/clothing/mask/bandana/gold = 3) +/obj/structure/closet/wardrobe/yellow/empty + starts_with = null /obj/structure/closet/wardrobe/atmospherics_yellow name = "atmospherics wardrobe" @@ -202,6 +233,8 @@ /obj/item/clothing/shoes/white = 3, /obj/item/clothing/head/soft/mime = 3) +/obj/structure/closet/wardrobe/white/empty + starts_with = null /obj/structure/closet/wardrobe/pjs name = "pajama wardrobe" @@ -351,6 +384,8 @@ /obj/item/clothing/shoes/black = 3, /obj/item/clothing/head/soft/grey = 3) +/obj/structure/closet/wardrobe/grey/empty + starts_with = null /obj/structure/closet/wardrobe/mixed name = "mixed wardrobe" diff --git a/maps/gateway_vr/snow_outpost.dmm b/maps/gateway_vr/snow_outpost.dmm index 03c5f2dd90..de530e0239 100644 --- a/maps/gateway_vr/snow_outpost.dmm +++ b/maps/gateway_vr/snow_outpost.dmm @@ -2410,11 +2410,7 @@ name = "Station Intercom (General)"; pixel_x = -28 }, -/obj/structure/closet/crate/hydroponics{ - desc = "All you need to destroy that pesky planet."; - name = "exotic seeds crate"; - starts_with = list(/obj/item/seeds/random = 6, /obj/item/seeds/replicapod = 2, /obj/item/seeds/ambrosiavulgarisseed = 2, /obj/item/seeds/kudzuseed, /obj/item/seeds/libertymycelium, /obj/item/seeds/reishimycelium) - }, +/obj/structure/closet/crate/hydroponics, /turf/simulated/floor/water, /area/awaymission/snow_outpost/outside) "il" = ( diff --git a/maps/offmap_vr/om_ships/aro2.dmm b/maps/offmap_vr/om_ships/aro2.dmm index 8eed067047..03b0fbfe82 100644 --- a/maps/offmap_vr/om_ships/aro2.dmm +++ b/maps/offmap_vr/om_ships/aro2.dmm @@ -2404,9 +2404,6 @@ /turf/simulated/floor/tiled/eris/dark, /area/aro2/boatdeck) "yK" = ( -/obj/structure/closet/secure_closet/freezer/fridge{ - starts_with = null - }, /obj/item/reagent_containers/food/snacks/generalschicken, /obj/item/storage/box/wings, /obj/item/reagent_containers/food/snacks/kitsuneudon, @@ -2414,6 +2411,7 @@ /obj/item/reagent_containers/food/snacks/grilledcheese, /obj/item/reagent_containers/food/snacks/jellysandwich, /obj/item/reagent_containers/food/snacks/enchiladas, +/obj/structure/closet/secure_closet/freezer/fridge/empty, /turf/simulated/floor/tiled/eris/techmaint_perforated, /area/aro2/dining) "yY" = ( diff --git a/maps/offmap_vr/talon/talon_v2.dmm b/maps/offmap_vr/talon/talon_v2.dmm index f9d2a97208..404132f630 100644 --- a/maps/offmap_vr/talon/talon_v2.dmm +++ b/maps/offmap_vr/talon/talon_v2.dmm @@ -6765,9 +6765,7 @@ /turf/simulated/floor/plating, /area/talon_v2/engineering/port_store) "wS" = ( -/obj/structure/closet/wardrobe/black{ - starts_with = list(/obj/item/clothing/under/color/black = 4, /obj/item/clothing/accessory/storage/black_vest = 4, /obj/item/clothing/accessory/storage/black_drop_pouches = 4, /obj/item/clothing/gloves/black = 4, /obj/item/clothing/head/soft/black = 4, /obj/item/clothing/mask/balaclava = 4, /obj/item/clothing/mask/bandana = 4, /obj/item/clothing/mask/gas/commando = 4, /obj/item/storage/backpack/messenger/black = 4, /obj/item/storage/backpack/dufflebag = 4, /obj/item/clothing/shoes/black = 4, /obj/item/clothing/shoes/boots/duty = 4) - }, +/obj/structure/closet/wardrobe/black/talon, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/armory) "wT" = ( @@ -8032,9 +8030,7 @@ /turf/simulated/floor/plating, /area/talon_v2/engineering/atmospherics) "BH" = ( -/obj/structure/closet/wardrobe/black{ - starts_with = list(/obj/item/clothing/under/color/black = 4, /obj/item/clothing/accessory/storage/black_vest = 4, /obj/item/clothing/accessory/storage/black_drop_pouches = 4, /obj/item/clothing/gloves/black = 4, /obj/item/clothing/head/soft/black = 4, /obj/item/clothing/mask/balaclava = 4, /obj/item/clothing/mask/bandana = 4, /obj/item/clothing/mask/gas/commando = 4, /obj/item/storage/backpack/messenger/black = 4, /obj/item/storage/backpack/dufflebag = 4, /obj/item/clothing/shoes/black = 4, /obj/item/clothing/shoes/boots/duty = 4) - }, +/obj/structure/closet/wardrobe/black/talon, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/crew_quarters/restrooms) "BI" = ( diff --git a/maps/submaps/pois_vr/aerostat/Epod4.dmm b/maps/submaps/pois_vr/aerostat/Epod4.dmm index 7212bcf26a..b5ad8ec5ba 100644 --- a/maps/submaps/pois_vr/aerostat/Epod4.dmm +++ b/maps/submaps/pois_vr/aerostat/Epod4.dmm @@ -63,11 +63,7 @@ name = "Station Intercom (General)"; pixel_x = -28 }, -/obj/structure/closet/crate/hydroponics{ - desc = "All you need to destroy that pesky planet."; - name = "exotic seeds crate"; - starts_with = list(/obj/item/seeds/random = 6, /obj/item/seeds/replicapod = 2, /obj/item/seeds/ambrosiavulgarisseed = 2, /obj/item/seeds/kudzuseed, /obj/item/seeds/libertymycelium, /obj/item/seeds/reishimycelium) - }, +/obj/structure/closet/crate/hydroponics/exotic, /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/Epod4) "o" = ( diff --git a/maps/submaps/pois_vr/debris_field/tinycarrier.dmm b/maps/submaps/pois_vr/debris_field/tinycarrier.dmm index aa9fdc29fd..aca45d3e87 100644 --- a/maps/submaps/pois_vr/debris_field/tinycarrier.dmm +++ b/maps/submaps/pois_vr/debris_field/tinycarrier.dmm @@ -254,14 +254,12 @@ /obj/item/clothing/under/solgov/utility/fleet/combat, /obj/item/clothing/suit/storage/solgov/service/fleet, /obj/item/clothing/suit/storage/solgov/service/fleet, -/obj/structure/closet/wardrobe/black{ - starts_with = list() - }, /obj/effect/floor_decal/corner/brown/full{ dir = 1 }, /obj/item/clothing/shoes/boots/duty, /obj/item/clothing/shoes/boots/duty, +/obj/structure/closet/wardrobe/black/empty, /turf/simulated/floor/tiled, /area/submap/debrisfield/tinyshuttle/crew) "aC" = ( @@ -562,10 +560,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 }, -/obj/structure/closet/secure_closet/guncabinet/sidearm{ - anchored = 1; - starts_with = list() - }, /obj/item/gun/projectile/p92x/large, /obj/item/gun/projectile/p92x/large, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -576,6 +570,9 @@ /obj/item/ammo_magazine/m9mm/large, /obj/item/ammo_magazine/m9mm/large, /obj/item/ammo_magazine/m9mm/large, +/obj/structure/closet/secure_closet/guncabinet{ + name = "emergency weapon cabinet" + }, /turf/simulated/floor/tiled, /area/submap/debrisfield/tinyshuttle/crew) "be" = ( diff --git a/maps/submaps/surface_submaps/wilderness/Epod4.dmm b/maps/submaps/surface_submaps/wilderness/Epod4.dmm index b94cd3e9eb..b034e1a4c8 100644 --- a/maps/submaps/surface_submaps/wilderness/Epod4.dmm +++ b/maps/submaps/surface_submaps/wilderness/Epod4.dmm @@ -85,11 +85,7 @@ name = "Station Intercom (General)"; pixel_x = -28 }, -/obj/structure/closet/crate/hydroponics{ - desc = "All you need to destroy that pesky planet."; - name = "exotic seeds crate"; - starts_with = list(/obj/item/seeds/random = 6, /obj/item/seeds/replicapod = 2, /obj/item/seeds/ambrosiavulgarisseed = 2, /obj/item/seeds/kudzuseed, /obj/item/seeds/libertymycelium, /obj/item/seeds/reishimycelium) - }, +/obj/structure/closet/crate/hydroponics/exotic, /turf/simulated/floor/water, /area/submap/Epod4) "o" = ( diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index 90d66b054b..814db18360 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -19443,9 +19443,7 @@ /obj/random/action_figure, /obj/random/action_figure, /obj/random/action_figure, -/obj/structure/closet/wardrobe/grey{ - starts_with = list(/obj/structure/barricade/cutout/viva, /obj/item/clothing/under/color/grey = 3, /obj/item/clothing/shoes/black = 3, /obj/item/clothing/head/soft/grey = 3, /obj/item/clothing/mask/gas/wwii = 3, /obj/item/storage/toolbox/mechanical = 3, /obj/item/clothing/gloves/fyellow = 3, /obj/item/card/id/gold/captain/spare/fakespare = 3, /obj/item/soap/syndie = 3, /obj/item/storage/box/mousetraps = 3) - }, +/obj/structure/closet/wardrobe/grey/empty, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "aHh" = ( diff --git a/modular_chomp/maps/cetus/cetus-2.dmm b/modular_chomp/maps/cetus/cetus-2.dmm index a13c083e01..18744a0c0c 100644 --- a/modular_chomp/maps/cetus/cetus-2.dmm +++ b/modular_chomp/maps/cetus/cetus-2.dmm @@ -45590,8 +45590,7 @@ /area/medical/Restrooms) "pyl" = ( /obj/structure/closet/secure_closet/cargotech{ - name = "mailman's locker"; - starts_with = list(/obj/item/clothing/under/rank/mailman,/obj/item/clothing/head/mailman,/obj/item/clothing/shoes/black,/obj/item/radio/headset/cargo,/obj/item/radio/headset/alt/cargo,/obj/item/storage/bag/mail,/obj/item/destTagger) + name = "mailman's locker" }, /obj/item/mail_scanner{ pixel_x = -5; @@ -45614,6 +45613,10 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/item/clothing/under/rank/mailman, +/obj/item/clothing/head/mailman, +/obj/item/storage/bag/mail, +/obj/item/destTagger, /turf/simulated/floor/tiled, /area/quartermaster/Recycling) "pyy" = ( diff --git a/modular_chomp/maps/cetus/cetus-3.dmm b/modular_chomp/maps/cetus/cetus-3.dmm index 9f709eb78c..1ff07c0169 100644 --- a/modular_chomp/maps/cetus/cetus-3.dmm +++ b/modular_chomp/maps/cetus/cetus-3.dmm @@ -370,6 +370,10 @@ }, /turf/simulated/floor/tiled/neutral, /area/maintenance/cetus/shallow/derelict/hallway) +"aaT" = ( +/obj/item/destTagger, +/turf/space, +/area/space) "aaZ" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -5871,11 +5875,18 @@ dir = 5 }, /obj/structure/closet/radiation{ - anchored = 1; - starts_with = list(/obj/item/clothing/suit/radiation=4,/obj/item/clothing/head/radiation=4,/obj/item/geiger=4) + anchored = 1 }, /obj/item/clothing/glasses/meson, /obj/item/clothing/glasses/meson, +/obj/item/clothing/head/radiation, +/obj/item/clothing/head/radiation, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/head/radiation/teshari, +/obj/item/clothing/suit/radiation/teshari, +/obj/item/geiger, +/obj/item/geiger, /turf/simulated/floor/tiled/dark, /area/rnd/research/particleaccelerator) "dyh" = ( @@ -7806,8 +7817,7 @@ /area/engineering/Solar_Control_ForPort) "eEF" = ( /obj/structure/closet/radiation{ - anchored = 1; - starts_with = list(/obj/item/clothing/suit/radiation=4,/obj/item/clothing/head/radiation=4,/obj/item/geiger=4) + anchored = 1 }, /obj/item/clothing/glasses/meson, /obj/item/clothing/glasses/meson, @@ -7829,6 +7839,12 @@ c_tag = "SCI - JR D3 Stairwell 3"; dir = 6 }, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/head/radiation, +/obj/item/clothing/head/radiation, /turf/simulated/floor/tiled/dark, /area/rnd/cetus/stairwelljr3) "eEH" = ( @@ -53718,7 +53734,7 @@ mco mco mco mco -mco +aaT mco mco mco diff --git a/modular_chomp/maps/common/common_objects.dm b/modular_chomp/maps/common/common_objects.dm index 1b6f26f030..5251a85c79 100644 --- a/modular_chomp/maps/common/common_objects.dm +++ b/modular_chomp/maps/common/common_objects.dm @@ -10,3 +10,104 @@ icon_modifier = "grey_" icon_state = "grey_railing0" interactable = TRUE + +/obj/structure/closet/secure_closet/security/snowfield + starts_with = list( + /obj/item/clothing/gloves/black, + /obj/item/clothing/accessory/holster, + /obj/item/storage/belt/security, + /obj/item/clothing/head/beret/sec/corporate/officer, + /obj/item/clothing/head/helmet, + /obj/item/radio/headset/alt/headset_sec, + /obj/item/radio/headset/headset_sec, + /obj/item/radio/off, + /obj/item/storage/backpack/security, + /obj/item/storage/backpack/satchel/sec, + /obj/item/clothing/shoes/boots/marine, + /obj/item/clothing/suit/armor/bulletproof, + /obj/item/clothing/under/soviet, + /obj/item/reagent_containers/spray/pepper, + /obj/item/melee/classic_baton, + /obj/item/ammo_magazine/makarov=2, + /obj/item/gun/projectile/serdy_pistols/makarov) + +/obj/structure/closet/secure_closet/medical3/snowfield + starts_with = list( + /obj/item/clothing/under/rank/medical, + /obj/item/clothing/under/rank/nurse, + /obj/item/clothing/under/rank/orderly, + /obj/item/clothing/suit/storage/toggle/labcoat, + /obj/item/clothing/suit/storage/toggle/labcoat/modern, + /obj/item/clothing/suit/storage/toggle/fr_jacket, + /obj/item/radio/headset/headset_med, + /obj/item/radio/headset/alt/headset_med, + /obj/item/clothing/suit/storage/hooded/wintercoat/medical, + /obj/item/clothing/shoes/boots/winter/medical, + /obj/item/clothing/under/rank/nursesuit, + /obj/item/clothing/head/nursehat, + /obj/item/storage/box/freezer=3, + /obj/item/storage/belt/medical) + +/obj/structure/closet/secure_closet/engineering_personal/snowfield + starts_with = list( + /obj/item/clothing/accessory/storage/brown_vest, + /obj/item/storage/toolbox/mechanical, + /obj/item/radio/headset/headset_eng, + /obj/item/radio/headset/alt/headset_eng, + /obj/item/clothing/suit/storage/hazardvest, + /obj/item/clothing/mask/gas, + /obj/item/cartridge/engineering, + /obj/item/taperoll/engineering, + /obj/item/clothing/head/hardhat, + /obj/item/clothing/suit/storage/hooded/wintercoat/engineering, + /obj/item/clothing/shoes/boots/winter/engineering, + /obj/item/tank/emergency/oxygen/engi, + /obj/item/storage/belt/utility, + /obj/item/reagent_containers/spray/windowsealant) + +/obj/structure/closet/secure_closet/detective/snowfield + starts_with = list( + /obj/item/clothing/gloves/forensic, + /obj/item/clothing/accessory/holster, + /obj/item/storage/belt/security, + /obj/item/clothing/head/fedora, + /obj/item/clothing/head/fedora/brown, + /obj/item/clothing/suit/storage/det_trench, + /obj/item/clothing/suit/storage/det_trench/grey, + /obj/item/clothing/suit/armor/bulletproof, + /obj/item/radio/headset/alt/headset_sec, + /obj/item/radio/headset/headset_sec, + /obj/item/radio/off, + /obj/item/storage/backpack/security, + /obj/item/storage/backpack/satchel/sec, + /obj/item/clothing/shoes/boots/marine, + /obj/item/clothing/under/soviet, + /obj/item/melee/classic_baton, + /obj/item/reagent_containers/spray/pepper, + /obj/item/flash, + /obj/item/ammo_magazine/s357=2, + /obj/item/gun/projectile/revolver/nagant) + + +/obj/structure/closet/secure_closet/warden/snowfield + starts_with = list( + /obj/item/clothing/gloves/combat, + /obj/item/clothing/accessory/holster, + /obj/item/storage/belt/security, + /obj/item/shield/riot, + /obj/item/ammo_magazine/akm=2, + /obj/item/gun/projectile/automatic/serdy/krinkov, + /obj/item/clothing/head/beret/sec/corporate/warden, + /obj/item/clothing/head/helmet/warden/hat, + /obj/item/clothing/head/helmet/warden, + /obj/item/clothing/suit/armor/swat/officer, + /obj/item/radio/headset/alt/heads/hos, + /obj/item/radio/headset/heads/hos, + /obj/item/storage/backpack/security, + /obj/item/storage/backpack/satchel/sec, + /obj/item/clothing/shoes/boots/marine, + /obj/item/ammo_magazine/s357=2, + /obj/item/gun/projectile/revolver/nagant/skinned, + /obj/item/clothing/under/soviet, + /obj/item/reagent_containers/spray/pepper, + /obj/item/melee/classic_baton) diff --git a/modular_chomp/maps/common_submaps/gateway/snowfield.dmm b/modular_chomp/maps/common_submaps/gateway/snowfield.dmm index 30afb9c0bf..7d56b9f232 100644 --- a/modular_chomp/maps/common_submaps/gateway/snowfield.dmm +++ b/modular_chomp/maps/common_submaps/gateway/snowfield.dmm @@ -746,10 +746,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/closet/l3closet/general{ - opened = 1; - starts_with = null - }, +/obj/structure/closet/l3closet, /turf/simulated/floor/tiled/steel, /area/awaymission/snowfield/medical/storage_room) "aLI" = ( @@ -1127,11 +1124,8 @@ /obj/effect/floor_decal/corner/green/border{ dir = 8 }, -/obj/structure/closet/secure_closet/paramedic{ - req_access = list(33); - starts_with = list(/obj/item/storage/backpack/dufflebag/emt,/obj/item/storage/box/autoinjectors,/obj/item/storage/box/syringes,/obj/item/reagent_containers/glass/bottle/inaprovaline,/obj/item/reagent_containers/glass/bottle/antitoxin,/obj/item/storage/belt/medical/emt,/obj/item/clothing/mask/gas,/obj/item/clothing/suit/storage/toggle/fr_jacket,/obj/item/clothing/suit/storage/toggle/labcoat/emt,/obj/item/clothing/suit/storage/hooded/wintercoat/medical/para,/obj/item/radio/headset/alt/headset_med,/obj/item/storage/briefcase/inflatable,/obj/item/flashlight,/obj/item/tank/emergency/oxygen/engi,/obj/item/radio/off,/obj/item/tool/crowbar,/obj/item/extinguisher/mini,/obj/item/storage/box/freezer,/obj/item/clothing/accessory/storage/white_vest,/obj/item/taperoll/medical) - }, /obj/effect/floor_decal/industrial/outline, +/obj/structure/closet/secure_closet/paramedic, /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/medical/medical_locker) "beX" = ( @@ -2737,10 +2731,8 @@ /turf/simulated/mineral/floor/cave, /area/awaymission/snowfield/security/hallway2) "cDP" = ( -/obj/structure/closet/secure_closet/warden{ - starts_with = list(/obj/item/clothing/gloves/combat,/obj/item/clothing/accessory/holster,/obj/item/storage/belt/security,/obj/item/shield/riot,/obj/item/ammo_magazine/akm=2,/obj/item/gun/projectile/automatic/serdy/krinkov,/obj/item/clothing/head/beret/sec/corporate/warden,/obj/item/clothing/head/helmet/warden/hat,/obj/item/clothing/head/helmet/warden,/obj/item/clothing/suit/armor/swat/officer,/obj/item/radio/headset/alt/heads/hos,/obj/item/radio/headset/heads/hos,/obj/item/storage/backpack/security,/obj/item/storage/backpack/satchel/sec,/obj/item/clothing/shoes/boots/marine,/obj/item/ammo_magazine/s357=2,/obj/item/gun/projectile/revolver/nagant/skinned,/obj/item/clothing/under/soviet,/obj/item/reagent_containers/spray/pepper,/obj/item/melee/classic_baton) - }, /obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/warden/snowfield, /turf/simulated/floor/tiled/steel, /area/awaymission/snowfield/security/warden) "cEo" = ( @@ -2925,9 +2917,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/closet/secure_closet/security{ - starts_with = list(/obj/item/clothing/gloves/black,/obj/item/clothing/accessory/holster,/obj/item/storage/belt/security,/obj/item/clothing/head/beret/sec/corporate/officer,/obj/item/clothing/head/helmet,/obj/item/radio/headset/alt/headset_sec,/obj/item/radio/headset/headset_sec,/obj/item/radio/off,/obj/item/storage/backpack/security,/obj/item/storage/backpack/satchel/sec,/obj/item/clothing/shoes/boots/marine,/obj/item/clothing/suit/armor/bulletproof,/obj/item/clothing/under/soviet,/obj/item/reagent_containers/spray/pepper,/obj/item/melee/classic_baton,/obj/item/ammo_magazine/makarov=2,/obj/item/gun/projectile/serdy_pistols/makarov) - }, +/obj/structure/closet/secure_closet/security/snowfield, /turf/simulated/floor/tiled/techfloor/grid, /area/awaymission/snowfield/security/security_lockerroom) "cQE" = ( @@ -3733,10 +3723,7 @@ }, /obj/item/soap, /obj/effect/floor_decal/industrial/outline, -/obj/structure/closet/secure_closet/medical3{ - req_access = list(33); - starts_with = list(/obj/item/clothing/under/rank/medical,/obj/item/clothing/under/rank/nurse,/obj/item/clothing/under/rank/orderly,/obj/item/clothing/suit/storage/toggle/labcoat,/obj/item/clothing/suit/storage/toggle/labcoat/modern,/obj/item/clothing/suit/storage/toggle/fr_jacket,/obj/item/radio/headset/headset_med,/obj/item/radio/headset/alt/headset_med,/obj/item/clothing/suit/storage/hooded/wintercoat/medical,/obj/item/clothing/shoes/boots/winter/medical,/obj/item/clothing/under/rank/nursesuit,/obj/item/clothing/head/nursehat,/obj/item/storage/box/freezer=3,/obj/item/storage/belt/medical) - }, +/obj/structure/closet/secure_closet/medical3/snowfield, /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/medical/medical_locker) "dzM" = ( @@ -4324,9 +4311,7 @@ /area/awaymission/snowfield/hallway/commandhallway_substation) "dWX" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/closet/secure_closet/security{ - starts_with = list(/obj/item/clothing/gloves/black,/obj/item/clothing/accessory/holster,/obj/item/storage/belt/security,/obj/item/clothing/head/beret/sec/corporate/officer,/obj/item/clothing/head/helmet,/obj/item/radio/headset/alt/headset_sec,/obj/item/radio/headset/headset_sec,/obj/item/radio/off,/obj/item/storage/backpack/security,/obj/item/storage/backpack/satchel/sec,/obj/item/clothing/shoes/boots/marine,/obj/item/clothing/suit/armor/bulletproof,/obj/item/clothing/under/soviet,/obj/item/reagent_containers/spray/pepper,/obj/item/melee/classic_baton,/obj/item/ammo_magazine/makarov=2,/obj/item/gun/projectile/serdy_pistols/makarov) - }, +/obj/structure/closet/secure_closet/security/snowfield, /turf/simulated/floor/tiled/techfloor/grid, /area/awaymission/snowfield/security/security_lockerroom) "dXK" = ( @@ -4727,10 +4712,7 @@ }, /obj/item/soap, /obj/effect/floor_decal/industrial/outline, -/obj/structure/closet/secure_closet/medical3{ - req_access = list(33); - starts_with = list(/obj/item/clothing/under/rank/medical,/obj/item/clothing/under/rank/nurse,/obj/item/clothing/under/rank/orderly,/obj/item/clothing/suit/storage/toggle/labcoat,/obj/item/clothing/suit/storage/toggle/labcoat/modern,/obj/item/clothing/suit/storage/toggle/fr_jacket,/obj/item/radio/headset/headset_med,/obj/item/radio/headset/alt/headset_med,/obj/item/clothing/suit/storage/hooded/wintercoat/medical,/obj/item/clothing/shoes/boots/winter/medical,/obj/item/clothing/under/rank/nursesuit,/obj/item/clothing/head/nursehat,/obj/item/storage/box/freezer=3,/obj/item/storage/belt/medical) - }, +/obj/structure/closet/secure_closet/medical3/snowfield, /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/medical/medical_locker) "epG" = ( @@ -4912,9 +4894,6 @@ /turf/simulated/floor/tiled/techfloor, /area/awaymission/snowfield/public/toolstroage2) "ewG" = ( -/obj/structure/closet/secure_closet/engineering_personal{ - starts_with = list(/obj/item/clothing/accessory/storage/brown_vest,/obj/item/storage/toolbox/mechanical,/obj/item/radio/headset/headset_eng,/obj/item/radio/headset/alt/headset_eng,/obj/item/clothing/suit/storage/hazardvest,/obj/item/clothing/mask/gas,/obj/item/cartridge/engineering,/obj/item/taperoll/engineering,/obj/item/clothing/head/hardhat,/obj/item/clothing/suit/storage/hooded/wintercoat/engineering,/obj/item/clothing/shoes/boots/winter/engineering,/obj/item/tank/emergency/oxygen/engi,/obj/item/storage/belt/utility,/obj/item/reagent_containers/spray/windowsealant) - }, /obj/structure/window/reinforced{ dir = 4; health = 1e+006 @@ -4926,6 +4905,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/closet/secure_closet/engineering_personal/snowfield, /turf/simulated/floor/tiled/techfloor/grid, /area/awaymission/snowfield/engineering/locker_room) "ewH" = ( @@ -6407,9 +6387,7 @@ /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/medical/chemistry) "fWi" = ( -/obj/structure/closet/crate/radiation{ - starts_with = list(/obj/item/clothing/suit/radiation=8,/obj/item/clothing/head/radiation=8) - }, +/obj/structure/closet/crate/radiation, /obj/item/stack/material/lead{ amount = 50 }, @@ -6417,6 +6395,14 @@ amount = 50 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/head/radiation, +/obj/item/clothing/head/radiation, +/obj/item/clothing/head/radiation, +/obj/item/clothing/head/radiation, /turf/simulated/floor/plating, /area/awaymission/snowfield/engineering/primary_storage) "fWx" = ( @@ -6888,14 +6874,12 @@ /turf/simulated/wall/cult, /area/awaymission/snowfield/dorms/panicroom) "gsi" = ( -/obj/structure/closet/secure_closet/engineering_personal{ - starts_with = list(/obj/item/clothing/accessory/storage/brown_vest,/obj/item/storage/toolbox/mechanical,/obj/item/radio/headset/headset_eng,/obj/item/radio/headset/alt/headset_eng,/obj/item/clothing/suit/storage/hazardvest,/obj/item/clothing/mask/gas,/obj/item/cartridge/engineering,/obj/item/taperoll/engineering,/obj/item/clothing/head/hardhat,/obj/item/clothing/suit/storage/hooded/wintercoat/engineering,/obj/item/clothing/shoes/boots/winter/engineering,/obj/item/tank/emergency/oxygen/engi,/obj/item/storage/belt/utility,/obj/item/reagent_containers/spray/windowsealant) - }, /obj/structure/window/reinforced{ dir = 4; health = 1e+006 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/closet/secure_closet/engineering_personal/snowfield, /turf/simulated/floor/tiled/techfloor/grid, /area/awaymission/snowfield/engineering/locker_room) "gsu" = ( @@ -10402,12 +10386,10 @@ /turf/simulated/floor/tiled/steel_grid, /area/awaymission/snowfield/dorms/dorm7) "jtR" = ( -/obj/structure/closet/secure_closet/security{ - starts_with = list(/obj/item/clothing/gloves/black,/obj/item/clothing/accessory/holster,/obj/item/storage/belt/security,/obj/item/clothing/head/beret/sec/corporate/officer,/obj/item/clothing/head/helmet,/obj/item/radio/headset/alt/headset_sec,/obj/item/radio/headset/headset_sec,/obj/item/radio/off,/obj/item/storage/backpack/security,/obj/item/storage/backpack/satchel/sec,/obj/item/clothing/shoes/boots/marine,/obj/item/clothing/suit/armor/bulletproof,/obj/item/clothing/under/soviet,/obj/item/reagent_containers/spray/pepper,/obj/item/melee/classic_baton,/obj/item/ammo_magazine/makarov=2,/obj/item/gun/projectile/serdy_pistols/makarov) - }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/window/reinforced, /obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/security/snowfield, /turf/simulated/floor/tiled/techfloor/grid, /area/awaymission/snowfield/security/security_lockerroom) "juu" = ( @@ -10635,9 +10617,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/closet/secure_closet/detective{ - starts_with = list(/obj/item/clothing/gloves/forensic,/obj/item/clothing/accessory/holster,/obj/item/storage/belt/security,/obj/item/clothing/head/fedora,/obj/item/clothing/head/fedora/brown,/obj/item/clothing/suit/storage/det_trench,/obj/item/clothing/suit/storage/det_trench/grey,/obj/item/clothing/suit/armor/bulletproof,/obj/item/radio/headset/alt/headset_sec,/obj/item/radio/headset/headset_sec,/obj/item/radio/off,/obj/item/storage/backpack/security,/obj/item/storage/backpack/satchel/sec,/obj/item/clothing/shoes/boots/marine,/obj/item/clothing/under/soviet,/obj/item/melee/classic_baton,/obj/item/reagent_containers/spray/pepper,/obj/item/flash,/obj/item/ammo_magazine/s357=2,/obj/item/gun/projectile/revolver/nagant) - }, +/obj/structure/closet/secure_closet/detective/snowfield, /turf/simulated/floor/lino, /area/awaymission/snowfield/security/detective) "jDy" = ( @@ -11515,18 +11495,6 @@ }, /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/engineering/staff_room) -"kpY" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/outline, -/obj/item/soap, -/obj/structure/closet/secure_closet/medical3{ - req_access = list(33); - starts_with = list(/obj/item/clothing/under/rank/medical,/obj/item/clothing/under/rank/nurse,/obj/item/clothing/under/rank/orderly,/obj/item/clothing/suit/storage/toggle/labcoat,/obj/item/clothing/suit/storage/toggle/labcoat/modern,/obj/item/clothing/suit/storage/toggle/fr_jacket,/obj/item/radio/headset/headset_med,/obj/item/radio/headset/alt/headset_med,/obj/item/clothing/suit/storage/hooded/wintercoat/medical,/obj/item/clothing/shoes/boots/winter/medical,/obj/item/clothing/under/rank/nursesuit,/obj/item/clothing/head/nursehat,/obj/item/storage/box/freezer=3,/obj/item/storage/belt/medical) - }, -/turf/simulated/floor/tiled/neutral, -/area/awaymission/snowfield/medical/medical_locker) "kqw" = ( /obj/item/pen, /turf/simulated/floor/wood, @@ -12980,15 +12948,13 @@ /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/medical/staff_room) "lDj" = ( -/obj/structure/closet/secure_closet/engineering_personal{ - starts_with = list(/obj/item/clothing/accessory/storage/brown_vest,/obj/item/storage/toolbox/mechanical,/obj/item/radio/headset/headset_eng,/obj/item/radio/headset/alt/headset_eng,/obj/item/clothing/suit/storage/hazardvest,/obj/item/clothing/mask/gas,/obj/item/cartridge/engineering,/obj/item/taperoll/engineering,/obj/item/clothing/head/hardhat,/obj/item/clothing/suit/storage/hooded/wintercoat/engineering,/obj/item/clothing/shoes/boots/winter/engineering,/obj/item/tank/emergency/oxygen/engi,/obj/item/storage/belt/utility,/obj/item/reagent_containers/spray/windowsealant) - }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 4; health = 1e+006 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/closet/secure_closet/engineering_personal/snowfield, /turf/simulated/floor/tiled/techfloor/grid, /area/awaymission/snowfield/engineering/locker_room) "lDr" = ( @@ -13208,11 +13174,8 @@ dir = 8 }, /obj/effect/floor_decal/industrial/outline, -/obj/structure/closet/secure_closet/medical3{ - req_access = list(33); - starts_with = list(/obj/item/clothing/under/rank/medical,/obj/item/clothing/under/rank/nurse,/obj/item/clothing/under/rank/orderly,/obj/item/clothing/suit/storage/toggle/labcoat,/obj/item/clothing/suit/storage/toggle/labcoat/modern,/obj/item/clothing/suit/storage/toggle/fr_jacket,/obj/item/radio/headset/headset_med,/obj/item/radio/headset/alt/headset_med,/obj/item/clothing/suit/storage/hooded/wintercoat/medical,/obj/item/clothing/shoes/boots/winter/medical,/obj/item/clothing/under/rank/nursesuit,/obj/item/clothing/head/nursehat,/obj/item/storage/box/freezer=3,/obj/item/storage/belt/medical) - }, /obj/item/soap, +/obj/structure/closet/secure_closet/medical3/snowfield, /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/medical/medical_locker) "lLo" = ( @@ -19547,14 +19510,11 @@ /obj/effect/floor_decal/corner/green/border{ dir = 8 }, -/obj/structure/closet/secure_closet/paramedic{ - req_access = list(33); - starts_with = list(/obj/item/storage/backpack/dufflebag/emt,/obj/item/storage/box/autoinjectors,/obj/item/storage/box/syringes,/obj/item/reagent_containers/glass/bottle/inaprovaline,/obj/item/reagent_containers/glass/bottle/antitoxin,/obj/item/storage/belt/medical/emt,/obj/item/clothing/mask/gas,/obj/item/clothing/suit/storage/toggle/fr_jacket,/obj/item/clothing/suit/storage/toggle/labcoat/emt,/obj/item/clothing/suit/storage/hooded/wintercoat/medical/para,/obj/item/radio/headset/alt/headset_med,/obj/item/storage/briefcase/inflatable,/obj/item/flashlight,/obj/item/tank/emergency/oxygen/engi,/obj/item/radio/off,/obj/item/tool/crowbar,/obj/item/extinguisher/mini,/obj/item/storage/box/freezer,/obj/item/clothing/accessory/storage/white_vest,/obj/item/taperoll/medical) - }, /obj/effect/floor_decal/industrial/outline, /obj/machinery/light{ dir = 8 }, +/obj/structure/closet/secure_closet/paramedic, /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/medical/medical_locker) "rKt" = ( @@ -20491,10 +20451,7 @@ dir = 8 }, /obj/effect/floor_decal/industrial/outline, -/obj/structure/closet/l3closet/general{ - opened = 1; - starts_with = null - }, +/obj/structure/closet/l3closet, /turf/simulated/floor/tiled/steel, /area/awaymission/snowfield/medical/storage_room) "sNi" = ( @@ -22508,11 +22465,8 @@ /obj/effect/floor_decal/corner/green/border{ dir = 9 }, -/obj/structure/closet/secure_closet/paramedic{ - req_access = list(33); - starts_with = list(/obj/item/storage/backpack/dufflebag/emt,/obj/item/storage/box/autoinjectors,/obj/item/storage/box/syringes,/obj/item/reagent_containers/glass/bottle/inaprovaline,/obj/item/reagent_containers/glass/bottle/antitoxin,/obj/item/storage/belt/medical/emt,/obj/item/clothing/mask/gas,/obj/item/clothing/suit/storage/toggle/fr_jacket,/obj/item/clothing/suit/storage/toggle/labcoat/emt,/obj/item/clothing/suit/storage/hooded/wintercoat/medical/para,/obj/item/radio/headset/alt/headset_med,/obj/item/storage/briefcase/inflatable,/obj/item/flashlight,/obj/item/tank/emergency/oxygen/engi,/obj/item/radio/off,/obj/item/tool/crowbar,/obj/item/extinguisher/mini,/obj/item/storage/box/freezer,/obj/item/clothing/accessory/storage/white_vest,/obj/item/taperoll/medical) - }, /obj/effect/floor_decal/industrial/outline, +/obj/structure/closet/secure_closet/paramedic, /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/medical/medical_locker) "uIr" = ( @@ -22870,10 +22824,8 @@ /area/awaymission/snowfield/hallway/commandhallway) "vaq" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/closet/secure_closet/security{ - starts_with = list(/obj/item/clothing/gloves/black,/obj/item/clothing/accessory/holster,/obj/item/storage/belt/security,/obj/item/clothing/head/beret/sec/corporate/officer,/obj/item/clothing/head/helmet,/obj/item/radio/headset/alt/headset_sec,/obj/item/radio/headset/headset_sec,/obj/item/radio/off,/obj/item/storage/backpack/security,/obj/item/storage/backpack/satchel/sec,/obj/item/clothing/shoes/boots/marine,/obj/item/clothing/suit/armor/bulletproof,/obj/item/clothing/under/soviet,/obj/item/reagent_containers/spray/pepper,/obj/item/melee/classic_baton,/obj/item/ammo_magazine/makarov=2,/obj/item/gun/projectile/serdy_pistols/makarov) - }, /obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/security/snowfield, /turf/simulated/floor/tiled/techfloor/grid, /area/awaymission/snowfield/security/security_lockerroom) "vaD" = ( @@ -24432,10 +24384,7 @@ }, /obj/item/soap, /obj/effect/floor_decal/industrial/outline, -/obj/structure/closet/secure_closet/medical3{ - req_access = list(33); - starts_with = list(/obj/item/clothing/under/rank/medical,/obj/item/clothing/under/rank/nurse,/obj/item/clothing/under/rank/orderly,/obj/item/clothing/suit/storage/toggle/labcoat,/obj/item/clothing/suit/storage/toggle/labcoat/modern,/obj/item/clothing/suit/storage/toggle/fr_jacket,/obj/item/radio/headset/headset_med,/obj/item/radio/headset/alt/headset_med,/obj/item/clothing/suit/storage/hooded/wintercoat/medical,/obj/item/clothing/shoes/boots/winter/medical,/obj/item/clothing/under/rank/nursesuit,/obj/item/clothing/head/nursehat,/obj/item/storage/box/freezer=3,/obj/item/storage/belt/medical) - }, +/obj/structure/closet/secure_closet/medical3/snowfield, /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/medical/medical_locker) "wuM" = ( @@ -43784,7 +43733,7 @@ kOt kdE dpf dzK -kpY +lLf lLf nPS vCN diff --git a/modular_chomp/maps/palettes/1SP_pods.dmm b/modular_chomp/maps/palettes/1SP_pods.dmm index acd1428338..604342cc87 100644 --- a/modular_chomp/maps/palettes/1SP_pods.dmm +++ b/modular_chomp/maps/palettes/1SP_pods.dmm @@ -9734,9 +9734,7 @@ "fsy" = ( /obj/structure/closet/secure_closet/hydroponics{ anchored = 1; - name = "minimalist botanist's locker"; - req_access = list(300); - starts_with = list(/obj/item/storage/bag/plants,/obj/item/clothing/gloves/botanic_leather,/obj/item/analyzer/plant_analyzer,/obj/item/material/minihoe,/obj/item/material/knife/machete/hatchet,/obj/item/reagent_containers/glass/beaker=2,/obj/item/tool/wirecutters/clippers/trimmers,/obj/item/reagent_containers/spray/plantbgone) + req_access = list(300) }, /turf/simulated/floor/tiled/hydro, /area/survivalpod) @@ -15156,8 +15154,7 @@ /obj/structure/closet/walllocker_double/survival/north{ dir = 1; name = "Emergency Food Wall Cabinet"; - pixel_y = -32; - starts_with = list(/obj/item/storage/mre/menu11=20,/obj/item/reagent_containers/food/drinks/cans/waterbottle=20) + pixel_y = -32 }, /turf/simulated/floor/carpet/sblucarpet, /area/survivalpod) @@ -20936,9 +20933,44 @@ /obj/structure/table/reinforced, /obj/structure/closet/crate/carp{ desc = "All you need to start your own honey farm."; - name = "Beekeeping crate"; - starts_with = list(/obj/item/beehive_assembly=5,/obj/item/bee_smoker,/obj/item/honey_frame=25,/obj/item/bee_pack=5) + name = "Beekeeping crate" }, +/obj/item/beehive_assembly, +/obj/item/beehive_assembly, +/obj/item/beehive_assembly, +/obj/item/beehive_assembly, +/obj/item/beehive_assembly, +/obj/item/bee_smoker, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/bee_pack, +/obj/item/bee_pack, +/obj/item/bee_pack, +/obj/item/bee_pack, +/obj/item/bee_pack, /turf/simulated/floor/tiled/hydro, /area/survivalpod) "npj" = ( diff --git a/modular_chomp/maps/relic_base/relicbase-3.dmm b/modular_chomp/maps/relic_base/relicbase-3.dmm index 013a377881..507add8577 100644 --- a/modular_chomp/maps/relic_base/relicbase-3.dmm +++ b/modular_chomp/maps/relic_base/relicbase-3.dmm @@ -11,6 +11,17 @@ /obj/effect/map_effect/portal/master/side_a/caves_to_wilderness, /turf/unsimulated/wall/planetary/normal/thor, /area/surface/outpost/wall/checkpoint) +"aac" = ( +/obj/structure/catwalk, +/obj/structure/closet/walllocker_double/engineering/north, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/suit/radiation, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/clothing/head/radiation, +/obj/item/clothing/head/radiation, +/turf/simulated/floor/plating, +/area/engineering/hallway/engineer_hallway) "aah" = ( /obj/effect/map_effect/portal/line/side_a{ dir = 4 @@ -1177,14 +1188,15 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "aFO" = ( -/obj/structure/closet/secure_closet/hos2{ - starts_with = list(/obj/item/cartridge/hos,/obj/item/taperoll/police,/obj/item/shield/riot/tele,/obj/item/storage/box/holobadge/hos,/obj/item/clothing/accessory/badge/holo/hos,/obj/item/reagent_containers/spray/pepper,/obj/item/tool/crowbar/red,/obj/item/storage/box/flashbangs,/obj/item/flash,/obj/item/melee/baton/loaded,/obj/item/cell/device/weapon,/obj/item/melee/telebaton,/obj/item/clothing/head/beret/sec/corporate/hos,/obj/item/clothing/suit/storage/hooded/wintercoat/security,/obj/item/clothing/shoes/boots/winter/security,/obj/item/flashlight/maglight) - }, +/obj/structure/closet/secure_closet/hos2, /obj/item/cell/device, /obj/item/holowarrant, /obj/item/rig/ch/pursuit, /obj/item/storage/secure/briefcase/nsfw_pack_hos, /obj/item/gun/energy/x01, +/obj/item/clothing/head/beret/sec/corporate/hos, +/obj/item/clothing/suit/storage/hooded/wintercoat/security/hos, +/obj/item/clothing/shoes/boots/winter/security, /turf/simulated/floor/carpet, /area/crew_quarters/heads/sc/hos) "aFW" = ( @@ -4087,9 +4099,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/surface/outside/path/plains) "ceP" = ( -/obj/structure/closet/secure_closet/warden{ - starts_with = list(/obj/item/clothing/suit/storage/vest/warden,/obj/item/clothing/under/rank/warden,/obj/item/clothing/under/rank/warden/corp,/obj/item/clothing/suit/storage/vest/wardencoat,/obj/item/clothing/suit/storage/vest/wardencoat/alt,/obj/item/clothing/suit/storage/vest/wardencoat/alt2,/obj/item/clothing/head/helmet/dermal,/obj/item/clothing/head/helmet/warden,/obj/item/clothing/head/helmet/warden/hat,/obj/item/cartridge/security,/obj/item/radio/headset/headset_sec,/obj/item/radio/headset/alt/headset_sec,/obj/item/clothing/glasses/sunglasses/sechud,/obj/item/taperoll/police,/obj/item/clothing/accessory/badge/holo/warden,/obj/item/storage/box/flashbangs,/obj/item/storage/belt/security,/obj/item/reagent_containers/spray/pepper,/obj/item/melee/baton/loaded,/obj/item/gun/energy/gun,/obj/item/cell/device/weapon,/obj/item/storage/box/holobadge,/obj/item/clothing/head/beret/sec/corporate/warden,/obj/item/clothing/suit/storage/hooded/wintercoat/security,/obj/item/clothing/shoes/boots/winter/security,/obj/item/flashlight/maglight,/obj/item/megaphone,/obj/item/clothing/mask/gas/half,/obj/item/retail_scanner/security) - }, +/obj/structure/closet/secure_closet/warden, /obj/item/gun/projectile/shotgun/pump/shorty{ ammo_type = /obj/item/ammo_casing/a12g/stunshell; desc = "A professionally cut down pump-action shotgun, with a checkered pistol grip, and an 8 round tube. Come with me if you want to live. This one is tagged 'Propety of the Warden.' Chambered in 12 gauge."; @@ -4107,6 +4117,7 @@ pixel_x = 4; pixel_y = 31 }, +/obj/item/clothing/mask/gas/half, /turf/simulated/floor/carpet, /area/security/warden) "cfp" = ( @@ -32076,13 +32087,17 @@ /turf/simulated/floor/tiled/dark, /area/expoutpost/shuttle) "nWc" = ( -/obj/structure/closet/walllocker_double/engineering/north{ - starts_with = list(/obj/item/clothing/suit/radiation = 2, /obj/item/clothing/head/radiation = 2, /obj/item/geiger = 2) - }, /obj/structure/cable/yellow{ icon_state = "2-4" }, /obj/structure/catwalk, +/obj/structure/closet/walllocker_double/engineering/north, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/suit/radiation, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/clothing/head/radiation, +/obj/item/clothing/head/radiation, /turf/simulated/floor/plating, /area/engineering/hallway/engineer_hallway) "nWg" = ( @@ -34669,10 +34684,14 @@ /turf/simulated/floor/tiled/techfloor, /area/medical/cryo/autoresleeve) "pmU" = ( -/obj/structure/closet/walllocker_double/engineering/north{ - starts_with = list(/obj/item/clothing/suit/radiation = 2, /obj/item/clothing/head/radiation = 2, /obj/item/geiger = 2) - }, /obj/structure/catwalk, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/suit/radiation, +/obj/structure/closet/walllocker_double/engineering/north, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/clothing/head/radiation, +/obj/item/clothing/head/radiation, /turf/simulated/floor/plating, /area/engineering/hallway/engineer_hallway) "pnz" = ( @@ -46272,13 +46291,17 @@ /turf/simulated/floor/tiled/techfloor, /area/medical/cryo/autoresleeve) "ugF" = ( -/obj/structure/closet/walllocker_double/engineering/north{ - starts_with = list(/obj/item/clothing/suit/radiation = 2, /obj/item/clothing/head/radiation = 2, /obj/item/geiger = 2) - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/structure/catwalk, +/obj/structure/closet/walllocker_double/engineering/north, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/suit/radiation, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/clothing/head/radiation, +/obj/item/clothing/head/radiation, /turf/simulated/floor/plating, /area/engineering/hallway/engineer_hallway) "ugT" = ( @@ -77882,7 +77905,7 @@ plZ pML qKt oOQ -pmU +aac lpm tqj eFA diff --git a/modular_chomp/maps/relic_base/relicbase-4.dmm b/modular_chomp/maps/relic_base/relicbase-4.dmm index 85dbd1dc3e..b85ce87bad 100644 --- a/modular_chomp/maps/relic_base/relicbase-4.dmm +++ b/modular_chomp/maps/relic_base/relicbase-4.dmm @@ -1418,10 +1418,6 @@ /area/engineering/atmos/storage) "bow" = ( /obj/random_multi/single_item/captains_spare_id, -/obj/structure/closet/secure_closet/captains{ - name = "station director's locker"; - starts_with = list(/obj/item/storage/backpack/dufflebag/captain,/obj/item/clothing/head/helmet,/obj/item/clothing/suit/storage/vest,/obj/item/cartridge/captain,/obj/item/storage/lockbox/medal,/obj/item/radio/headset/heads/captain,/obj/item/radio/headset/alt/heads/captain,/obj/item/melee/telebaton,/obj/item/flash,/obj/item/storage/box/ids,/obj/item/melee/rapier,/obj/item/clothing/accessory/holster/machete/rapier) - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -1435,6 +1431,9 @@ /obj/item/ammo_magazine/tp23s/rubber, /obj/item/ammo_magazine/tp23s/rubber, /obj/item/perfect_tele, +/obj/structure/closet/secure_closet/captains{ + name = "station director's locker" + }, /turf/simulated/floor/carpet/blue2, /area/crew_quarters/heads/sc/sd) "bqy" = ( @@ -11396,9 +11395,6 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 10 }, -/obj/structure/closet/secure_closet/guncabinet/sidearm{ - starts_with = null - }, /obj/item/ammo_magazine/m9mm/rubber, /obj/item/ammo_magazine/m9mm/rubber, /obj/item/ammo_magazine/m9mm/rubber, @@ -11420,6 +11416,9 @@ /obj/item/gun/energy/gun, /obj/item/gun/energy/gun, /obj/item/gun/energy/gun, +/obj/structure/closet/secure_closet/guncabinet{ + name = "emergency weapon cabinet" + }, /turf/simulated/floor/tiled/dark, /area/bridge) "kAb" = ( @@ -18363,9 +18362,6 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 9 }, -/obj/structure/closet/secure_closet/guncabinet/sidearm{ - starts_with = null - }, /obj/item/ammo_magazine/m9mm/rubber, /obj/item/ammo_magazine/m9mm/rubber, /obj/item/ammo_magazine/m9mm/rubber, @@ -18390,6 +18386,9 @@ /obj/item/gun/energy/gun, /obj/item/gun/energy/gun, /obj/item/gun/energy/gun, +/obj/structure/closet/secure_closet/guncabinet{ + name = "emergency weapon cabinet" + }, /turf/simulated/floor/tiled/dark, /area/bridge) "qmv" = ( diff --git a/modular_chomp/maps/soluna_nexus/soluna_nexus-1.dmm b/modular_chomp/maps/soluna_nexus/soluna_nexus-1.dmm index 42027b3b65..7c8034d23f 100644 --- a/modular_chomp/maps/soluna_nexus/soluna_nexus-1.dmm +++ b/modular_chomp/maps/soluna_nexus/soluna_nexus-1.dmm @@ -14865,9 +14865,6 @@ /turf/simulated/floor/tiled/dark, /area/harbor/Dock2) "cZm" = ( -/obj/structure/closet/secure_closet/freezer/fridge{ - starts_with = null - }, /obj/random/maintenance/foodstuff, /obj/random/maintenance/foodstuff, /obj/random/maintenance/foodstuff, @@ -14879,6 +14876,7 @@ /obj/random/drinksoft, /obj/random/drinksoft, /obj/random/drinksoft, +/obj/structure/closet/secure_closet/freezer/fridge/empty, /turf/simulated/floor/tiled, /area/maintenance/ab_GeneralStore) "cZn" = ( @@ -39508,14 +39506,12 @@ /obj/random/maintenance/foodstuff, /obj/random/maintenance/foodstuff, /obj/random/maintenance/foodstuff, -/obj/structure/closet/secure_closet/freezer/fridge{ - starts_with = null - }, /obj/random/maintenance/foodstuff, /obj/random/maintenance/foodstuff, /obj/random/maintenance/foodstuff, /obj/random/maintenance/foodstuff, /obj/random/maintenance/foodstuff, +/obj/structure/closet/secure_closet/freezer/fridge/empty, /turf/simulated/floor/plating/turfpack/station, /area/maintenance/ab_GeneralStore) "lzJ" = ( @@ -40327,13 +40323,11 @@ /obj/random/drinksoft, /obj/random/drinksoft, /obj/random/drinksoft, -/obj/structure/closet/secure_closet/freezer/fridge{ - starts_with = null - }, /obj/random/drinksoft, /obj/random/drinksoft, /obj/random/drinksoft, /obj/random/drinksoft, +/obj/structure/closet/secure_closet/freezer/fridge/empty, /turf/simulated/floor/tiled, /area/maintenance/ab_GeneralStore) "lQb" = ( @@ -44426,10 +44420,8 @@ /turf/simulated/floor/tiled, /area/hallway/Aft_1_Deck_Stairwell) "nmw" = ( -/obj/structure/closet/secure_closet/freezer/fridge{ - starts_with = null - }, /obj/effect/floor_decal/rust, +/obj/structure/closet/secure_closet/freezer/fridge/empty, /turf/simulated/floor/plating/turfpack/station, /area/maintenance/ab_Medical) "nmP" = ( @@ -46182,9 +46174,6 @@ /turf/simulated/floor/plating, /area/crew_quarters/Custodial_Office) "nSH" = ( -/obj/structure/closet/secure_closet/freezer/fridge{ - starts_with = null - }, /obj/random/drinkbottle, /obj/random/drinkbottle, /obj/random/drinkbottle, @@ -46199,6 +46188,7 @@ /obj/random/drinkbottle, /obj/random/drinkbottle, /obj/random/drinksoft, +/obj/structure/closet/secure_closet/freezer/fridge/empty, /turf/simulated/floor/plating, /area/maintenance/ab_GeneralStore) "nSV" = ( @@ -50075,14 +50065,12 @@ /obj/random/meat, /obj/random/meat, /obj/effect/decal/cleanable/cobweb, -/obj/structure/closet/secure_closet/freezer/fridge{ - starts_with = null - }, /obj/random/meat, /obj/random/meat, /obj/random/meat, /obj/random/meat, /obj/random/meat, +/obj/structure/closet/secure_closet/freezer/fridge/empty, /turf/simulated/floor/tiled, /area/maintenance/ab_GeneralStore) "phi" = ( @@ -66841,15 +66829,13 @@ /obj/random/organ, /obj/random/organ, /obj/random/organ, -/obj/structure/closet/secure_closet/freezer/fridge{ - starts_with = null - }, /obj/random/organ, /obj/random/organ, /obj/random/organ, /obj/random/organ, /obj/random/organ, /obj/effect/floor_decal/rust, +/obj/structure/closet/secure_closet/freezer/fridge/empty, /turf/simulated/floor/tiled, /area/maintenance/ab_GeneralStore) "vic" = ( diff --git a/modular_chomp/maps/soluna_nexus/soluna_nexus-2.dmm b/modular_chomp/maps/soluna_nexus/soluna_nexus-2.dmm index 08741ca5cc..f3ed27aeb9 100644 --- a/modular_chomp/maps/soluna_nexus/soluna_nexus-2.dmm +++ b/modular_chomp/maps/soluna_nexus/soluna_nexus-2.dmm @@ -3914,8 +3914,7 @@ /area/rnd/Locker_Room) "agw" = ( /obj/structure/closet/secure_closet/cargotech{ - name = "mailman's locker"; - starts_with = list(/obj/item/clothing/under/rank/mailman,/obj/item/clothing/head/mailman,/obj/item/clothing/shoes/black,/obj/item/radio/headset/cargo,/obj/item/radio/headset/alt/cargo,/obj/item/storage/bag/mail,/obj/item/destTagger) + name = "mailman's locker" }, /obj/item/clothing/under/rank/mailman2, /obj/item/clothing/under/rank/mailman, @@ -3931,6 +3930,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 5 }, +/obj/item/destTagger, /turf/simulated/floor/tiled/dark, /area/quartermaster/Mail_Room) "agx" = ( diff --git a/modular_chomp/maps/soluna_nexus/soluna_nexus-3.dmm b/modular_chomp/maps/soluna_nexus/soluna_nexus-3.dmm index 091d6b3db3..29387ef891 100644 --- a/modular_chomp/maps/soluna_nexus/soluna_nexus-3.dmm +++ b/modular_chomp/maps/soluna_nexus/soluna_nexus-3.dmm @@ -13368,14 +13368,12 @@ /obj/machinery/light{ dir = 1 }, -/obj/structure/closet/secure_closet/freezer/fridge{ - starts_with = null - }, /obj/machinery/status_display{ layer = 4; pixel_y = 32 }, /obj/effect/floor_decal/borderfloorblack/full, +/obj/structure/closet/secure_closet/freezer/fridge/empty, /turf/simulated/floor/tiled/dark, /area/hallway/Star_Breakroom) "dXC" = ( @@ -48933,9 +48931,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/structure/closet/secure_closet/freezer/fridge{ - starts_with = null - }, +/obj/structure/closet/secure_closet/freezer/fridge/empty, /turf/simulated/floor/wood/sif, /area/bridge/Breakroom) "pLZ" = ( @@ -66114,9 +66110,6 @@ /area/space) "vyo" = ( /obj/item/storage/toolbox/lunchbox/nymph/filled, -/obj/structure/closet/secure_closet/freezer/fridge{ - starts_with = null - }, /obj/machinery/light{ dir = 1 }, @@ -66125,6 +66118,7 @@ pixel_y = 32 }, /obj/effect/floor_decal/borderfloorblack/full, +/obj/structure/closet/secure_closet/freezer/fridge/empty, /turf/simulated/floor/tiled/dark, /area/hallway/Port_Breakroom) "vyq" = ( diff --git a/modular_chomp/maps/southern_cross/southern_cross-1.dmm b/modular_chomp/maps/southern_cross/southern_cross-1.dmm index 5d96efeafc..88ee4ef62f 100644 --- a/modular_chomp/maps/southern_cross/southern_cross-1.dmm +++ b/modular_chomp/maps/southern_cross/southern_cross-1.dmm @@ -4023,9 +4023,7 @@ /turf/simulated/floor/tiled, /area/maintenance/abcargo) "qi" = ( -/obj/structure/closet/secure_closet/freezer/fridge{ - starts_with = null - }, +/obj/structure/closet/secure_closet/freezer/fridge/empty, /turf/simulated/floor/reinforced, /area/maintenance/abchemistry) "qk" = ( @@ -5317,13 +5315,11 @@ /obj/random/drinksoft, /obj/random/drinksoft, /obj/random/drinksoft, -/obj/structure/closet/secure_closet/freezer/fridge{ - starts_with = null - }, /obj/random/drinksoft, /obj/random/drinksoft, /obj/random/drinksoft, /obj/random/drinksoft, +/obj/structure/closet/secure_closet/freezer/fridge/empty, /turf/simulated/floor/plating/turfpack/station, /area/maintenance/thrift) "vS" = ( @@ -7420,14 +7416,12 @@ /obj/random/maintenance/foodstuff, /obj/random/maintenance/foodstuff, /obj/random/maintenance/foodstuff, -/obj/structure/closet/secure_closet/freezer/fridge{ - starts_with = null - }, /obj/random/maintenance/foodstuff, /obj/random/maintenance/foodstuff, /obj/random/maintenance/foodstuff, /obj/random/maintenance/foodstuff, /obj/random/maintenance/foodstuff, +/obj/structure/closet/secure_closet/freezer/fridge/empty, /turf/simulated/floor/plating/turfpack/station, /area/maintenance/thrift) "Fr" = ( @@ -8163,14 +8157,12 @@ /obj/random/meat, /obj/random/meat, /obj/effect/decal/cleanable/cobweb, -/obj/structure/closet/secure_closet/freezer/fridge{ - starts_with = null - }, /obj/random/meat, /obj/random/meat, /obj/random/meat, /obj/random/meat, /obj/random/meat, +/obj/structure/closet/secure_closet/freezer/fridge/empty, /turf/simulated/floor/tiled, /area/maintenance/thrift) "Ip" = ( @@ -8541,14 +8533,12 @@ /obj/random/organ, /obj/random/organ, /obj/random/organ, -/obj/structure/closet/secure_closet/freezer/fridge{ - starts_with = null - }, /obj/random/organ, /obj/random/organ, /obj/random/organ, /obj/random/organ, /obj/random/organ, +/obj/structure/closet/secure_closet/freezer/fridge/empty, /turf/simulated/floor/plating/turfpack/station, /area/maintenance/thrift) "Kf" = ( diff --git a/modular_chomp/maps/southern_cross/southern_cross-10.dmm b/modular_chomp/maps/southern_cross/southern_cross-10.dmm index 309d56b110..c420f0af71 100644 --- a/modular_chomp/maps/southern_cross/southern_cross-10.dmm +++ b/modular_chomp/maps/southern_cross/southern_cross-10.dmm @@ -556,8 +556,7 @@ "es" = ( /obj/structure/closet/medical_wall{ name = "Wilderness Shelter first-aid closet"; - pixel_y = 31; - starts_with = list(/obj/item/roller,/obj/item/bodybag/cryobag,/obj/item/storage/firstaid/regular=2,/obj/item/storage/pill_bottle/spaceacillin) + pixel_y = 31 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -565,6 +564,11 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, +/obj/item/roller, +/obj/item/bodybag/cryobag, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, +/obj/item/storage/pill_bottle/spaceacillin, /turf/simulated/floor/tiled/white, /area/surface/outpost/shelter) "ez" = ( @@ -936,12 +940,16 @@ "sJ" = ( /obj/structure/closet/medical_wall{ name = "Wilderness Shelter first-aid closet"; - pixel_y = 31; - starts_with = list(/obj/item/roller,/obj/item/bodybag/cryobag,/obj/item/storage/firstaid/regular=2,/obj/item/storage/pill_bottle/spaceacillin) + pixel_y = 31 }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/item/roller, +/obj/item/bodybag/cryobag, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, +/obj/item/storage/pill_bottle/spaceacillin, /turf/simulated/floor/wood/sif, /area/surface/outpost/shelter) "sR" = ( @@ -1088,12 +1096,36 @@ /area/surface/outpost/shelter/exterior) "xj" = ( /obj/structure/closet/walllocker_double/survival/north{ - name = "Wilderness Shelter Emergency Survival Wall Cabinet"; - starts_with = list(/obj/item/gps=5,/obj/item/material/knife/tacknife/survival=5,/obj/random/mre=5,/obj/item/flashlight/color/yellow=5,/obj/item/flashlight/flare=5,/obj/item/reagent_containers/food/drinks/cans/waterbottle=5,/obj/item/whetstone) + name = "Wilderness Shelter Emergency Survival Wall Cabinet" }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/material/knife/tacknife/survival, +/obj/item/material/knife/tacknife/survival, +/obj/item/material/knife/tacknife/survival, +/obj/item/material/knife/tacknife/survival, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/item/flashlight/color/yellow, +/obj/item/flashlight/color/yellow, +/obj/item/flashlight/color/yellow, +/obj/item/flashlight/color/yellow, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/whetstone, /turf/simulated/floor/wood/sif, /area/surface/outpost/shelter) "xA" = ( @@ -1141,12 +1173,12 @@ name = "Wilderness Shelter defibrillator closet"; pixel_y = 31; req_access = null; - req_one_access = list(1,3,43,66,67); - starts_with = list(/obj/item/defib_kit/loaded) + req_one_access = list(1,3,43,66,67) }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/item/defib_kit/loaded, /turf/simulated/floor/wood/sif, /area/surface/outpost/shelter) "zb" = ( @@ -1669,9 +1701,50 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/structure/closet/walllocker_double/survival/north{ +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/structure/closet/medical_wall{ name = "Wilderness Shelter Emergency Food Wall Cabinet"; - starts_with = list(/obj/random/mre=20,/obj/item/reagent_containers/food/drinks/cans/waterbottle=20) + pixel_y = 31; + desc = "A wall mounted storage cabinet. It contains a small amount of emergency supplies for wilderness survival, but they probably won't last very long." }, /turf/simulated/floor/tiled/white, /area/surface/outpost/shelter) @@ -1695,8 +1768,7 @@ name = "Wilderness Shelter defibrillator closet"; pixel_y = 31; req_access = null; - req_one_access = list(1,3,43,66,67); - starts_with = list(/obj/item/defib_kit/loaded) + req_one_access = list(1,3,43,66,67) }, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -1704,6 +1776,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, +/obj/item/defib_kit/loaded, /turf/simulated/floor/tiled/white, /area/surface/outpost/shelter) "WL" = ( diff --git a/modular_chomp/maps/southern_cross/southern_cross-12-unused.dmm b/modular_chomp/maps/southern_cross/southern_cross-12-unused.dmm index 9fa0f7c909..baa9f0ed7e 100644 --- a/modular_chomp/maps/southern_cross/southern_cross-12-unused.dmm +++ b/modular_chomp/maps/southern_cross/southern_cross-12-unused.dmm @@ -283,9 +283,9 @@ name = "Wilderness Shelter defibrillator closet"; pixel_y = 31; req_access = null; - req_one_access = list(1,3,43,66,67); - starts_with = list(/obj/item/defib_kit/loaded) + req_one_access = list(1,3,43,66,67) }, +/obj/item/defib_kit/loaded, /turf/simulated/floor/wood/sif, /area/surface/outpost/shelter) "jc" = ( @@ -481,9 +481,34 @@ /turf/simulated/floor/water/deep) "nj" = ( /obj/structure/closet/walllocker_double/survival/north{ - name = "Wilderness Shelter Emergency Survival Wall Cabinet"; - starts_with = list(/obj/item/gps=5,/obj/item/material/knife/tacknife/survival=5,/obj/random/mre=5,/obj/item/flashlight/color/yellow=5,/obj/item/flashlight/flare=5,/obj/item/reagent_containers/food/drinks/cans/waterbottle=5,/obj/item/whetstone) + name = "Wilderness Shelter Emergency Survival Wall Cabinet" }, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/material/knife/tacknife/survival, +/obj/item/material/knife/tacknife/survival, +/obj/item/material/knife/tacknife/survival, +/obj/item/material/knife/tacknife/survival, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/item/flashlight/color/yellow, +/obj/item/flashlight/color/yellow, +/obj/item/flashlight/color/yellow, +/obj/item/flashlight/color/yellow, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/whetstone, /turf/simulated/floor/wood/sif, /area/surface/outpost/shelter) "ns" = ( @@ -1213,9 +1238,13 @@ "Gg" = ( /obj/structure/closet/medical_wall{ name = "Wilderness Shelter first-aid closet"; - pixel_y = 31; - starts_with = list(/obj/item/roller,/obj/item/bodybag/cryobag,/obj/item/storage/firstaid/regular=2,/obj/item/storage/pill_bottle/spaceacillin) + pixel_y = 31 }, +/obj/item/roller, +/obj/item/bodybag/cryobag, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, +/obj/item/storage/pill_bottle/spaceacillin, /turf/simulated/floor/wood/sif, /area/surface/outpost/shelter) "Gp" = ( diff --git a/modular_chomp/maps/southern_cross/southern_cross-2.dmm b/modular_chomp/maps/southern_cross/southern_cross-2.dmm index 908e52e5f5..07e65580dc 100644 --- a/modular_chomp/maps/southern_cross/southern_cross-2.dmm +++ b/modular_chomp/maps/southern_cross/southern_cross-2.dmm @@ -17567,12 +17567,15 @@ dir = 5 }, /obj/structure/closet/secure_closet/cargotech{ - name = "mailman's locker"; - starts_with = list(/obj/item/clothing/under/rank/mailman,/obj/item/clothing/head/mailman,/obj/item/clothing/shoes/black,/obj/item/radio/headset/cargo,/obj/item/radio/headset/alt/cargo,/obj/item/storage/bag/mail,/obj/item/destTagger) + name = "mailman's locker" }, /obj/item/mail_scanner, /obj/item/mail_scanner, /obj/item/mail_scanner, +/obj/item/clothing/under/rank/mailman, +/obj/item/clothing/head/mailman, +/obj/item/storage/bag/mail, +/obj/item/destTagger, /turf/simulated/floor/tiled, /area/quartermaster/delivery) "hIE" = ( diff --git a/modular_chomp/maps/southern_cross/southern_cross-3.dmm b/modular_chomp/maps/southern_cross/southern_cross-3.dmm index 021e8b5c60..b67acffa84 100644 --- a/modular_chomp/maps/southern_cross/southern_cross-3.dmm +++ b/modular_chomp/maps/southern_cross/southern_cross-3.dmm @@ -52316,15 +52316,20 @@ dir = 10 }, /obj/structure/closet/radiation{ - anchored = 1; - starts_with = list(/obj/item/clothing/suit/radiation=4,/obj/item/clothing/head/radiation=4,/obj/item/geiger=4) + anchored = 1 }, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/head/radiation, +/obj/item/clothing/head/radiation, +/obj/item/geiger, +/obj/item/geiger, /obj/item/clothing/glasses/meson, /obj/item/clothing/glasses/meson, /obj/item/clothing/glasses/meson, /obj/item/clothing/glasses/meson, -/obj/item/clothing/suit/radiation/teshari, /obj/item/clothing/head/radiation/teshari, +/obj/item/clothing/suit/radiation/teshari, /turf/simulated/floor/tiled/white, /area/rnd/research) "ilQ" = ( diff --git a/modular_chomp/maps/southern_cross/southern_cross-4.dmm b/modular_chomp/maps/southern_cross/southern_cross-4.dmm index 613456a4e4..1d91834bce 100644 --- a/modular_chomp/maps/southern_cross/southern_cross-4.dmm +++ b/modular_chomp/maps/southern_cross/southern_cross-4.dmm @@ -3051,9 +3051,16 @@ dir = 1 }, /obj/structure/closet/radiation{ - anchored = 1; - starts_with = list(/obj/item/clothing/suit/radiation=4,/obj/item/clothing/head/radiation=4,/obj/item/geiger=4) + anchored = 1 }, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/head/radiation, +/obj/item/clothing/head/radiation, +/obj/item/clothing/suit/radiation/teshari, +/obj/item/clothing/head/radiation/teshari, /turf/simulated/floor/tiled/dark, /area/rnd/research/particleaccelerator) "cCe" = ( diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/Chapel.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/Chapel.dmm index 4bd0793f0d..927d7f9259 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/Chapel.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/Chapel.dmm @@ -99,9 +99,32 @@ /turf/simulated/floor/wood/sif, /area/submap/Chapel1) "ax" = ( -/obj/structure/closet/crate/trashcart{ - starts_with = list(/obj/item/stock_parts/capacitor/omni = 5, /obj/item/stock_parts/manipulator/omni = 5, /obj/item/stock_parts/matter_bin/omni = 5, /obj/item/stock_parts/micro_laser/omni = 5, /obj/item/stock_parts/scanning_module/omni = 5) - }, +/obj/structure/closet/crate/trashcart, +/obj/item/stock_parts/capacitor/omni, +/obj/item/stock_parts/capacitor/omni, +/obj/item/stock_parts/capacitor/omni, +/obj/item/stock_parts/capacitor/omni, +/obj/item/stock_parts/capacitor/omni, +/obj/item/stock_parts/manipulator/omni, +/obj/item/stock_parts/manipulator/omni, +/obj/item/stock_parts/manipulator/omni, +/obj/item/stock_parts/manipulator/omni, +/obj/item/stock_parts/manipulator/omni, +/obj/item/stock_parts/matter_bin/omni, +/obj/item/stock_parts/matter_bin/omni, +/obj/item/stock_parts/matter_bin/omni, +/obj/item/stock_parts/matter_bin/omni, +/obj/item/stock_parts/matter_bin/omni, +/obj/item/stock_parts/micro_laser/omni, +/obj/item/stock_parts/micro_laser/omni, +/obj/item/stock_parts/micro_laser/omni, +/obj/item/stock_parts/micro_laser/omni, +/obj/item/stock_parts/micro_laser/omni, +/obj/item/stock_parts/scanning_module/omni, +/obj/item/stock_parts/scanning_module/omni, +/obj/item/stock_parts/scanning_module/omni, +/obj/item/stock_parts/scanning_module/omni, +/obj/item/stock_parts/scanning_module/omni, /turf/simulated/floor/wood/sif, /area/submap/Chapel1) "ay" = ( diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/Epod4.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/Epod4.dmm index eea6a5f5a0..7a623d5d16 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/Epod4.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/Epod4.dmm @@ -85,11 +85,7 @@ name = "Station Intercom (General)"; pixel_x = -28 }, -/obj/structure/closet/crate/hydroponics{ - desc = "All you need to destroy that pesky planet."; - name = "exotic seeds crate"; - starts_with = list(/obj/item/seeds/random = 6, /obj/item/seeds/replicapod = 2, /obj/item/seeds/ambrosiavulgarisseed = 2, /obj/item/seeds/kudzuseed, /obj/item/seeds/libertymycelium, /obj/item/seeds/reishimycelium) - }, +/obj/structure/closet/crate/hydroponics/exotic, /turf/simulated/floor/water, /area/submap/Epod4) "o" = ( diff --git a/tools/maplint/lints/closet_vars.yml b/tools/maplint/lints/closet_vars.yml new file mode 100644 index 0000000000..ef84dad885 --- /dev/null +++ b/tools/maplint/lints/closet_vars.yml @@ -0,0 +1,3 @@ +/obj/structure/closet: + banned_variables: + - starts_with