diff --git a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm new file mode 100644 index 00000000000..73b009a1da8 --- /dev/null +++ b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm @@ -0,0 +1,38 @@ +/decl/closet_appearance/wall/autolok + color = COLOR_GRAY20 + decals = null + extra_decals = list( + "stripe_outer" = COLOR_BLUE_GRAY, + "stripe_inner" = COLOR_OFF_WHITE + ) + +/decl/closet_appearance/secure_closet/talon + color = COLOR_GRAY80 + decals = list( + "lower_holes" + ) + +/decl/closet_appearance/secure_closet/talon/engineer + extra_decals = list( + "stripes_horizontal" = COLOR_BEASTY_BROWN + ) + +/decl/closet_appearance/secure_closet/talon/guard + extra_decals = list( + "stripes_horizontal" = COLOR_NT_RED + ) + +/decl/closet_appearance/secure_closet/talon/pilot + extra_decals = list( + "stripes_horizontal" = COLOR_PURPLE + ) + +/decl/closet_appearance/secure_closet/talon/doctor + extra_decals = list( + "stripes_horizontal" = COLOR_SKY_BLUE + ) + +/decl/closet_appearance/secure_closet/talon/captain + extra_decals = list( + "stripes_horizontal" = COLOR_GOLD + ) \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm index ed987176cfc..99f486cb7c8 100644 --- a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm @@ -201,3 +201,19 @@ /obj/item/seeds/kudzuseed, /obj/item/seeds/libertymycelium, /obj/item/seeds/reishimycelium) + +/obj/structure/closet/autolok_wall + name = "autolok suit storage" + desc = "It's wall-mounted storage unit for an AutoLok suit." + icon = 'icons/obj/closets/bases/wall.dmi' + closet_appearance = /decl/closet_appearance/wall/autolok + anchored = 1 + density = 0 + wall_mounted = 1 + store_mobs = 0 + + starts_with = list( + /obj/item/clothing/suit/space/void/autolok, + /obj/item/weapon/tank/emergency/oxygen/double, + /obj/item/device/suit_cooling_unit/emergency + ) diff --git a/maps/tether/submaps/offmap/talon.dm b/maps/tether/submaps/offmap/talon.dm index e4fb0265fec..4a9f97ea78a 100644 --- a/maps/tether/submaps/offmap/talon.dm +++ b/maps/tether/submaps/offmap/talon.dm @@ -250,6 +250,7 @@ Once in open space, consider disabling nonessential power-consuming electronics /obj/structure/closet/secure_closet/talon_captain name = "talon captain's locker" req_access = list(access_talon) + closet_appearance = /decl/closet_appearance/secure_closet/talon/captain starts_with = list( /obj/item/weapon/storage/backpack/dufflebag/captain, @@ -267,6 +268,7 @@ Once in open space, consider disabling nonessential power-consuming electronics /obj/structure/closet/secure_closet/talon_guard name = "talon guard's locker" req_access = list(access_talon) + closet_appearance = /decl/closet_appearance/secure_closet/talon/guard starts_with = list( /obj/item/clothing/suit/armor/pcarrier/light, @@ -292,6 +294,7 @@ Once in open space, consider disabling nonessential power-consuming electronics /obj/structure/closet/secure_closet/talon_doctor name = "talon doctor's locker" req_access = list(access_talon) + closet_appearance = /decl/closet_appearance/secure_closet/talon/doctor starts_with = list( /obj/item/clothing/under/rank/medical, @@ -311,6 +314,7 @@ Once in open space, consider disabling nonessential power-consuming electronics /obj/structure/closet/secure_closet/talon_engineer name = "talon engineer's locker" req_access = list(access_talon) + closet_appearance = /decl/closet_appearance/secure_closet/talon/engineer starts_with = list( /obj/item/clothing/accessory/storage/brown_vest, @@ -332,6 +336,7 @@ Once in open space, consider disabling nonessential power-consuming electronics /obj/structure/closet/secure_closet/talon_pilot name = "talon pilot's locker" req_access = list(access_talon) + closet_appearance = /decl/closet_appearance/secure_closet/talon/pilot starts_with = list( /obj/item/weapon/material/knife/tacknife/survival, diff --git a/maps/tether/submaps/offmap/talon1.dmm b/maps/tether/submaps/offmap/talon1.dmm index 8b9188f6cfd..6b9ede55d19 100644 --- a/maps/tether/submaps/offmap/talon1.dmm +++ b/maps/tether/submaps/offmap/talon1.dmm @@ -1094,7 +1094,9 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/closet/emcloset, +/obj/structure/closet/autolok_wall{ + pixel_x = -27 + }, /turf/simulated/floor/tiled/eris/steel, /area/talon/deckone/central_hallway) "iX" = ( @@ -1876,7 +1878,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/structure/closet/emcloset, +/obj/structure/closet/autolok_wall{ + pixel_y = -24 + }, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "pJ" = ( @@ -2307,7 +2311,9 @@ icon_state = "extinguisher_closed"; pixel_x = -30 }, -/obj/structure/closet/emcloset, +/obj/structure/closet/autolok_wall{ + pixel_y = -24 + }, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "uj" = ( @@ -3019,6 +3025,15 @@ }, /turf/simulated/floor/tiled/eris/steel/gray_perforated, /area/talon/deckone/workroom) +"AU" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/closet/autolok_wall{ + pixel_x = 27 + }, +/turf/simulated/floor/tiled/eris/steel, +/area/talon/deckone/central_hallway) "AV" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/eris/steel, @@ -16438,7 +16453,7 @@ fJ Bj Jw oe -iT +AU IW Zq Lf diff --git a/maps/tether/submaps/offmap/talon2.dmm b/maps/tether/submaps/offmap/talon2.dmm index 76bddbccbb2..33411889694 100644 --- a/maps/tether/submaps/offmap/talon2.dmm +++ b/maps/tether/submaps/offmap/talon2.dmm @@ -2485,15 +2485,12 @@ icon_state = "0-4" }, /obj/structure/closet/crate/plastic, -/obj/item/clothing/suit/space/emergency, /obj/item/device/flashlight, /obj/item/weapon/storage/briefcase/inflatable, -/obj/item/clothing/head/helmet/space/emergency, /obj/item/device/flashlight/glowstick, /obj/item/device/flashlight/glowstick, /obj/item/device/flashlight/glowstick, /obj/item/weapon/storage/box/metalfoam, -/obj/item/weapon/tank/oxygen, /obj/item/device/survivalcapsule/luxury, /turf/simulated/floor/tiled/techfloor/grid, /area/talon/decktwo/lifeboat) @@ -2986,6 +2983,9 @@ /turf/simulated/floor/plating/eris/under, /area/talon/maintenance/decktwo_aft) "Bd" = ( +/obj/structure/closet/autolok_wall{ + pixel_y = -24 + }, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/decktwo/bridge_upper) "Bv" = ( @@ -3100,6 +3100,9 @@ "CN" = ( /obj/structure/bed/padded, /obj/item/weapon/bedsheet, +/obj/structure/closet/autolok_wall{ + pixel_x = 27 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/talon/decktwo/lifeboat) "CW" = ( @@ -3638,6 +3641,9 @@ }, /obj/item/weapon/bedsheet, /obj/structure/bed/padded, +/obj/structure/closet/autolok_wall{ + pixel_x = 27 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/talon/decktwo/lifeboat) "Lj" = ( diff --git a/maps/tether/submaps/om_ships/aro2.dmm b/maps/tether/submaps/om_ships/aro2.dmm index 4c79d606c87..2d7dd7b29cb 100644 --- a/maps/tether/submaps/om_ships/aro2.dmm +++ b/maps/tether/submaps/om_ships/aro2.dmm @@ -107,6 +107,9 @@ name = "west bump"; pixel_x = -24 }, +/obj/structure/closet/autolok_wall{ + pixel_y = 32 + }, /turf/simulated/floor/carpet/blue, /area/aro2/room1) "aD" = ( @@ -418,6 +421,9 @@ name = "west bump"; pixel_x = -24 }, +/obj/structure/closet/autolok_wall{ + pixel_y = 32 + }, /turf/simulated/floor/carpet/gaycarpet, /area/aro2/room2) "cE" = ( @@ -561,9 +567,6 @@ /obj/structure/flora/tree/jungle_small, /turf/simulated/floor/grass, /area/aro2/boatdeck) -"dF" = ( -/turf/simulated/floor/tiled/eris/techmaint_perforated, -/area/aro2/dining) "dG" = ( /obj/structure/cable/cyan{ d1 = 4; @@ -813,6 +816,9 @@ d2 = 4; icon_state = "2-4" }, +/obj/structure/closet/autolok_wall{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/eris/dark, /area/aro2/starboardbay) "fn" = ( @@ -925,6 +931,9 @@ d2 = 8; icon_state = "2-8" }, +/obj/structure/closet/autolok_wall{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/eris/dark, /area/aro2/portbay) "fQ" = ( @@ -1467,6 +1476,9 @@ name = "west bump"; pixel_x = -24 }, +/obj/structure/closet/autolok_wall{ + pixel_y = 32 + }, /turf/simulated/floor/carpet/purcarpet, /area/aro2/room3) "lR" = ( @@ -1949,6 +1961,12 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/plating/eris/under, /area/aro2/airarea) +"rd" = ( +/obj/structure/closet/autolok_wall{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/area/aro2/powerarea) "rl" = ( /obj/structure/cable/cyan{ d1 = 1; @@ -2328,7 +2346,6 @@ name = "exterior shutters"; pixel_x = 28 }, -/obj/structure/closet/crate/bin, /turf/simulated/floor/wood, /area/aro2/dining) "va" = ( @@ -2395,12 +2412,6 @@ }, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/aro2/dining) -"vJ" = ( -/obj/machinery/vending/cola{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/techmaint_perforated, -/area/aro2/dining) "vN" = ( /obj/structure/cable/cyan{ d1 = 1; @@ -2505,6 +2516,8 @@ /obj/machinery/light{ dir = 1 }, +/obj/structure/table/steel, +/obj/machinery/chemical_dispenser/bar_soft/full, /turf/simulated/floor/tiled/eris/techmaint_perforated, /area/aro2/dining) "xk" = ( @@ -2637,9 +2650,16 @@ /turf/simulated/floor/tiled/eris/dark, /area/aro2/boatdeck) "yK" = ( -/obj/machinery/vending/food/arojoan{ - dir = 8 +/obj/structure/closet/secure_closet/freezer/fridge{ + starts_with = null }, +/obj/item/weapon/reagent_containers/food/snacks/generalschicken, +/obj/item/weapon/storage/box/wings, +/obj/item/weapon/reagent_containers/food/snacks/kitsuneudon, +/obj/item/weapon/reagent_containers/food/snacks/fries, +/obj/item/weapon/reagent_containers/food/snacks/grilledcheese, +/obj/item/weapon/reagent_containers/food/snacks/jellysandwich, +/obj/item/weapon/reagent_containers/food/snacks/enchiladas, /turf/simulated/floor/tiled/eris/techmaint_perforated, /area/aro2/dining) "yY" = ( @@ -4184,6 +4204,12 @@ }, /turf/simulated/floor/tiled/eris/dark, /area/aro2/portbay) +"PR" = ( +/obj/structure/closet/autolok_wall{ + pixel_y = 32 + }, +/turf/simulated/floor/carpet/oracarpet, +/area/aro2/cockpit) "PV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -4370,10 +4396,10 @@ /turf/simulated/floor/plating/eris/under, /area/aro2/airarea) "Sp" = ( -/obj/machinery/vending/snack{ +/obj/machinery/vending/dinnerware{ dir = 8 }, -/turf/simulated/floor/tiled/eris/techmaint_perforated, +/turf/simulated/floor/wood, /area/aro2/dining) "Sq" = ( /obj/structure/railing/grey{ @@ -4382,11 +4408,8 @@ /turf/simulated/floor/water/indoors/surfluid, /area/aro2/surfluid) "Sr" = ( -/obj/machinery/chemical_dispenser/bar_soft/full{ - dir = 8 - }, -/obj/structure/table/steel, -/turf/simulated/floor/tiled/eris/techmaint_perforated, +/obj/structure/closet/crate/bin, +/turf/simulated/floor/wood, /area/aro2/dining) "St" = ( /obj/machinery/computer/ship/navigation/telescreen{ @@ -4738,6 +4761,12 @@ /obj/structure/table/fancyblack, /turf/simulated/floor/carpet/bcarpet, /area/shuttle/aroboat2) +"VW" = ( +/obj/structure/closet/autolok_wall{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/area/aro2/airarea) "VZ" = ( /obj/structure/cable/cyan{ d1 = 1; @@ -13606,7 +13635,7 @@ Jm lE gc jm -sP +rd oj oj oj @@ -14277,9 +14306,9 @@ zV oU bU xb -dF -dF -dF +dk +dk +dk QW QW dk @@ -14419,7 +14448,7 @@ pe pe bU yK -vJ +dk Sr Sp QW @@ -15267,7 +15296,7 @@ az az aL aL -XN +PR XN Me yx @@ -16304,7 +16333,7 @@ Ln lK gi jt -nq +VW qT Pd ih diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 899a81bdf73..860af8cf3df 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -29814,6 +29814,9 @@ /obj/structure/bed/chair/shuttle{ dir = 4 }, +/obj/structure/closet/autolok_wall{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/eris/white, /area/shuttle/medivac/general) "gYC" = ( @@ -30408,6 +30411,9 @@ health = 1e+006 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/structure/closet/autolok_wall{ + pixel_x = 27 + }, /turf/simulated/floor/tiled/eris/steel/gray_perforated, /area/shuttle/securiship/general) "knm" = ( diff --git a/vorestation.dme b/vorestation.dme index 641850b4df8..65f66cd229f 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1396,6 +1396,7 @@ #include "code\game\objects\structures\window_vr.dm" #include "code\game\objects\structures\crates_lockers\__closets.dm" #include "code\game\objects\structures\crates_lockers\_closets_appearance_definitions.dm" +#include "code\game\objects\structures\crates_lockers\_closets_appearance_definitions_vr.dm" #include "code\game\objects\structures\crates_lockers\crates.dm" #include "code\game\objects\structures\crates_lockers\crates_vr.dm" #include "code\game\objects\structures\crates_lockers\largecrate.dm"