Merge branch 'master' into scarboroughtypos

shiptest-ss13 · Apr 17, 2024 · 60f516c · 60f516c
2 parents e270afa + bc7e700
commit 60f516c
Show file tree

Hide file tree

Showing 81 changed files with 1,345 additions and 1,579 deletions.
diff --git a/_maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm b/_maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm
@@ -89,10 +89,8 @@
 	dir = 4;
 	color = "#808080"
 	},
-/obj/structure/closet/wall/red{
-	dir = 8;
+/obj/structure/closet/wall/red/directional/east{
 	name = "armory locker";
-	pixel_x = 28;
 	req_one_access_txt = "1"
 	},
 /obj/item/storage/box/slugshot,
@@ -1151,10 +1149,8 @@
 "sw" = (
 /obj/effect/turf_decal/siding/wood/end,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/closet/wall{
-	dir = 8;
-	icon_door = "grey_wall";
-	pixel_x = 28
+/obj/structure/closet/wall/directional/east{
+	icon_door = "grey_wall"
 	},
 /obj/item/flashlight/lantern{
 	pixel_x = 8
@@ -1471,10 +1467,7 @@
 "wx" = (
 /obj/structure/catwalk/over,
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/emcloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/west,
 /obj/machinery/atmospherics/pipe/simple/orange/hidden,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -2012,10 +2005,7 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/closet/emcloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/west,
 /obj/item/skub{
 	pixel_x = -5;
 	pixel_y = 6
@@ -2121,10 +2111,8 @@
 	dir = 8;
 	color = "#808080"
 	},
-/obj/structure/closet/wall/red{
-	dir = 4;
+/obj/structure/closet/wall/red/directional/west{
 	name = "armory locker";
-	pixel_x = -28;
 	req_one_access_txt = "1"
 	},
 /obj/item/storage/belt/military,
@@ -2425,10 +2413,7 @@
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "KC" = (
 /obj/structure/catwalk/over,
-/obj/structure/closet/firecloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/firecloset/wall/directional/west,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/yellow{
@@ -2841,10 +2826,8 @@
 	dir = 4;
 	color = "#A47449"
 	},
-/obj/structure/closet/wall{
-	name = "uniform closet";
-	dir = 4;
-	pixel_x = -28
+/obj/structure/closet/wall/directional/west{
+	name = "uniform closet"
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/yellow{
@@ -2947,10 +2930,7 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ruin/beach/starwalker)
 "SS" = (
-/obj/structure/closet/emcloset/wall{
-	dir = 8;
-	pixel_x = 32
-	},
+/obj/structure/closet/emcloset/wall/directional/east,
 /obj/item/stack/sticky_tape,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/pod,
@@ -3360,10 +3340,8 @@
 	dir = 6;
 	color = "#808080"
 	},
-/obj/structure/closet/wall/red{
-	dir = 8;
+/obj/structure/closet/wall/red/directional/east{
 	name = "armory locker";
-	pixel_x = 28;
 	req_one_access_txt = "1"
 	},
 /obj/structure/railing,

diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm
@@ -321,10 +321,7 @@
 /turf/open/floor/vault,
 /area/ruin/unpowered/corprejectrooms)
 "io" = (
-/obj/structure/closet/wall/red{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/wall/red/directional/west,
 /obj/item/keycard/office{
 	desc = "Only Elite level employees are authorized to handle this keycard. All other employees may face termination if found in possession.";
 	name = "Vault Card";
@@ -1392,9 +1389,7 @@
 /turf/open/floor/plating/catwalk_floor,
 /area/ruin/unpowered/corprejectrooms)
 "Fa" = (
-/obj/structure/closet/firecloset/wall{
-	pixel_x = -27
-	},
+/obj/structure/closet/firecloset/wall/directional/north,
 /obj/structure/cable/blue{
 	icon_state = "5-6"
 	},

diff --git a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
@@ -465,10 +465,8 @@
 /area/ship/storage)
 "fv" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/closet/wall/red{
-	dir = 1;
-	name = "Bartender's locker";
-	pixel_y = -28
+/obj/structure/closet/wall/red/directional/south{
+	name = "Bartender's locker"
 	},
 /obj/item/clothing/under/suit/waiter/syndicate,
 /obj/item/clothing/suit/apron/purple_bartender,
@@ -1029,10 +1027,7 @@
 /obj/structure/sign/poster/contraband/lusty_xenomorph{
 	pixel_y = 32
 	},
-/obj/structure/closet/secure_closet/freezer/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/secure_closet/freezer/wall/directional/west,
 /obj/item/reagent_containers/food/snacks/rationpack,
 /obj/item/reagent_containers/food/snacks/rationpack,
 /obj/item/reagent_containers/food/snacks/rationpack,
@@ -2857,10 +2852,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 8
 	},
-/obj/structure/closet/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/wall/directional/west,
 /obj/item/reagent_containers/syringe/contraband/bath_salts{
 	pixel_y = 6;
 	pixel_x = -4

diff --git a/_maps/RandomRuins/JungleRuins/jungle_interceptor.dmm b/_maps/RandomRuins/JungleRuins/jungle_interceptor.dmm
@@ -443,10 +443,7 @@
 /turf/open/floor/plating/dirt/jungle/dark/lit,
 /area/overmap_encounter/planetoid/jungle/explored)
 "dv" = (
-/obj/structure/closet/wall/blue{
-	dir = 4;
-	pixel_x = -29
-	},
+/obj/structure/closet/wall/blue/directional/west,
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
@@ -485,10 +482,7 @@
 /turf/closed/wall/mineral/titanium,
 /area/ruin/jungle/interceptor/porthall)
 "dE" = (
-/obj/structure/closet/emcloset/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/east,
 /obj/effect/turf_decal/corner/opaque/orange/border{
 	dir = 6
 	},
@@ -581,10 +575,8 @@
 	},
 /obj/item/clothing/suit/armor/vest,
 /obj/item/gun/energy/disabler,
-/obj/structure/closet/wall/red{
-	name = "secure locker";
-	dir = 4;
-	pixel_x = -28
+/obj/structure/closet/wall/red/directional/west{
+	name = "secure locker"
 	},
 /turf/open/floor/plasteel/dark,
 /area/ruin/jungle/interceptor/security)
@@ -999,10 +991,7 @@
 /obj/effect/turf_decal/corner/opaque/bottlegreen/border{
 	dir = 5
 	},
-/obj/structure/closet/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/wall/directional/east,
 /obj/item/reagent_containers/food/snacks/meat/slab/monkey,
 /obj/item/reagent_containers/food/snacks/meat/slab/monkey,
 /obj/item/reagent_containers/food/condiment/sugar,
@@ -1096,10 +1085,7 @@
 /turf/open/floor/wood,
 /area/ruin/jungle/interceptor/starhall)
 "im" = (
-/obj/structure/closet/wall/blue{
-	dir = 4;
-	pixel_x = -29
-	},
+/obj/structure/closet/wall/blue/directional/west,
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
@@ -1166,10 +1152,7 @@
 /obj/effect/turf_decal/corner/opaque/bottlegreen/border{
 	dir = 8
 	},
-/obj/structure/closet/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/wall/directional/west,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ruin/jungle/interceptor/starhall)
@@ -1529,10 +1512,7 @@
 /turf/open/floor/plating/dirt/jungle/lit,
 /area/overmap_encounter/planetoid/jungle/explored)
 "mU" = (
-/obj/structure/closet/wall/blue{
-	dir = 4;
-	pixel_x = -29
-	},
+/obj/structure/closet/wall/blue/directional/west,
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
@@ -1796,10 +1776,7 @@
 /obj/effect/turf_decal/corner_steel_grid{
 	dir = 10
 	},
-/obj/structure/closet/emcloset/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/south,
 /obj/structure/cable/green{
 	icon_state = "4-9"
 	},
@@ -2124,10 +2101,7 @@
 /turf/open/floor/plating/dirt/jungle/lit,
 /area/overmap_encounter/planetoid/jungle/explored)
 "rU" = (
-/obj/structure/closet/emcloset/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/east,
 /obj/item/clothing/mask/breath,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/plastic,
@@ -3087,10 +3061,8 @@
 /obj/effect/turf_decal/corner/transparent/bar/three_quarters{
 	dir = 4
 	},
-/obj/structure/closet/wall/red{
-	name = "secure locker";
-	dir = 4;
-	pixel_x = -28
+/obj/structure/closet/wall/red/directional/west{
+	name = "secure locker"
 	},
 /turf/open/floor/plasteel/dark,
 /area/ruin/jungle/interceptor/security)
@@ -3209,10 +3181,7 @@
 /obj/structure/chair{
 	dir = 4
 	},
-/obj/structure/closet/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/wall/directional/west,
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
@@ -3934,10 +3903,8 @@
 	},
 /obj/item/light/bulb/broken,
 /obj/item/clothing/suit/space/hardsuit/security,
-/obj/structure/closet/wall/red{
-	name = "secure locker";
-	dir = 1;
-	pixel_y = -28
+/obj/structure/closet/wall/red/directional/south{
+	name = "secure locker"
 	},
 /turf/open/floor/plating/rust,
 /area/ruin/jungle/interceptor/security)
@@ -4503,9 +4470,7 @@
 /obj/structure/cable/orange{
 	icon_state = "2-8"
 	},
-/obj/structure/closet/wall{
-	pixel_y = 29
-	},
+/obj/structure/closet/wall/directional/north,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /obj/effect/decal/cleanable/glass,
 /obj/machinery/light/small/broken/directional/east,
@@ -4891,6 +4856,10 @@
 	},
 /turf/open/floor/plating,
 /area/ruin/jungle/interceptor/porthall)
+"Pi" = (
+/obj/item/circuitboard/machine/ship_gravity,
+/turf/open/floor/plating/rust,
+/area/overmap_encounter/planetoid/jungle/explored)
 "Pk" = (
 /obj/effect/turf_decal/corner/opaque/purple/three_quarters{
 	icon_state = "borderfloor_white";
@@ -5513,10 +5482,7 @@
 /turf/open/floor/plating/rust,
 /area/ruin/jungle/interceptor/starlaunchertwo)
 "UD" = (
-/obj/structure/closet/firecloset/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/firecloset/wall/directional/east,
 /obj/effect/turf_decal/corner/opaque/orange/border{
 	dir = 5
 	},
@@ -7954,7 +7920,7 @@ aG
 SC
 Mw
 EJ
-wH
+Pi
 sV
 Mw
 Bb

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_crashed_pinnance.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_crashed_pinnance.dmm
@@ -369,10 +369,8 @@
 /turf/open/floor/plasteel/mono/white,
 /area/ruin/unpowered/crashsite/pinnance)
 "Gt" = (
-/obj/structure/closet/wall/white{
-	dir = 8;
-	name = "survey gear";
-	pixel_x = 30
+/obj/structure/closet/wall/white/directional/east{
+	name = "survey gear"
 	},
 /obj/item/survey_handheld/elite,
 /obj/item/survey_handheld/advanced,

diff --git a/_maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm b/_maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm
@@ -1964,10 +1964,7 @@
 /area/ruin/powered)
 "Tl" = (
 /obj/machinery/light/directional/south,
-/obj/structure/closet/secure_closet/wall{
-	dir = 4;
-	pixel_x = -27
-	},
+/obj/structure/closet/secure_closet/wall/directional/west,
 /obj/item/storage/firstaid/ancient,
 /obj/item/clothing/neck/stethoscope,
 /obj/item/grenade/chem_grenade/teargas{