diff --git a/aurorastation.dme b/aurorastation.dme index c865ed97144..d5a1a4d4564 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1351,14 +1351,15 @@ #include "code\game\objects\structures\crates_lockers\closets\wardrobe.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\bar.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\engineering.dm" -#include "code\game\objects\structures\crates_lockers\closets\secure\freezer.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\hydroponics.dm" +#include "code\game\objects\structures\crates_lockers\closets\secure\kitchen.dm" +#include "code\game\objects\structures\crates_lockers\closets\secure\locker.dm" +#include "code\game\objects\structures\crates_lockers\closets\secure\marooning.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\medical.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\operations.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\personal.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\scientist.dm" -#include "code\game\objects\structures\crates_lockers\closets\secure\secure_closets.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\security.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\service.dm" #include "code\game\objects\structures\crates_lockers\crates\gear_loadout.dm" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/kitchen.dm similarity index 63% rename from code/game/objects/structures/crates_lockers/closets/secure/freezer.dm rename to code/game/objects/structures/crates_lockers/closets/secure/kitchen.dm index 70767bbc845..4cde2dfde79 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/kitchen.dm @@ -1,9 +1,59 @@ // -// Freezer +// Refrigerators // + +// Empty Refrigerator +/obj/structure/closet/secure_closet/refrigerator + name = "refrigerator" + desc = "A white refrigerator." + icon_state = "refrigerator" + door_anim_squish = 0.22 + door_anim_angle = 123 + +// Standard Refrigerator +/obj/structure/closet/secure_closet/refrigerator/standard/fill() + // 5 Cartons of Milk + for(var/i = 0, i < 5, i++) + new /obj/item/reagent_containers/food/drinks/carton/milk(src) + // 2 Cartons of Soy Milk + for(var/i = 0, i < 2, i++) + new /obj/item/reagent_containers/food/drinks/carton/soymilk(src) + // 1 Egg Box + for(var/i = 0, i < 2, i++) + new /obj/item/storage/box/fancy/egg_box(src) + // 1 Stick of Butter + for(var/i = 0, i < 1, i++) + new /obj/item/reagent_containers/food/snacks/spreads/butter(src) + // 4 Random Condiments + for(var/i = 0, i < 4, i++) + new /obj/random/condiment(src) + // 2 Random Kitchen Staples + for(var/i = 0, i < 2, i++) + new /obj/random/kitchen_staples(src) + +// Cafe Refrigerator +/obj/structure/closet/secure_closet/refrigerator/cafe/fill() + // 6 Cartons of Milk + for(var/i = 0, i < 6, i++) + new /obj/item/reagent_containers/food/drinks/carton/milk(src) + // 3 Egg Boxes + // 3 Bags of Flour + for(var/i = 0, i < 3, i++) + new /obj/item/storage/box/fancy/egg_box(src) + new /obj/item/reagent_containers/food/condiment/flour(src) + // 2 Cartons of Soymilk and 2 Bags of Sugar + for(var/i = 0, i < 2, i++) + new /obj/item/reagent_containers/food/drinks/carton/soymilk(src) + new /obj/item/reagent_containers/food/condiment/sugar(src) + +// +// Freezers +// + +// Empty Freezer /obj/structure/closet/secure_closet/freezer name = "freezer" - desc = "A freezer." + desc = "A white freezer." icon_state = "freezer" door_anim_squish = 0.22 door_anim_angle = 123 @@ -11,31 +61,37 @@ // Meat Freezer /obj/structure/closet/secure_closet/freezer/meat name = "meat freezer" + desc = "A white freezer labelled \"Meat\"." /obj/structure/closet/secure_closet/freezer/meat/fill() - ..() for(var/i = 0, i < 8, i++) new /obj/item/reagent_containers/food/snacks/meat(src) -/obj/structure/closet/secure_closet/freezer/meat/super_meat/fill() // This is enough meat to do 10 grill batches. +// Grilling Meat Freezer +// Enough meat to do 10 grill batches. +/obj/structure/closet/secure_closet/freezer/meat/grill/fill() + // 30 Meat for(var/i = 0, i < 30, i++) new /obj/item/reagent_containers/food/snacks/meat(src) - var/obj/item/reagent_containers/food/condiment/shaker/spacespice/SS = new(src) - SS.pixel_x = 6 - SS.pixel_y = 12 + // 1 Salt Shaker var/obj/item/reagent_containers/food/condiment/shaker/salt/S = new(src) S.pixel_x = 6 S.pixel_y = 10 + // 1 Pepper Shaker var/obj/item/reagent_containers/food/condiment/shaker/peppermill/P = new(src) P.pixel_x = 6 P.pixel_y = 8 + // 1 Space Spice Shaker + var/obj/item/reagent_containers/food/condiment/shaker/spacespice/SS = new(src) + SS.pixel_x = 6 + SS.pixel_y = 12 // Chicken and Fish Freezer /obj/structure/closet/secure_closet/freezer/chicken_and_fish name = "chicken and fish freezer" + desc = "A white freezer labelled \"Chicken and Fish\"." /obj/structure/closet/secure_closet/freezer/chicken_and_fish/fill() - ..() // 6 Chicken Fillets for(var/i = 0, i < 6, i++) new /obj/item/reagent_containers/food/snacks/meat/chicken(src) @@ -43,73 +99,51 @@ for(var/i = 0, i < 6, i++) new /obj/item/reagent_containers/food/snacks/fish/fishfillet(src) -/obj/structure/closet/secure_closet/freezer/fridge - name = "refrigerator" - desc = "A refrigerator." +// Empty Biohazard Freezer +/obj/structure/closet/secure_closet/freezer/kois + name = "biohazard freezer" + desc = "A freezer, painted in a sickly yellow, with a biohazard sign on the door." + icon_state = "freezer_biohazard" -/obj/structure/closet/secure_closet/freezer/fridge/fill() - ..() - for(var/i = 0, i < 5, i++) - new /obj/item/reagent_containers/food/drinks/carton/milk(src) - for(var/i = 0, i < 2, i++) - new /obj/item/reagent_containers/food/drinks/carton/soymilk(src) - for(var/i = 0, i < 2, i++) - new /obj/item/storage/box/fancy/egg_box(src) - for(var/i = 0, i < 1, i++) - new /obj/item/reagent_containers/food/snacks/spreads/butter(src) - for(var/i = 0, i < 4, i++) - new /obj/random/condiment(src) - for(var/i = 0, i < 2, i++) - new /obj/random/kitchen_staples(src) +// K'ois Freezer +/obj/structure/closet/secure_closet/freezer/kois/spores + name = "k'ois freezer" + desc = "A freezer labelled \"K'ois\", painted in a sickly yellow, with a biohazard sign on the door. " -/obj/structure/closet/secure_closet/freezer/kitchen +/obj/structure/closet/secure_closet/freezer/kois/spores/fill() + // 8 K'ois + for(var/i = 0, i < 8, i++) + new /obj/item/reagent_containers/food/snacks/grown/kois(src) + +// +// Kitchen Cabinets +// + +// Empty Kitchen Cabinet +/obj/structure/closet/secure_closet/kitchen_cabinet name = "kitchen cabinet" - desc = "A cabinet." - req_access = list(ACCESS_KITCHEN) + desc = "A white kitchen cabinet." -/obj/structure/closet/secure_closet/freezer/kitchen/fill() +// Standard Kitchen Cabinet +/obj/structure/closet/secure_closet/kitchen_cabinet/standard/fill() for(var/i = 0, i < 2, i++) new /obj/item/reagent_containers/food/condiment/flour(src) new /obj/item/reagent_containers/food/condiment/sugar(src) new /obj/item/reagent_containers/food/condiment/shaker/spacespice(src) -/obj/structure/closet/secure_closet/freezer/kitchen/mining - req_access = list() +// +// Miscellaneous +// +// Money +// Used on the Grand Romanovich. /obj/structure/closet/secure_closet/freezer/money - name = "freezer" - desc = "This contains cold hard cash." - req_access = list(ACCESS_HEADS_VAULT) + name = "credits freezer" + desc = "This contains cold, hard credits." /obj/structure/closet/secure_closet/freezer/money/fill() - ..() - for(var/i = 0, i < rand(15,25), i++) + for(var/i = 0, i < rand(15, 25), i++) new /obj/random/spacecash(src) - for(var/i = 0, i < rand(6,9), i++) + for(var/i = 0, i < rand(6, 9), i++) new /obj/random/coin(src) - -/obj/structure/closet/secure_closet/freezer/cafe/fill() - ..() - for(var/i = 0, i < 6, i++) - new /obj/item/reagent_containers/food/drinks/carton/milk(src) - for(var/i = 0, i < 3, i++) - new /obj/item/storage/box/fancy/egg_box(src) - new /obj/item/reagent_containers/food/condiment/flour(src) - for(var/i = 0, i < 2, i++) - new /obj/item/reagent_containers/food/drinks/carton/soymilk(src) - new /obj/item/reagent_containers/food/condiment/sugar(src) - -/obj/structure/closet/secure_closet/freezer/kois - name = "freezer" - desc = "A freezer, painted in a sickly yellow, with a biohazard sign on the door." - icon_state = "freezer_kois" - -/obj/structure/closet/secure_closet/freezer/kois/spores - name = "k'ois freezer" - desc = "A freezer with k'ois inside. Painted in a sickly yellow, with a biohazard sign on the door." - -/obj/structure/closet/secure_closet/freezer/kois/spores/fill() - ..() - for(var/i = 0, i < 8, i++) - new /obj/item/reagent_containers/food/snacks/grown/kois(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/locker.dm similarity index 63% rename from code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm rename to code/game/objects/structures/crates_lockers/closets/secure/locker.dm index 0124dff0165..5a46342f15b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/locker.dm @@ -1,11 +1,11 @@ /obj/structure/closet/secure_closet - name = "secure locker" - desc = "It's an immobile card-locked storage unit." + name = "locker" + desc = "It's a steel ID-locked locker." icon = 'icons/obj/closet.dmi' icon_state = "secure" + anchored = FALSE secure = TRUE opened = FALSE - anchored = FALSE locked = TRUE health = 200 @@ -55,7 +55,7 @@ . = ..() togglelock(user) -/obj/structure/closet/proc/CanChainsaw(var/obj/item/material/twohanded/chainsaw/ChainSawVar) // Wow, this is like, a real-life fossil. +/obj/structure/closet/proc/CanChainsaw(var/obj/item/material/twohanded/chainsaw/ChainSawVar) return (ChainSawVar.powered && !opened && !broken) /obj/structure/closet/emag_act(var/remaining_charges, var/mob/user, var/emag_source, var/visual_feedback = "", var/audible_feedback = "") @@ -78,7 +78,7 @@ return 1 /obj/structure/closet/proc/verb_togglelock() - set src in oview(1) // One square distance + set src in oview(1) set category = "Object" set name = "Toggle Lock" @@ -89,35 +89,3 @@ togglelock(usr) else to_chat(usr, SPAN_WARNING("This mob type can't use this verb.")) - -// Marooning Equipment -/obj/structure/closet/secure_closet/marooning_equipment - name = "marooning equipment locker" - icon_state = "maroon" - req_one_access = list(ACCESS_SECURITY, ACCESS_HEADS) // Marooned personnel would likely be marooned by security and/or command. - -/obj/structure/closet/secure_closet/marooning_equipment/fill() - new /obj/item/clothing/mask/breath(src) - new /obj/item/clothing/under/color/yellow(src) - new /obj/item/clothing/shoes/workboots/grey(src) - new /obj/item/clothing/head/helmet/space/emergency/marooning_equipment(src) - new /obj/item/clothing/suit/space/emergency/marooning_equipment(src) - new /obj/item/tank/oxygen/marooning_equipment(src) - new /obj/item/storage/backpack/duffel/marooning_equipment(src) - -/obj/item/storage/backpack/duffel/marooning_equipment - name = "marooning equipment duffel bag" - desc = "A duffel bag full of marooning equipment." - starts_with = list( - /obj/item/crowbar/red = 1, - /obj/item/device/flashlight/heavy = 1, - /obj/item/device/gps/marooning_equipment = 1, - /obj/item/airbubble = 1, - - // Rations - /obj/item/storage/box/fancy/mre/random = 2, - /obj/item/reagent_containers/food/drinks/waterbottle = 4, - - // Medical Supplies - /obj/item/storage/firstaid/stab = 1, - ) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/marooning.dm b/code/game/objects/structures/crates_lockers/closets/secure/marooning.dm new file mode 100644 index 00000000000..4db89477eb9 --- /dev/null +++ b/code/game/objects/structures/crates_lockers/closets/secure/marooning.dm @@ -0,0 +1,34 @@ +// +// Marooning Equipment +// +/obj/structure/closet/secure_closet/marooning_equipment + name = "marooning equipment locker" + icon_state = "maroon" + req_one_access = list(ACCESS_HEADS, ACCESS_SECURITY) // Marooned personnel would likely be marooned by security and/or command. + +/obj/structure/closet/secure_closet/marooning_equipment/fill() + new /obj/item/clothing/mask/breath(src) + new /obj/item/clothing/under/color/yellow(src) + new /obj/item/clothing/shoes/workboots/grey(src) + new /obj/item/clothing/head/helmet/space/emergency/marooning_equipment(src) + new /obj/item/clothing/suit/space/emergency/marooning_equipment(src) + new /obj/item/tank/oxygen/marooning_equipment(src) + new /obj/item/storage/backpack/duffel/marooning_equipment(src) + +/obj/item/storage/backpack/duffel/marooning_equipment + name = "marooning equipment duffel bag" + desc = "A duffel bag full of marooning equipment." + starts_with = list( + // Tools + /obj/item/crowbar/red = 1, + /obj/item/device/flashlight/heavy = 1, + /obj/item/device/gps/marooning_equipment = 1, + /obj/item/airbubble = 1, + + // Rations + /obj/item/storage/box/fancy/mre/random = 2, + /obj/item/reagent_containers/food/drinks/waterbottle = 4, + + // Medical Supplies + /obj/item/storage/firstaid/stab = 1 + ) diff --git a/html/changelogs/SleepyGemmy-refrigerators_and_freezers.yml b/html/changelogs/SleepyGemmy-refrigerators_and_freezers.yml new file mode 100644 index 00000000000..b46d4ec04ba --- /dev/null +++ b/html/changelogs/SleepyGemmy-refrigerators_and_freezers.yml @@ -0,0 +1,8 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - tweak: "Changed refrigerators and kitchen cabinets to have their own paths." + - tweak: "Added standard refrigerators and kitchen cabinet variants filled with the standard contents. The base variants are now empty." + - maptweak: "Paths updated in the maps to use the new kitchen storage variants." diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi index ab4ce5b3164..706ba007751 100644 Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index 039a3b885ba..841a35e2306 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -8661,7 +8661,7 @@ /turf/simulated/floor/shuttle/black, /area/shuttle/mercenary) "bKj" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /turf/unsimulated/floor{ icon_state = "tiled_preview" }, @@ -11461,7 +11461,7 @@ /turf/unsimulated/floor/plating, /area/shuttle/escape) "dGn" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/storage/box/fancy/egg_box, /obj/item/storage/box/fancy/egg_box, /obj/item/reagent_containers/food/drinks/carton/soymilk, @@ -18442,7 +18442,7 @@ /turf/unsimulated/floor/plating, /area/centcom/distress_prep) "hTk" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ +/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ req_access = null }, /obj/structure/sign/poster{ diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 45556da560c..206bd02ca3b 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -1678,7 +1678,7 @@ /turf/simulated/floor/plating, /area/maintenance/substation/security) "ady" = ( -/obj/structure/closet/secure_closet/freezer/fridge{ +/obj/structure/closet/secure_closet/refrigerator/standard{ desc = "It looks like it has not been used for some time."; name = "Dust-covered refrigerator" }, @@ -49536,7 +49536,7 @@ dir = 4; icon_state = "tube_empty" }, -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/storage/box/fancy/egg_box, /obj/item/storage/box/fancy/egg_box, /obj/item/reagent_containers/food/drinks/carton/soymilk, @@ -68784,7 +68784,7 @@ /area/engineering/foyer) "wil" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/closet/secure_closet/freezer/kitchen, +/obj/structure/closet/secure_closet/kitchen_cabinet/standard, /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, /turf/simulated/floor/tiled/white, diff --git a/maps/away/away_site/abandoned_diner/abandoned_diner.dmm b/maps/away/away_site/abandoned_diner/abandoned_diner.dmm index 7805d9eb1fc..7a8a51de945 100644 --- a/maps/away/away_site/abandoned_diner/abandoned_diner.dmm +++ b/maps/away/away_site/abandoned_diner/abandoned_diner.dmm @@ -4374,7 +4374,7 @@ /turf/simulated/floor/tiled, /area/abandoned_diner/docking/b) "nIF" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/storage/box/fancy/egg_box, /obj/item/storage/box/fancy/egg_box, /obj/effect/floor_decal/industrial/outline/grey, @@ -4527,7 +4527,7 @@ /turf/simulated/floor/tiled/dark, /area/abandoned_diner/backroom) "ovC" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/effect/floor_decal/industrial/outline/grey, /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, diff --git a/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dmm b/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dmm index 8d3a90bdbe2..382d9997a39 100644 --- a/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dmm +++ b/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dmm @@ -357,7 +357,7 @@ /turf/simulated/floor/reinforced/airless, /area/crashed_elyran_tanker/tanks) "dm" = ( -/obj/structure/closet/secure_closet/freezer/fridge{ +/obj/structure/closet/secure_closet/refrigerator/standard{ opened = 1 }, /obj/effect/decal/cleanable/dirt, diff --git a/maps/away/away_site/first_aurora/first_aurora.dmm b/maps/away/away_site/first_aurora/first_aurora.dmm index 49be7ad9108..46be01fe4e8 100644 --- a/maps/away/away_site/first_aurora/first_aurora.dmm +++ b/maps/away/away_site/first_aurora/first_aurora.dmm @@ -3962,11 +3962,11 @@ /turf/simulated/floor/tiled/airless, /area/derelict/hallway/southwest) "mZ" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /turf/simulated/floor/tiled/airless, /area/derelict/hallway/southwest) "na" = ( -/obj/structure/closet/secure_closet/freezer/kitchen, +/obj/structure/closet/secure_closet/kitchen_cabinet/standard, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/airless, /area/derelict/hallway/southwest) diff --git a/maps/away/away_site/hivebot_hub/hivebot_hub.dmm b/maps/away/away_site/hivebot_hub/hivebot_hub.dmm index b97a0acd9bd..85e78a1ab12 100644 --- a/maps/away/away_site/hivebot_hub/hivebot_hub.dmm +++ b/maps/away/away_site/hivebot_hub/hivebot_hub.dmm @@ -230,7 +230,7 @@ "qA" = (/obj/effect/decal/cleanable/dirt,/obj/effect/floor_decal/corner/brown{dir = 10},/obj/machinery/light,/turf/simulated/floor/tiled/dark/airless,/area/hivebothub/secure) "qC" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/pipe/simple/hidden,/obj/effect/decal/cleanable/floor_damage/rust,/turf/simulated/floor/tiled/dark/airless,/area/hivebothub/portdocks) "qE" = (/obj/effect/decal/cleanable/blood/drip,/obj/item/stack/material/graphite{pixel_y = -7; pixel_x = -8},/turf/simulated/floor/tiled/dark/airless,/area/hivebothub/portdocks) -"qF" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/structure/closet/secure_closet/freezer/fridge,/obj/effect/decal/cleanable/flour,/turf/simulated/floor/tiled/airless,/area/hivebothub/kitchen) +"qF" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/structure/closet/secure_closet/refrigerator/standard,/obj/effect/decal/cleanable/flour,/turf/simulated/floor/tiled/airless,/area/hivebothub/kitchen) "qG" = (/obj/structure/girder,/turf/simulated/floor/airless,/area/hivebothub/kitchen) "qI" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/effect/decal/cleanable/dirt,/obj/item/ore/iron{pixel_x = 4; pixel_y = 5},/obj/machinery/door/blast/shutters/open{id = "hivebot_starboard_shutter_4"},/turf/simulated/floor/tiled/dark/full/airless,/area/hivebothub/starboarddocks) "qO" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/suit_storage_unit/standard_unit,/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/alarm/north,/turf/simulated/floor/airless,/area/hivebothub/engi) diff --git a/maps/away/away_site/idris_wreck/idris_wreck.dmm b/maps/away/away_site/idris_wreck/idris_wreck.dmm index b979c63bb54..0e47f8700aa 100644 --- a/maps/away/away_site/idris_wreck/idris_wreck.dmm +++ b/maps/away/away_site/idris_wreck/idris_wreck.dmm @@ -1600,7 +1600,7 @@ /turf/simulated/floor/tiled/airless, /area/idris_wreck/central) "vU" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /turf/simulated/floor/lino{ initial_gas = null }, diff --git a/maps/away/away_site/konyang/point_verdant/point_verdant-2.dmm b/maps/away/away_site/konyang/point_verdant/point_verdant-2.dmm index 4b7ae31a861..a224c0a2132 100644 --- a/maps/away/away_site/konyang/point_verdant/point_verdant-2.dmm +++ b/maps/away/away_site/konyang/point_verdant/point_verdant-2.dmm @@ -8677,7 +8677,7 @@ /area/point_verdant/outdoors) "wS" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/storage/box/fancy/egg_box, /obj/item/storage/box/fancy/egg_box, /obj/item/storage/box/fancy/egg_box, diff --git a/maps/away/away_site/magshield/magshield.dmm b/maps/away/away_site/magshield/magshield.dmm index ba3aa9146c7..ef2f11d71be 100644 --- a/maps/away/away_site/magshield/magshield.dmm +++ b/maps/away/away_site/magshield/magshield.dmm @@ -3203,7 +3203,7 @@ /turf/simulated/floor/tiled/freezer, /area/magshield/south) "jB" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /turf/simulated/floor/tiled/freezer, /area/magshield/south) "jC" = ( @@ -3388,7 +3388,7 @@ /turf/simulated/floor/tiled/freezer, /area/magshield/south) "kp" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/reagent_containers/food/snacks/hotdog, /turf/simulated/floor/tiled/freezer, /area/magshield/south) diff --git a/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dmm b/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dmm index 9f69be04874..da11a93e608 100644 --- a/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dmm +++ b/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dmm @@ -1157,7 +1157,7 @@ /turf/simulated/floor/airless, /area/overgrown_mining_station) "MP" = ( -/obj/structure/closet/secure_closet/freezer/kitchen, +/obj/structure/closet/secure_closet/kitchen_cabinet/standard, /turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "MW" = ( diff --git a/maps/away/away_site/pirate_base/pirate_base.dmm b/maps/away/away_site/pirate_base/pirate_base.dmm index 2bc6aa1358a..d75f0482476 100644 --- a/maps/away/away_site/pirate_base/pirate_base.dmm +++ b/maps/away/away_site/pirate_base/pirate_base.dmm @@ -1404,7 +1404,7 @@ /area/piratebase/living) "gM" = ( /obj/random/dirt_75, -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/storage/box/produce, /obj/item/storage/box/produce, /obj/item/storage/box/produce, @@ -2653,7 +2653,7 @@ /area/piratebase/quarters) "nf" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/reagent_containers/food/snacks/sliceable/bread, /obj/item/reagent_containers/food/snacks/sliceable/bread{ pixel_y = -4; @@ -3766,7 +3766,7 @@ /turf/simulated/floor/tiled/white, /area/shuttle/pirate_shuttle/med) "sh" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, @@ -6198,7 +6198,7 @@ /turf/simulated/floor/tiled/full, /area/piratebase/eva) "Gc" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, diff --git a/maps/away/away_site/racers/racers.dmm b/maps/away/away_site/racers/racers.dmm index 4bcd72072dd..55f32297f6a 100644 --- a/maps/away/away_site/racers/racers.dmm +++ b/maps/away/away_site/racers/racers.dmm @@ -1136,7 +1136,7 @@ /area/space) "frf" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/storage/box/fancy/egg_box, /obj/item/storage/box/fancy/egg_box, /obj/item/reagent_containers/food/drinks/carton/soymilk, @@ -1959,7 +1959,7 @@ /area/racers) "jnP" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/closet/secure_closet/freezer/kitchen{ +/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ req_access = list(202) }, /obj/item/reagent_containers/food/condiment/flour, @@ -4892,7 +4892,7 @@ /area/racers) "xFs" = ( /obj/machinery/light/small, -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/reagent_containers/food/snacks/meatball, /obj/item/reagent_containers/food/snacks/meatball, /obj/item/reagent_containers/food/snacks/meatball, diff --git a/maps/away/away_site/romanovich/grand_romanovich.dmm b/maps/away/away_site/romanovich/grand_romanovich.dmm index a81237c892f..dfa9bc61bf6 100644 --- a/maps/away/away_site/romanovich/grand_romanovich.dmm +++ b/maps/away/away_site/romanovich/grand_romanovich.dmm @@ -5993,7 +5993,7 @@ dir = 5; icon_state = "spline_fancy" }, -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/reagent_containers/food/drinks/bottle/messa_mead, /obj/item/reagent_containers/food/drinks/bottle/messa_mead, /obj/item/reagent_containers/food/drinks/bottle/messa_mead, @@ -6258,7 +6258,7 @@ /turf/simulated/floor/carpet/art, /area/grand_romanovich) "vp" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/reagent_containers/food/drinks/bottle/messa_mead, /obj/item/reagent_containers/food/drinks/bottle/messa_mead, /obj/item/reagent_containers/food/drinks/bottle/messa_mead, @@ -6440,7 +6440,7 @@ dir = 4; icon_state = "spline_fancy" }, -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/reagent_containers/food/snacks/tajaran_bread, /obj/item/reagent_containers/food/snacks/tajaran_bread, /obj/item/reagent_containers/food/snacks/tajaran_bread, @@ -6542,7 +6542,7 @@ /turf/simulated/floor/wood, /area/grand_romanovich) "zi" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/reagent_containers/food/snacks/meat/adhomai, /obj/item/reagent_containers/food/snacks/meat/adhomai, /obj/item/reagent_containers/food/snacks/meat/adhomai, @@ -7268,7 +7268,7 @@ /turf/simulated/floor/tiled/white, /area/grand_romanovich) "Ld" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/reagent_containers/food/snacks/tajaran_bread, /obj/item/reagent_containers/food/snacks/tajaran_bread, /obj/item/reagent_containers/food/snacks/tajaran_bread, diff --git a/maps/away/away_site/shady/shady.dmm b/maps/away/away_site/shady/shady.dmm index a36c5fa3adc..2f89b268f82 100644 --- a/maps/away/away_site/shady/shady.dmm +++ b/maps/away/away_site/shady/shady.dmm @@ -2175,7 +2175,7 @@ /area/hideout) "HE" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat, @@ -2461,7 +2461,7 @@ /area/hideout) "LW" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, diff --git a/maps/away/away_site/tajara/peoples_station/peoples_station.dmm b/maps/away/away_site/tajara/peoples_station/peoples_station.dmm index f965d70d520..89e775cead3 100644 --- a/maps/away/away_site/tajara/peoples_station/peoples_station.dmm +++ b/maps/away/away_site/tajara/peoples_station/peoples_station.dmm @@ -1620,7 +1620,7 @@ }, /area/shuttle/fang/engine) "hc" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ +/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ req_access = null }, /obj/item/storage/box/produce{ diff --git a/maps/away/away_site/tajara/saniorios_smuggler/saniorios_smuggler.dmm b/maps/away/away_site/tajara/saniorios_smuggler/saniorios_smuggler.dmm index 4da686565a6..f44d8cf8e46 100644 --- a/maps/away/away_site/tajara/saniorios_smuggler/saniorios_smuggler.dmm +++ b/maps/away/away_site/tajara/saniorios_smuggler/saniorios_smuggler.dmm @@ -1139,7 +1139,7 @@ }, /area/space) "Ws" = ( -/obj/structure/closet/secure_closet/freezer/meat/super_meat, +/obj/structure/closet/secure_closet/freezer/meat/grill, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor{ temperature = 278.15 diff --git a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm index 4645b53f4e7..82cddc56304 100644 --- a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm +++ b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm @@ -3399,7 +3399,7 @@ /turf/simulated/floor/tiled/dark, /area/tcaf_corvette/messhall) "Dp" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ +/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ req_access = list(204) }, /obj/item/reagent_containers/food/snacks/meat, diff --git a/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dmm b/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dmm index 9e14c18da57..c2320756296 100644 --- a/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dmm +++ b/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dmm @@ -2531,7 +2531,7 @@ /turf/simulated/floor/tiled/white, /area/ship/tcfl_peacekeeper_ship) "pqU" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ +/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ req_access = list(204) }, /obj/item/reagent_containers/food/snacks/meat, diff --git a/maps/away/ships/casino/casino.dmm b/maps/away/ships/casino/casino.dmm index 6c875844755..bb49a40f3ff 100644 --- a/maps/away/ships/casino/casino.dmm +++ b/maps/away/ships/casino/casino.dmm @@ -2771,7 +2771,7 @@ /turf/simulated/floor/tiled/white, /area/casino/casino_kitchen) "il" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8; level = 2 @@ -2785,7 +2785,7 @@ /turf/simulated/floor/tiled/white, /area/casino/casino_kitchen) "im" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -2795,7 +2795,7 @@ /turf/simulated/floor/tiled/white, /area/casino/casino_kitchen) "in" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/reagent_containers/food/condiment/flour, /obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/tiled/white, diff --git a/maps/away/ships/coc/coc_ranger/coc_ship.dmm b/maps/away/ships/coc/coc_ranger/coc_ship.dmm index 1d455e40c23..902bc9ecc91 100644 --- a/maps/away/ships/coc/coc_ranger/coc_ship.dmm +++ b/maps/away/ships/coc/coc_ranger/coc_ship.dmm @@ -3424,7 +3424,7 @@ /turf/simulated/wall/shuttle/space_ship/mercenary, /area/ship/ranger_corvette/engineering) "oOX" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ +/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ req_access = null }, /obj/item/reagent_containers/food/snacks/meat, diff --git a/maps/away/ships/coc/coc_scarab/coc_scarab_deck_2.dmm b/maps/away/ships/coc/coc_scarab/coc_scarab_deck_2.dmm index 29fd94db5c5..2bfef3b45e5 100644 --- a/maps/away/ships/coc/coc_scarab/coc_scarab_deck_2.dmm +++ b/maps/away/ships/coc/coc_scarab/coc_scarab_deck_2.dmm @@ -3571,7 +3571,7 @@ /turf/simulated/floor/tiled/dark, /area/ship/coc_scarab/equipment) "sq" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator, /obj/item/reagent_containers/food/drinks/cans/beetle_milk, /obj/item/reagent_containers/food/drinks/cans/beetle_milk, /obj/item/reagent_containers/food/drinks/cans/beetle_milk, diff --git a/maps/away/ships/coc/coc_surveyor/coc_surveyor.dmm b/maps/away/ships/coc/coc_surveyor/coc_surveyor.dmm index e4e5dd992d1..13e1fd241e7 100644 --- a/maps/away/ships/coc/coc_surveyor/coc_surveyor.dmm +++ b/maps/away/ships/coc/coc_surveyor/coc_surveyor.dmm @@ -2171,7 +2171,7 @@ /turf/simulated/floor/tiled/white, /area/coc_survey_ship/medical) "sQ" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ +/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ req_access = null }, /obj/item/reagent_containers/food/snacks/meat, diff --git a/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dmm b/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dmm index cf16ee44e8d..f47c5245fcc 100644 --- a/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dmm +++ b/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dmm @@ -2091,7 +2091,7 @@ /turf/simulated/floor, /area/ship/gadpathur_patrol/engineering) "qU" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ +/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ req_access = null }, /obj/item/storage/box/fancy/egg_box, diff --git a/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm b/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm index 123e3979385..a6c82c9ed59 100644 --- a/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm +++ b/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm @@ -2070,7 +2070,7 @@ /turf/simulated/floor/tiled/dark/full, /area/shuttle/elyran_shuttle) "kZ" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ +/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ req_access = null; anchored = 1 }, diff --git a/maps/away/ships/freebooter/freebooter_ship.dmm b/maps/away/ships/freebooter/freebooter_ship.dmm index a0a75b99e02..4eb1508ccc1 100644 --- a/maps/away/ships/freebooter/freebooter_ship.dmm +++ b/maps/away/ships/freebooter/freebooter_ship.dmm @@ -4448,7 +4448,7 @@ /turf/simulated/floor/tiled/dark, /area/ship/freebooter_ship/pod2) "kzm" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ +/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ req_access = null }, /obj/item/reagent_containers/food/snacks/meat, diff --git a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm index c92d0d517d6..a1b7eee8530 100644 --- a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm +++ b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm @@ -6571,7 +6571,7 @@ /turf/simulated/floor/tiled/white, /area/hegemony_ship/canteen) "Nc" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ +/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ req_access = null }, /obj/effect/floor_decal/corner/grey/diagonal, diff --git a/maps/away/ships/hegemony/miners_guild/miners_guild_station.dmm b/maps/away/ships/hegemony/miners_guild/miners_guild_station.dmm index 52b152618e0..4baa8eff49e 100644 --- a/maps/away/ships/hegemony/miners_guild/miners_guild_station.dmm +++ b/maps/away/ships/hegemony/miners_guild/miners_guild_station.dmm @@ -1511,7 +1511,7 @@ /turf/simulated/floor/plating, /area/miners_guild) "qC" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/storage/box/fancy/egg_box, /obj/item/storage/box/fancy/egg_box, /obj/item/reagent_containers/food/condiment/flour, @@ -3959,7 +3959,7 @@ /turf/simulated/floor/tiled/steel, /area/miners_guild/engineering1) "RK" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat, diff --git a/maps/away/ships/heph/cyclops/cyclops.dmm b/maps/away/ships/heph/cyclops/cyclops.dmm index d3593dcbe99..a1b8c5688b9 100644 --- a/maps/away/ships/heph/cyclops/cyclops.dmm +++ b/maps/away/ships/heph/cyclops/cyclops.dmm @@ -1312,7 +1312,7 @@ /area/hephmining_ship/cyclops/cyclops_engineering) "nb" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/structure/closet/secure_closet/freezer/kitchen{ +/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ req_access = null }, /obj/effect/floor_decal/corner/grey/diagonal, diff --git a/maps/away/ships/heph/heph_security/heph_security.dmm b/maps/away/ships/heph/heph_security/heph_security.dmm index 9e272cf26be..bba48ea15fc 100644 --- a/maps/away/ships/heph/heph_security/heph_security.dmm +++ b/maps/away/ships/heph/heph_security/heph_security.dmm @@ -614,7 +614,7 @@ /turf/simulated/wall/shuttle/raider, /area/heph_security_ship/francisca) "ez" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/storage/box/fancy/egg_box, /obj/item/storage/box/fancy/egg_box, /obj/item/reagent_containers/food/condiment/enzyme{ @@ -1109,7 +1109,7 @@ /turf/simulated/floor/tiled/dark, /area/heph_security_ship/brig) "ir" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/effect/floor_decal/spline/plain{ dir = 10 @@ -3602,7 +3602,7 @@ /turf/simulated/floor/tiled, /area/heph_security_ship) "Bm" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/reagent_containers/food/snacks/meat/chicken, /obj/item/reagent_containers/food/snacks/meat/chicken, /obj/item/reagent_containers/food/snacks/meat/chicken, @@ -4808,7 +4808,7 @@ /turf/simulated/floor, /area/heph_security_ship/atmos) "KO" = ( -/obj/structure/closet/secure_closet/freezer/fridge{ +/obj/structure/closet/secure_closet/refrigerator/standard{ name = "k'ois freezer" }, /obj/item/reagent_containers/food/snacks/koiswaffles, diff --git a/maps/away/ships/iac/iac_rescue_ship.dmm b/maps/away/ships/iac/iac_rescue_ship.dmm index 172c15b937c..357ade1e4a0 100644 --- a/maps/away/ships/iac/iac_rescue_ship.dmm +++ b/maps/away/ships/iac/iac_rescue_ship.dmm @@ -5043,7 +5043,7 @@ /area/ship/iac_rescue_ship/medical) "kHO" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/reagent_containers/food/drinks/carton/soymilk, /obj/item/reagent_containers/food/drinks/carton/soymilk, /obj/item/reagent_containers/food/drinks/carton/milk, diff --git a/maps/away/ships/idris/idris_cruiser.dmm b/maps/away/ships/idris/idris_cruiser.dmm index 7f30cd7f014..e20a871e9d4 100644 --- a/maps/away/ships/idris/idris_cruiser.dmm +++ b/maps/away/ships/idris/idris_cruiser.dmm @@ -271,7 +271,7 @@ /turf/simulated/floor/tiled, /area/ship/idris_cruiser/corridor/maintenance_foyer) "bm" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/reagent_containers/food/drinks/carton/milk, /obj/item/reagent_containers/food/drinks/carton/milk, /obj/item/reagent_containers/food/drinks/carton/milk, diff --git a/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm b/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm index 8f7ff9d8b76..9d39967097e 100644 --- a/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm +++ b/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm @@ -5906,7 +5906,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/reagent_containers/food/drinks/carton/cream, /obj/item/reagent_containers/food/condiment/enzyme{ pixel_x = -9; diff --git a/maps/away/ships/konyang/water_barge/water_barge.dmm b/maps/away/ships/konyang/water_barge/water_barge.dmm index d492f8aea94..137dc4e8843 100644 --- a/maps/away/ships/konyang/water_barge/water_barge.dmm +++ b/maps/away/ships/konyang/water_barge/water_barge.dmm @@ -742,7 +742,7 @@ /turf/space, /area/space) "hv" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/drinks/carton/soymilk, diff --git a/maps/away/ships/nka/nka_merchant/nka_merchant.dmm b/maps/away/ships/nka/nka_merchant/nka_merchant.dmm index a6ad8c53254..1b2f1aa5bb5 100644 --- a/maps/away/ships/nka/nka_merchant/nka_merchant.dmm +++ b/maps/away/ships/nka/nka_merchant/nka_merchant.dmm @@ -978,7 +978,7 @@ }, /area/nka_merchant/merchant) "dd" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ +/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ req_access = null }, /obj/item/storage/box/produce{ diff --git a/maps/away/ships/orion/orion_express_ship.dmm b/maps/away/ships/orion/orion_express_ship.dmm index 149b54a3ac7..4b5082b41f4 100644 --- a/maps/away/ships/orion/orion_express_ship.dmm +++ b/maps/away/ships/orion/orion_express_ship.dmm @@ -1445,7 +1445,7 @@ /turf/simulated/floor, /area/ship/orion/cargo) "gqU" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ +/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ req_access = list(201) }, /obj/item/reagent_containers/food/snacks/meat, diff --git a/maps/away/ships/pra/headmaster/headmaster_ship.dmm b/maps/away/ships/pra/headmaster/headmaster_ship.dmm index 280e486a1ad..98468dfa5d5 100644 --- a/maps/away/ships/pra/headmaster/headmaster_ship.dmm +++ b/maps/away/ships/pra/headmaster/headmaster_ship.dmm @@ -5932,7 +5932,7 @@ }, /area/headmaster_ship/bridge) "OT" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ +/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ req_access = null }, /obj/item/storage/box/produce{ diff --git a/maps/away/ships/sadar_scout/sadar_scout.dmm b/maps/away/ships/sadar_scout/sadar_scout.dmm index 5d583ac401a..549f97cbb0c 100644 --- a/maps/away/ships/sadar_scout/sadar_scout.dmm +++ b/maps/away/ships/sadar_scout/sadar_scout.dmm @@ -6329,7 +6329,7 @@ /turf/simulated/floor/tiled/dark, /area/ship/sadar_scout/forehall) "UX" = ( -/obj/structure/closet/secure_closet/freezer/fridge{ +/obj/structure/closet/secure_closet/refrigerator/standard{ anchored = 1 }, /obj/item/reagent_containers/food/condiment/enzyme{ diff --git a/maps/away/ships/scc/scc_scout_ship.dmm b/maps/away/ships/scc/scc_scout_ship.dmm index 84d3f40a023..78e33b17f8e 100644 --- a/maps/away/ships/scc/scc_scout_ship.dmm +++ b/maps/away/ships/scc/scc_scout_ship.dmm @@ -7618,7 +7618,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, diff --git a/maps/away/ships/sol_merc/fsf_patrol_ship.dmm b/maps/away/ships/sol_merc/fsf_patrol_ship.dmm index 9dcd5dfc0ed..fa0d0e58ec7 100644 --- a/maps/away/ships/sol_merc/fsf_patrol_ship.dmm +++ b/maps/away/ships/sol_merc/fsf_patrol_ship.dmm @@ -1158,7 +1158,7 @@ /turf/simulated/floor/plating, /area/shuttle/fsf_shuttle) "hsz" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ +/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ req_access = list(203) }, /obj/item/reagent_containers/food/snacks/meat, diff --git a/maps/away/ships/sol_pirate/sfa_patrol_ship.dmm b/maps/away/ships/sol_pirate/sfa_patrol_ship.dmm index 63ee3b65e48..f46cb884e23 100644 --- a/maps/away/ships/sol_pirate/sfa_patrol_ship.dmm +++ b/maps/away/ships/sol_pirate/sfa_patrol_ship.dmm @@ -1045,7 +1045,7 @@ /turf/simulated/wall/rusty, /area/ship/sfa_patrol_ship/Suit_Storage) "eoo" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ +/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ req_access = null }, /obj/item/reagent_containers/food/snacks/meat, @@ -1095,7 +1095,7 @@ dir = 4; icon_state = "tube_empty" }, -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/white, /area/ship/sfa_patrol_ship/medbay) diff --git a/maps/away/ships/sol_ssmd/ssmd_ship.dmm b/maps/away/ships/sol_ssmd/ssmd_ship.dmm index d1010a43da3..054503cfc71 100644 --- a/maps/away/ships/sol_ssmd/ssmd_ship.dmm +++ b/maps/away/ships/sol_ssmd/ssmd_ship.dmm @@ -292,7 +292,7 @@ /turf/simulated/floor/tiled/dark, /area/ship/ssmd_corvette/brig) "aLy" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ +/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ req_access = null }, /obj/item/reagent_containers/food/snacks/meat, @@ -6695,7 +6695,7 @@ /turf/simulated/floor/tiled/dark, /area/ship/ssmd_corvette/canteen) "upw" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ +/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ req_access = null }, /obj/item/reagent_containers/food/snacks/meat, @@ -7349,7 +7349,7 @@ /turf/simulated/floor/tiled/white, /area/ship/ssmd_corvette/medbay) "wiX" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ +/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ req_access = null }, /obj/item/reagent_containers/food/snacks/meat, diff --git a/maps/away/ships/tajara/circus/adhomian_circus.dmm b/maps/away/ships/tajara/circus/adhomian_circus.dmm index a8f4e4339b5..21c611b95d8 100644 --- a/maps/away/ships/tajara/circus/adhomian_circus.dmm +++ b/maps/away/ships/tajara/circus/adhomian_circus.dmm @@ -1010,7 +1010,7 @@ }, /area/adhomian_circus/port) "eZF" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/reagent_containers/food/snacks/stew/tajaran, /obj/item/reagent_containers/food/snacks/stew/tajaran, /obj/item/reagent_containers/food/snacks/stew/tajaran, @@ -2419,7 +2419,7 @@ }, /area/adhomian_circus/crew) "mTv" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/reagent_containers/food/snacks/adhomian_sausage, /obj/item/reagent_containers/food/snacks/adhomian_sausage, /obj/item/reagent_containers/food/snacks/adhomian_sausage, @@ -2774,7 +2774,7 @@ }, /area/adhomian_circus/fortune) "ozN" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/reagent_containers/food/snacks/explorer_ration, /obj/item/reagent_containers/food/snacks/explorer_ration, /obj/item/reagent_containers/food/snacks/explorer_ration, @@ -3363,7 +3363,7 @@ }, /area/adhomian_circus/port) "rWg" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/reagent_containers/food/snacks/fruit_rikazu, /obj/item/reagent_containers/food/snacks/fruit_rikazu, /obj/item/reagent_containers/food/snacks/fruit_rikazu, @@ -4272,7 +4272,7 @@ }, /area/adhomian_circus/port) "xas" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/reagent_containers/food/snacks/tajaran_bread, /obj/item/reagent_containers/food/snacks/tajaran_bread, /obj/item/reagent_containers/food/snacks/tajaran_bread, diff --git a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm index c3519b0673f..a94d8d8204e 100644 --- a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm +++ b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm @@ -3318,7 +3318,7 @@ }, /area/tajaran_smuggler/power) "ttw" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ +/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ req_access = null }, /obj/item/storage/box/produce{ diff --git a/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm b/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm index f33f2957bb4..1c6e8598746 100644 --- a/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm +++ b/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm @@ -4458,7 +4458,7 @@ /turf/simulated/floor/plating, /area/ship/tirakqi_smuggler/bridge) "Bf" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ +/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ req_access = null; anchored = 1 }, diff --git a/maps/away/ships/tramp_freighter/tramp_freighter.dmm b/maps/away/ships/tramp_freighter/tramp_freighter.dmm index 151b0c275dc..78fdd25bc39 100644 --- a/maps/away/ships/tramp_freighter/tramp_freighter.dmm +++ b/maps/away/ships/tramp_freighter/tramp_freighter.dmm @@ -645,7 +645,7 @@ /turf/template_noop, /area/space) "ia" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ +/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ req_access = null }, /obj/item/reagent_containers/food/snacks/meat, diff --git a/maps/away/ships/wildlands_militia/militia_ship.dmm b/maps/away/ships/wildlands_militia/militia_ship.dmm index da9b5e9facc..b6f5c6d87a9 100644 --- a/maps/away/ships/wildlands_militia/militia_ship.dmm +++ b/maps/away/ships/wildlands_militia/militia_ship.dmm @@ -1168,7 +1168,7 @@ /turf/simulated/floor/shuttle/dark_blue, /area/ship/militia_ship) "piw" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ +/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ req_access = null }, /obj/item/reagent_containers/food/snacks/meat, diff --git a/maps/away/ships/yacht/yacht.dmm b/maps/away/ships/yacht/yacht.dmm index b61bb8f574b..655d05521be 100644 --- a/maps/away/ships/yacht/yacht.dmm +++ b/maps/away/ships/yacht/yacht.dmm @@ -347,7 +347,7 @@ /turf/simulated/floor/wood/yew, /area/shuttle/yacht/living) "bg" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood/yew, /area/shuttle/yacht/living) @@ -633,7 +633,7 @@ /turf/simulated/floor/plating, /area/shuttle/yacht/engine) "ca" = ( -/obj/structure/closet/secure_closet/freezer/kitchen, +/obj/structure/closet/secure_closet/kitchen_cabinet/standard, /obj/effect/decal/cleanable/dirt, /obj/machinery/light_switch{ pixel_x = -6; @@ -964,7 +964,7 @@ /turf/simulated/floor/plating, /area/shuttle/yacht/engine) "cW" = ( -/obj/structure/closet/secure_closet/freezer/kitchen, +/obj/structure/closet/secure_closet/kitchen_cabinet/standard, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood/yew, diff --git a/maps/away/ships/yacht_civ/yacht_civ.dmm b/maps/away/ships/yacht_civ/yacht_civ.dmm index d0c15ecbcb3..c6c0ed92a53 100644 --- a/maps/away/ships/yacht_civ/yacht_civ.dmm +++ b/maps/away/ships/yacht_civ/yacht_civ.dmm @@ -463,7 +463,7 @@ "ff" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/item/storage/box/produce, -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/storage/box/produce, /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, diff --git a/maps/dungeon_spawns/coc_ship_unique.dmm b/maps/dungeon_spawns/coc_ship_unique.dmm index 3857003507e..770a60ed87a 100644 --- a/maps/dungeon_spawns/coc_ship_unique.dmm +++ b/maps/dungeon_spawns/coc_ship_unique.dmm @@ -1176,7 +1176,7 @@ /obj/item/reagent_containers/food/snacks/meat/adhomai, /obj/item/reagent_containers/food/snacks/meat/adhomai, /obj/item/reagent_containers/food/snacks/meat/adhomai, -/obj/structure/closet/secure_closet/freezer/fridge{ +/obj/structure/closet/secure_closet/refrigerator/standard{ desc = "It looks like it has not been used for some time."; name = "dust-covered refrigerator" }, diff --git a/maps/event/generic_dock/generic_dock-1.dmm b/maps/event/generic_dock/generic_dock-1.dmm index 749e325a66a..76f443ff7e0 100644 --- a/maps/event/generic_dock/generic_dock-1.dmm +++ b/maps/event/generic_dock/generic_dock-1.dmm @@ -4147,7 +4147,7 @@ /turf/unsimulated/floor/plating, /area/shuttle/escape) "dGn" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/storage/box/fancy/egg_box, /obj/item/storage/box/fancy/egg_box, /obj/item/reagent_containers/food/drinks/carton/soymilk, diff --git a/maps/event/halloween/halloween.dmm b/maps/event/halloween/halloween.dmm index 8b1d21e2f0f..0ccf6061c2b 100644 --- a/maps/event/halloween/halloween.dmm +++ b/maps/event/halloween/halloween.dmm @@ -3404,7 +3404,7 @@ /turf/simulated/floor/carpet/red, /area/city/kitchen) "nS" = ( -/obj/structure/closet/secure_closet/freezer/meat/super_meat, +/obj/structure/closet/secure_closet/freezer/meat/grill, /turf/simulated/floor/tiled/freezer, /area/city/kitchen) "nT" = ( @@ -3633,7 +3633,7 @@ /turf/simulated/floor/wood, /area/city/horrorhouse) "oW" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/storage/box/fancy/egg_box, /obj/item/storage/box/fancy/egg_box, /obj/item/reagent_containers/food/drinks/carton/milk, diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm index a3a5c3ddc26..1da7652152d 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm @@ -851,7 +851,7 @@ /turf/simulated/floor/exoplanet/lino/diamond, /area/adhomai_bar) "Ta" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/storage/box/fancy/egg_box, /obj/item/storage/box/fancy/egg_box, /obj/item/reagent_containers/food/drinks/carton/milk, @@ -884,7 +884,7 @@ /turf/simulated/floor/exoplanet/wood, /area/adhomai_bar) "TJ" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ +/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ req_access = null }, /obj/item/reagent_containers/food/snacks/meat/adhomai, diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm index 30c2c502f20..f82bcbb9b06 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm @@ -687,7 +687,7 @@ /turf/simulated/floor/exoplanet/wood, /area/adhomai_village) "Oc" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/reagent_containers/food/snacks/meat/adhomai, /obj/item/reagent_containers/food/snacks/meat/adhomai, /obj/item/reagent_containers/food/snacks/meat/adhomai, @@ -714,7 +714,7 @@ /turf/simulated/floor/exoplanet/wood, /area/adhomai_village) "Pc" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ +/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ req_access = null }, /obj/item/storage/box/produce{ diff --git a/maps/random_ruins/exoplanets/asteroid/abandoned_prison/abandoned_prison.dmm b/maps/random_ruins/exoplanets/asteroid/abandoned_prison/abandoned_prison.dmm index 04d440842ff..c41018b5805 100644 --- a/maps/random_ruins/exoplanets/asteroid/abandoned_prison/abandoned_prison.dmm +++ b/maps/random_ruins/exoplanets/asteroid/abandoned_prison/abandoned_prison.dmm @@ -430,7 +430,7 @@ /turf/simulated/floor/tiled/steel, /area/abandoned_prison/eva_prep) "fP" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/effect/floor_decal/corner_wide/black/diagonal, /turf/simulated/floor/tiled/white, /area/abandoned_prison/kitchen) diff --git a/maps/random_ruins/exoplanets/asteroid/coalition_base/coalition_base.dmm b/maps/random_ruins/exoplanets/asteroid/coalition_base/coalition_base.dmm index 34254d4cbf3..19096910e07 100644 --- a/maps/random_ruins/exoplanets/asteroid/coalition_base/coalition_base.dmm +++ b/maps/random_ruins/exoplanets/asteroid/coalition_base/coalition_base.dmm @@ -78,7 +78,7 @@ /turf/simulated/wall/r_wall, /area/coalition_base/kitchen) "bU" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ +/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ req_access = null }, /obj/item/reagent_containers/food/condiment/flour, diff --git a/maps/random_ruins/exoplanets/asteroid/coc_ship/coc_ship_unique.dmm b/maps/random_ruins/exoplanets/asteroid/coc_ship/coc_ship_unique.dmm index 04ff45909d9..9ec87185f6e 100644 --- a/maps/random_ruins/exoplanets/asteroid/coc_ship/coc_ship_unique.dmm +++ b/maps/random_ruins/exoplanets/asteroid/coc_ship/coc_ship_unique.dmm @@ -1576,7 +1576,7 @@ /obj/item/reagent_containers/food/snacks/meat/adhomai, /obj/item/reagent_containers/food/snacks/meat/adhomai, /obj/item/reagent_containers/food/snacks/meat/adhomai, -/obj/structure/closet/secure_closet/freezer/fridge{ +/obj/structure/closet/secure_closet/refrigerator/standard{ desc = "It looks like it has not been used for some time."; name = "dust-covered refrigerator" }, diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dmm b/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dmm index 8031462e544..048f8658fb9 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dmm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dmm @@ -3192,7 +3192,7 @@ /turf/simulated/floor/exoplanet/dirt_konyang, /area/konyang_landing_zone) "LX" = ( -/obj/structure/closet/secure_closet/freezer/meat/super_meat, +/obj/structure/closet/secure_closet/freezer/meat/grill, /obj/effect/floor_decal/corner/pink/diagonal, /turf/simulated/floor/tiled/white, /area/konyang_landing_zone/command_center_abandoned/living) diff --git a/maps/random_ruins/exoplanets/konyang/hivebot_burrows_2.dmm b/maps/random_ruins/exoplanets/konyang/hivebot_burrows_2.dmm index d93fa73e544..274d6205fd2 100644 --- a/maps/random_ruins/exoplanets/konyang/hivebot_burrows_2.dmm +++ b/maps/random_ruins/exoplanets/konyang/hivebot_burrows_2.dmm @@ -2652,7 +2652,7 @@ /turf/simulated/floor/exoplanet/tiled/dark, /area/hivebot_burrows_2) "Le" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/storage/box/fancy/egg_box, /obj/item/storage/box/fancy/egg_box, /obj/item/reagent_containers/food/condiment/flour, diff --git a/maps/random_ruins/exoplanets/konyang/homestead.dmm b/maps/random_ruins/exoplanets/konyang/homestead.dmm index 94353de1aa2..c673bbab229 100644 --- a/maps/random_ruins/exoplanets/konyang/homestead.dmm +++ b/maps/random_ruins/exoplanets/konyang/homestead.dmm @@ -341,7 +341,7 @@ /turf/simulated/floor/wood, /area/konyang_homestead) "oG" = ( -/obj/structure/closet/secure_closet/freezer/fridge{ +/obj/structure/closet/secure_closet/refrigerator/standard{ pixel_x = -8 }, /obj/item/reagent_containers/food/snacks/fish, diff --git a/maps/random_ruins/exoplanets/konyang/landing_zone.dmm b/maps/random_ruins/exoplanets/konyang/landing_zone.dmm index 597a4599eab..b870a18ad45 100644 --- a/maps/random_ruins/exoplanets/konyang/landing_zone.dmm +++ b/maps/random_ruins/exoplanets/konyang/landing_zone.dmm @@ -3085,7 +3085,7 @@ /turf/simulated/floor/exoplanet/dirt_konyang, /area/konyang_landing_zone) "LX" = ( -/obj/structure/closet/secure_closet/freezer/meat/super_meat, +/obj/structure/closet/secure_closet/freezer/meat/grill, /obj/effect/floor_decal/corner/pink/diagonal, /turf/simulated/floor/tiled/white, /area/konyang_landing_zone/command_center/living) diff --git a/maps/random_ruins/exoplanets/konyang/ocean/naval_landing_zone.dmm b/maps/random_ruins/exoplanets/konyang/ocean/naval_landing_zone.dmm index 78417b34b0d..724c3d3eae6 100644 --- a/maps/random_ruins/exoplanets/konyang/ocean/naval_landing_zone.dmm +++ b/maps/random_ruins/exoplanets/konyang/ocean/naval_landing_zone.dmm @@ -2824,7 +2824,7 @@ /turf/simulated/floor/tiled, /area/konyang_landing_zone) "Nv" = ( -/obj/structure/closet/secure_closet/freezer/meat/super_meat, +/obj/structure/closet/secure_closet/freezer/meat/grill, /obj/effect/floor_decal/corner/pink/diagonal, /turf/simulated/floor/tiled/white, /area/konyang_landing_zone/command_center/living) diff --git a/maps/random_ruins/exoplanets/konyang/pirate_moonshine.dmm b/maps/random_ruins/exoplanets/konyang/pirate_moonshine.dmm index 720eefc5d54..df2e6dfe6cf 100644 --- a/maps/random_ruins/exoplanets/konyang/pirate_moonshine.dmm +++ b/maps/random_ruins/exoplanets/konyang/pirate_moonshine.dmm @@ -17,7 +17,7 @@ /turf/simulated/floor/wood, /area/konyang_pirate_moonshine) "f" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/storage/box/donkpockets/gwok/takoyaki{ icon_state = "redbox" }, diff --git a/maps/random_ruins/exoplanets/konyang/pirate_outpost.dmm b/maps/random_ruins/exoplanets/konyang/pirate_outpost.dmm index d0cf5c559fa..eb9e16ff3f3 100644 --- a/maps/random_ruins/exoplanets/konyang/pirate_outpost.dmm +++ b/maps/random_ruins/exoplanets/konyang/pirate_outpost.dmm @@ -3,7 +3,7 @@ /turf/simulated/floor/exoplanet/water/shallow/konyang, /area/konyang_pirate_outpost) "am" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/trash/ramen, /turf/simulated/floor/wood, /area/konyang_pirate_outpost) diff --git a/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dmm b/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dmm index ac8b3696aae..b8b22747090 100644 --- a/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dmm +++ b/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dmm @@ -738,7 +738,7 @@ /turf/simulated/floor/exoplanet/tiled, /area/konyang_telecomms_outpost) "Nv" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, diff --git a/maps/random_ruins/exoplanets/konyang/village.dmm b/maps/random_ruins/exoplanets/konyang/village.dmm index 9438a393717..5a9935ab486 100644 --- a/maps/random_ruins/exoplanets/konyang/village.dmm +++ b/maps/random_ruins/exoplanets/konyang/village.dmm @@ -1412,7 +1412,7 @@ /turf/simulated/floor/lino/diamond, /area/konyang_village) "Le" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/storage/box/fancy/egg_box, /obj/item/storage/box/fancy/egg_box, /obj/item/storage/box/fancy/egg_box, diff --git a/maps/random_ruins/exoplanets/konyang/zombie_outpost.dmm b/maps/random_ruins/exoplanets/konyang/zombie_outpost.dmm index 76c22a8f153..f66f156b4a2 100644 --- a/maps/random_ruins/exoplanets/konyang/zombie_outpost.dmm +++ b/maps/random_ruins/exoplanets/konyang/zombie_outpost.dmm @@ -782,7 +782,7 @@ /turf/simulated/floor/bluegrid/cooled, /area/konyang_telecomms_outpost) "Gu" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, diff --git a/maps/random_ruins/exoplanets/konyang/zombie_village.dmm b/maps/random_ruins/exoplanets/konyang/zombie_village.dmm index c2f217ac0a4..2aefe49f718 100644 --- a/maps/random_ruins/exoplanets/konyang/zombie_village.dmm +++ b/maps/random_ruins/exoplanets/konyang/zombie_village.dmm @@ -1889,7 +1889,7 @@ /turf/simulated/floor/exoplanet/konyang, /area/konyang_village) "Ym" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/storage/box/fancy/egg_box, /obj/item/storage/box/fancy/egg_box, /obj/item/storage/box/fancy/egg_box, diff --git a/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm b/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm index 4350c0919c4..ad0a97d7fba 100644 --- a/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm +++ b/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm @@ -2572,7 +2572,7 @@ /turf/template_noop, /area/exoplanet/barren/raskara) "Ic" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ +/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ req_access = null }, /obj/item/storage/box/produce{ diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index 45e3269c5ee..9dc824604b2 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -26836,7 +26836,7 @@ }, /area/horizon/kitchen/freezer) "myE" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/storage/box/fancy/egg_box, /obj/item/storage/box/fancy/egg_box, /obj/item/reagent_containers/food/drinks/carton/milk, diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index 6bab93e25be..cbca5f18f92 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -29334,7 +29334,7 @@ dir = 8 }, /obj/machinery/firealarm/east, -/obj/structure/closet/secure_closet/freezer/cafe, +/obj/structure/closet/secure_closet/refrigerator/cafe, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/white, /area/horizon/cafeteria) diff --git a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm index 61e075f4a47..ffbe52fc1f8 100644 --- a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm +++ b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm @@ -5675,7 +5675,7 @@ /turf/unsimulated/floor, /area/centcom/bar) "amB" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/storage/box/fancy/egg_box, /obj/item/storage/box/fancy/egg_box, /obj/item/reagent_containers/food/drinks/carton/soymilk, @@ -22676,7 +22676,7 @@ /turf/unsimulated/floor, /area/centcom/legion/hangar5) "bep" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ +/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ req_access = null }, /obj/structure/sign/poster{ @@ -23889,7 +23889,7 @@ /turf/unsimulated/floor, /area/antag/mercenary) "bgW" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/refrigerator/standard, /turf/unsimulated/floor, /area/antag/mercenary) "bgX" = (