diff --git a/_maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm b/_maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm
index 0839518362b4..3bf64a6b03b7 100644
--- 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
index 3b21c3271764..5a3d8ea3a2c7 100644
--- 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
index ff730ff082bd..bed82db78338 100644
--- 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
index ae980c270cdd..628c44f42f6e 100644
--- 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
index ae8079063627..32c0fbf31006 100644
--- 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
index 9b5adb277fa8..ed6c98765b2b 100644
--- 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{
diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm
index e4d83a8eb842..209709f2599b 100644
--- a/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm
+++ b/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm
@@ -195,10 +195,8 @@
/turf/open/floor/engine,
/area/ruin/whitesands/pubbycrash)
"fk" = (
-/obj/structure/closet/wall/blue{
- dir = 1;
- name = "Captain's locker";
- pixel_y = -28
+/obj/structure/closet/wall/blue/directional/south{
+ name = "Captain's locker"
},
/obj/item/clothing/suit/space/hardsuit/mining/heavy,
/obj/effect/decal/cleanable/dirt,
@@ -503,10 +501,7 @@
/area/ruin/whitesands/pubbycrash)
"ln" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/emcloset/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/emcloset/wall/directional/south,
/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/plasteel/tech/grid,
/area/ruin/whitesands/pubbycrash/engine_room)
@@ -660,10 +655,8 @@
},
/area/ruin/whitesands/pubbycrash/split)
"oo" = (
-/obj/structure/closet/wall/white{
- dir = 1;
- name = "Medicine storage";
- pixel_y = -30
+/obj/structure/closet/wall/white/directional/south{
+ name = "Medicine storage"
},
/obj/item/storage/firstaid/ancient{
pixel_x = 6;
@@ -857,10 +850,9 @@
/obj/effect/turf_decal/siding/brown{
dir = 1
},
-/obj/structure/closet/wall{
+/obj/structure/closet/wall/directional/north{
icon_door = "orange_wall";
- name = "Mining equipment";
- pixel_y = 28
+ name = "Mining equipment"
},
/obj/item/clothing/glasses/meson,
/obj/item/clothing/glasses/meson,
@@ -1818,10 +1810,8 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/wall/red{
- dir = 8;
+/obj/structure/closet/wall/red/directional/east{
name = "Firearm Locker";
- pixel_x = 29;
welded = 1
},
/obj/effect/turf_decal/spline/fancy/opaque/black{
@@ -1988,10 +1978,8 @@
/turf/open/floor/plasteel,
/area/ruin/whitesands/pubbycrash/split)
"Pr" = (
-/obj/structure/closet/wall/red{
- dir = 4;
+/obj/structure/closet/wall/red/directional/west{
name = "Pilots locker";
- pixel_x = -29;
welded = 1
},
/obj/item/clothing/under/suit/black,
diff --git a/_maps/RandomRuins/SpaceRuins/astraeus.dmm b/_maps/RandomRuins/SpaceRuins/astraeus.dmm
index adf957299b7a..db2b305b063b 100644
--- a/_maps/RandomRuins/SpaceRuins/astraeus.dmm
+++ b/_maps/RandomRuins/SpaceRuins/astraeus.dmm
@@ -1499,7 +1499,7 @@
/turf/open/floor/plasteel/dark/airless,
/area/ruin/space/has_grav/astraeus/bridge)
"Ni" = (
-/obj/structure/closet/wall,
+/obj/structure/closet/wall/directional/north,
/obj/item/circuitboard/computer/rdconsole,
/obj/item/clothing/suit/toggle/labcoat,
/obj/item/research_notes/loot/big,
diff --git a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm
index 28695ad57a80..a1bfbbcabd83 100644
--- a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm
+++ b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm
@@ -1282,9 +1282,7 @@
/turf/open/floor/plasteel/white,
/area/ruin/space/has_grav)
"IR" = (
-/obj/structure/closet/firecloset/wall{
- pixel_y = 29
- },
+/obj/structure/closet/firecloset/wall/directional/north,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav)
"Ja" = (
@@ -1820,9 +1818,7 @@
/area/ruin/space/has_grav)
"UQ" = (
/obj/effect/turf_decal/siding/purple,
-/obj/structure/closet/firecloset/wall{
- pixel_y = 29
- },
+/obj/structure/closet/firecloset/wall/directional/north,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav)
"UR" = (
diff --git a/_maps/RandomRuins/SpaceRuins/fueldepot.dmm b/_maps/RandomRuins/SpaceRuins/fueldepot.dmm
index abe9e9f4562c..aa5edab6420a 100644
--- a/_maps/RandomRuins/SpaceRuins/fueldepot.dmm
+++ b/_maps/RandomRuins/SpaceRuins/fueldepot.dmm
@@ -148,10 +148,8 @@
},
/obj/structure/table_frame,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/closet/wall{
- name = "armory locker";
- pixel_x = 28;
- dir = 8
+/obj/structure/closet/wall/directional/east{
+ name = "armory locker"
},
/turf/open/floor/mineral/plastitanium,
/area/ruin/unpowered)
@@ -218,10 +216,8 @@
/obj/effect/turf_decal/industrial/warning{
dir = 5
},
-/obj/structure/closet/wall{
- name = "armory locker";
- pixel_x = 28;
- dir = 8
+/obj/structure/closet/wall/directional/east{
+ name = "armory locker"
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/gun/ballistic/shotgun/brimstone,
@@ -615,10 +611,8 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/closet/wall{
- name = "suit locker";
- pixel_x = -28;
- dir = 4
+/obj/structure/closet/wall/directional/west{
+ name = "suit locker"
},
/turf/open/floor/mineral/plastitanium,
/area/ruin/unpowered)
@@ -1314,10 +1308,8 @@
/obj/effect/decal/cleanable/oil,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/reagent_containers/food/drinks/bottle/rum,
-/obj/structure/closet/wall{
- name = "armory locker";
- pixel_x = 28;
- dir = 8
+/obj/structure/closet/wall/directional/east{
+ name = "armory locker"
},
/turf/open/floor/mineral/plastitanium,
/area/ruin/unpowered)
@@ -1458,10 +1450,8 @@
/obj/structure/cable{
icon_state = "4-6"
},
-/obj/structure/closet/wall{
- name = "suit locker";
- pixel_x = -28;
- dir = 4
+/obj/structure/closet/wall/directional/west{
+ name = "suit locker"
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/mineral/plastitanium,
diff --git a/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm b/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm
index 3175796cd159..c9984937d2a7 100644
--- a/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm
+++ b/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm
@@ -4615,10 +4615,7 @@
},
/area/ruin/space/has_grav/singularitylab)
"sr" = (
-/obj/structure/closet/wall{
- dir = 4;
- pixel_x = -32
- },
+/obj/structure/closet/wall/directional/west,
/obj/item/reagent_containers/food/drinks/flask,
/turf/open/floor/wood,
/area/ruin/space/has_grav/singularitylab/civvie)
@@ -8959,10 +8956,7 @@
/turf/open/floor/engine,
/area/ruin/space/has_grav/singularitylab/reactor)
"Jk" = (
-/obj/structure/closet/wall{
- dir = 4;
- pixel_x = -32
- },
+/obj/structure/closet/wall/directional/west,
/turf/open/floor/wood,
/area/ruin/space/has_grav/singularitylab/civvie)
"Jl" = (
diff --git a/_maps/RandomRuins/SpaceRuins/spacemall.dmm b/_maps/RandomRuins/SpaceRuins/spacemall.dmm
index aba1424544be..e5ed66920caf 100644
--- a/_maps/RandomRuins/SpaceRuins/spacemall.dmm
+++ b/_maps/RandomRuins/SpaceRuins/spacemall.dmm
@@ -1439,9 +1439,7 @@
pixel_y = 5
},
/obj/item/reagent_containers/food/condiment/sugar,
-/obj/structure/closet/wall{
- pixel_y = 30
- },
+/obj/structure/closet/wall/directional/north,
/obj/item/spacecash/bundle/c100,
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/spacemall)
diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm
index 570af22f6ced..cc330e69baa9 100644
--- a/_maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm
+++ b/_maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm
@@ -4127,9 +4127,7 @@
/turf/closed/wall/concrete/reinforced,
/area/ruin/wasteplanet/abandoned_mechbay/mechlab)
"Yu" = (
-/obj/structure/closet/wall/white{
- pixel_y = 29
- },
+/obj/structure/closet/wall/white/directional/north,
/obj/item/storage/firstaid/toxin,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 10
diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_crash_kitchen.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_crash_kitchen.dmm
index 2cd76a6338be..7a4b5e4caa3c 100644
--- a/_maps/RandomRuins/WasteRuins/wasteplanet_crash_kitchen.dmm
+++ b/_maps/RandomRuins/WasteRuins/wasteplanet_crash_kitchen.dmm
@@ -431,10 +431,7 @@
/obj/machinery/advanced_airlock_controller{
pixel_y = -24
},
-/obj/structure/closet/emcloset/wall{
- pixel_x = 28;
- dir = 8
- },
+/obj/structure/closet/emcloset/wall/directional/east,
/turf/open/floor/plasteel/tech,
/area/ruin/unpowered)
"TZ" = (
diff --git a/_maps/configs/pgf_crying_sun.json b/_maps/configs/pgf_crying_sun.json
index 5112e1b25280..d4eb67b1fb50 100644
--- a/_maps/configs/pgf_crying_sun.json
+++ b/_maps/configs/pgf_crying_sun.json
@@ -46,5 +46,5 @@
"slots": 3
}
},
- "enabled":false
+ "enabled":true
}
diff --git a/_maps/outpost/indie_space.dmm b/_maps/outpost/indie_space.dmm
index e7d2e554a70e..7d7ad5ecb653 100644
--- a/_maps/outpost/indie_space.dmm
+++ b/_maps/outpost/indie_space.dmm
@@ -2856,10 +2856,7 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/closet/emcloset/wall{
- dir = 4;
- pixel_x = -28
- },
+/obj/structure/closet/emcloset/wall/directional/west,
/turf/open/floor/plasteel,
/area/outpost/hallway/central)
"sB" = (
@@ -3933,10 +3930,7 @@
"yV" = (
/obj/effect/turf_decal/corner/opaque/grey/full,
/obj/effect/turf_decal/corner/opaque/neutral,
-/obj/structure/closet/firecloset/wall{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/firecloset/wall/directional/east,
/turf/open/floor/plasteel,
/area/outpost/hallway/port)
"za" = (
@@ -7221,9 +7215,7 @@
/obj/effect/turf_decal/corner/opaque/neutral{
dir = 1
},
-/obj/structure/closet/emcloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/emcloset/wall/directional/north,
/turf/open/floor/plasteel,
/area/outpost/hallway/central)
"SC" = (
diff --git a/_maps/outpost/nanotrasen_asteroid.dmm b/_maps/outpost/nanotrasen_asteroid.dmm
index 2ea6c907e80e..02d44702bc23 100644
--- a/_maps/outpost/nanotrasen_asteroid.dmm
+++ b/_maps/outpost/nanotrasen_asteroid.dmm
@@ -3893,10 +3893,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 1
},
-/obj/structure/closet/secure_closet/freezer/wall{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/secure_closet/freezer/wall/directional/east,
/turf/open/floor/wood,
/area/outpost/hallway/central)
"op" = (
@@ -5299,10 +5296,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 1
},
-/obj/structure/closet/secure_closet/freezer/wall{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/secure_closet/freezer/wall/directional/east,
/obj/item/clothing/suit/apron/chef,
/turf/open/floor/concrete/tiles,
/area/outpost/crew/library)
@@ -5958,10 +5952,8 @@
},
/obj/effect/turf_decal/siding/wood,
/obj/machinery/light/directional/north,
-/obj/structure/closet/wall{
- name = "Storage Locker";
- dir = 8;
- pixel_x = 28
+/obj/structure/closet/wall/directional/east{
+ name = "Storage Locker"
},
/turf/open/floor/carpet,
/area/outpost/hallway/central)
@@ -6029,9 +6021,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 1
},
-/obj/structure/closet/emcloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/emcloset/wall/directional/north,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
},
@@ -6147,10 +6137,8 @@
/obj/item/reagent_containers/glass/rag,
/obj/item/mop,
/obj/item/soap/deluxe,
-/obj/structure/closet/wall/blue{
- dir = 4;
- name = "Janitorial Closet";
- pixel_x = -29
+/obj/structure/closet/wall/blue/directional/west{
+ name = "Janitorial Closet"
},
/obj/machinery/door/window,
/obj/effect/turf_decal/industrial/warning,
@@ -7235,9 +7223,7 @@
/obj/effect/turf_decal/techfloor/orange{
dir = 5
},
-/obj/structure/closet/firecloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/firecloset/wall/directional/north,
/turf/open/floor/plasteel/tech/grid,
/area/outpost/engineering)
"zm" = (
@@ -7383,10 +7369,8 @@
/turf/open/floor/grass,
/area/outpost/crew/garden)
"zP" = (
-/obj/structure/closet/wall/red{
- dir = 8;
- name = "Bartender's locker";
- pixel_x = 29
+/obj/structure/closet/wall/red/directional/east{
+ name = "Bartender's locker"
},
/obj/structure/cable{
icon_state = "1-8"
@@ -9154,10 +9138,8 @@
/turf/open/floor/plating,
/area/outpost/crew/lounge)
"Gi" = (
-/obj/structure/closet/wall{
- name = "Storage Locker";
- pixel_y = -28;
- dir = 1
+/obj/structure/closet/wall/directional/south{
+ name = "Storage Locker"
},
/turf/open/floor/carpet/green,
/area/outpost/hallway/central)
@@ -10427,10 +10409,7 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/emcloset/wall{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/emcloset/wall/directional/east,
/turf/open/floor/wood,
/area/outpost/hallway/central)
"Kn" = (
@@ -14302,10 +14281,7 @@
/obj/effect/turf_decal/techfloor/orange{
dir = 8
},
-/obj/structure/closet/emcloset/wall{
- dir = 4;
- pixel_x = -28
- },
+/obj/structure/closet/emcloset/wall/directional/west,
/turf/open/floor/plasteel/tech/grid,
/area/outpost/engineering)
"Yi" = (
@@ -14580,10 +14556,7 @@
/turf/closed/indestructible/reinforced,
/area/outpost/crew/dorm)
"Zb" = (
-/obj/structure/closet/secure_closet/freezer/wall{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/secure_closet/freezer/wall/directional/east,
/obj/item/clothing/under/shorts/cookjorts,
/obj/item/clothing/shoes/cookflops,
/obj/item/clothing/suit/toggle/chef,
@@ -14866,10 +14839,8 @@
dir = 6
},
/obj/machinery/light/directional/south,
-/obj/structure/closet/wall{
+/obj/structure/closet/wall/directional/east{
name = "Game Locker";
- dir = 8;
- pixel_x = 28;
desc = "It's a basic storage unit. Theres a little label on it, asking you to put the toys back in when finished"
},
/obj/item/toy/figure/curator{
diff --git a/_maps/shuttles/independent/independent_beluga.dmm b/_maps/shuttles/independent/independent_beluga.dmm
index e8bf634e863f..65df51cb9735 100644
--- a/_maps/shuttles/independent/independent_beluga.dmm
+++ b/_maps/shuttles/independent/independent_beluga.dmm
@@ -335,10 +335,8 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/structure/closet/wall/blue{
- dir = 4;
- name = "Janitorial Closet";
- pixel_x = -28
+/obj/structure/closet/wall/blue/directional/west{
+ name = "Janitorial Closet"
},
/obj/item/mop,
/obj/item/reagent_containers/glass/bucket,
@@ -659,10 +657,8 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/structure/closet/wall/blue{
- dir = 1;
- name = "Bridge Officers Locker";
- pixel_y = -28
+/obj/structure/closet/wall/blue/directional/south{
+ name = "Bridge Officers Locker"
},
/obj/item/clothing/shoes/cowboy/fancy,
/obj/item/clothing/gloves/color/white,
@@ -1045,10 +1041,8 @@
/turf/open/floor/wood,
/area/ship/crew/canteen)
"jI" = (
-/obj/structure/closet/wall/orange{
- name = "fuel locker";
- dir = 4;
- pixel_x = -28
+/obj/structure/closet/wall/orange/directional/west{
+ name = "fuel locker"
},
/obj/item/stack/sheet/mineral/plasma/five{
pixel_y = 3
@@ -1593,10 +1587,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
},
-/obj/structure/closet/firecloset/wall{
- dir = 4;
- pixel_x = -28
- },
+/obj/structure/closet/firecloset/wall/directional/west,
/turf/open/floor/carpet/nanoweave,
/area/ship/hallway/central)
"pe" = (
@@ -2093,6 +2084,8 @@
/obj/structure/cable/yellow{
icon_state = "1-8"
},
+/obj/structure/cable/yellow,
+/obj/machinery/power/ship_gravity,
/turf/open/floor/plating,
/area/ship/engineering)
"tR" = (
@@ -2199,10 +2192,7 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/bridge)
"vd" = (
-/obj/structure/closet/emcloset/wall{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/emcloset/wall/directional/east,
/turf/open/floor/carpet/nanoweave/purple,
/area/ship/crew)
"vj" = (
@@ -2629,10 +2619,8 @@
/turf/open/floor/plasteel/white,
/area/ship/hallway/central)
"yZ" = (
-/obj/structure/closet/wall{
- dir = 1;
- name = "Utility Closet";
- pixel_y = -28
+/obj/structure/closet/wall/directional/south{
+ name = "Utility Closet"
},
/obj/item/radio,
/obj/item/radio,
@@ -2741,10 +2729,7 @@
/obj/structure/cable/yellow{
icon_state = "2-9"
},
-/obj/structure/closet/emcloset/wall{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/emcloset/wall/directional/east,
/turf/open/floor/plating,
/area/ship/engineering)
"AF" = (
@@ -3222,9 +3207,7 @@
/turf/open/floor/carpet/nanoweave/beige,
/area/ship/crew/dorm)
"EP" = (
-/obj/structure/closet/secure_closet/freezer/wall{
- pixel_y = 28
- },
+/obj/structure/closet/secure_closet/freezer/wall/directional/north,
/obj/item/reagent_containers/food/condiment/rice{
pixel_y = 17
},
@@ -3469,10 +3452,8 @@
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/bridge)
"Hu" = (
-/obj/structure/closet/wall/blue{
- dir = 4;
- name = "Captains Locker";
- pixel_x = -28
+/obj/structure/closet/wall/blue/directional/west{
+ name = "Captains Locker"
},
/obj/item/clothing/under/rank/command/captain,
/obj/item/clothing/under/rank/command,
@@ -3653,10 +3634,7 @@
/turf/open/floor/engine/hull/interior,
/area/ship/cargo)
"IH" = (
-/obj/structure/closet/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/wall/directional/south,
/obj/item/storage/briefcase,
/obj/item/folder/yellow,
/obj/item/folder/red,
@@ -3755,10 +3733,7 @@
/obj/effect/turf_decal/techfloor{
dir = 1
},
-/obj/structure/closet/emcloset/wall{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/emcloset/wall/directional/east,
/turf/open/floor/plasteel/tech,
/area/ship/crew/cryo)
"Jk" = (
@@ -3914,10 +3889,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/obj/structure/closet/firecloset/wall{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/firecloset/wall/directional/east,
/obj/machinery/door/firedoor/border_only,
/obj/item/reagent_containers/syringe/contraband{
pixel_x = 6;
@@ -4974,10 +4946,8 @@
/area/ship/engineering)
"WG" = (
/obj/effect/turf_decal/siding/wideplating/dark,
-/obj/structure/closet/wall/red{
- dir = 1;
- name = "Officer's Locker";
- pixel_y = -28
+/obj/structure/closet/wall/red/directional/south{
+ name = "Officer's Locker"
},
/obj/item/clothing/shoes/combat,
/obj/item/storage/belt/security/webbing/inteq,
diff --git a/_maps/shuttles/independent/independent_box.dmm b/_maps/shuttles/independent/independent_box.dmm
index 685f9518f44e..0e1e4e9439b5 100644
--- a/_maps/shuttles/independent/independent_box.dmm
+++ b/_maps/shuttles/independent/independent_box.dmm
@@ -1180,10 +1180,7 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/firecloset/wall{
- dir = 4;
- pixel_x = -32
- },
+/obj/structure/closet/firecloset/wall/directional/west,
/obj/item/storage/firstaid/fire,
/obj/item/extinguisher/mini,
/turf/open/floor/plasteel/tech,
@@ -1570,10 +1567,7 @@
pixel_x = -25;
pixel_y = 24
},
-/obj/structure/closet/emcloset/wall{
- dir = 4;
- pixel_x = -32
- },
+/obj/structure/closet/emcloset/wall/directional/west,
/turf/open/floor/plasteel/white,
/area/ship/cargo)
"ss" = (
@@ -2484,6 +2478,9 @@
/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
/turf/open/floor/plating,
/area/ship/engineering)
"KI" = (
@@ -2554,8 +2551,9 @@
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 9
},
-/obj/structure/salvageable/computer{
- dir = 8
+/obj/machinery/power/ship_gravity,
+/obj/structure/cable{
+ icon_state = "0-8"
},
/turf/open/floor/plating,
/area/ship/engineering)
diff --git a/_maps/shuttles/independent/independent_boyardee.dmm b/_maps/shuttles/independent/independent_boyardee.dmm
index 20a0cacad9ac..7d6fb95b99da 100644
--- a/_maps/shuttles/independent/independent_boyardee.dmm
+++ b/_maps/shuttles/independent/independent_boyardee.dmm
@@ -97,10 +97,8 @@
pixel_x = -5;
pixel_y = -4
},
-/obj/structure/closet/wall/white{
- dir = 8;
- name = "First Aid";
- pixel_x = 28
+/obj/structure/closet/wall/white/directional/east{
+ name = "First Aid"
},
/obj/machinery/light/small/directional/south,
/obj/machinery/newscaster/directional/west,
@@ -439,6 +437,10 @@
icon_state = "2-8"
},
/obj/item/radio/intercom/directional/east,
+/obj/structure/table/reinforced,
+/obj/item/stock_parts/cell/high/plus,
+/obj/item/stock_parts/cell/high/plus,
+/obj/machinery/cell_charger,
/turf/open/floor/plating,
/area/ship/maintenance)
"iB" = (
@@ -665,12 +667,14 @@
/turf/open/floor/carpet/red_gold,
/area/ship/crew/canteen)
"mH" = (
-/obj/machinery/power/port_gen/pacman,
+/obj/effect/turf_decal/box,
/obj/structure/cable/yellow{
- icon_state = "0-2"
+ icon_state = "2-4"
},
-/obj/effect/turf_decal/box,
-/obj/item/stack/sheet/mineral/plasma/five,
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/glass/bucket,
+/obj/item/mop,
/turf/open/floor/plating,
/area/ship/maintenance)
"nc" = (
@@ -1573,11 +1577,12 @@
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen)
"CV" = (
-/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/mop,
/obj/effect/turf_decal/box,
+/obj/machinery/power/port_gen/pacman,
+/obj/item/stack/sheet/mineral/plasma/five,
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
+ },
/turf/open/floor/plating,
/area/ship/maintenance)
"Da" = (
@@ -2496,10 +2501,10 @@
/turf/open/floor/plasteel,
/area/ship/crew/canteen)
"TN" = (
-/obj/structure/table/reinforced,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high/plus,
-/obj/item/stock_parts/cell/high/plus,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/power/ship_gravity,
/turf/open/floor/plating,
/area/ship/maintenance)
"Uf" = (
@@ -2627,6 +2632,9 @@
icon_state = "2-8"
},
/obj/effect/turf_decal/box,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
/turf/open/floor/plating,
/area/ship/maintenance)
"VR" = (
diff --git a/_maps/shuttles/independent/independent_bubble.dmm b/_maps/shuttles/independent/independent_bubble.dmm
index 32efe563c0bb..c34ad8349987 100644
--- a/_maps/shuttles/independent/independent_bubble.dmm
+++ b/_maps/shuttles/independent/independent_bubble.dmm
@@ -480,13 +480,9 @@
/turf/open/floor/plasteel,
/area/ship/bridge)
"uw" = (
-/obj/item/pipe_dispenser,
-/obj/structure/closet/crate,
-/obj/item/construction/plumbing,
-/obj/item/construction/rcd/arcd,
-/obj/item/stack/sheet/plasteel/fifty,
-/obj/item/construction/rcd/combat,
/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable,
+/obj/machinery/power/ship_gravity,
/turf/open/floor/plating/rust,
/area/ship/maintenance/aft)
"uE" = (
@@ -636,6 +632,9 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plating/rust,
/area/ship/maintenance/aft)
"Ay" = (
@@ -988,6 +987,21 @@
"Ob" = (
/turf/closed/wall,
/area/ship/maintenance/aft)
+"OR" = (
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/structure/closet/crate,
+/obj/item/stack/sheet/plasteel/fifty,
+/obj/item/pipe_dispenser,
+/obj/item/construction/rcd/arcd,
+/obj/item/construction/rcd/combat,
+/obj/item/construction/plumbing,
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
"OY" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -1345,7 +1359,7 @@ bv
MZ
jI
MW
-VA
+OR
Ob
Ob
VB
diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm
index f72fb5396d21..6150fe8877ec 100644
--- a/_maps/shuttles/independent/independent_dwayne.dmm
+++ b/_maps/shuttles/independent/independent_dwayne.dmm
@@ -254,6 +254,10 @@
dir = 4
},
/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/power/ship_gravity,
+/obj/structure/cable/yellow{
+ icon_state = "0-2"
+ },
/turf/open/floor/plating,
/area/ship/engineering)
"gm" = (
@@ -292,9 +296,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 6
},
-/obj/structure/closet/wall{
- pixel_y = 28
- },
+/obj/structure/closet/wall/directional/north,
/obj/item/clothing/shoes/cowboy,
/obj/item/clothing/shoes/cowboy,
/obj/item/clothing/shoes/cowboy,
@@ -422,9 +424,7 @@
/obj/effect/turf_decal/corner/opaque/blue{
dir = 4
},
-/obj/structure/closet/emcloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/emcloset/wall/directional/north,
/turf/open/floor/plasteel/white{
dir = 1
},
@@ -1499,9 +1499,8 @@
/obj/item/pickaxe/silver,
/obj/item/storage/bag/ore,
/obj/item/storage/bag/ore,
-/obj/structure/closet/wall{
- name = "equipment closet";
- pixel_y = 28
+/obj/structure/closet/wall/directional/north{
+ name = "equipment closet"
},
/obj/effect/turf_decal/industrial/warning/corner{
dir = 1
diff --git a/_maps/shuttles/independent/independent_junker.dmm b/_maps/shuttles/independent/independent_junker.dmm
index 006a74a2e3fb..a5b4354e7456 100644
--- a/_maps/shuttles/independent/independent_junker.dmm
+++ b/_maps/shuttles/independent/independent_junker.dmm
@@ -2266,9 +2266,7 @@
/obj/item/gun/ballistic/automatic/pistol/disposable,
/obj/item/reagent_containers/food/drinks/bottle/hooch,
/obj/machinery/light/dim/directional/south,
-/obj/structure/closet/wall/blue{
- dir = 8;
- pixel_x = 32;
+/obj/structure/closet/wall/blue/directional/east{
welded = 1
},
/turf/open/floor/plating,
diff --git a/_maps/shuttles/independent/independent_kilo.dmm b/_maps/shuttles/independent/independent_kilo.dmm
index 556b235dafc5..b9c686406b14 100644
--- a/_maps/shuttles/independent/independent_kilo.dmm
+++ b/_maps/shuttles/independent/independent_kilo.dmm
@@ -618,7 +618,6 @@
"cY" = (
/obj/effect/decal/cleanable/greenglow,
/obj/effect/decal/cleanable/dirt,
-/obj/structure/table,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 1
},
@@ -632,6 +631,10 @@
pixel_x = -23;
id = "kiloengine"
},
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/machinery/power/ship_gravity,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"cZ" = (
@@ -1841,6 +1844,9 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 1
},
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
/turf/open/floor/plating,
/area/ship/engineering/engine)
"Nq" = (
diff --git a/_maps/shuttles/independent/independent_lagoon.dmm b/_maps/shuttles/independent/independent_lagoon.dmm
index c015f0c262a1..f1f68c199fa4 100644
--- a/_maps/shuttles/independent/independent_lagoon.dmm
+++ b/_maps/shuttles/independent/independent_lagoon.dmm
@@ -386,10 +386,7 @@
/obj/item/clothing/suit/hawaiian,
/obj/item/spacecash/bundle/c1000,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/closet/wall{
- dir = 4;
- pixel_x = -28
- },
+/obj/structure/closet/wall/directional/west,
/obj/effect/turf_decal/siding/wood{
dir = 8
},
@@ -741,8 +738,11 @@
/turf/open/floor/plasteel/dark,
/area/ship/security)
"eS" = (
-/obj/structure/reagent_dispensers/watertank,
/obj/machinery/light/directional/west,
+/obj/machinery/power/ship_gravity,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
/turf/open/floor/plating,
/area/ship/engineering)
"eT" = (
@@ -1163,10 +1163,7 @@
/turf/open/floor/engine,
/area/ship/engineering)
"hN" = (
-/obj/structure/closet/emcloset/wall{
- dir = 1;
- pixel_y = -32
- },
+/obj/structure/closet/emcloset/wall/directional/south,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
@@ -1261,10 +1258,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 8
},
-/obj/structure/closet/firecloset/wall{
- dir = 4;
- pixel_x = -28
- },
+/obj/structure/closet/firecloset/wall/directional/west,
/obj/structure/cable{
icon_state = "1-4"
},
@@ -2691,9 +2685,7 @@
/obj/item/cultivator,
/obj/item/storage/box/beakers,
/obj/item/plant_analyzer,
-/obj/structure/closet/wall{
- pixel_y = 28
- },
+/obj/structure/closet/wall/directional/north,
/obj/item/storage/bag/plants/portaseeder,
/obj/item/clothing/gloves/botanic_leather,
/obj/effect/turf_decal/siding/wood{
@@ -2893,10 +2885,7 @@
/turf/open/floor/plating,
/area/ship/engineering)
"sQ" = (
-/obj/structure/closet/firecloset/wall{
- dir = 4;
- pixel_x = -32
- },
+/obj/structure/closet/firecloset/wall/directional/west,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 5
},
@@ -3717,10 +3706,7 @@
/turf/open/floor/plasteel,
/area/ship/hallway/port)
"ys" = (
-/obj/structure/closet/emcloset/wall{
- dir = 4;
- pixel_x = -32
- },
+/obj/structure/closet/emcloset/wall/directional/west,
/obj/item/storage/firstaid/o2,
/obj/effect/turf_decal/corner/opaque/white/border{
dir = 8
@@ -3791,9 +3777,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
-/obj/structure/closet/firecloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/firecloset/wall/directional/north,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -4074,6 +4058,7 @@
/obj/structure/cable{
icon_state = "2-8"
},
+/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating,
/area/ship/engineering)
"Bg" = (
@@ -4195,9 +4180,7 @@
/turf/open/floor/plasteel,
/area/ship/hallway/starboard)
"BT" = (
-/obj/structure/closet/emcloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/emcloset/wall/directional/north,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
@@ -4598,10 +4581,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/structure/closet/firecloset/wall{
- dir = 1;
- pixel_y = -32
- },
+/obj/structure/closet/firecloset/wall/directional/south,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
@@ -5063,10 +5043,7 @@
/obj/structure/disposalpipe/segment{
dir = 5
},
-/obj/structure/closet/emcloset/wall{
- dir = 4;
- pixel_x = -32
- },
+/obj/structure/closet/emcloset/wall/directional/west,
/obj/item/storage/firstaid/o2,
/obj/effect/turf_decal/corner/opaque/white/border{
dir = 8
@@ -6274,10 +6251,7 @@
/turf/open/floor/wood,
/area/ship/crew/dorm)
"QU" = (
-/obj/structure/closet/firecloset/wall{
- dir = 4;
- pixel_x = -32
- },
+/obj/structure/closet/firecloset/wall/directional/west,
/obj/structure/cable{
icon_state = "2-4"
},
@@ -6763,10 +6737,9 @@
/obj/item/radio,
/obj/item/gun/energy/e_gun/advtaser,
/obj/item/pen/survival,
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/north{
icon_state = "sec_wall";
name = "equipment locker";
- pixel_y = 28;
req_access = list(30)
},
/obj/item/card/id/captains_spare,
@@ -7449,6 +7422,9 @@
/obj/structure/cable{
icon_state = "1-4"
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plating,
/area/ship/engineering)
"Yu" = (
diff --git a/_maps/shuttles/independent/independent_mudskipper.dmm b/_maps/shuttles/independent/independent_mudskipper.dmm
index 5ac1bcdd0e65..f82cdc7ba748 100644
--- a/_maps/shuttles/independent/independent_mudskipper.dmm
+++ b/_maps/shuttles/independent/independent_mudskipper.dmm
@@ -162,6 +162,7 @@
name = "Engine Shutters"
},
/obj/machinery/cell_charger,
+/obj/item/storage/toolbox/mechanical,
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/engine)
"dN" = (
@@ -384,6 +385,9 @@
/obj/structure/cable{
icon_state = "1-8"
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plating,
/area/ship/engineering/engine)
"ib" = (
@@ -615,10 +619,8 @@
/turf/open/floor/plasteel/dark,
/area/ship/cargo)
"nV" = (
-/obj/structure/closet/wall/blue{
- dir = 4;
+/obj/structure/closet/wall/blue/directional/west{
secure = 1;
- pixel_x = -28;
locked = 1
},
/obj/item/gun/energy/laser/scatter,
@@ -876,10 +878,10 @@
/obj/structure/railing{
dir = 8
},
-/obj/structure/table/reinforced{
- color = "#c1b6a5"
+/obj/structure/cable{
+ icon_state = "0-1"
},
-/obj/item/storage/toolbox/mechanical,
+/obj/machinery/power/ship_gravity,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/engine)
"sT" = (
@@ -1638,9 +1640,6 @@
/area/ship/hallway/aft)
"KA" = (
/obj/structure/window/reinforced/spawner,
-/obj/structure/table/reinforced{
- color = "#c1b6a5"
- },
/obj/item/paper_bin,
/obj/item/analyzer{
pixel_y = 3;
@@ -1653,6 +1652,9 @@
/obj/structure/cable{
icon_state = "1-8"
},
+/obj/structure/table/reinforced{
+ color = "#c1b6a5"
+ },
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/engine)
"KT" = (
diff --git a/_maps/shuttles/independent/independent_rigger.dmm b/_maps/shuttles/independent/independent_rigger.dmm
index 03044b113956..13b336dc36ae 100644
--- a/_maps/shuttles/independent/independent_rigger.dmm
+++ b/_maps/shuttles/independent/independent_rigger.dmm
@@ -351,12 +351,10 @@
/obj/item/reagent_containers/syringe{
pixel_x = 7
},
-/obj/structure/closet/secure_closet/wall{
- dir = 8;
+/obj/structure/closet/secure_closet/wall/directional/east{
icon_door = "med_wall";
locked = 0;
name = "mortuary locker";
- pixel_x = 28;
req_access_txt = "5"
},
/obj/effect/turf_decal/corner/opaque/green{
@@ -657,11 +655,9 @@
/obj/effect/turf_decal/borderfloor{
dir = 4
},
-/obj/structure/closet/wall{
- dir = 8;
+/obj/structure/closet/wall/directional/east{
icon_door = "white_wall";
- name = "medical closet";
- pixel_x = 28
+ name = "medical closet"
},
/obj/item/storage/backpack/satchel/med,
/obj/item/clothing/shoes/sneakers/white,
@@ -760,10 +756,16 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/crew)
"jx" = (
-/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable{
- icon_state = "0-4"
+ icon_state = "4-8"
+ },
+/obj/structure/closet/wall/orange/directional/north{
+ name = "fuel supply"
},
+/obj/item/stack/sheet/mineral/uranium/five,
+/obj/item/stack/sheet/mineral/plasma/fifty,
+/obj/effect/turf_decal/radiation,
+/obj/effect/turf_decal/industrial/outline/yellow,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/engine)
"jy" = (
@@ -1008,16 +1010,13 @@
/obj/structure/cable{
icon_state = "2-8"
},
-/obj/structure/closet/emcloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/emcloset/wall/directional/north,
/turf/open/floor/plating,
/area/ship/maintenance/central)
"mH" = (
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/north{
icon_state = "sec_wall";
name = "firearms locker";
- pixel_y = 28;
req_access_txt = "1"
},
/obj/item/gun/ballistic/shotgun/flamingarrow,
@@ -1424,10 +1423,9 @@
/turf/open/floor/engine/hull,
/area/ship/external)
"sq" = (
-/obj/structure/closet/wall{
+/obj/structure/closet/wall/directional/north{
icon_door = "red_wall";
- name = "security closet";
- pixel_y = 28
+ name = "security closet"
},
/obj/item/storage/backpack/security,
/obj/item/clothing/gloves/fingerless,
@@ -1599,10 +1597,9 @@
dir = 4
},
/obj/structure/catwalk/over,
-/obj/structure/closet/wall{
+/obj/structure/closet/wall/directional/north{
icon_door = "yellow_wall";
- name = "engineering closet";
- pixel_y = 28
+ name = "engineering closet"
},
/obj/item/storage/backpack/industrial,
/obj/item/clothing/shoes/workboots,
@@ -1982,12 +1979,10 @@
pixel_x = -4;
pixel_y = 5
},
-/obj/structure/closet/secure_closet/wall{
- dir = 1;
+/obj/structure/closet/secure_closet/wall/directional/south{
icon_door = "med_wall";
locked = 0;
name = "medical locker";
- pixel_y = -28;
req_access_txt = "5"
},
/obj/effect/turf_decal/corner/opaque/green/border{
@@ -2334,8 +2329,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/machinery/light/small/directional/north,
/obj/structure/catwalk/over,
+/obj/machinery/light/small/directional/north,
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"BZ" = (
@@ -2439,11 +2434,9 @@
/obj/effect/turf_decal/corner/opaque/red{
dir = 8
},
-/obj/structure/closet/secure_closet/wall{
- dir = 1;
+/obj/structure/closet/secure_closet/wall/directional/south{
icon_state = "sec_wall";
name = "firearms locker";
- pixel_y = -28;
req_access_txt = "1"
},
/obj/item/flashlight/seclite,
@@ -2462,13 +2455,17 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering)
"DE" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/sign/warning/nosmoking{
- pixel_y = 32
- },
/obj/effect/turf_decal/industrial/warning{
dir = 8
},
+/obj/structure/cable{
+ icon_state = "4-10"
+ },
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/engine)
"DG" = (
@@ -2885,11 +2882,9 @@
/obj/effect/turf_decal/corner/opaque/red{
dir = 8
},
-/obj/structure/closet/secure_closet/wall{
- dir = 1;
+/obj/structure/closet/secure_closet/wall/directional/south{
icon_state = "sec_wall";
name = "armor locker";
- pixel_y = -28;
req_access_txt = "1"
},
/obj/item/clothing/suit/armor/vest/alt,
@@ -3077,11 +3072,9 @@
/obj/effect/turf_decal/corner/opaque/red{
dir = 8
},
-/obj/structure/closet/secure_closet/wall{
- dir = 1;
+/obj/structure/closet/secure_closet/wall/directional/south{
icon_state = "sec_wall";
name = "firearms locker";
- pixel_y = -28;
req_access_txt = "1"
},
/obj/item/storage/belt/security,
@@ -3274,10 +3267,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 1
},
-/obj/structure/closet/firecloset/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/firecloset/wall/directional/south,
/turf/open/floor/plasteel/tech,
/area/ship/maintenance/central)
"NU" = (
@@ -3434,12 +3424,10 @@
},
/obj/effect/turf_decal/corner/opaque/white/mono,
/obj/item/roller,
-/obj/structure/closet/secure_closet/wall{
- dir = 1;
+/obj/structure/closet/secure_closet/wall/directional/south{
icon_door = "med_wall";
locked = 0;
name = "medical locker";
- pixel_y = -28;
req_access_txt = "5"
},
/obj/item/roller,
@@ -3599,11 +3587,9 @@
/obj/item/clothing/head/HoS/cowboy,
/obj/item/ammo_box/c38,
/obj/item/ammo_box/c38,
-/obj/structure/closet/secure_closet/wall{
- dir = 4;
+/obj/structure/closet/secure_closet/wall/directional/west{
icon_state = "solgov_wall";
name = "first mate's closet";
- pixel_x = -28;
req_access_txt = "57"
},
/turf/open/floor/carpet/blue,
@@ -3766,11 +3752,9 @@
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/head/caphat/cowboy,
/obj/item/gun/ballistic/automatic/pistol/candor,
-/obj/structure/closet/secure_closet/wall{
- dir = 8;
+/obj/structure/closet/secure_closet/wall/directional/east{
icon_state = "solgov_wall";
name = "captain's closet";
- pixel_x = 28;
req_access_txt = "20"
},
/obj/item/ammo_box/magazine/m45,
@@ -4036,11 +4020,11 @@
/obj/structure/cable/yellow{
icon_state = "1-4"
},
-/obj/structure/closet/crate,
-/obj/item/stack/sheet/mineral/uranium/five,
-/obj/item/stack/sheet/mineral/plasma/fifty,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/turf_decal/radiation,
+/obj/machinery/power/ship_gravity,
+/obj/structure/cable{
+ icon_state = "0-5"
+ },
+/obj/effect/turf_decal/industrial/hatch/yellow,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/engine)
"Vo" = (
@@ -4149,10 +4133,9 @@
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/cargo)
"WG" = (
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/north{
icon_state = "sec_wall";
name = "ammunition locker";
- pixel_y = 28;
req_access_txt = "1"
},
/obj/item/ammo_box/c38_box,
@@ -4184,6 +4167,9 @@
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/structure/sign/warning/nosmoking{
+ pixel_y = 32
+ },
/turf/open/floor/plasteel/tech,
/area/ship/engineering/engine)
"WO" = (
@@ -4482,9 +4468,8 @@
dir = 4
},
/obj/structure/catwalk/over,
-/obj/structure/closet/wall/orange{
- name = "tool closet";
- pixel_y = 28
+/obj/structure/closet/wall/orange/directional/north{
+ name = "tool closet"
},
/obj/item/storage/toolbox/mechanical,
/obj/item/storage/belt/utility,
diff --git a/_maps/shuttles/independent/independent_schmiedeberg.dmm b/_maps/shuttles/independent/independent_schmiedeberg.dmm
index f9c4ee6c499c..a77e943f1558 100644
--- a/_maps/shuttles/independent/independent_schmiedeberg.dmm
+++ b/_maps/shuttles/independent/independent_schmiedeberg.dmm
@@ -146,7 +146,6 @@
/turf/open/floor/plating,
/area/ship/bridge)
"bu" = (
-/obj/structure/catwalk/over,
/obj/structure/cable{
icon_state = "2-8"
},
@@ -157,8 +156,9 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 4
+ dir = 1
},
+/obj/structure/catwalk/over,
/turf/open/floor/plating,
/area/ship/engineering)
"bD" = (
@@ -467,10 +467,7 @@
dir = 4
},
/obj/structure/curtain/bounty,
-/obj/structure/closet/emcloset/wall{
- dir = 1;
- pixel_y = -32
- },
+/obj/structure/closet/emcloset/wall/directional/south,
/obj/effect/turf_decal/siding/wood{
dir = 1
},
@@ -536,6 +533,7 @@
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 1
},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering)
"gt" = (
@@ -1290,6 +1288,9 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
/turf/open/floor/plating,
/area/ship/engineering)
"rC" = (
@@ -1559,6 +1560,9 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 9
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/ship/engineering)
"wz" = (
@@ -1759,10 +1763,7 @@
icon_state = "1-8"
},
/obj/effect/turf_decal/corner/opaque/blue/three_quarters,
-/obj/structure/closet/emcloset/wall{
- dir = 1;
- pixel_y = -32
- },
+/obj/structure/closet/emcloset/wall/directional/south,
/turf/open/floor/plasteel/white,
/area/ship/cargo)
"yv" = (
@@ -1973,12 +1974,10 @@
/obj/item/reagent_containers/syringe/piercing,
/obj/item/reagent_containers/syringe/piercing,
/obj/item/reagent_containers/syringe/piercing,
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/south{
desc = "For when you REALLY need to reserve the right to deny service. Immediate results guaranteed*";
- dir = 1;
icon_state = "sec_wall";
- name = "Unruly Customer Pacification";
- pixel_y = -28
+ name = "Unruly Customer Pacification"
},
/obj/item/reagent_containers/glass/bottle/chloralhydrate{
pixel_x = 10
@@ -2039,10 +2038,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 9
},
-/obj/structure/closet/emcloset/wall{
- dir = 8;
- pixel_x = 32
- },
+/obj/structure/closet/emcloset/wall/directional/east,
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/crew/canteen)
"CX" = (
@@ -2216,9 +2212,8 @@
/obj/item/clothing/head/helmet/space/orange,
/obj/item/pickaxe/mini,
/obj/item/pickaxe/mini,
-/obj/structure/closet/wall/white{
- name = "E.V.A";
- pixel_y = 28
+/obj/structure/closet/wall/white/directional/north{
+ name = "E.V.A"
},
/obj/machinery/power/apc/auto_name/directional/east,
/obj/structure/cable{
@@ -2443,10 +2438,7 @@
/obj/machinery/portable_atmospherics/scrubber,
/obj/machinery/light/small/directional/west,
/obj/effect/turf_decal/box/white,
-/obj/structure/closet/emcloset/wall{
- dir = 1;
- pixel_y = -32
- },
+/obj/structure/closet/emcloset/wall/directional/south,
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering)
"Ln" = (
@@ -2527,9 +2519,7 @@
/turf/open/floor/concrete/slab_3,
/area/ship/crew/hydroponics)
"MP" = (
-/obj/structure/closet/secure_closet/freezer/wall{
- pixel_y = 32
- },
+/obj/structure/closet/secure_closet/freezer/wall/directional/north,
/obj/item/storage/fancy/egg_box,
/obj/item/storage/fancy/egg_box,
/obj/item/reagent_containers/food/condiment/flour,
@@ -2673,8 +2663,11 @@
/obj/effect/turf_decal/siding/thinplating/dark/end{
dir = 8
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/obj/effect/decal/cleanable/oil/streak,
+/obj/machinery/power/ship_gravity,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering)
"Oe" = (
@@ -2692,10 +2685,7 @@
/turf/open/floor/concrete/tiles,
/area/ship/crew/hydroponics)
"On" = (
-/obj/structure/closet/wall{
- dir = 4;
- pixel_x = -32
- },
+/obj/structure/closet/wall/directional/west,
/obj/machinery/washing_machine,
/obj/item/clothing/suit/longcoat/chemist,
/obj/item/clothing/suit/longcoat/chemist,
@@ -3323,6 +3313,9 @@
pixel_x = 11;
pixel_y = -16
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 9
+ },
/turf/open/floor/plating,
/area/ship/engineering)
"Yw" = (
@@ -3510,11 +3503,9 @@
/obj/machinery/door/window/eastright{
dir = 1
},
-/obj/structure/closet/secure_closet/wall{
- dir = 8;
+/obj/structure/closet/secure_closet/wall/directional/east{
icon_state = "solgov_wall";
name = "Chief Pharmacist's Locker";
- pixel_x = 32;
req_access_txt = "40"
},
/obj/item/storage/bag/medical,
diff --git a/_maps/shuttles/independent/independent_shetland.dmm b/_maps/shuttles/independent/independent_shetland.dmm
index 113975fc8edf..3d5fa7c58420 100644
--- a/_maps/shuttles/independent/independent_shetland.dmm
+++ b/_maps/shuttles/independent/independent_shetland.dmm
@@ -333,6 +333,9 @@
/obj/machinery/atmospherics/pipe/simple/dark/visible{
dir = 9
},
+/obj/structure/cable{
+ icon_state = "5-9"
+ },
/turf/open/floor/plasteel/dark,
/area/ship/engineering/engine)
"cR" = (
@@ -815,6 +818,9 @@
/obj/effect/turf_decal/miskilamo_big/six{
dir = 8
},
+/obj/structure/cable{
+ icon_state = "2-9"
+ },
/turf/open/floor/plasteel/dark,
/area/ship/engineering/engine)
"gZ" = (
@@ -1282,11 +1288,9 @@
/obj/effect/turf_decal/corner/opaque/green{
dir = 8
},
-/obj/structure/closet/secure_closet/wall{
- dir = 8;
+/obj/structure/closet/secure_closet/wall/directional/east{
icon_door = "med_wall";
name = "mortuary locker";
- pixel_x = 28;
req_access_txt = "5"
},
/obj/item/reagent_containers/glass/bottle/formaldehyde{
@@ -1662,6 +1666,9 @@
/area/ship/security)
"oH" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/structure/cable{
+ icon_state = "6-8"
+ },
/turf/open/floor/plasteel/dark,
/area/ship/engineering/engine)
"oK" = (
@@ -2111,11 +2118,9 @@
/area/ship/hallway/fore)
"rQ" = (
/obj/effect/turf_decal/corner/opaque/bottlegreen/full,
-/obj/structure/closet/wall{
- dir = 4;
+/obj/structure/closet/wall/directional/west{
icon_door = "white_wall";
- name = "medical closet";
- pixel_x = -28
+ name = "medical closet"
},
/obj/item/storage/backpack/satchel/med,
/obj/item/clothing/shoes/sneakers/white,
@@ -2137,6 +2142,9 @@
/obj/machinery/atmospherics/pipe/simple/dark/visible{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "1-6"
+ },
/turf/open/floor/plasteel/dark,
/area/ship/engineering/engine)
"sb" = (
@@ -3194,10 +3202,7 @@
/turf/open/floor/carpet/blue,
/area/ship/bridge)
"AG" = (
-/obj/structure/closet/emcloset/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/emcloset/wall/directional/south,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -3259,6 +3264,13 @@
/obj/effect/turf_decal/industrial/warning/fulltile,
/turf/open/floor/plasteel/dark,
/area/ship/hallway/port)
+"BR" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
"BY" = (
/obj/machinery/door/airlock{
name = "Dormitory"
@@ -4169,6 +4181,10 @@
"Km" = (
/obj/effect/turf_decal/box,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/power/ship_gravity,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
/turf/open/floor/plating,
/area/ship/engineering/engine)
"Kn" = (
@@ -4601,6 +4617,9 @@
/area/ship/engineering/engine)
"NK" = (
/obj/structure/closet/cardboard,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plating,
/area/ship/engineering/engine)
"NR" = (
@@ -4924,6 +4943,9 @@
/obj/machinery/atmospherics/pipe/layer_manifold/visible{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel/dark,
/area/ship/engineering/engine)
"Qt" = (
@@ -5019,11 +5041,9 @@
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"Rm" = (
-/obj/structure/closet/secure_closet/wall{
- dir = 8;
+/obj/structure/closet/secure_closet/wall/directional/east{
icon_door = "med_wall";
name = "medical locker";
- pixel_x = 28;
req_access_txt = "5"
},
/obj/item/storage/box/syringes,
@@ -5759,6 +5779,9 @@
/obj/effect/turf_decal/miskilamo_big/eight{
dir = 8
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel/dark,
/area/ship/engineering/engine)
"XY" = (
@@ -6111,7 +6134,7 @@ PP
PP
QB
Id
-pr
+BR
Zn
JF
xf
diff --git a/_maps/shuttles/independent/independent_tranquility.dmm b/_maps/shuttles/independent/independent_tranquility.dmm
index fd1a368ebc50..d39a1ef392e3 100644
--- a/_maps/shuttles/independent/independent_tranquility.dmm
+++ b/_maps/shuttles/independent/independent_tranquility.dmm
@@ -563,10 +563,8 @@
/obj/item/reagent_containers/food/condiment/rice,
/obj/item/reagent_containers/food/condiment/rice,
/obj/item/storage/box/condimentbottles,
-/obj/structure/closet/secure_closet/wall{
- dir = 4;
- name = "Kitchen Cabinet";
- pixel_x = -28
+/obj/structure/closet/secure_closet/wall/directional/west{
+ name = "Kitchen Cabinet"
},
/turf/open/floor/plasteel/white,
/area/ship/crew/canteen)
@@ -672,10 +670,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
},
-/obj/structure/closet/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/wall/directional/south,
/obj/item/radio,
/obj/item/radio,
/obj/item/radio,
@@ -1284,6 +1279,10 @@
/obj/structure/railing{
dir = 4
},
+/obj/machinery/power/ship_gravity,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering/engine)
"jk" = (
@@ -1329,10 +1328,8 @@
/turf/open/floor/grass,
/area/ship/crew/hydroponics)
"js" = (
-/obj/structure/closet/wall{
- dir = 4;
- name = "Wardrobe";
- pixel_x = -28
+/obj/structure/closet/wall/directional/west{
+ name = "Wardrobe"
},
/obj/item/clothing/head/beret,
/obj/item/clothing/under/color/jumpskirt/random,
@@ -1418,6 +1415,23 @@
},
/turf/open/floor/wood/birch,
/area/ship/crew/crewtwo)
+"ka" = (
+/obj/machinery/power/terminal,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
"kr" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -1455,10 +1469,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 5
},
-/obj/structure/closet/wall{
- dir = 4;
- name = "Wardrobe";
- pixel_x = -28
+/obj/structure/closet/wall/directional/west{
+ name = "Wardrobe"
},
/obj/item/clothing/head/wig/random,
/obj/item/clothing/under/color/jumpskirt/random,
@@ -1747,10 +1759,7 @@
/turf/open/floor/carpet/nanoweave/beige,
/area/ship/hallway/port)
"ny" = (
-/obj/structure/closet/firecloset/wall{
- dir = 4;
- pixel_x = -32
- },
+/obj/structure/closet/firecloset/wall/directional/west,
/turf/open/floor/carpet/nanoweave/beige,
/area/ship/hallway/starboard)
"nz" = (
@@ -1990,10 +1999,7 @@
/area/ship/hallway/port)
"pT" = (
/obj/effect/turf_decal/techfloor/orange,
-/obj/structure/closet/wall/orange{
- dir = 1;
- pixel_y = -32
- },
+/obj/structure/closet/wall/orange/directional/south,
/obj/item/stack/tape/industrial/electrical,
/obj/item/stack/tape/industrial,
/obj/item/holosign_creator/engineering,
@@ -2071,10 +2077,8 @@
/area/ship/hallway/port)
"qV" = (
/obj/effect/turf_decal/siding/wood,
-/obj/structure/closet/wall{
- dir = 1;
- name = "Wardrobe";
- pixel_y = -28
+/obj/structure/closet/wall/directional/south{
+ name = "Wardrobe"
},
/obj/item/clothing/head/wig/random,
/obj/item/storage/box/syndie_kit/chameleon,
@@ -2458,10 +2462,8 @@
/turf/open/floor/carpet/nanoweave/beige,
/area/ship/hallway/port)
"ub" = (
-/obj/structure/closet/wall{
- dir = 8;
- name = "Personal Effects";
- pixel_x = 32
+/obj/structure/closet/wall/directional/east{
+ name = "Personal Effects"
},
/obj/effect/turf_decal/siding/wood{
dir = 4
@@ -2937,9 +2939,7 @@
/turf/open/floor/carpet/nanoweave/red,
/area/ship/crew/dorm/dormfour)
"xW" = (
-/obj/structure/closet/wall/orange{
- pixel_y = 32
- },
+/obj/structure/closet/wall/orange/directional/north,
/obj/item/clothing/suit/fire/atmos,
/obj/item/clothing/mask/gas/atmos,
/obj/item/clothing/head/hardhat/atmos,
@@ -3469,9 +3469,8 @@
/obj/item/clothing/under/pants/khaki,
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/under/suit/charcoal,
-/obj/structure/closet/wall{
- name = "Wardrobe";
- pixel_y = 28
+/obj/structure/closet/wall/directional/north{
+ name = "Wardrobe"
},
/obj/item/clothing/accessory/waistcoat,
/turf/open/floor/carpet/black,
@@ -4486,10 +4485,8 @@
icon_state = "1-8"
},
/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/structure/closet/wall/blue{
- dir = 1;
- name = "Janitorial Closet";
- pixel_y = -28
+/obj/structure/closet/wall/blue/directional/south{
+ name = "Janitorial Closet"
},
/obj/item/soap/deluxe,
/obj/item/mop,
@@ -4748,10 +4745,8 @@
/turf/open/floor/carpet/nanoweave/beige,
/area/ship/hallway/starboard)
"LS" = (
-/obj/structure/closet/wall{
- dir = 8;
- name = "Wardrobe";
- pixel_x = 32
+/obj/structure/closet/wall/directional/east{
+ name = "Wardrobe"
},
/obj/item/clothing/suit/toggle/labcoat/chemist/side,
/obj/item/clothing/head/beret/puce,
@@ -4791,10 +4786,8 @@
"Md" = (
/obj/item/circuitboard/machine/telecomms/relay,
/obj/item/circuitboard/machine/telecomms/message_server,
-/obj/structure/closet/wall/blue{
- dir = 4;
- name = "Component Storage";
- pixel_x = -28
+/obj/structure/closet/wall/blue/directional/west{
+ name = "Component Storage"
},
/obj/item/stack/cable_coil/blue,
/obj/item/stock_parts/subspace/filter,
@@ -5464,10 +5457,8 @@
/obj/item/reagent_containers/food/condiment/soymilk,
/obj/item/storage/fancy/egg_box,
/obj/item/storage/fancy/egg_box,
-/obj/structure/closet/secure_closet/wall{
- dir = 8;
- name = "Freezer";
- pixel_x = 32
+/obj/structure/closet/secure_closet/wall/directional/east{
+ name = "Freezer"
},
/turf/open/floor/plasteel/white,
/area/ship/crew/canteen)
@@ -5836,10 +5827,8 @@
/turf/closed/wall/mineral/titanium,
/area/ship/storage)
"TI" = (
-/obj/structure/closet/wall/blue{
- dir = 4;
- name = "Personal Effects";
- pixel_x = -32
+/obj/structure/closet/wall/blue/directional/west{
+ name = "Personal Effects"
},
/obj/item/storage/belt/utility/full,
/obj/item/clothing/suit/hooded/wintercoat/engineering,
@@ -5856,10 +5845,8 @@
/turf/open/floor/carpet/nanoweave/red,
/area/ship/crew/dorm/dormfour)
"TJ" = (
-/obj/structure/closet/wall{
- dir = 8;
- name = "Personal Effects";
- pixel_x = 32
+/obj/structure/closet/wall/directional/east{
+ name = "Personal Effects"
},
/obj/item/storage/bag/chemistry,
/obj/item/storage/box/pillbottles,
@@ -6634,10 +6621,7 @@
/turf/open/floor/plasteel/white,
/area/ship/medical/surgery)
"ZU" = (
-/obj/structure/closet/emcloset/wall{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/emcloset/wall/directional/east,
/turf/open/floor/carpet/nanoweave/beige,
/area/ship/hallway/port)
@@ -7309,7 +7293,7 @@ rB
aC
Fq
jh
-JX
+ka
Jq
Gs
"}
diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm
index 647896ce8185..e8baced58968 100644
--- a/_maps/shuttles/inteq/inteq_colossus.dmm
+++ b/_maps/shuttles/inteq/inteq_colossus.dmm
@@ -190,10 +190,9 @@
/obj/item/clothing/head/soft/inteq,
/obj/item/clothing/head/soft/inteq,
/obj/item/clothing/head/soft/inteq,
-/obj/structure/closet/wall{
+/obj/structure/closet/wall/directional/north{
icon_door = "orange_wall";
- name = "uniform closet";
- pixel_y = 28
+ name = "uniform closet"
},
/obj/machinery/firealarm/directional/east,
/turf/open/floor/plasteel/grimy,
@@ -1775,10 +1774,8 @@
/obj/item/tank/internals/oxygen,
/obj/item/tank/internals/oxygen,
/obj/item/tank/internals/oxygen,
-/obj/structure/closet/wall{
- dir = 8;
- icon_state = "emergency_wall";
- pixel_x = 28
+/obj/structure/closet/wall/directional/east{
+ icon_state = "emergency_wall"
},
/turf/open/floor/plasteel/tech/grid,
/area/ship/hallway/port)
@@ -2294,10 +2291,9 @@
/obj/item/clothing/shoes/sneakers/black,
/obj/item/clothing/shoes/sneakers/black,
/obj/item/clothing/shoes/sneakers/black,
-/obj/structure/closet/wall{
+/obj/structure/closet/wall/directional/north{
icon_door = "orange_wall";
- name = "uniform closet";
- pixel_y = 28
+ name = "uniform closet"
},
/turf/open/floor/plasteel/grimy,
/area/ship/crew)
@@ -2621,12 +2617,10 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/security/armory)
"Da" = (
-/obj/structure/closet/secure_closet/wall{
- dir = 4;
+/obj/structure/closet/secure_closet/wall/directional/west{
icon_door = "solgov_wall";
icon_state = "solgov_wall";
name = "vanguard's locker";
- pixel_x = -28;
req_access_txt = "58"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -2801,6 +2795,9 @@
/obj/effect/turf_decal/corner_techfloor_gray{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"EQ" = (
@@ -2898,11 +2895,9 @@
/area/ship/crew/toilet)
"GL" = (
/obj/machinery/atmospherics/pipe/layer_manifold/visible,
-/obj/structure/closet/wall{
- dir = 8;
+/obj/structure/closet/wall/directional/east{
icon_door = "yellow_wall";
- name = "engineering closet";
- pixel_x = 32
+ name = "engineering closet"
},
/obj/structure/catwalk/over/plated_catwalk/dark,
/obj/item/storage/backpack/industrial,
@@ -3264,10 +3259,7 @@
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"KM" = (
-/obj/structure/closet/emcloset/wall{
- dir = 4;
- pixel_x = -32
- },
+/obj/structure/closet/emcloset/wall/directional/west,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
"Ld" = (
@@ -3662,8 +3654,9 @@
/obj/structure/sign/warning/nosmoking/circle{
pixel_x = 32
},
-/obj/effect/turf_decal/number/zero{
- dir = 8
+/obj/machinery/power/ship_gravity,
+/obj/structure/cable{
+ icon_state = "0-8"
},
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
@@ -4548,10 +4541,7 @@
piping_layer = 2
},
/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/structure/closet/firecloset/wall{
- dir = 4;
- pixel_x = -28
- },
+/obj/structure/closet/firecloset/wall/directional/west,
/turf/open/floor/plating,
/area/ship/engineering)
"Zz" = (
diff --git a/_maps/shuttles/inteq/inteq_hound.dmm b/_maps/shuttles/inteq/inteq_hound.dmm
index e67d176f5683..5616d1d2d4b0 100644
--- a/_maps/shuttles/inteq/inteq_hound.dmm
+++ b/_maps/shuttles/inteq/inteq_hound.dmm
@@ -650,10 +650,9 @@
/obj/effect/turf_decal/siding/thinplating{
dir = 1
},
-/obj/structure/closet/wall{
+/obj/structure/closet/wall/directional/north{
icon_door = "orange_wall";
- name = "uniform closet";
- pixel_y = 28
+ name = "uniform closet"
},
/obj/item/clothing/head/soft/inteq,
/obj/item/clothing/head/soft/inteq,
@@ -965,12 +964,10 @@
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
"va" = (
-/obj/structure/closet/secure_closet/wall{
- dir = 4;
+/obj/structure/closet/secure_closet/wall/directional/west{
icon_door = "solgov_wall";
icon_state = "solgov_wall";
name = "vanguard's locker";
- pixel_x = -28;
req_access_txt = "58"
},
/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
@@ -1102,10 +1099,9 @@
/obj/item/storage/belt/security/webbing/inteq,
/obj/item/storage/belt/security/webbing/inteq,
/obj/item/storage/belt/security/webbing/inteq,
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/north{
icon_state = "sec_wall";
name = "equipment locker";
- pixel_y = 28;
req_one_access_txt = "1"
},
/turf/open/floor/plasteel/patterned/grid,
@@ -1245,9 +1241,7 @@
/obj/structure/sign/poster/official/safety_internals{
pixel_x = -32
},
-/obj/structure/closet/emcloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/emcloset/wall/directional/north,
/turf/open/floor/plasteel/tech/grid,
/area/ship/cargo)
"AW" = (
@@ -1391,11 +1385,9 @@
/obj/item/gun/ballistic/automatic/assault/skm/inteq{
pixel_x = -5
},
-/obj/structure/closet/secure_closet/wall{
- dir = 1;
+/obj/structure/closet/secure_closet/wall/directional/south{
icon_state = "sec_wall";
name = "weapons lockup";
- pixel_y = -28;
req_one_access_txt = "58"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -1956,10 +1948,7 @@
pixel_x = 25;
pixel_y = 7
},
-/obj/structure/closet/emcloset/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/emcloset/wall/directional/south,
/turf/open/floor/plasteel/tech/grid,
/area/ship/cargo)
"OP" = (
@@ -2256,6 +2245,9 @@
/obj/effect/turf_decal/siding/thinplating/dark/corner{
dir = 1
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel/tech,
/area/ship/storage/eva)
"Wk" = (
@@ -2282,6 +2274,10 @@
codes_txt = "patrol;next_patrol=crew";
location = "eva"
},
+/obj/machinery/power/ship_gravity,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
/turf/open/floor/plasteel/tech,
/area/ship/storage/eva)
"Xc" = (
diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm
index c8bdcb1bd3be..4234e39cbafc 100644
--- a/_maps/shuttles/inteq/inteq_talos.dmm
+++ b/_maps/shuttles/inteq/inteq_talos.dmm
@@ -162,9 +162,7 @@
/obj/effect/turf_decal/siding/thinplating{
dir = 1
},
-/obj/structure/closet/emcloset/wall{
- pixel_y = 32
- },
+/obj/structure/closet/emcloset/wall/directional/north,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
"aV" = (
@@ -1317,15 +1315,9 @@
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 1
},
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/item/analyzer{
- pixel_x = 6;
- pixel_y = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 1
+/obj/machinery/power/ship_gravity,
+/obj/structure/cable{
+ icon_state = "0-4"
},
/turf/open/floor/plasteel/dark,
/area/ship/engineering)
@@ -1540,6 +1532,13 @@
icon_state = "2-4"
},
/obj/effect/turf_decal/number/five,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable/yellow{
+ icon_state = "1-10"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel/dark,
/area/ship/engineering)
"jT" = (
@@ -2728,10 +2727,8 @@
/obj/structure/catwalk/over/plated_catwalk,
/obj/structure/railing,
/obj/machinery/airalarm/directional/north,
-/obj/structure/closet/wall{
- dir = 4;
- icon_door = "grey_wall";
- pixel_x = -32
+/obj/structure/closet/wall/directional/west{
+ icon_door = "grey_wall"
},
/obj/item/radio/headset,
/obj/item/radio/headset,
@@ -2757,6 +2754,19 @@
},
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
+"qD" = (
+/obj/structure/railing,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 6
+ },
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plating,
+/area/ship/engineering)
"qF" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -3787,9 +3797,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/structure/closet/emcloset/wall{
- pixel_y = 32
- },
+/obj/structure/closet/emcloset/wall/directional/north,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/port)
"wQ" = (
@@ -3815,9 +3823,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
},
-/obj/structure/closet/emcloset/wall{
- pixel_y = 32
- },
+/obj/structure/closet/emcloset/wall/directional/north,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
"xb" = (
@@ -4532,6 +4538,9 @@
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 1
+ },
/turf/open/floor/plasteel/dark,
/area/ship/engineering)
"Ba" = (
@@ -5822,7 +5831,13 @@
/obj/item/assembly/igniter{
pixel_y = 6
},
-/obj/structure/cable/yellow,
+/obj/item/analyzer{
+ pixel_x = 6;
+ pixel_y = 4
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-5"
+ },
/turf/open/floor/plasteel/dark,
/area/ship/engineering)
"Lu" = (
@@ -6237,16 +6252,9 @@
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/engineering)
"OG" = (
-/obj/structure/cable/yellow{
- icon_state = "2-4"
- },
/obj/structure/railing,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/structure/catwalk/over,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 6
- },
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/tech,
/area/ship/engineering)
"OK" = (
/obj/machinery/cryopod{
@@ -7944,7 +7952,7 @@ sV
sV
AO
cj
-ek
+qD
jS
AZ
gV
diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm
index ede8c585a5c2..89c80e0e363a 100644
--- a/_maps/shuttles/inteq/inteq_valor.dmm
+++ b/_maps/shuttles/inteq/inteq_valor.dmm
@@ -141,9 +141,7 @@
/obj/effect/turf_decal/borderfloor{
dir = 4
},
-/obj/structure/closet/firecloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/firecloset/wall/directional/north,
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
"bB" = (
@@ -526,10 +524,9 @@
dir = 4
},
/obj/structure/table,
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/north{
icon_state = "sec_wall";
name = "equipment locker";
- pixel_y = 28;
req_access = list(1)
},
/obj/item/storage/box/zipties,
@@ -572,10 +569,7 @@
/turf/open/floor/plasteel/white,
/area/ship/medical)
"eV" = (
-/obj/structure/closet/firecloset/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/firecloset/wall/directional/south,
/obj/structure/cable{
icon_state = "1-4"
},
@@ -904,10 +898,7 @@
/obj/structure/chair/sofa/left{
dir = 8
},
-/obj/structure/closet/firecloset/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/firecloset/wall/directional/south,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
"ix" = (
@@ -1745,9 +1736,7 @@
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
"pA" = (
-/obj/structure/closet/wall{
- pixel_y = 28
- },
+/obj/structure/closet/wall/directional/north,
/obj/item/radio,
/obj/item/radio,
/obj/item/radio,
@@ -1803,9 +1792,7 @@
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen)
"pU" = (
-/obj/structure/closet/firecloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/firecloset/wall/directional/north,
/obj/machinery/atmospherics/components/binary/pump/on/layer2{
dir = 4
},
@@ -1943,6 +1930,10 @@
pixel_y = 32
},
/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/power/ship_gravity,
/turf/open/floor/plating,
/area/ship/maintenance/port)
"rY" = (
@@ -2060,10 +2051,9 @@
/obj/item/gun/ballistic/automatic/pistol/commander/inteq/no_mag{
pixel_x = 4
},
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/north{
icon_state = "sec_wall";
name = "weapons lockup";
- pixel_y = 28;
req_access = list(1)
},
/obj/structure/table,
@@ -2369,10 +2359,7 @@
"vx" = (
/obj/effect/turf_decal/siding/thinplating/dark/end,
/obj/machinery/airalarm/directional/south,
-/obj/structure/closet/wall/white{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/wall/white/directional/east,
/obj/item/clothing/under/rank/medical/gown,
/obj/item/clothing/under/rank/medical/gown,
/obj/item/clothing/under/rank/medical/gown,
@@ -4355,12 +4342,10 @@
/obj/item/clothing/under/syndicate/inteq,
/obj/item/clothing/suit/armor/hos/inteq,
/obj/item/clothing/head/beret/sec/hos/inteq,
-/obj/structure/closet/secure_closet/wall{
- dir = 4;
+/obj/structure/closet/secure_closet/wall/directional/west{
icon_door = "solgov_wall";
icon_state = "solgov_wall";
name = "vanguard's locker";
- pixel_x = -28;
req_access = list(58)
},
/obj/item/storage/lockbox/medal/sec,
@@ -4378,10 +4363,7 @@
/obj/structure/chair/sofa/right{
dir = 8
},
-/obj/structure/closet/emcloset/wall{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/emcloset/wall/directional/east,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
"Oh" = (
@@ -4398,9 +4380,7 @@
/obj/effect/turf_decal/borderfloor{
dir = 8
},
-/obj/structure/closet/emcloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/emcloset/wall/directional/north,
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
"Ok" = (
@@ -4703,9 +4683,7 @@
/obj/item/clothing/head/soft/inteq,
/obj/item/clothing/head/soft/inteq,
/obj/item/clothing/head/soft/inteq,
-/obj/structure/closet/wall{
- pixel_y = 28
- },
+/obj/structure/closet/wall/directional/north,
/obj/machinery/airalarm/directional/east,
/turf/open/floor/carpet/black,
/area/ship/crew/dorm)
@@ -4720,10 +4698,8 @@
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
"RR" = (
-/obj/structure/closet/secure_closet/wall{
- dir = 4;
+/obj/structure/closet/secure_closet/wall/directional/west{
name = "honorable corpsman's locker";
- pixel_x = -28;
req_access = list(19)
},
/obj/item/clothing/shoes/combat,
@@ -5131,6 +5107,9 @@
/obj/structure/cable{
icon_state = "2-10"
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plating,
/area/ship/maintenance/port)
"WC" = (
@@ -5389,9 +5368,7 @@
/obj/item/clothing/shoes/combat,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/shoes/combat,
-/obj/structure/closet/wall{
- pixel_y = 28
- },
+/obj/structure/closet/wall/directional/north,
/turf/open/floor/carpet/black,
/area/ship/crew/dorm)
"YZ" = (
diff --git a/_maps/shuttles/inteq/inteq_vaquero.dmm b/_maps/shuttles/inteq/inteq_vaquero.dmm
index c93d0cc7f0a8..23e763a6b9c6 100644
--- a/_maps/shuttles/inteq/inteq_vaquero.dmm
+++ b/_maps/shuttles/inteq/inteq_vaquero.dmm
@@ -670,7 +670,6 @@
name = "Air to Distro"
},
/obj/effect/turf_decal/hardline_small,
-/obj/machinery/light/small/directional/north,
/obj/machinery/atmospherics/components/binary/pump/layer4{
dir = 4;
name = "Input to Waste"
@@ -679,6 +678,7 @@
pixel_x = 10;
pixel_y = 22
},
+/obj/machinery/firealarm/directional/north,
/turf/open/floor/plasteel/tech,
/area/ship/maintenance/starboard)
"jB" = (
@@ -890,11 +890,9 @@
/obj/item/clothing/head/hardhat,
/obj/item/clothing/shoes/combat,
/obj/effect/turf_decal/hardline_small/right,
-/obj/structure/closet/wall{
- dir = 8;
+/obj/structure/closet/wall/directional/east{
icon_door = "yellow_wall";
- name = "engineering closet";
- pixel_x = 28
+ name = "engineering closet"
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 4
@@ -908,12 +906,10 @@
/turf/open/floor/plasteel/tech,
/area/ship/maintenance/starboard)
"mu" = (
-/obj/structure/closet/secure_closet/wall{
- dir = 4;
+/obj/structure/closet/secure_closet/wall/directional/west{
icon_door = "solgov_wall";
icon_state = "solgov_wall";
name = "vanguard's locker";
- pixel_x = -28;
req_access_txt = "20"
},
/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
@@ -1209,10 +1205,9 @@
/obj/item/clothing/head/soft/inteq,
/obj/item/clothing/head/soft/inteq,
/obj/item/clothing/head/soft/inteq,
-/obj/structure/closet/wall{
+/obj/structure/closet/wall/directional/north{
icon_door = "orange_wall";
- name = "uniform closet";
- pixel_y = 28
+ name = "uniform closet"
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 8
@@ -1737,9 +1732,8 @@
/turf/open/floor/plasteel/dark,
/area/ship/security)
"Bu" = (
-/obj/structure/closet/wall{
- icon_door = "grey_wall";
- pixel_y = 28
+/obj/structure/closet/wall/directional/north{
+ icon_door = "grey_wall"
},
/obj/structure/cable{
icon_state = "0-2"
@@ -1868,10 +1862,8 @@
dir = 9
},
/obj/effect/turf_decal/number/six,
-/obj/structure/closet/wall/orange{
- dir = 8;
+/obj/structure/closet/wall/orange/directional/east{
name = "tool closet";
- pixel_x = 28;
req_access_txt = "11"
},
/obj/item/pipe_dispenser,
@@ -2149,10 +2141,9 @@
/obj/item/clothing/shoes/sneakers/black,
/obj/item/clothing/shoes/sneakers/black,
/obj/item/clothing/shoes/sneakers/black,
-/obj/structure/closet/wall{
+/obj/structure/closet/wall/directional/north{
icon_door = "orange_wall";
- name = "uniform closet";
- pixel_y = 28
+ name = "uniform closet"
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
@@ -2167,13 +2158,16 @@
/obj/machinery/atmospherics/pipe/manifold/cyan/visible/layer2{
dir = 1
},
-/obj/machinery/firealarm/directional/north,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
-/obj/structure/reagent_dispensers/fueltank,
+/obj/machinery/power/ship_gravity,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/light/small/directional/north,
/turf/open/floor/plasteel/tech,
/area/ship/maintenance/starboard)
"Hn" = (
@@ -2220,10 +2214,9 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/security)
"HN" = (
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/north{
icon_door = "med_wall";
name = "medical locker";
- pixel_y = 28;
req_access_txt = "5"
},
/obj/item/storage/firstaid/regular{
@@ -2382,6 +2375,9 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
/turf/open/floor/plasteel/tech,
/area/ship/maintenance/starboard)
"JL" = (
@@ -2391,6 +2387,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/directional/south,
+/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"Kr" = (
diff --git a/_maps/shuttles/minutemen/minutemen_vela.dmm b/_maps/shuttles/minutemen/minutemen_vela.dmm
index 200a677ea101..8525a9d297bb 100644
--- a/_maps/shuttles/minutemen/minutemen_vela.dmm
+++ b/_maps/shuttles/minutemen/minutemen_vela.dmm
@@ -1032,10 +1032,7 @@
/turf/open/floor/plasteel/grimy,
/area/ship/crew/dorm)
"gB" = (
-/obj/structure/closet/emcloset/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/emcloset/wall/directional/south,
/obj/effect/turf_decal/techfloor{
dir = 10
},
@@ -1563,10 +1560,7 @@
/turf/open/floor/plasteel/dark,
/area/ship/science)
"jI" = (
-/obj/structure/closet/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/wall/directional/south,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 5
},
@@ -2490,10 +2484,7 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/closet/firecloset/wall{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/firecloset/wall/directional/east,
/obj/machinery/button/door{
dir = 8;
id = "vela_labeva";
@@ -3979,10 +3970,7 @@
/turf/open/floor/plasteel/tech,
/area/ship/engineering/atmospherics)
"wk" = (
-/obj/structure/closet/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/wall/directional/south,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
@@ -4074,6 +4062,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/generic,
+/obj/machinery/power/floodlight,
/turf/open/floor/plating,
/area/ship/storage)
"wD" = (
@@ -4735,10 +4724,7 @@
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"zR" = (
-/obj/structure/closet/firecloset/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/firecloset/wall/directional/south,
/obj/effect/decal/cleanable/dirt,
/obj/item/storage/firstaid/fire,
/obj/effect/turf_decal/techfloor,
@@ -5555,7 +5541,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/box/corners,
-/obj/machinery/power/floodlight,
+/obj/machinery/power/ship_gravity,
/turf/open/floor/plating,
/area/ship/storage)
"Ex" = (
@@ -6188,10 +6174,7 @@
/turf/open/floor/plating,
/area/ship/hallway/central)
"HO" = (
-/obj/structure/closet/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/wall/directional/south,
/obj/machinery/power/apc/auto_name/directional/west,
/obj/effect/turf_decal/steeldecal/steel_decals_central7{
pixel_y = 1
@@ -6399,10 +6382,8 @@
/area/ship/hallway/central)
"Jj" = (
/obj/effect/turf_decal/spline/fancy/opaque/black,
-/obj/structure/closet/wall{
- dir = 4;
- name = "spare uniforms";
- pixel_x = -28
+/obj/structure/closet/wall/directional/west{
+ name = "spare uniforms"
},
/obj/item/clothing/under/clip/minutemen,
/obj/item/clothing/under/clip/minutemen,
@@ -7411,10 +7392,7 @@
/turf/open/floor/plasteel/dark,
/area/ship/science/xenobiology)
"Ox" = (
-/obj/structure/closet/emcloset/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/emcloset/wall/directional/south,
/obj/effect/turf_decal/techfloor{
dir = 6
},
@@ -8486,10 +8464,7 @@
/obj/machinery/camera/autoname{
dir = 10
},
-/obj/structure/closet/firecloset/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/firecloset/wall/directional/south,
/obj/effect/turf_decal/techfloor,
/turf/open/floor/plasteel/dark,
/area/ship/hangar/port)
@@ -8517,10 +8492,7 @@
/turf/open/floor/plating,
/area/ship/engineering)
"Uw" = (
-/obj/structure/closet/firecloset/wall{
- dir = 4;
- pixel_x = -28
- },
+/obj/structure/closet/firecloset/wall/directional/west,
/obj/item/storage/box/gum/happiness,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/engine)
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm b/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm
index 4ee6ad18467c..6fef103cab50 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm
@@ -46,11 +46,7 @@
"ap" = (
/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/closet/emcloset/wall{
- dir = 4;
- pixel_x = -32;
- pixel_y = -6
- },
+/obj/structure/closet/emcloset/wall/directional/west,
/turf/open/floor/plating,
/area/ship/hallway/port)
"ar" = (
@@ -726,6 +722,9 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
/turf/open/floor/plating,
/area/ship/engineering)
"dd" = (
@@ -845,9 +844,7 @@
/obj/effect/turf_decal/corner/opaque/bar{
dir = 1
},
-/obj/structure/closet/emcloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/emcloset/wall/directional/north,
/turf/open/floor/plasteel,
/area/ship/crew)
"dr" = (
@@ -917,6 +914,10 @@
/obj/effect/turf_decal/industrial/warning{
dir = 8
},
+/obj/machinery/power/ship_gravity,
+/obj/structure/cable{
+ icon_state = "0-1"
+ },
/turf/open/floor/plating,
/area/ship/engineering)
"dE" = (
@@ -927,10 +928,8 @@
/obj/machinery/camera{
dir = 5
},
-/obj/structure/closet/wall{
- dir = 4;
- name = "Emergency Defense Storage";
- pixel_x = -28
+/obj/structure/closet/wall/directional/west{
+ name = "Emergency Defense Storage"
},
/obj/item/ammo_box/magazine/co9mm{
pixel_x = 5
@@ -1444,10 +1443,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/structure/closet/firecloset/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/firecloset/wall/directional/south,
/turf/open/floor/plasteel,
/area/ship/hallway/port)
"oz" = (
@@ -2205,6 +2201,9 @@
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
/obj/structure/catwalk/over,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plating,
/area/ship/engineering)
"ID" = (
@@ -2705,10 +2704,8 @@
dir = 4
},
/obj/effect/turf_decal/corner/opaque/lime,
-/obj/structure/closet/wall{
- dir = 4;
- name = "Radio Storage";
- pixel_x = -28
+/obj/structure/closet/wall/directional/west{
+ name = "Radio Storage"
},
/obj/item/radio,
/obj/item/radio,
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm b/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm
index 46e396a197a8..8c17da5f36ee 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm
@@ -1064,9 +1064,9 @@
/turf/open/floor/plasteel/patterned,
/area/ship/cargo/port)
"ks" = (
-/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/closet/firecloset/full,
+/obj/structure/cable,
+/obj/machinery/power/ship_gravity,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"ku" = (
@@ -1094,6 +1094,9 @@
"kL" = (
/obj/structure/chair/stool,
/obj/effect/landmark/start/station_engineer,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plating,
/area/ship/engineering/engine)
"kM" = (
@@ -2282,6 +2285,9 @@
/obj/structure/cable{
icon_state = "1-4"
},
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
/turf/open/floor/plating,
/area/ship/engineering/engine)
"wY" = (
@@ -2503,6 +2509,9 @@
/obj/machinery/atmospherics/pipe/simple/purple/hidden/layer1{
dir = 9
},
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
/turf/open/floor/plating,
/area/ship/engineering/engine)
"zn" = (
@@ -3567,6 +3576,12 @@
/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating,
/area/ship/maintenance/fore)
+"JL" = (
+/obj/structure/closet/firecloset/full,
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
"JV" = (
/obj/structure/table/reinforced,
/obj/machinery/fax/nanotrasen,
@@ -4030,6 +4045,12 @@
/obj/effect/turf_decal/industrial/hatch/yellow,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/atmospherics)
+"Pp" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
"Pr" = (
/obj/structure/sign/warning/fire,
/turf/closed/wall/mineral/titanium/nodiagonal,
@@ -5389,7 +5410,7 @@ Bi
Tb
st
Tb
-SQ
+JL
Ug
hu
hu
@@ -5475,7 +5496,7 @@ FZ
on
on
Fq
-on
+Pp
lW
Ug
hu
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm
index ba2c8c61533e..4fa6a4424482 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm
@@ -352,11 +352,9 @@
/obj/item/clothing/under/rank/cargo/qm,
/obj/effect/turf_decal/corner/opaque/yellow/full,
/obj/effect/turf_decal/corner/opaque/yellow/diagonal,
-/obj/structure/closet/wall{
- dir = 4;
+/obj/structure/closet/wall/directional/west{
icon_door = "orange_wall";
- name = "quartermaster's closet";
- pixel_x = -28
+ name = "quartermaster's closet"
},
/obj/item/clothing/neck/cloak/qm,
/obj/item/clothing/under/rank/cargo/qm/skirt,
@@ -1192,9 +1190,8 @@
/turf/open/floor/plasteel/white,
/area/ship/medical)
"eV" = (
-/obj/structure/closet/wall/orange{
- name = "fuel locker";
- pixel_y = 28
+/obj/structure/closet/wall/orange/directional/north{
+ name = "fuel locker"
},
/obj/item/stack/sheet/mineral/plasma/fifty,
/obj/effect/decal/cleanable/wrapping{
@@ -1458,9 +1455,8 @@
/turf/open/floor/plasteel,
/area/ship/hallway/fore)
"gb" = (
-/obj/structure/closet/wall/orange{
- name = "Chief Engineer's Locker";
- pixel_y = 28
+/obj/structure/closet/wall/orange/directional/north{
+ name = "Chief Engineer's Locker"
},
/obj/item/clothing/under/rank/engineering/chief_engineer,
/obj/item/clothing/suit/toggle/hazard,
@@ -2578,9 +2574,7 @@
/turf/open/floor/wood,
/area/ship/crew/dorm)
"ki" = (
-/obj/structure/closet/wall/orange{
- dir = 4;
- pixel_x = -28;
+/obj/structure/closet/wall/orange/directional/west{
name = "Pilot's Locker"
},
/obj/item/clothing/under/rank/security/officer/military/eng,
@@ -3761,9 +3755,7 @@
/obj/effect/turf_decal/steeldecal/steel_decals10{
dir = 4
},
-/obj/structure/closet/wall/blue{
- pixel_y = 28
- },
+/obj/structure/closet/wall/blue/directional/north,
/obj/item/aicard{
pixel_x = -5
},
@@ -3861,10 +3853,8 @@
/obj/item/clothing/suit/fire/atmos,
/obj/item/clothing/mask/gas/atmos,
/obj/item/clothing/head/hardhat/atmos,
-/obj/structure/closet/wall{
- name = "Atmospheric locker";
- dir = 8;
- pixel_x = 28
+/obj/structure/closet/wall/directional/east{
+ name = "Atmospheric locker"
},
/obj/effect/turf_decal/techfloor/orange{
dir = 4
@@ -3959,10 +3949,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/directional/west,
-/obj/structure/closet/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/wall/directional/south,
/obj/item/clothing/under/rank/rnd/roboticist,
/obj/item/clothing/under/rank/rnd/research_director/turtleneck,
/obj/item/clothing/under/rank/rnd/roboticist/skirt,
@@ -4151,10 +4138,7 @@
/turf/open/floor/plasteel/elevatorshaft,
/area/ship/science/robotics)
"pk" = (
-/obj/structure/closet/secure_closet/freezer/wall{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/secure_closet/freezer/wall/directional/east,
/obj/item/clothing/under/shorts/cookjorts,
/obj/item/clothing/shoes/cookflops,
/obj/item/clothing/suit/toggle/chef,
@@ -4173,10 +4157,7 @@
},
/obj/effect/decal/cleanable/vomit/old,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/closet/wall{
- dir = 4;
- pixel_x = -28
- },
+/obj/structure/closet/wall/directional/west,
/obj/item/reagent_containers/syringe/contraband/fentanyl{
pixel_x = -3;
pixel_y = 4
@@ -5019,10 +5000,7 @@
/obj/effect/turf_decal/techfloor/orange{
dir = 4
},
-/obj/structure/closet/firecloset/wall{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/firecloset/wall/directional/east,
/obj/effect/turf_decal/industrial/warning{
dir = 8
},
@@ -5442,9 +5420,8 @@
pixel_y = 7;
pixel_x = 9
},
-/obj/structure/closet/wall{
- name = "Toy Storage";
- pixel_y = 28
+/obj/structure/closet/wall/directional/north{
+ name = "Toy Storage"
},
/obj/item/toy/figure/engineer{
pixel_x = 7
@@ -5777,7 +5754,6 @@
/obj/effect/decal/cleanable/greenglow{
pixel_y = -10
},
-/obj/machinery/light/directional/east,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -5802,7 +5778,6 @@
/obj/effect/turf_decal/techfloor/orange{
dir = 8
},
-/obj/structure/frame/machine,
/obj/effect/turf_decal/industrial/warning{
dir = 4;
color = "#808080"
@@ -5825,9 +5800,8 @@
/turf/open/floor/plasteel/elevatorshaft,
/area/ship/science/robotics)
"vb" = (
-/obj/structure/closet/wall/orange{
- name = "Pilot's Locker";
- pixel_y = 28
+/obj/structure/closet/wall/orange/directional/north{
+ name = "Pilot's Locker"
},
/obj/item/clothing/under/rank/security/officer/military/eng,
/obj/item/clothing/suit/jacket/leather/duster,
@@ -6366,10 +6340,7 @@
/obj/effect/turf_decal/techfloor/orange{
dir = 4
},
-/obj/structure/closet/emcloset/wall{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/emcloset/wall/directional/east,
/obj/effect/turf_decal/techfloor/hole/right{
dir = 4
},
@@ -7528,10 +7499,7 @@
/turf/open/floor/plasteel/tech,
/area/ship/engineering)
"BJ" = (
-/obj/structure/closet/emcloset/wall{
- dir = 4;
- pixel_x = -28
- },
+/obj/structure/closet/emcloset/wall/directional/west,
/obj/effect/turf_decal/industrial/warning{
dir = 4
},
@@ -8648,10 +8616,8 @@
/obj/effect/turf_decal/siding/wood{
dir = 9
},
-/obj/structure/closet/wall{
- name = "Utility Closet";
- dir = 4;
- pixel_x = -28
+/obj/structure/closet/wall/directional/west{
+ name = "Utility Closet"
},
/obj/item/flashlight,
/obj/item/flashlight,
@@ -9114,10 +9080,7 @@
/turf/open/floor/plasteel/dark,
/area/ship/engineering/atmospherics)
"HG" = (
-/obj/structure/closet/secure_closet/freezer/wall{
- dir = 4;
- pixel_x = -28
- },
+/obj/structure/closet/secure_closet/freezer/wall/directional/west,
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/holopad,
/obj/effect/turf_decal/siding/white{
@@ -9170,9 +9133,8 @@
/turf/open/floor/wood,
/area/ship/crew/dorm/dormtwo)
"HI" = (
-/obj/structure/closet/wall/orange{
- name = "Pilot's Locker";
- pixel_y = 28
+/obj/structure/closet/wall/orange/directional/north{
+ name = "Pilot's Locker"
},
/obj/item/clothing/under/rank/security/officer/military/eng,
/obj/item/clothing/suit/jacket/leather/duster,
@@ -9773,9 +9735,6 @@
/obj/effect/turf_decal/techfloor/orange{
dir = 1
},
-/obj/structure/sign/poster/official/build{
- pixel_y = -32
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
@@ -9788,6 +9747,9 @@
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
/turf/open/floor/plasteel/tech,
/area/ship/engineering)
"Kp" = (
@@ -10239,11 +10201,9 @@
dir = 10
},
/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/wall{
- dir = 1;
+/obj/structure/closet/wall/directional/south{
icon_door = null;
- name = "Office Supplies";
- pixel_y = -28
+ name = "Office Supplies"
},
/obj/item/storage/briefcase,
/obj/item/storage/secure/briefcase{
@@ -10566,11 +10526,9 @@
/turf/open/floor/plating,
/area/ship/engineering)
"MT" = (
-/obj/structure/closet/wall{
- dir = 8;
+/obj/structure/closet/wall/directional/east{
icon_door = "red_wall";
- name = "Roboticists Locker";
- pixel_x = 28
+ name = "Roboticists Locker"
},
/obj/item/clothing/suit/longcoat/roboblack,
/obj/item/clothing/suit/longcoat/robowhite,
@@ -10693,9 +10651,8 @@
/obj/item/storage/backpack/industrial,
/obj/item/clothing/head/beret/eng/hazard,
/obj/item/clothing/glasses/meson/engine,
-/obj/structure/closet/wall/orange{
- name = "Engineering locker";
- pixel_y = 28
+/obj/structure/closet/wall/orange/directional/north{
+ name = "Engineering locker"
},
/obj/effect/decal/cleanable/dirt,
/obj/item/storage/belt/utility/full/engi{
@@ -10880,11 +10837,9 @@
/turf/open/floor/plasteel,
/area/ship/hallway/fore)
"Of" = (
-/obj/structure/closet/wall{
+/obj/structure/closet/wall/directional/east{
icon_door = "orange_wall";
- name = "Mining equipment";
- pixel_x = 29;
- dir = 8
+ name = "Mining equipment"
},
/obj/item/storage/bag/ore,
/obj/item/storage/bag/ore,
@@ -11762,6 +11717,17 @@
/obj/machinery/light/directional/south,
/turf/open/floor/plasteel,
/area/ship/hallway/aft)
+"Sb" = (
+/obj/structure/sign/poster/official/build{
+ pixel_y = -32
+ },
+/obj/machinery/light/directional/south,
+/obj/structure/cable{
+ icon_state = "0-1"
+ },
+/obj/machinery/power/ship_gravity,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
"Sc" = (
/obj/structure/cable/yellow{
icon_state = "2-4"
@@ -13082,9 +13048,8 @@
/obj/effect/turf_decal/techfloor{
dir = 4
},
-/obj/structure/closet/wall/red{
- name = "Ammo locker";
- pixel_y = 28
+/obj/structure/closet/wall/red/directional/north{
+ name = "Ammo locker"
},
/obj/item/ammo_box/magazine/co9mm{
pixel_x = -7
@@ -13567,10 +13532,8 @@
/obj/item/storage/backpack/ert/janitor{
pixel_x = 6
},
-/obj/structure/closet/wall/blue{
- dir = 8;
- name = "Janitorial Closet";
- pixel_x = 28
+/obj/structure/closet/wall/blue/directional/east{
+ name = "Janitorial Closet"
},
/obj/item/clothing/suit/longcoat/science{
name = "janitor longcoat"
@@ -14168,7 +14131,7 @@ Fu
WW
Mv
Ko
-hr
+Sb
hr
UJ
UJ
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm b/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm
index e01ceabaf3b3..117d575d366a 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm
@@ -1639,6 +1639,9 @@
dir = 5
},
/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
/turf/open/floor/plating,
/area/ship/engineering)
"id" = (
@@ -3227,6 +3230,8 @@
"NL" = (
/obj/effect/decal/cleanable/blood/splatter,
/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/power/ship_gravity,
+/obj/structure/cable,
/turf/open/floor/plating,
/area/ship/engineering)
"NN" = (
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm b/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm
index d6cc2ca80968..beee568b9a48 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm
@@ -108,10 +108,7 @@
/turf/open/floor/plasteel/white,
/area/ship/crew/toilet)
"aV" = (
-/obj/structure/closet/emcloset/wall{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/emcloset/wall/directional/east,
/obj/structure/cable{
icon_state = "1-8"
},
@@ -1520,6 +1517,10 @@
/obj/structure/railing{
dir = 8
},
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/power/ship_gravity,
/turf/open/floor/plasteel/tech/grid,
/area/ship/maintenance/port)
"iy" = (
@@ -1819,9 +1820,7 @@
/turf/open/floor/mineral/plastitanium/red/brig,
/area/ship/hallway/central)
"km" = (
-/obj/structure/closet/wall/blue{
- dir = 4;
- pixel_x = -30;
+/obj/structure/closet/wall/blue/directional/west{
name = "Space Suits";
desc = "Contains supplies for space walking."
},
@@ -2101,10 +2100,7 @@
/turf/open/floor/plating,
/area/ship/maintenance/port)
"lA" = (
-/obj/structure/closet/emcloset/wall{
- dir = 8;
- pixel_x = 32
- },
+/obj/structure/closet/emcloset/wall/directional/east,
/obj/machinery/light/directional/north,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/crew/dorm/dormthree)
@@ -2672,6 +2668,9 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
/turf/open/floor/plasteel/tech/grid,
/area/ship/maintenance/port)
"pe" = (
@@ -3568,10 +3567,7 @@
/turf/open/floor/plating,
/area/ship/storage/eva)
"uO" = (
-/obj/structure/closet/firecloset/wall{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/firecloset/wall/directional/east,
/obj/structure/cable{
icon_state = "1-2"
},
@@ -3751,9 +3747,7 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/electrical)
"wk" = (
-/obj/structure/closet/emcloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/emcloset/wall/directional/north,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -4516,9 +4510,7 @@
/turf/open/floor/plasteel/dark,
/area/ship/security/armory)
"AP" = (
-/obj/structure/closet/wall/blue{
- dir = 4;
- pixel_x = -30;
+/obj/structure/closet/wall/blue/directional/west{
name = "Space Suits";
desc = "Contains supplies for space walking."
},
@@ -6396,10 +6388,7 @@
/obj/structure/railing/corner{
dir = 4
},
-/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 = 8
},
@@ -7462,9 +7451,7 @@
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/bridge)
"Rm" = (
-/obj/structure/closet/firecloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/firecloset/wall/directional/north,
/obj/structure/cable{
icon_state = "4-8"
},
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm
index b9f1fe3ee680..398fcebfbfb7 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm
@@ -3,12 +3,10 @@
/obj/structure/chair/comfy/brown{
dir = 1
},
-/obj/structure/closet/secure_closet/wall{
- dir = 4;
+/obj/structure/closet/secure_closet/wall/directional/west{
icon_door = "sec_wall";
icon_state = "sec_wall";
name = "gun locker";
- pixel_x = -32;
req_access_txt = "19"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -1169,6 +1167,10 @@
sortTypes = list(4);
tag = "Engineering"
},
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/machinery/firealarm/directional/east,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/engineering)
"ir" = (
@@ -1330,7 +1332,9 @@
/obj/structure/disposalpipe/segment{
dir = 8
},
-/obj/machinery/firealarm/directional/south,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
/turf/open/floor/plasteel/patterned/grid,
/area/ship/engineering)
"jo" = (
@@ -2185,10 +2189,8 @@
/turf/open/floor/plasteel/white,
/area/ship/science)
"oE" = (
-/obj/structure/closet/wall{
- dir = 1;
- icon_door = "grey_wall";
- pixel_y = -28
+/obj/structure/closet/wall/directional/south{
+ icon_door = "grey_wall"
},
/obj/item/clothing/under/color/grey,
/obj/item/clothing/under/color/grey,
@@ -2239,9 +2241,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/structure/closet/firecloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/firecloset/wall/directional/north,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/engineering/atmospherics)
"oQ" = (
@@ -2545,10 +2545,7 @@
dir = 8
},
/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/structure/closet/emcloset/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/emcloset/wall/directional/south,
/turf/open/floor/plasteel,
/area/ship/hallway/central)
"qw" = (
@@ -2922,10 +2919,7 @@
/obj/structure/disposalpipe/trunk{
dir = 1
},
-/obj/structure/closet/emcloset/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/emcloset/wall/directional/south,
/turf/open/floor/plasteel,
/area/ship/crew/cryo)
"sJ" = (
@@ -3057,9 +3051,7 @@
/obj/effect/turf_decal/corner/transparent/neutral{
dir = 4
},
-/obj/structure/closet/emcloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/emcloset/wall/directional/north,
/turf/open/floor/plasteel,
/area/ship/hallway/central)
"tO" = (
@@ -5972,6 +5964,12 @@
},
/turf/open/floor/plasteel,
/area/ship/cargo)
+"MT" = (
+/obj/machinery/power/ship_gravity,
+/obj/structure/cable,
+/obj/effect/turf_decal/industrial/warning/corner,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/engineering)
"Nd" = (
/obj/structure/disposalpipe/segment{
dir = 2
@@ -8183,7 +8181,7 @@ hr
vx
XK
jn
-WU
+MT
VV
Aj
VV
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm b/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
index 360f9fec6963..7605fa6433cd 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
@@ -381,9 +381,7 @@
/turf/open/floor/plating,
/area/ship/hallway/central)
"dK" = (
-/obj/structure/closet/firecloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/firecloset/wall/directional/north,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
@@ -441,22 +439,13 @@
/turf/template_noop,
/area/template_noop)
"eo" = (
-/obj/structure/rack,
-/obj/item/flashlight/seclite{
- pixel_x = 4;
- pixel_y = -1
- },
-/obj/item/gps{
- pixel_y = 10;
- pixel_x = -5
- },
-/obj/item/kitchen/knife/combat/survival{
- pixel_y = 6;
- pixel_x = 5
- },
/obj/effect/turf_decal/techfloor{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/power/ship_gravity,
/turf/open/floor/plasteel/mono/dark,
/area/ship/engineering)
"er" = (
@@ -947,9 +936,7 @@
/turf/open/floor/plasteel/dark,
/area/ship/security)
"iI" = (
-/obj/structure/closet/emcloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/emcloset/wall/directional/north,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 1
},
@@ -1495,10 +1482,7 @@
/turf/open/floor/plasteel/white,
/area/ship/hallway/port)
"pf" = (
-/obj/structure/closet/emcloset/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/emcloset/wall/directional/south,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
@@ -1536,14 +1520,43 @@
/area/ship/crew/toilet)
"ps" = (
/obj/structure/closet/secure_closet/lp/engineer,
-/obj/item/clothing/head/welding,
-/obj/item/holosign_creator/engineering,
-/obj/item/holosign_creator/atmos,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/glasses/meson/gar,
-/obj/item/crowbar/power,
-/obj/item/clothing/shoes/magboots,
/obj/machinery/light/dim/directional/north,
+/obj/item/clothing/gloves/color/yellow{
+ pixel_y = -9
+ },
+/obj/item/crowbar/power{
+ pixel_y = 3
+ },
+/obj/item/clothing/shoes/magboots{
+ pixel_x = -6;
+ pixel_y = -8
+ },
+/obj/item/holosign_creator/engineering{
+ pixel_y = 6;
+ pixel_x = -5
+ },
+/obj/item/holosign_creator/atmos{
+ pixel_y = 6;
+ pixel_x = 6
+ },
+/obj/item/flashlight/seclite{
+ pixel_x = 2;
+ pixel_y = 15
+ },
+/obj/item/gps{
+ pixel_y = 9;
+ pixel_x = -12
+ },
+/obj/item/kitchen/knife/combat/survival{
+ pixel_y = 6;
+ pixel_x = 5
+ },
+/obj/item/clothing/head/welding{
+ pixel_y = -9
+ },
+/obj/item/clothing/glasses/meson/gar{
+ pixel_y = 8
+ },
/turf/open/floor/plasteel/mono/dark,
/area/ship/engineering)
"pA" = (
@@ -2668,10 +2681,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/closet/firecloset/wall{
- dir = 4;
- pixel_x = -28
- },
+/obj/structure/closet/firecloset/wall/directional/west,
/turf/open/floor/plasteel/white,
/area/ship/hallway/central)
"BY" = (
@@ -2979,6 +2989,9 @@
/obj/effect/turf_decal/siding/yellow{
dir = 5
},
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
/turf/open/floor/plasteel/tech,
/area/ship/engineering)
"FQ" = (
@@ -3043,10 +3056,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 8
},
-/obj/structure/closet/emcloset/wall{
- dir = 4;
- pixel_x = -30
- },
+/obj/structure/closet/emcloset/wall/directional/west,
/turf/open/floor/plasteel/white,
/area/ship/hallway/central)
"Gn" = (
@@ -4015,10 +4025,7 @@
/turf/open/floor/plasteel/white,
/area/ship/hallway/port)
"RA" = (
-/obj/structure/closet/firecloset/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/firecloset/wall/directional/south,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm b/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm
index 5ec1a75727d5..803c5f0ea0c2 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm
@@ -2164,10 +2164,8 @@
/turf/open/floor/plasteel/dark,
/area/ship/cargo/office)
"qS" = (
-/obj/structure/closet/secure_closet/wall{
- dir = 4;
+/obj/structure/closet/secure_closet/wall/directional/west{
name = "The Captain's Personal Medicine Cabinet And Soap Holder";
- pixel_x = -28;
req_access_txt = "20"
},
/obj/item/soap/nanotrasen,
@@ -2385,6 +2383,10 @@
/obj/structure/disposalpipe/segment{
dir = 8
},
+/obj/machinery/power/ship_gravity,
+/obj/structure/cable{
+ icon_state = "0-1"
+ },
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/engine)
"sU" = (
@@ -3700,10 +3702,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
-/obj/structure/closet/emcloset/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/emcloset/wall/directional/south,
/turf/open/floor/carpet/nanoweave,
/area/ship/hallway/central)
"Dy" = (
@@ -5672,9 +5671,7 @@
/turf/open/floor/engine,
/area/ship/engineering/atmospherics)
"Wy" = (
-/obj/structure/closet/emcloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/emcloset/wall/directional/north,
/turf/open/floor/carpet/nanoweave,
/area/ship/hallway/central)
"Wz" = (
diff --git a/_maps/shuttles/pgf/pgf_crying_sun.dmm b/_maps/shuttles/pgf/pgf_crying_sun.dmm
index f797f25d2f95..e39ca5bb9654 100644
--- a/_maps/shuttles/pgf/pgf_crying_sun.dmm
+++ b/_maps/shuttles/pgf/pgf_crying_sun.dmm
@@ -239,10 +239,8 @@
pixel_x = 7;
pixel_y = -5
},
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/west{
icon_state = "sec_wall";
- dir = 4;
- pixel_x = -28;
name = "equipment locker"
},
/obj/effect/turf_decal/corner/opaque/purple/border{
@@ -292,6 +290,13 @@
},
/turf/open/floor/plasteel/sepia,
/area/ship/crew/dorm/dormthree)
+"ck" = (
+/obj/effect/turf_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/structure/tank_dispenser,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/construction)
"cs" = (
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable{
@@ -701,8 +706,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 9
},
-/obj/item/radio/intercom/directional/east,
-/obj/structure/tank_dispenser,
+/obj/structure/cable,
+/obj/machinery/power/ship_gravity,
/turf/open/floor/plating,
/area/ship/engineering)
"gx" = (
@@ -786,11 +791,9 @@
/obj/structure/cable{
icon_state = "1-4"
},
-/obj/structure/closet/wall{
- dir = 1;
+/obj/structure/closet/wall/directional/south{
icon_door = null;
- name = "Uniforms";
- pixel_y = -28
+ name = "Uniforms"
},
/obj/item/clothing/under/gezena{
pixel_y = -5;
@@ -983,10 +986,7 @@
/obj/effect/turf_decal/spline/fancy/opaque/lime{
dir = 8
},
-/obj/structure/closet/firecloset/wall{
- dir = 4;
- pixel_x = -28
- },
+/obj/structure/closet/firecloset/wall/directional/west,
/obj/structure/cable{
icon_state = "1-2"
},
@@ -1175,9 +1175,8 @@
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"jt" = (
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/north{
icon_state = "cargo_wall";
- pixel_y = 28;
name = "Engineer's Locker"
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -1512,10 +1511,7 @@
/turf/open/floor/plasteel/sepia,
/area/ship/crew/dorm/dormthree)
"na" = (
-/obj/structure/closet/firecloset/wall{
- dir = 4;
- pixel_x = -28
- },
+/obj/structure/closet/firecloset/wall/directional/west,
/obj/machinery/light/directional/north,
/turf/open/floor/plasteel/mono/dark,
/area/ship/bridge)
@@ -1536,9 +1532,7 @@
/turf/open/floor/plating,
/area/ship/engineering)
"nm" = (
-/obj/structure/closet/wall/blue{
- dir = 4;
- pixel_x = -28;
+/obj/structure/closet/wall/blue/directional/west{
name = "Spare EVA Closet"
},
/obj/effect/turf_decal/corner/opaque/lime/mono,
@@ -1729,9 +1723,7 @@
/obj/effect/turf_decal/siding/wood/end{
dir = 4
},
-/obj/structure/closet/wall{
- dir = 8;
- pixel_x = 28;
+/obj/structure/closet/wall/directional/east{
name = "Cleaning Station"
},
/obj/machinery/computer/helm/viewscreen/directional/south,
@@ -1990,9 +1982,8 @@
/turf/closed/wall/mineral/titanium/exterior,
/area/ship/construction)
"qZ" = (
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/north{
icon_state = "cargo_wall";
- pixel_y = 28;
name = "Engineer's Locker"
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
@@ -2068,10 +2059,8 @@
/turf/open/floor/plasteel/tech,
/area/ship/crew/office)
"rN" = (
-/obj/structure/closet/secure_closet/wall{
- icon_state = "secure_wall";
- dir = 8;
- pixel_x = 26
+/obj/structure/closet/secure_closet/wall/directional/east{
+ icon_state = "secure_wall"
},
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable{
@@ -2125,10 +2114,7 @@
/obj/effect/turf_decal/corner_steel_grid{
dir = 10
},
-/obj/structure/closet/emcloset/wall{
- dir = 1;
- pixel_y = -27
- },
+/obj/structure/closet/emcloset/wall/directional/south,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
},
@@ -2218,10 +2204,7 @@
/obj/structure/railing{
dir = 6
},
-/obj/structure/closet/emcloset/wall{
- dir = 4;
- pixel_x = -28
- },
+/obj/structure/closet/emcloset/wall/directional/west,
/turf/open/floor/plasteel/mono/dark,
/area/ship/bridge)
"ty" = (
@@ -2314,10 +2297,8 @@
pixel_x = 11;
pixel_y = -5
},
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/west{
icon_state = "sec_wall";
- dir = 4;
- pixel_x = -28;
name = "equipment locker"
},
/obj/structure/window/reinforced{
@@ -3033,11 +3014,9 @@
/obj/effect/turf_decal/corner_steel_grid{
dir = 9
},
-/obj/structure/closet/wall{
- dir = 2;
+/obj/structure/closet/wall/directional/north{
icon_door = null;
- name = "headset storage";
- pixel_y = 28
+ name = "headset storage"
},
/obj/item/encryptionkey/pgf{
pixel_y = -5;
@@ -3412,9 +3391,7 @@
/obj/item/towel,
/obj/item/towel,
/obj/item/towel,
-/obj/structure/closet/wall{
- dir = 4;
- pixel_x = -28;
+/obj/structure/closet/wall/directional/west{
name = "towel closet"
},
/turf/open/floor/plastic,
@@ -3707,10 +3684,7 @@
/obj/effect/turf_decal/spline/fancy/opaque/lime{
dir = 8
},
-/obj/structure/closet/emcloset/wall{
- dir = 4;
- pixel_x = -28
- },
+/obj/structure/closet/emcloset/wall/directional/west,
/obj/structure/cable{
icon_state = "1-2"
},
@@ -3730,11 +3704,9 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
},
-/obj/structure/closet/wall{
- dir = 1;
+/obj/structure/closet/wall/directional/south{
icon_door = null;
- name = "Uniforms";
- pixel_y = -28
+ name = "Uniforms"
},
/obj/item/clothing/gloves/gezena{
pixel_x = -5;
@@ -4462,10 +4434,7 @@
/obj/effect/turf_decal/corner_steel_grid{
dir = 10
},
-/obj/structure/closet/firecloset/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/firecloset/wall/directional/south,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
},
@@ -4481,10 +4450,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/structure/closet/firecloset/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/firecloset/wall/directional/south,
/turf/open/floor/plating,
/area/ship/engineering)
"KB" = (
@@ -4711,13 +4677,10 @@
/turf/open/floor/plasteel/tech,
/area/ship/crew/dorm/dormtwo)
"MC" = (
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/east{
icon_door = "med_wall";
name = "Doctor's Locker";
- pixel_y = 0;
- req_access_txt = "5";
- dir = 8;
- pixel_x = 28
+ req_access_txt = "5"
},
/obj/item/clothing/gloves/gezena{
pixel_x = 3;
@@ -4935,6 +4898,7 @@
pixel_x = 6;
pixel_y = 2
},
+/obj/item/radio/intercom/directional/south,
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering)
"Nz" = (
@@ -5269,10 +5233,8 @@
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen)
"PP" = (
-/obj/structure/closet/wall{
- dir = 4;
+/obj/structure/closet/wall/directional/west{
icon_state = "emergency_wall";
- pixel_x = -28;
name = "Spare Internals Closet"
},
/obj/effect/turf_decal/corner/opaque/lime/mono,
@@ -5417,10 +5379,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/structure/closet/emcloset/wall{
- dir = 1;
- pixel_y = -27
- },
+/obj/structure/closet/emcloset/wall/directional/south,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
/turf/open/floor/plating,
/area/ship/engineering)
@@ -5574,10 +5533,7 @@
dir = 10
},
/obj/machinery/light/directional/north,
-/obj/structure/closet/emcloset/wall{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/emcloset/wall/directional/east,
/turf/open/floor/engine/hull/reinforced/interior,
/area/ship/construction)
"RX" = (
@@ -6359,10 +6315,8 @@
/turf/open/floor/plasteel/mono/dark,
/area/ship/hallway/central)
"Xz" = (
-/obj/structure/closet/secure_closet/wall{
- icon_state = "secure_wall";
- dir = 8;
- pixel_x = 26
+/obj/structure/closet/secure_closet/wall/directional/east{
+ icon_state = "secure_wall"
},
/turf/open/floor/plastic,
/area/ship/crew/toilet)
@@ -6642,10 +6596,8 @@
/turf/open/floor/plasteel/tech,
/area/ship/crew/dorm/dormthree)
"ZH" = (
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/south{
icon_state = "cargo_wall";
- pixel_y = -28;
- dir = 1;
name = "Engineering Equipment"
},
/obj/item/storage/box/metalfoam{
@@ -7597,7 +7549,7 @@ Sh
vh
mL
cY
-xO
+ck
TO
xz
xz
diff --git a/_maps/shuttles/pirate/pirate_ember.dmm b/_maps/shuttles/pirate/pirate_ember.dmm
index 2694926c67ae..5bec6898af92 100644
--- a/_maps/shuttles/pirate/pirate_ember.dmm
+++ b/_maps/shuttles/pirate/pirate_ember.dmm
@@ -205,10 +205,7 @@
/area/ship/hallway/central)
"aZ" = (
/obj/effect/decal/cleanable/oil,
-/obj/structure/closet/firecloset/wall{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/firecloset/wall/directional/east,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 8
},
@@ -1414,10 +1411,8 @@
/turf/open/floor/plasteel,
/area/ship/crew/canteen)
"hq" = (
-/obj/structure/closet/wall{
- name = "Atmospheric locker";
- dir = 4;
- pixel_x = -28
+/obj/structure/closet/wall/directional/west{
+ name = "Atmospheric locker"
},
/obj/item/clothing/suit/hooded/wintercoat/engineering/atmos,
/obj/item/clothing/suit/fire/atmos,
@@ -1464,10 +1459,7 @@
/turf/open/floor/plating/rust,
/area/ship/medical)
"hy" = (
-/obj/structure/closet/emcloset/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/emcloset/wall/directional/south,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/wrapping,
/obj/item/kirbyplants/random,
@@ -1996,6 +1988,20 @@
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/structure/closet/crate/engineering,
+/obj/item/stack/sheet/metal/fifty{
+ pixel_y = 2
+ },
+/obj/item/stack/sheet/metal/fifty{
+ pixel_y = 6;
+ pixel_x = 6
+ },
+/obj/item/stack/sheet/mineral/plastitanium/fifty{
+ pixel_x = -3
+ },
+/obj/item/stack/sheet/mineral/plastitanium/twenty{
+ pixel_y = 2
+ },
/turf/open/floor/plasteel/tech,
/area/ship/engineering/electrical)
"kc" = (
@@ -2423,10 +2429,8 @@
},
/area/ship/engineering/electrical)
"mi" = (
-/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/effect/turf_decal/techfloor{
@@ -2722,11 +2726,9 @@
/area/ship/maintenance/fore)
"nx" = (
/obj/effect/turf_decal/techfloor,
-/obj/structure/closet/wall{
- dir = 1;
+/obj/structure/closet/wall/directional/south{
icon_door = "yellow_wall";
- name = "engineering closet";
- pixel_y = -28
+ name = "engineering closet"
},
/obj/item/clothing/suit/toggle/industrial,
/obj/item/clothing/under/utility,
@@ -2849,10 +2851,8 @@
/obj/effect/turf_decal/techfloor{
dir = 4
},
-/obj/structure/closet/wall/red{
- dir = 1;
- name = "Firearm Locker";
- pixel_y = -28
+/obj/structure/closet/wall/red/directional/south{
+ name = "Firearm Locker"
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/steeldecal/steel_decals_central2{
@@ -3301,9 +3301,7 @@
/turf/open/floor/plasteel/dark,
/area/ship/hallway/fore)
"qr" = (
-/obj/structure/closet/emcloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/emcloset/wall/directional/north,
/obj/item/seeds/berry{
pixel_x = -8;
pixel_y = 6
@@ -3339,10 +3337,8 @@
pixel_x = 1;
pixel_y = -4
},
-/obj/structure/closet/wall/blue{
- dir = 4;
- name = "Component Storage";
- pixel_x = -28
+/obj/structure/closet/wall/blue/directional/west{
+ name = "Component Storage"
},
/obj/item/stack/cable_coil/blue,
/obj/item/stack/cable_coil/orange{
@@ -3565,10 +3561,7 @@
"rJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/directional/east,
-/obj/structure/closet/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/wall/directional/south,
/obj/item/reagent_containers/syringe/contraband/fentanyl{
pixel_x = -3;
pixel_y = 4
@@ -3609,10 +3602,7 @@
/turf/closed/wall/rust,
/area/ship/crew/canteen)
"rQ" = (
-/obj/structure/closet/emcloset/wall{
- dir = 4;
- pixel_x = -28
- },
+/obj/structure/closet/emcloset/wall/directional/west,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/ship/hallway/central)
@@ -3707,19 +3697,9 @@
/obj/structure/cable{
icon_state = "2-9"
},
-/obj/item/stack/sheet/metal/fifty{
- pixel_y = 2
- },
-/obj/item/stack/sheet/metal/fifty{
- pixel_y = 6;
- pixel_x = 6
- },
-/obj/structure/closet/crate/engineering,
-/obj/item/stack/sheet/mineral/plastitanium/fifty{
- pixel_x = -3
- },
-/obj/item/stack/sheet/mineral/plastitanium/twenty{
- pixel_y = 2
+/obj/machinery/power/ship_gravity,
+/obj/structure/cable{
+ icon_state = "0-2"
},
/turf/open/floor/plasteel/tech,
/area/ship/engineering/electrical)
@@ -4549,6 +4529,7 @@
/obj/effect/turf_decal/industrial/warning{
dir = 4
},
+/obj/machinery/power/ship_gravity/unanchored,
/turf/open/floor/plating/rust,
/area/ship/hallway/central)
"vY" = (
@@ -4688,9 +4669,7 @@
/area/ship/maintenance/central)
"wC" = (
/obj/structure/catwalk/over/plated_catwalk,
-/obj/structure/closet/firecloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/firecloset/wall/directional/north,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/turf/open/floor/plating,
/area/ship/hallway/central)
@@ -4736,10 +4715,7 @@
/obj/effect/turf_decal/trimline/transparent/lightgrey/line{
dir = 4
},
-/obj/structure/closet/emcloset/wall{
- dir = 4;
- pixel_x = -28
- },
+/obj/structure/closet/emcloset/wall/directional/west,
/obj/structure/cable{
icon_state = "1-2"
},
@@ -5453,10 +5429,8 @@
/turf/open/floor/plasteel/dark,
/area/ship/hallway/fore)
"AL" = (
-/obj/structure/closet/wall/orange{
- dir = 8;
- name = "Engineering locker";
- pixel_x = 28
+/obj/structure/closet/wall/orange/directional/east{
+ name = "Engineering locker"
},
/obj/effect/decal/cleanable/robot_debris/gib,
/obj/item/clothing/under/utility,
@@ -5867,9 +5841,7 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/wall{
- dir = 8;
- pixel_x = 28;
+/obj/structure/closet/wall/directional/east{
name = "Uniform Closet"
},
/obj/item/clothing/neck/shemagh,
@@ -6102,9 +6074,7 @@
/obj/effect/turf_decal/techfloor/corner{
dir = 4
},
-/obj/structure/closet/wall/blue{
- dir = 8;
- pixel_x = 28;
+/obj/structure/closet/wall/blue/directional/east{
name = "Bridge Officer's locker"
},
/obj/item/clothing/shoes/workboots,
@@ -6843,11 +6813,9 @@
/area/ship/maintenance/fore)
"GF" = (
/obj/effect/turf_decal/techfloor,
-/obj/structure/closet/wall{
- dir = 1;
+/obj/structure/closet/wall/directional/south{
icon_door = "yellow_wall";
- name = "engineering closet";
- pixel_y = -28
+ name = "engineering closet"
},
/obj/item/clothing/suit/toggle/industrial,
/obj/item/clothing/under/utility,
@@ -7751,10 +7719,8 @@
dir = 6
},
/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/wall{
- name = "Utility Closet";
- pixel_y = -28;
- dir = 1
+/obj/structure/closet/wall/directional/south{
+ name = "Utility Closet"
},
/obj/item/radio/old{
pixel_x = 2;
@@ -8176,9 +8142,7 @@
/obj/effect/turf_decal/techfloor/corner{
dir = 4
},
-/obj/structure/closet/wall/blue{
- dir = 8;
- pixel_x = 28;
+/obj/structure/closet/wall/blue/directional/east{
name = "Bridge Officer's locker"
},
/obj/item/clothing/shoes/workboots,
@@ -8953,10 +8917,8 @@
/turf/open/floor/plasteel,
/area/ship/hallway/central)
"Pn" = (
-/obj/structure/closet/wall/red{
- name = "Ammo locker";
- dir = 4;
- pixel_x = -28
+/obj/structure/closet/wall/red/directional/west{
+ name = "Ammo locker"
},
/obj/effect/turf_decal/techfloor{
dir = 8
@@ -9246,10 +9208,7 @@
"QH" = (
/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/closet/emcloset/wall{
- dir = 4;
- pixel_x = -28
- },
+/obj/structure/closet/emcloset/wall/directional/west,
/obj/structure/catwalk/over/plated_catwalk/dark,
/turf/open/floor/plating,
/area/ship/engineering/communications)
@@ -9883,10 +9842,7 @@
/obj/effect/turf_decal/industrial/warning{
dir = 4
},
-/obj/structure/closet/emcloset/wall{
- dir = 4;
- pixel_x = -28
- },
+/obj/structure/closet/emcloset/wall/directional/west,
/obj/machinery/advanced_airlock_controller{
pixel_y = 26
},
diff --git a/_maps/shuttles/pirate/pirate_libertatia.dmm b/_maps/shuttles/pirate/pirate_libertatia.dmm
index e0c0905371ad..2fe2cd9ddb20 100644
--- a/_maps/shuttles/pirate/pirate_libertatia.dmm
+++ b/_maps/shuttles/pirate/pirate_libertatia.dmm
@@ -424,10 +424,8 @@
/obj/effect/turf_decal/industrial/warning{
dir = 5
},
-/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"
},
/turf/open/floor/mineral/plastitanium,
@@ -443,10 +441,8 @@
/obj/effect/turf_decal/industrial/warning{
dir = 8
},
-/obj/structure/closet/wall/red{
- dir = 4;
+/obj/structure/closet/wall/red/directional/west{
name = "suit locker";
- pixel_x = -28;
req_one_access_txt = "1"
},
/turf/open/floor/mineral/plastitanium,
@@ -501,10 +497,8 @@
/obj/effect/turf_decal/industrial/warning{
dir = 4
},
-/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/gun/ballistic/shotgun/doublebarrel{
@@ -535,10 +529,8 @@
/obj/effect/turf_decal/industrial/warning/corner{
dir = 1
},
-/obj/structure/closet/wall/red{
- dir = 4;
+/obj/structure/closet/wall/red/directional/west{
name = "suit locker";
- pixel_x = -28;
req_one_access_txt = "1"
},
/turf/open/floor/mineral/plastitanium,
@@ -585,10 +577,8 @@
/obj/effect/turf_decal/industrial/warning{
dir = 6
},
-/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"
},
/turf/open/floor/mineral/plastitanium,
@@ -659,9 +649,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
-/obj/structure/closet/emcloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/emcloset/wall/directional/north,
/obj/machinery/advanced_airlock_controller{
pixel_y = -25
},
@@ -900,10 +888,8 @@
/obj/item/clothing/under/costume/sailor,
/obj/item/clothing/under/costume/sailor,
/obj/item/clothing/under/costume/sailor,
-/obj/structure/closet/wall{
- dir = 8;
- icon_door = "grey_wall";
- pixel_x = 28
+/obj/structure/closet/wall/directional/east{
+ icon_door = "grey_wall"
},
/turf/open/floor/pod/light,
/area/ship/crew)
@@ -1139,10 +1125,7 @@
/obj/structure/cable{
icon_state = "0-2"
},
-/obj/structure/closet/emcloset/wall{
- dir = 4;
- pixel_x = -28
- },
+/obj/structure/closet/emcloset/wall/directional/west,
/turf/open/floor/pod/light,
/area/ship/cargo)
"Hh" = (
@@ -1312,10 +1295,7 @@
/obj/structure/cable/yellow,
/obj/machinery/power/terminal,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/closet/firecloset/wall{
- dir = 4;
- pixel_x = -28
- },
+/obj/structure/closet/firecloset/wall/directional/west,
/turf/open/floor/plating{
icon_state = "platingdmg3"
},
@@ -1402,10 +1382,7 @@
/obj/item/wrench,
/obj/effect/decal/cleanable/oil,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/closet/firecloset/wall{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/firecloset/wall/directional/east,
/turf/open/floor/plating,
/area/ship/hallway/starboard)
"OA" = (
@@ -1790,6 +1767,7 @@
"WC" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/machinery/power/ship_gravity/unanchored,
/turf/open/floor/mineral/plastitanium,
/area/ship/cargo)
"WK" = (
diff --git a/_maps/shuttles/pirate/pirate_noderider.dmm b/_maps/shuttles/pirate/pirate_noderider.dmm
index e9a28b74cfde..df346f703dd3 100644
--- a/_maps/shuttles/pirate/pirate_noderider.dmm
+++ b/_maps/shuttles/pirate/pirate_noderider.dmm
@@ -294,10 +294,7 @@
/obj/item/storage/box/handcuffs,
/obj/item/storage/box/handcuffs,
/obj/item/storage/box/handcuffs,
-/obj/structure/closet/wall/red{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/wall/red/directional/east,
/obj/item/storage/backpack/duffelbag/syndie/c4,
/turf/open/floor/plasteel/tech,
/area/ship/security/armory)
@@ -413,6 +410,12 @@
dir = 1
},
/obj/effect/turf_decal/industrial/caution,
+/obj/structure/closet/secure_closet/engineering_electrical{
+ req_access = null
+ },
+/obj/structure/cable{
+ icon_state = "5-8"
+ },
/turf/open/floor/plasteel/dark,
/area/ship/engineering)
"fD" = (
@@ -1021,8 +1024,7 @@
/turf/open/floor/plating/airless,
/area/ship/external)
"qh" = (
-/obj/structure/closet/wall/red{
- pixel_y = 28;
+/obj/structure/closet/wall/red/directional/north{
name = "weapons locker"
},
/obj/item/gun/energy/e_gun/smg,
@@ -1188,10 +1190,8 @@
/obj/structure/sign/poster/contraband/cybersun_borg{
pixel_y = 32
},
-/obj/structure/closet/wall/white{
- dir = 4;
- name = "First Aid";
- pixel_x = -28
+/obj/structure/closet/wall/white/directional/west{
+ name = "First Aid"
},
/obj/item/storage/backpack/duffelbag/med/surgery,
/obj/item/storage/toolbox/mechanical,
@@ -1291,8 +1291,7 @@
/turf/closed/wall/r_wall/syndicate,
/area/ship/maintenance/central)
"tF" = (
-/obj/structure/closet/wall/red{
- pixel_y = 28;
+/obj/structure/closet/wall/red/directional/north{
name = "armor locker"
},
/obj/item/clothing/suit/armor/riot,
@@ -1477,9 +1476,7 @@
/area/ship/external)
"xl" = (
/obj/structure/table,
-/obj/structure/closet/wall/red{
- pixel_x = -28;
- dir = 4;
+/obj/structure/closet/wall/red/directional/west{
name = "captain's locker"
},
/obj/effect/turf_decal/spline/fancy/opaque/black{
@@ -2539,9 +2536,7 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/maintenance/central)
"MJ" = (
-/obj/structure/closet/wall{
- dir = 1;
- pixel_y = -28;
+/obj/structure/closet/wall/directional/south{
name = "node uniforms"
},
/obj/item/clothing/under/utility,
@@ -2964,9 +2959,6 @@
/obj/structure/railing/corner{
layer = 3.1
},
-/obj/structure/closet/secure_closet/engineering_electrical{
- req_access = null
- },
/obj/effect/turf_decal/spline/fancy/opaque/black/corner,
/obj/effect/turf_decal/industrial/warning{
dir = 1
@@ -2974,6 +2966,10 @@
/obj/effect/turf_decal/corner_techfloor_gray{
dir = 8
},
+/obj/machinery/power/ship_gravity,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
/turf/open/floor/plasteel/dark,
/area/ship/engineering)
"Vb" = (
diff --git a/_maps/shuttles/roumain/srm_elder.dmm b/_maps/shuttles/roumain/srm_elder.dmm
index e5f06babb733..6d1a743dc6a0 100644
--- a/_maps/shuttles/roumain/srm_elder.dmm
+++ b/_maps/shuttles/roumain/srm_elder.dmm
@@ -30,6 +30,9 @@
/obj/structure/cable{
icon_state = "1-10"
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel/dark,
/area/ship/engineering/engine)
"al" = (
@@ -207,9 +210,7 @@
/turf/open/floor/wood/maple,
/area/ship/hallway/central)
"cg" = (
-/obj/structure/closet/emcloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/emcloset/wall/directional/north,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -815,10 +816,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 10
},
-/obj/structure/closet/emcloset/wall{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/emcloset/wall/directional/east,
/obj/effect/turf_decal/trimline/opaque/red/arrow_cw{
dir = 8
},
@@ -850,9 +848,7 @@
/turf/open/floor/wood/ebony,
/area/ship/hallway/port)
"iT" = (
-/obj/structure/closet/firecloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/firecloset/wall/directional/north,
/obj/effect/turf_decal/siding/brown{
dir = 1
},
@@ -913,12 +909,12 @@
/turf/open/floor/plasteel/white,
/area/ship/medical)
"jr" = (
+/obj/machinery/power/ship_gravity,
+/obj/structure/cable,
/turf/open/floor/plasteel/dark,
/area/ship/engineering/engine)
"jv" = (
-/obj/structure/closet/firecloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/firecloset/wall/directional/north,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -1887,10 +1883,7 @@
/turf/open/floor/grass/ship/jungle,
/area/ship/bridge)
"wE" = (
-/obj/structure/closet/firecloset/wall{
- dir = 4;
- pixel_x = -28
- },
+/obj/structure/closet/firecloset/wall/directional/west,
/turf/open/floor/grass/ship/jungle,
/area/ship/roumain)
"xe" = (
@@ -2322,10 +2315,7 @@
/turf/open/floor/plasteel/dark,
/area/ship/engineering/atmospherics)
"Cr" = (
-/obj/structure/closet/emcloset/wall{
- dir = 4;
- pixel_x = -28
- },
+/obj/structure/closet/emcloset/wall/directional/west,
/turf/open/floor/grass/ship/jungle,
/area/ship/roumain)
"Cx" = (
@@ -2396,9 +2386,7 @@
/turf/open/floor/plating,
/area/ship/hallway/port)
"CF" = (
-/obj/structure/closet/emcloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/emcloset/wall/directional/north,
/obj/effect/turf_decal/siding/brown{
dir = 1
},
@@ -2662,9 +2650,7 @@
/turf/open/floor/wood/ebony,
/area/ship/storage)
"HB" = (
-/obj/structure/closet/wall/blue{
- dir = 8;
- pixel_x = 28;
+/obj/structure/closet/wall/blue/directional/east{
name = "Spare EVA Closet"
},
/obj/item/clothing/suit/space/eva{
@@ -2695,10 +2681,7 @@
/turf/open/floor/wood/mahogany,
/area/ship/bridge)
"Ii" = (
-/obj/structure/closet/firecloset/wall{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/firecloset/wall/directional/east,
/obj/effect/turf_decal/spline/fancy/wood{
dir = 4
},
@@ -4159,10 +4142,7 @@
/turf/open/floor/wood/mahogany,
/area/ship/hallway/starboard)
"ZI" = (
-/obj/structure/closet/emcloset/wall{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/emcloset/wall/directional/east,
/obj/effect/turf_decal/spline/fancy/wood{
dir = 4
},
diff --git a/_maps/shuttles/solgov/solgov_chronicle.dmm b/_maps/shuttles/solgov/solgov_chronicle.dmm
index 9cceb17c5dea..c790d8a67b7c 100644
--- a/_maps/shuttles/solgov/solgov_chronicle.dmm
+++ b/_maps/shuttles/solgov/solgov_chronicle.dmm
@@ -51,6 +51,9 @@
dir = 4
},
/obj/machinery/meter/atmos/layer2,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering/engine)
"aB" = (
@@ -3127,8 +3130,7 @@
/turf/open/floor/engine/n2,
/area/ship/engineering/engine)
"Ez" = (
-/obj/structure/closet/secure_closet/wall{
- pixel_y = 28;
+/obj/structure/closet/secure_closet/wall/directional/north{
name = "bridge supplies"
},
/obj/item/binoculars,
@@ -3333,10 +3335,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 10
},
-/obj/structure/closet/firecloset/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/firecloset/wall/directional/south,
/obj/machinery/camera/autoname{
dir = 4
},
@@ -3866,6 +3865,10 @@
/obj/effect/turf_decal/techfloor{
dir = 1
},
+/obj/machinery/power/ship_gravity,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering/engine)
"LE" = (
@@ -3896,10 +3899,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/structure/closet/firecloset/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/firecloset/wall/directional/south,
/turf/open/floor/wood,
/area/ship/bridge)
"Me" = (
@@ -3942,6 +3942,9 @@
dir = 4
},
/obj/structure/extinguisher_cabinet/directional/south,
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
/turf/open/floor/plasteel/white,
/area/ship/engineering/engine)
"MT" = (
@@ -3972,10 +3975,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
-/obj/structure/closet/firecloset/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/firecloset/wall/directional/south,
/turf/open/floor/plasteel/white,
/area/ship/engineering/engine)
"Nm" = (
diff --git a/_maps/shuttles/solgov/solgov_inkwell.dmm b/_maps/shuttles/solgov/solgov_inkwell.dmm
index e42972d85eed..c64c73a5f191 100644
--- a/_maps/shuttles/solgov/solgov_inkwell.dmm
+++ b/_maps/shuttles/solgov/solgov_inkwell.dmm
@@ -400,6 +400,9 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel/white,
/area/ship/engineering)
"dm" = (
@@ -1051,10 +1054,7 @@
/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{
dir = 8
},
-/obj/structure/closet/emcloset/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/emcloset/wall/directional/south,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
@@ -1308,10 +1308,7 @@
/obj/item/clothing/under/solgov/formal/skirt,
/obj/item/clothing/suit/solgov/suit,
/obj/structure/table/wood,
-/obj/structure/closet/wall{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/wall/directional/east,
/obj/machinery/button/door{
pixel_y = -21;
pixel_x = -8;
@@ -1695,10 +1692,7 @@
/obj/item/clothing/under/solgov/formal/skirt,
/obj/item/clothing/suit/solgov/suit,
/obj/structure/table/wood,
-/obj/structure/closet/wall{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/wall/directional/east,
/obj/item/clothing/suit/hooded/wintercoat/solgov,
/obj/item/clothing/suit/hooded/wintercoat/solgov,
/turf/open/floor/wood/walnut,
@@ -2566,9 +2560,7 @@
dir = 8
},
/obj/structure/table/wood,
-/obj/structure/closet/wall{
- pixel_y = 28
- },
+/obj/structure/closet/wall/directional/north,
/obj/item/radio,
/obj/item/radio,
/obj/item/radio,
@@ -4416,6 +4408,9 @@
},
/obj/machinery/light/directional/west,
/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering)
"Ct" = (
@@ -4619,6 +4614,10 @@
/obj/structure/sign/poster/solgov/random{
pixel_y = 32
},
+/obj/machinery/power/ship_gravity,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering)
"DF" = (
@@ -5827,9 +5826,7 @@
/obj/effect/turf_decal/techfloor{
dir = 1
},
-/obj/structure/closet/firecloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/firecloset/wall/directional/north,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/white,
/area/ship/hallway/starboard)
@@ -6259,10 +6256,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/closet/emcloset/wall{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/emcloset/wall/directional/east,
/turf/open/floor/plasteel/tech,
/area/ship/hallway/starboard)
"PB" = (
@@ -6400,9 +6394,7 @@
/obj/effect/turf_decal/spline/fancy/transparent/solgovblue{
dir = 8
},
-/obj/structure/closet/firecloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/firecloset/wall/directional/north,
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
"QT" = (
@@ -6933,6 +6925,9 @@
},
/obj/machinery/light/directional/north,
/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
/turf/open/floor/plasteel/tech,
/area/ship/maintenance/port)
"Ul" = (
diff --git a/_maps/shuttles/solgov/solgov_paracelsus.dmm b/_maps/shuttles/solgov/solgov_paracelsus.dmm
index b4ca4f13cb07..ba1181c14daa 100644
--- a/_maps/shuttles/solgov/solgov_paracelsus.dmm
+++ b/_maps/shuttles/solgov/solgov_paracelsus.dmm
@@ -1160,9 +1160,7 @@
/turf/template_noop,
/area/template_noop)
"lD" = (
-/obj/structure/closet/wall{
- pixel_y = 28
- },
+/obj/structure/closet/wall/directional/north,
/obj/item/radio,
/obj/item/radio,
/obj/item/radio,
@@ -1891,8 +1889,7 @@
/obj/structure/railing/wood{
dir = 8
},
-/obj/structure/closet/secure_closet/wall{
- pixel_y = 28;
+/obj/structure/closet/secure_closet/wall/directional/north{
name = "navigational supplies";
req_access_txt = "19"
},
@@ -2025,6 +2022,7 @@
/obj/machinery/atmospherics/pipe/manifold/general/visible/layer2{
dir = 4
},
+/obj/machinery/airalarm/directional/east,
/turf/open/floor/plasteel/dark,
/area/ship/maintenance/starboard)
"ul" = (
@@ -2450,7 +2448,8 @@
/area/ship/hallway/starboard)
"xU" = (
/obj/effect/turf_decal/techfloor,
-/obj/machinery/airalarm/directional/south,
+/obj/structure/cable,
+/obj/machinery/power/ship_gravity,
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/maintenance/starboard)
"xX" = (
@@ -2866,11 +2865,9 @@
/obj/item/ammo_box/magazine/pistol556mm,
/obj/item/ammo_box/magazine/pistol556mm,
/obj/item/ammo_box/magazine/pistol556mm,
-/obj/structure/closet/secure_closet/wall{
- dir = 1;
+/obj/structure/closet/secure_closet/wall/directional/south{
icon_state = "sec_wall";
name = "firearms locker";
- pixel_y = -28;
req_access_txt = "19"
},
/turf/open/floor/carpet/royalblue,
@@ -3540,6 +3537,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 9
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/maintenance/starboard)
"IO" = (
@@ -4316,10 +4316,7 @@
/area/ship/cargo/office)
"Pp" = (
/obj/structure/table/wood,
-/obj/structure/closet/secure_closet/wall{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/secure_closet/wall/directional/east,
/obj/item/clipboard,
/obj/item/paper_bin/carbon,
/obj/item/clothing/accessory/waistcoat/solgov,
@@ -4552,6 +4549,9 @@
dir = 8;
name = "Air to Distro"
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel/dark,
/area/ship/maintenance/starboard)
"RA" = (
diff --git a/_maps/shuttles/subshuttles/inteq_anvil.dmm b/_maps/shuttles/subshuttles/inteq_anvil.dmm
index f14f1e64d7fd..5e591774e259 100644
--- a/_maps/shuttles/subshuttles/inteq_anvil.dmm
+++ b/_maps/shuttles/subshuttles/inteq_anvil.dmm
@@ -46,10 +46,7 @@
},
/obj/effect/landmark/ert_shuttle_spawn,
/obj/machinery/light/directional/east,
-/obj/structure/closet/emcloset/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/emcloset/wall/directional/south,
/obj/item/tank/internals/oxygen,
/obj/item/tank/internals/oxygen,
/turf/open/floor/plasteel/dark,
diff --git a/_maps/shuttles/subshuttles/nanotrasen_ancon.dmm b/_maps/shuttles/subshuttles/nanotrasen_ancon.dmm
index 7176477bab9c..1238678040f8 100644
--- a/_maps/shuttles/subshuttles/nanotrasen_ancon.dmm
+++ b/_maps/shuttles/subshuttles/nanotrasen_ancon.dmm
@@ -149,9 +149,7 @@
/turf/open/floor/plasteel/white,
/area/ship/bridge)
"vV" = (
-/obj/structure/closet/emcloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/emcloset/wall/directional/north,
/obj/item/clothing/suit/space/eva,
/obj/item/clothing/suit/space/eva,
/obj/item/clothing/suit/space/eva,
diff --git a/_maps/shuttles/subshuttles/pgf_nail.dmm b/_maps/shuttles/subshuttles/pgf_nail.dmm
index 80534adfc514..9a5224dc4573 100644
--- a/_maps/shuttles/subshuttles/pgf_nail.dmm
+++ b/_maps/shuttles/subshuttles/pgf_nail.dmm
@@ -194,9 +194,7 @@
/obj/structure/railing{
dir = 4
},
-/obj/structure/closet/emcloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/emcloset/wall/directional/north,
/turf/open/floor/plasteel/tech,
/area/ship/bridge)
"y" = (
diff --git a/_maps/shuttles/subshuttles/syndicate_runner.dmm b/_maps/shuttles/subshuttles/syndicate_runner.dmm
index 21e4f84a10e5..100a0d234000 100644
--- a/_maps/shuttles/subshuttles/syndicate_runner.dmm
+++ b/_maps/shuttles/subshuttles/syndicate_runner.dmm
@@ -188,10 +188,7 @@
/obj/effect/turf_decal/trimline/opaque/bar/filled/corner{
dir = 1
},
-/obj/structure/closet/emcloset/wall{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/emcloset/wall/directional/east,
/obj/item/tank/internals/oxygen,
/obj/item/tank/internals/oxygen,
/obj/item/tank/internals/oxygen,
diff --git a/_maps/shuttles/syndicate/syndicate_aegis.dmm b/_maps/shuttles/syndicate/syndicate_aegis.dmm
index f5b0e87a6b1b..e879c978eef0 100644
--- a/_maps/shuttles/syndicate/syndicate_aegis.dmm
+++ b/_maps/shuttles/syndicate/syndicate_aegis.dmm
@@ -32,10 +32,8 @@
},
/obj/item/clothing/neck/stripedredscarf,
/obj/item/clothing/neck/tie/red,
-/obj/structure/closet/wall/red{
- dir = 8;
+/obj/structure/closet/wall/red/directional/east{
name = "Captain's Locker";
- pixel_x = 30;
req_access_txt = "20"
},
/obj/item/storage/belt/sabre,
@@ -84,10 +82,9 @@
/obj/item/shovel/spade,
/obj/item/cultivator,
/obj/item/reagent_containers/glass/bucket,
-/obj/structure/closet/wall/white{
+/obj/structure/closet/wall/white/directional/north{
color = "#50C878";
- name = "Produce Production Locker";
- pixel_y = 30
+ name = "Produce Production Locker"
},
/obj/item/storage/box/disks_plantgene,
/obj/item/clothing/gloves/botanic_leather,
@@ -128,11 +125,9 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/structure/closet/wall{
- dir = 8;
+/obj/structure/closet/wall/directional/east{
icon_door = "orange_wall";
- name = "Mining equipment";
- pixel_x = 29
+ name = "Mining equipment"
},
/obj/item/gps/mining,
/obj/item/pickaxe,
@@ -236,9 +231,8 @@
/obj/item/folder/red,
/obj/item/laser_pointer/red,
/obj/item/clipboard,
-/obj/structure/closet/wall/red{
- name = "Psychologists Locker";
- pixel_y = 28
+/obj/structure/closet/wall/red/directional/north{
+ name = "Psychologists Locker"
},
/obj/item/clothing/head/suns,
/obj/item/clothing/gloves/suns/xo,
@@ -506,9 +500,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
-/obj/structure/closet/firecloset/wall{
- pixel_y = 29
- },
+/obj/structure/closet/firecloset/wall/directional/north,
/obj/structure/catwalk/over,
/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
dir = 1
@@ -571,9 +563,8 @@
/obj/item/clothing/glasses/hud/health/sunglasses,
/obj/item/clothing/neck/stripedredscarf,
/obj/item/clothing/neck/stripedbluescarf,
-/obj/structure/closet/wall/red{
- name = "Lead Doctor's Locker";
- pixel_y = 28
+/obj/structure/closet/wall/red/directional/north{
+ name = "Lead Doctor's Locker"
},
/obj/item/reagent_containers/food/drinks/bottle/holywater,
/obj/item/clothing/suit/armor/vest/security/brig_phys{
@@ -671,10 +662,8 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/wall/white{
- dir = 8;
- name = "Bartenders Clothing";
- pixel_x = 30
+/obj/structure/closet/wall/white/directional/east{
+ name = "Bartenders Clothing"
},
/obj/item/clothing/under/rank/civilian/bartender/skirt,
/obj/item/clothing/under/rank/civilian/bartender,
@@ -742,9 +731,8 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering)
"fJ" = (
-/obj/structure/closet/wall/orange{
- name = "fuel locker";
- pixel_y = 28
+/obj/structure/closet/wall/orange/directional/north{
+ name = "fuel locker"
},
/obj/item/stack/sheet/mineral/uranium/five{
pixel_x = 2
@@ -1002,8 +990,7 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/wall/white{
- pixel_y = 26;
+/obj/structure/closet/wall/white/directional/north{
name = "bureaucratic supplies"
},
/obj/item/paper_bin,
@@ -1528,7 +1515,9 @@
name = "Engineering storage";
pixel_x = 23
},
-/obj/machinery/space_heater,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering)
"mv" = (
@@ -1886,6 +1875,7 @@
/obj/structure/cable/yellow{
icon_state = "0-4"
},
+/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering)
"qa" = (
@@ -2327,10 +2317,8 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/wall/white{
- dir = 4;
- name = "Cooks Clothing";
- pixel_x = -30
+/obj/structure/closet/wall/white/directional/west{
+ name = "Cooks Clothing"
},
/obj/item/book/manual/wiki/cooking,
/obj/item/clothing/under/rank/civilian/chef,
@@ -2362,9 +2350,8 @@
/turf/open/floor/plating,
/area/ship/engineering)
"vs" = (
-/obj/structure/closet/wall/orange{
- name = "Engineering locker";
- pixel_y = 30
+/obj/structure/closet/wall/orange/directional/north{
+ name = "Engineering locker"
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 8
@@ -2501,9 +2488,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
},
-/obj/structure/closet/emcloset/wall{
- pixel_y = 31
- },
+/obj/structure/closet/emcloset/wall/directional/north,
/obj/structure/catwalk/over,
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -2512,11 +2497,11 @@
/area/ship/engineering)
"wM" = (
/obj/machinery/atmospherics/pipe/layer_manifold,
+/obj/structure/rack,
/obj/item/clothing/mask/gas/suns,
/obj/item/clothing/mask/gas/suns,
/obj/item/clothing/mask/gas/suns,
/obj/item/holosign_creator/atmos,
-/obj/structure/rack,
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering)
"wQ" = (
@@ -2547,10 +2532,8 @@
/area/ship/hallway/central)
"xh" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/wall{
- dir = 1;
- name = "Patient Clothing Closet";
- pixel_y = -30
+/obj/structure/closet/wall/directional/south{
+ name = "Patient Clothing Closet"
},
/obj/effect/decal/cleanable/blood/drip,
/obj/item/clothing/under/rank/medical/gown,
@@ -2686,6 +2669,9 @@
pixel_y = 7
},
/obj/item/storage/toolbox/mechanical,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering)
"yA" = (
@@ -3142,9 +3128,8 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/structure/closet/wall/orange{
- name = "Emergency Engineering";
- pixel_y = 30
+/obj/structure/closet/wall/orange/directional/north{
+ name = "Emergency Engineering"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -3399,11 +3384,9 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/structure/closet/wall{
- dir = 8;
+/obj/structure/closet/wall/directional/east{
icon_door = "orange_wall";
- name = "Mining equipment";
- pixel_x = 29
+ name = "Mining equipment"
},
/obj/item/gps/mining,
/obj/item/pickaxe,
@@ -3860,12 +3843,9 @@
/turf/open/floor/carpet/red,
/area/ship/crew/office)
"Mb" = (
-/obj/machinery/portable_atmospherics/canister/air,
-/obj/effect/turf_decal/corner_techfloor_grid/diagonal{
- dir = 4
- },
-/obj/effect/decal/cleanable/generic,
/obj/machinery/light/small/directional/south,
+/obj/machinery/power/ship_gravity,
+/obj/structure/cable/yellow,
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering)
"Mc" = (
@@ -4488,10 +4468,8 @@
name = "butlers's uniform"
},
/obj/item/clothing/under/suit/waiter/syndicate,
-/obj/structure/closet/wall/red{
- dir = 8;
- name = "Uniform Closet";
- pixel_x = 30
+/obj/structure/closet/wall/red/directional/east{
+ name = "Uniform Closet"
},
/obj/structure/table/wood,
/obj/effect/turf_decal/siding/wood{
@@ -4613,9 +4591,8 @@
/turf/open/floor/plasteel/tech,
/area/ship/medical)
"Tt" = (
-/obj/structure/closet/wall/orange{
- name = "Chemical Closet";
- pixel_y = 30
+/obj/structure/closet/wall/orange/directional/north{
+ name = "Chemical Closet"
},
/obj/item/storage/bag/chemistry,
/obj/item/clothing/glasses/sunglasses/chemical,
@@ -4738,10 +4715,7 @@
/obj/item/ammo_box/magazine/m10mm,
/obj/item/kitchen/knife/combat/survival,
/obj/item/kitchen/knife/combat/survival,
-/obj/structure/closet/secure_closet/wall{
- dir = 8;
- pixel_x = 32
- },
+/obj/structure/closet/secure_closet/wall/directional/east,
/turf/open/floor/wood/walnut,
/area/ship/bridge)
"Uu" = (
@@ -4978,6 +4952,7 @@
dir = 1
},
/obj/effect/decal/cleanable/glass,
+/obj/machinery/space_heater,
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering)
"WE" = (
@@ -5085,10 +5060,8 @@
/obj/item/radio,
/obj/item/radio,
/obj/item/radio,
-/obj/structure/closet/wall{
- dir = 8;
- name = "Uniform closet";
- pixel_x = 32
+/obj/structure/closet/wall/directional/east{
+ name = "Uniform closet"
},
/obj/effect/turf_decal/siding/wood{
dir = 4
@@ -5212,10 +5185,8 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/structure/closet/secure_closet/freezer/wall{
- dir = 1;
- name = "Kitchen Freezer";
- pixel_y = -30
+/obj/structure/closet/secure_closet/freezer/wall/directional/south{
+ name = "Kitchen Freezer"
},
/obj/effect/turf_decal/trimline/opaque/brown/filled/line,
/obj/structure/table/wood/reinforced,
@@ -5256,7 +5227,6 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/structure/catwalk/over,
-/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
/area/ship/engineering)
"Zj" = (
@@ -5279,6 +5249,42 @@
},
/turf/open/floor/plasteel/tech,
/area/ship/cargo)
+"Zq" = (
+/obj/structure/closet/wall/orange{
+ name = "Engineering locker";
+ pixel_y = 30
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/obj/item/tank/internals/oxygen,
+/obj/item/storage/toolbox/syndicate{
+ name = "syndicate toolbox";
+ pixel_x = -3;
+ pixel_y = 5
+ },
+/obj/item/storage/belt/utility/syndicate,
+/obj/structure/catwalk/over,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/item/storage/box/stockparts/t2,
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/item/clothing/gloves/suns/yellow,
+/obj/item/clothing/shoes/jackboots/suns,
+/obj/item/clothing/suit/toggle/suns/workervest,
+/obj/item/clothing/under/syndicate/suns/workerjumpsuit,
+/obj/item/clothing/mask/gas/suns,
+/obj/item/clothing/head/safety_helmet/suns,
+/obj/item/clothing/glasses/meson/engine,
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plating,
+/area/ship/engineering)
"Zu" = (
/obj/effect/turf_decal/siding/wood/corner,
/obj/effect/turf_decal/siding/wood{
@@ -5805,7 +5811,7 @@ vh
ZU
gB
It
-vs
+Zq
yb
mt
Mb
diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm
index 523a524de9d0..d02d2a60319c 100644
--- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm
+++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm
@@ -86,10 +86,8 @@
/obj/item/storage/firstaid/medical,
/obj/item/storage/firstaid/regular,
/obj/item/storage/firstaid/regular,
-/obj/structure/closet/wall/white{
- dir = 1;
- name = "Medical Supplies";
- pixel_y = -32
+/obj/structure/closet/wall/white/directional/south{
+ name = "Medical Supplies"
},
/turf/open/floor/plasteel/dark,
/area/ship/crew)
@@ -1156,6 +1154,9 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 5
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plating,
/area/ship/engineering)
"BS" = (
@@ -1379,9 +1380,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 6
},
-/obj/structure/closet/wall{
- pixel_y = 28
- },
+/obj/structure/closet/wall/directional/north,
/obj/machinery/computer/cryopod/directional/west,
/obj/machinery/camera/autoname{
dir = 4
@@ -1425,9 +1424,8 @@
/turf/closed/wall/mineral/plastitanium,
/area/ship/bridge)
"KP" = (
-/obj/structure/closet/wall{
- name = "emergency rum cabinet";
- pixel_y = 28
+/obj/structure/closet/wall/directional/north{
+ name = "emergency rum cabinet"
},
/obj/item/reagent_containers/food/drinks/bottle/rum,
/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{
@@ -1765,7 +1763,16 @@
dir = 1
},
/obj/machinery/light/small/directional/south,
-/obj/machinery/space_heater,
+/obj/structure/closet/secure_closet/engineering_personal,
+/obj/item/clothing/glasses/welding,
+/obj/item/clothing/glasses/welding,
+/obj/item/storage/belt/utility/full,
+/obj/item/storage/belt/utility/full,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/gloves/color/yellow,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
/turf/open/floor/plating,
/area/ship/engineering)
"SL" = (
@@ -1794,14 +1801,10 @@
/area/ship/engineering)
"Ul" = (
/obj/effect/decal/cleanable/oil,
-/obj/structure/closet/secure_closet/engineering_personal,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/storage/belt/utility/full,
-/obj/item/storage/belt/utility/full,
-/obj/item/clothing/glasses/welding,
-/obj/item/clothing/glasses/welding,
-/obj/structure/extinguisher_cabinet/directional/west,
+/obj/machinery/power/ship_gravity,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
/turf/open/floor/plating,
/area/ship/engineering)
"UZ" = (
@@ -1874,9 +1877,7 @@
"VJ" = (
/obj/structure/chair/comfy/black,
/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner,
-/obj/structure/closet/wall{
- pixel_y = 28
- },
+/obj/structure/closet/wall/directional/north,
/turf/open/floor/plasteel/dark,
/area/ship/crew)
"Xa" = (
@@ -1976,6 +1977,7 @@
/obj/effect/turf_decal/spline/fancy/transparent/grey{
dir = 1
},
+/obj/machinery/space_heater,
/turf/open/floor/plating,
/area/ship/engineering)
"ZI" = (
diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm
index 0cd79289edec..cce460292a0c 100644
--- a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm
+++ b/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm
@@ -1486,10 +1486,8 @@
/turf/open/floor/plasteel/mono/dark,
/area/ship/cargo)
"zq" = (
-/obj/structure/closet/wall/red{
- dir = 8;
- name = "uniform closet";
- pixel_x = 28
+/obj/structure/closet/wall/red/directional/east{
+ name = "uniform closet"
},
/obj/item/clothing/under/syndicate/gorlex,
/obj/item/clothing/under/syndicate/gorlex,
@@ -1558,9 +1556,7 @@
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"Af" = (
-/obj/structure/closet/emcloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/emcloset/wall/directional/north,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/mono/dark,
/area/ship/cargo)
@@ -2395,6 +2391,8 @@
/obj/structure/cable{
icon_state = "1-8"
},
+/obj/machinery/power/ship_gravity,
+/obj/structure/cable,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"Oy" = (
@@ -3161,9 +3159,7 @@
/obj/structure/cable{
icon_state = "2-8"
},
-/obj/structure/closet/emcloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/emcloset/wall/directional/north,
/turf/open/floor/plasteel/tech,
/area/ship/hallway/central)
"Yc" = (
diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
index b5135c604f0e..a4f74d6a6737 100644
--- a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
+++ b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
@@ -376,12 +376,10 @@
/obj/item/clothing/shoes/combat,
/obj/item/clothing/mask/gas/syndicate,
/obj/item/clothing/suit/armor/vest/duster,
-/obj/structure/closet/secure_closet/wall{
- dir = 1;
+/obj/structure/closet/secure_closet/wall/directional/south{
icon_state = "sec_wall";
name = "Bridge Officer's Locker";
- req_access_txt = "57";
- pixel_y = -29
+ req_access_txt = "57"
},
/obj/item/melee/classic_baton/telescopic,
/obj/item/clothing/neck/chameleon,
@@ -834,10 +832,8 @@
/obj/effect/turf_decal/siding/wood{
dir = 8
},
-/obj/structure/closet/wall{
- dir = 4;
- name = "Utility Closet";
- pixel_x = -30
+/obj/structure/closet/wall/directional/west{
+ name = "Utility Closet"
},
/obj/item/radio,
/obj/item/radio,
@@ -887,10 +883,7 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/closet/emcloset/wall{
- dir = 4;
- pixel_x = -28
- },
+/obj/structure/closet/emcloset/wall/directional/west,
/obj/machinery/advanced_airlock_controller{
dir = 8;
pixel_x = 24
@@ -1160,10 +1153,8 @@
/turf/open/floor/circuit/green/off,
/area/ship/maintenance/starboard)
"lr" = (
-/obj/structure/closet/wall/orange{
- dir = 1;
- name = "Engineering locker";
- pixel_y = -30
+/obj/structure/closet/wall/orange/directional/south{
+ name = "Engineering locker"
},
/obj/item/clothing/under/syndicate/coldres,
/obj/item/clothing/suit/toggle/industrial,
@@ -1411,11 +1402,9 @@
/obj/item/pickaxe,
/obj/item/mining_scanner,
/obj/item/mining_scanner,
-/obj/structure/closet/wall{
- dir = 1;
+/obj/structure/closet/wall/directional/south{
icon_door = "orange_wall";
- name = "Mining equipment";
- pixel_y = -29
+ name = "Mining equipment"
},
/obj/item/gps/mining,
/turf/open/floor/plasteel/tech,
@@ -1580,10 +1569,7 @@
dir = 8;
name = "tactical chair"
},
-/obj/structure/closet/firecloset/wall{
- dir = 8;
- pixel_x = 29
- },
+/obj/structure/closet/firecloset/wall/directional/east,
/obj/effect/turf_decal/techfloor{
dir = 4
},
@@ -2020,12 +2006,10 @@
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/storage/toolbox/ammo/c10mm,
-/obj/structure/closet/secure_closet/wall{
- dir = 4;
+/obj/structure/closet/secure_closet/wall/directional/west{
icon_state = "sec_wall";
name = "Ammo Locker";
- req_access_txt = "1";
- pixel_x = -29
+ req_access_txt = "1"
},
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/smgm45,
@@ -2304,12 +2288,10 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/closet/secure_closet/wall{
- dir = 4;
+/obj/structure/closet/secure_closet/wall/directional/west{
icon_state = "secure_wall";
name = "Peacekeeping Locker";
- req_access_txt = "1";
- pixel_x = -29
+ req_access_txt = "1"
},
/obj/item/gun/energy/disabler,
/obj/item/gun/energy/disabler,
@@ -2707,8 +2689,8 @@
/obj/structure/cable{
icon_state = "0-2"
},
-/obj/structure/cable/yellow{
- icon_state = "1-4"
+/obj/structure/cable{
+ icon_state = "1-2"
},
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering)
@@ -2730,10 +2712,8 @@
icon_state = "1-2"
},
/obj/structure/catwalk/over,
-/obj/structure/closet/wall/orange{
- dir = 8;
- name = "fuel locker";
- pixel_x = 28
+/obj/structure/closet/wall/orange/directional/east{
+ name = "fuel locker"
},
/obj/item/stack/sheet/mineral/plasma/five,
/obj/item/stack/sheet/mineral/plasma/five,
@@ -2910,12 +2890,10 @@
},
/obj/item/clothing/mask/gas/sechailer/swat,
/obj/item/clothing/head/HoS/beret/syndicate,
-/obj/structure/closet/secure_closet/wall{
- dir = 4;
+/obj/structure/closet/secure_closet/wall/directional/west{
icon_state = "sec_wall";
name = "Sergeant's Locker";
- req_access_txt = "58";
- pixel_x = -29
+ req_access_txt = "58"
},
/obj/item/melee/classic_baton/telescopic,
/obj/item/clothing/suit/armor/vest/blueshirt,
@@ -3131,10 +3109,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 9
},
-/obj/structure/closet/firecloset/wall{
- dir = 8;
- pixel_x = 29
- },
+/obj/structure/closet/firecloset/wall/directional/east,
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering)
"Eb" = (
@@ -3244,13 +3219,11 @@
/turf/open/floor/mineral/plastitanium/red,
/area/ship/hallway/central)
"EL" = (
-/obj/effect/turf_decal/industrial/warning{
- dir = 6
- },
-/obj/machinery/computer/monitor,
-/obj/structure/cable/yellow{
+/obj/machinery/power/ship_gravity,
+/obj/structure/cable{
icon_state = "0-2"
},
+/obj/effect/turf_decal/industrial/outline/yellow,
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering)
"EN" = (
@@ -3524,9 +3497,6 @@
icon_state = "1-2"
},
/obj/structure/catwalk/over,
-/obj/structure/cable/yellow{
- icon_state = "1-8"
- },
/turf/open/floor/plating,
/area/ship/engineering)
"HF" = (
@@ -4004,10 +3974,8 @@
/obj/effect/turf_decal/trimline/transparent/bar/filled/line{
dir = 6
},
-/obj/structure/closet/wall/red{
- dir = 1;
- name = "Bartender's locker";
- pixel_y = -29
+/obj/structure/closet/wall/red/directional/south{
+ name = "Bartender's locker"
},
/obj/item/clothing/shoes/cowboy/black,
/obj/item/storage/belt/military/snack,
@@ -4122,12 +4090,10 @@
/obj/structure/cable{
icon_state = "2-4"
},
-/obj/structure/closet/secure_closet/wall{
- dir = 4;
+/obj/structure/closet/secure_closet/wall/directional/west{
icon_state = "sec_wall";
name = "Armor Locker";
- req_access_txt = "1";
- pixel_x = -29
+ req_access_txt = "1"
},
/obj/item/storage/belt/military,
/obj/item/storage/belt/military,
@@ -5545,10 +5511,8 @@
/obj/effect/turf_decal/siding/wood{
dir = 10
},
-/obj/structure/closet/wall{
- dir = 4;
- name = "uniform closet";
- pixel_x = -30
+/obj/structure/closet/wall/directional/west{
+ name = "uniform closet"
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/storage/backpack/duffelbag/syndie,
diff --git a/_maps/shuttles/syndicate/syndicate_litieguai.dmm b/_maps/shuttles/syndicate/syndicate_litieguai.dmm
index e81231480dfb..fb7070893017 100644
--- a/_maps/shuttles/syndicate/syndicate_litieguai.dmm
+++ b/_maps/shuttles/syndicate/syndicate_litieguai.dmm
@@ -67,6 +67,12 @@
},
/turf/open/floor/plasteel/white,
/area/ship/cargo)
+"bz" = (
+/obj/machinery/light/small/directional/south,
+/obj/machinery/power/ship_gravity,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
"bD" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
@@ -1021,11 +1027,10 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 8
},
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/north{
icon_state = "sec_wall";
name = "firearms locker";
- req_access_txt = "5";
- pixel_y = 28
+ req_access_txt = "5"
},
/obj/item/ammo_box/magazine/m10mm/rubber,
/obj/item/ammo_box/magazine/m10mm/rubber,
@@ -1093,9 +1098,7 @@
/turf/open/floor/plasteel/freezer,
/area/ship/crew/toilet)
"wt" = (
-/obj/structure/closet/emcloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/emcloset/wall/directional/north,
/obj/effect/turf_decal/number/two,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
@@ -1379,7 +1382,6 @@
/area/ship/medical)
"zT" = (
/obj/effect/turf_decal/number/zero,
-/obj/machinery/light/small/directional/north,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"Ah" = (
@@ -1403,12 +1405,10 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
},
-/obj/structure/closet/secure_closet/wall{
- dir = 1;
+/obj/structure/closet/secure_closet/wall/directional/south{
icon_state = "sec_wall";
name = "armor locker";
- req_access_txt = "5";
- pixel_y = -28
+ req_access_txt = "5"
},
/obj/item/clothing/suit/armor/vest/marine/trauma,
/obj/item/clothing/suit/armor/vest/marine/trauma,
@@ -1490,12 +1490,10 @@
/obj/item/storage/belt/medical,
/obj/item/healthanalyzer/advanced,
/obj/item/hypospray/mkii/CMO,
-/obj/structure/closet/secure_closet/wall{
- dir = 4;
+/obj/structure/closet/secure_closet/wall/directional/west{
icon_state = "solgov_wall";
name = "chief medical officer's closet";
- req_access_txt = "40";
- pixel_x = -28
+ req_access_txt = "40"
},
/obj/item/storage/backpack/satchel/med,
/obj/item/defibrillator/compact/loaded,
@@ -1561,12 +1559,10 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 5
},
-/obj/structure/closet/secure_closet/wall{
- dir = 1;
+/obj/structure/closet/secure_closet/wall/directional/south{
icon_state = "sec_wall";
name = "clothing locker";
- req_access_txt = "5";
- pixel_y = -28
+ req_access_txt = "5"
},
/obj/item/clothing/under/syndicate/medic,
/obj/item/clothing/under/syndicate/medic,
@@ -1650,6 +1646,9 @@
/obj/effect/turf_decal/industrial/warning/corner{
dir = 8
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plating,
/area/ship/maintenance/port)
"DX" = (
@@ -2392,11 +2391,10 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 10
},
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/north{
icon_state = "sec_wall";
name = "equipment locker";
- req_access_txt = "5";
- pixel_y = 28
+ req_access_txt = "5"
},
/obj/item/healthanalyzer/advanced,
/obj/item/healthanalyzer/advanced,
@@ -2790,6 +2788,10 @@
/obj/structure/window/reinforced/fulltile/shuttle,
/turf/open/floor/plating,
/area/ship/science)
+"VN" = (
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
"WB" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -2842,12 +2844,10 @@
/obj/item/areaeditor/shuttle,
/obj/item/megaphone/command,
/obj/item/clothing/glasses/sunglasses,
-/obj/structure/closet/secure_closet/wall{
- dir = 4;
+/obj/structure/closet/secure_closet/wall/directional/west{
icon_state = "solgov_wall";
name = "captain's closet";
- req_access_txt = "20";
- pixel_x = -28
+ req_access_txt = "20"
},
/obj/item/gun/ballistic/revolver,
/obj/item/clothing/suit/armor/vest/capcarapace/cybersun,
@@ -2873,10 +2873,7 @@
/obj/machinery/atmospherics/components/binary/pump/on/layer2{
dir = 8
},
-/obj/structure/closet/firecloset/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/firecloset/wall/directional/south,
/turf/open/floor/plating,
/area/ship/maintenance/port)
"Xx" = (
@@ -2925,7 +2922,9 @@
dir = 4
},
/obj/item/storage/toolbox/electrical,
-/obj/machinery/light/small/directional/south,
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
/turf/open/floor/plating,
/area/ship/maintenance/port)
"YA" = (
@@ -3158,7 +3157,7 @@ HU
ZC
XL
Yw
-ZC
+bz
fp
UG
vx
@@ -3172,7 +3171,7 @@ gL
UG
UG
Ti
-UO
+VN
zT
kh
UO
@@ -3182,7 +3181,7 @@ ZC
KS
Xu
ZC
-UG
+fp
UG
UG
Ra
@@ -3194,7 +3193,7 @@ tO
Ra
UG
UG
-UG
+Ti
UO
wt
xW
diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
index 79c693817dda..19071dbc1baf 100644
--- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
+++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
@@ -4,10 +4,7 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/closet/emcloset/wall{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/emcloset/wall/directional/east,
/obj/item/clothing/suit/space/syndicate/black/engie,
/obj/item/clothing/head/helmet/space/syndicate/black/engie,
/turf/open/floor/plasteel/dark,
@@ -135,10 +132,7 @@
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"aG" = (
-/obj/structure/closet/secure_closet/wall{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/secure_closet/wall/directional/east,
/obj/item/kitchen/knife,
/obj/item/cutting_board,
/obj/item/clothing/under/suit/waiter/syndicate,
@@ -410,6 +404,9 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
+ },
/turf/open/floor/plasteel/dark,
/area/ship/engineering/atmospherics)
"cC" = (
@@ -2323,9 +2320,7 @@
/obj/item/card/id/syndicate_command/lieutenant{
name = "lieutenant ID card"
},
-/obj/structure/closet/secure_closet/wall{
- dir = 4;
- pixel_x = -28;
+/obj/structure/closet/secure_closet/wall/directional/west{
name = "spare cards locker";
req_access = list(3,150)
},
@@ -2428,10 +2423,7 @@
/obj/effect/turf_decal/corner/opaque/syndiered{
dir = 10
},
-/obj/structure/closet/firecloset/wall{
- dir = 1;
- pixel_y = -28
- },
+/obj/structure/closet/firecloset/wall/directional/south,
/obj/effect/turf_decal/borderfloorblack{
dir = 1
},
@@ -4781,10 +4773,7 @@
/obj/effect/turf_decal/corner/opaque/syndiered{
dir = 9
},
-/obj/structure/closet/firecloset/wall{
- dir = 4;
- pixel_x = -28
- },
+/obj/structure/closet/firecloset/wall/directional/west,
/obj/effect/turf_decal/borderfloorblack{
dir = 4
},
@@ -5212,10 +5201,7 @@
/obj/effect/turf_decal/corner/opaque/syndiered{
dir = 9
},
-/obj/structure/closet/emcloset/wall{
- dir = 4;
- pixel_x = -28
- },
+/obj/structure/closet/emcloset/wall/directional/west,
/obj/effect/turf_decal/borderfloorblack{
dir = 4
},
@@ -5798,10 +5784,7 @@
/turf/open/floor/plasteel/mono/dark,
/area/ship/hallway/port)
"GN" = (
-/obj/structure/closet/emcloset/wall{
- dir = 4;
- pixel_x = -28
- },
+/obj/structure/closet/emcloset/wall/directional/west,
/obj/item/clothing/suit/space/syndicate,
/obj/item/clothing/suit/space/syndicate,
/obj/item/clothing/head/helmet/space/syndicate,
@@ -6173,10 +6156,7 @@
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/engineering/communications)
"IV" = (
-/obj/structure/closet/emcloset/wall{
- dir = 4;
- pixel_x = -28
- },
+/obj/structure/closet/emcloset/wall/directional/west,
/obj/item/clothing/suit/space/syndicate,
/obj/item/clothing/head/helmet/space/syndicate,
/obj/item/clothing/head/helmet/space/syndicate,
@@ -7103,6 +7083,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 5
},
+/obj/structure/extinguisher_cabinet/directional/south,
/turf/open/floor/plasteel/dark,
/area/ship/engineering/atmospherics)
"Pd" = (
@@ -7777,10 +7758,7 @@
"SA" = (
/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/closet/emcloset/wall{
- dir = 8;
- pixel_x = 28
- },
+/obj/structure/closet/emcloset/wall/directional/east,
/obj/item/clothing/suit/space/syndicate/black/engie,
/obj/item/clothing/head/helmet/space/syndicate/black/engie,
/turf/open/floor/plasteel/dark,
@@ -8157,7 +8135,8 @@
/turf/open/floor/plasteel/tech,
/area/ship/hallway/central)
"UB" = (
-/obj/structure/extinguisher_cabinet/directional/south,
+/obj/machinery/power/ship_gravity,
+/obj/structure/cable/yellow,
/turf/open/floor/plasteel/dark,
/area/ship/engineering/atmospherics)
"UC" = (
@@ -8340,9 +8319,8 @@
/obj/effect/turf_decal/trimline/opaque/orange/line{
dir = 5
},
-/obj/structure/closet/wall/orange{
- name = "Chemical Closet";
- pixel_y = 28
+/obj/structure/closet/wall/orange/directional/north{
+ name = "Chemical Closet"
},
/obj/item/storage/bag/chemistry,
/obj/item/reagent_containers/glass/beaker/large,
@@ -8573,9 +8551,7 @@
dir = 5
},
/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/closet/firecloset/wall{
- pixel_y = 28
- },
+/obj/structure/closet/firecloset/wall/directional/north,
/obj/effect/turf_decal/borderfloorblack,
/turf/open/floor/plasteel/tech,
/area/ship/hallway/starboard)
diff --git a/code/controllers/subsystem/overmap.dm b/code/controllers/subsystem/overmap.dm
index b96a4944c812..93852230b244 100644
--- a/code/controllers/subsystem/overmap.dm
+++ b/code/controllers/subsystem/overmap.dm
@@ -274,7 +274,7 @@ SUBSYSTEM_DEF(overmap)
var/datum/map_zone/mapzone = SSmapping.create_map_zone(encounter_name)
var/datum/virtual_level/vlevel = SSmapping.create_virtual_level(
encounter_name,
- list(ZTRAIT_MINING = TRUE, ZTRAIT_BASETURF = dynamic_datum.default_baseturf),
+ list(ZTRAIT_MINING = TRUE, ZTRAIT_BASETURF = dynamic_datum.default_baseturf, ZTRAIT_GRAVITY = dynamic_datum.gravity),
mapzone,
dynamic_datum.vlevel_width,
dynamic_datum.vlevel_height,
diff --git a/code/game/area/ship_areas.dm b/code/game/area/ship_areas.dm
index abf40f900af5..5f4e75b71d4d 100644
--- a/code/game/area/ship_areas.dm
+++ b/code/game/area/ship_areas.dm
@@ -68,7 +68,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/ship
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
- has_gravity = STANDARD_GRAVITY
always_unpowered = FALSE
area_flags = VALID_TERRITORY | BLOBS_ALLOWED // Loading the same shuttle map at a different time will produce distinct area instances.
icon_state = "shuttle"
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 0c4cdb31c9be..b539e421508d 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -1556,6 +1556,7 @@
* * No gravity if this atom is in is a space turf
* * Gravity if the area it's in always has gravity
* * Gravity if there's a gravity generator on the z level
+ * * Gravity if there is a ship gravity generator in a ship
* * Gravity if the Z level has an SSMappingTrait for ZTRAIT_GRAVITY
* * otherwise no gravity
*/
@@ -1588,12 +1589,22 @@
else
// See if there's a gravity generator on our map zone
var/datum/map_zone/mapzone = T.get_map_zone()
+ var/max_grav = T.virtual_level_trait(ZTRAIT_GRAVITY)
if(mapzone?.gravity_generators.len)
- var/max_grav = 0
for(var/obj/machinery/gravity_generator/main/G as anything in mapzone.gravity_generators)
max_grav = max(G.setting,max_grav)
- return max_grav
- return T.virtual_level_trait(ZTRAIT_GRAVITY)
+ // Check for ship-based gravity
+ var/area/ship/ship = A
+ if(istype(ship))
+ var/obj/docking_port/mobile/shuttle = ship.mobile_port
+ if(shuttle)
+ for(var/datum/weakref/weakref as anything in shuttle.gravgen_list)
+ var/obj/machinery/power/ship_gravity/SG = weakref.resolve()
+ if(!SG)
+ shuttle.gravgen_list -= weakref
+ continue
+ max_grav = max(SG.active,max_grav)
+ return max_grav
/**
* Called when a mob examines (shift click or verb) this atom twice (or more) within EXAMINE_MORE_TIME (default 1.5 seconds)
diff --git a/code/game/machinery/shuttle/ship_gravity.dm b/code/game/machinery/shuttle/ship_gravity.dm
new file mode 100644
index 000000000000..bfcf937f341a
--- /dev/null
+++ b/code/game/machinery/shuttle/ship_gravity.dm
@@ -0,0 +1,124 @@
+//
+// Ship Gravity Generator
+//
+
+/obj/machinery/power/ship_gravity
+ name = "gravitational generator"
+ desc = "A ship-portable gravity generator, capable of providing gravity throughout the vessel it is installed on."
+ icon = 'icons/obj/machines/ship_gravity.dmi'
+ icon_state = "shipgrav"
+ base_icon_state = "shipgrav"
+ density = TRUE
+ idle_power_usage = 10
+ active_power_usage = 5000
+ circuit = /obj/item/circuitboard/machine/ship_gravity
+ var/charging = FALSE
+ var/active = FALSE
+ var/charge = 0
+
+/obj/machinery/power/ship_gravity/unanchored
+ anchored = FALSE
+
+/obj/machinery/power/ship_gravity/admin
+ idle_power_usage = 0
+ active_power_usage = 0
+ active = TRUE
+
+/obj/machinery/power/ship_gravity/Initialize()
+ . = ..()
+ if(anchored)
+ connect_to_network()
+
+/obj/machinery/power/ship_gravity/process()
+ if(charging && (!active_power_usage || surplus() >= active_power_usage))
+ add_load(active_power_usage)
+ charge = min(charge+1, 5)
+ if(charge >= 5)
+ set_state(TRUE)
+ else
+ charge = max(charge-1, 0)
+ if(!charge)
+ set_state(FALSE)
+ update_appearance()
+
+/obj/machinery/power/ship_gravity/proc/set_state(toggle)
+ if(toggle == active)
+ return
+ if(toggle)
+ active = TRUE
+ playsound(src.loc, 'sound/effects/empulse.ogg', 100, TRUE)
+ visible_message(span_warning("The [src.name] finishes charging!"), blind_message = span_hear("You hear a low hum fade in."))
+ else
+ visible_message(span_danger("The [src.name] shuts down due to lack of power!"), blind_message = span_hear("You hear a low hum fade out."))
+ active = FALSE
+ log_game("[src] deactivated due to lack of power at [AREACOORD(src)]", INVESTIGATE_GRAVITY)
+ update_appearance()
+
+/obj/machinery/power/ship_gravity/update_overlays()
+ . = ..()
+ var/mutable_appearance/charge_state
+ if(active)
+ charge_state = mutable_appearance(icon, "charge_active")
+ if(charge < 5)
+ charge_state = mutable_appearance(icon, "charge_[charge]")
+ . += charge_state
+
+/obj/machinery/power/ship_gravity/examine(mob/user)
+ . = ..()
+ if(anchored)
+ . += span_info("It's secured to the floor, you can unsecure it with a wrench.")
+ else
+ . += span_info("It's currently unsecured, you can secure it with a wrench.")
+ if(in_range(user, src) || isobserver(user))
+ if(!charging && !charge)
+ . += span_info("Its status display is currently turned off.")
+ else
+ . += span_info("Its status display reads: Current charge at [charge*20]%.")
+
+/obj/machinery/power/ship_gravity/screwdriver_act(mob/living/user, obj/item/I)
+ ..()
+ if(charging || charge)
+ to_chat(user, span_notice("You cannot open the maintenance panel on [src] while it is active!"))
+ return TRUE
+ default_deconstruction_screwdriver(user, "shipgrav_o", "shipgrav", I)
+ return TRUE
+
+/obj/machinery/power/ship_gravity/wrench_act(mob/living/user, obj/item/I)
+ . =..()
+ if(active)
+ to_chat(user, span_notice("You cannot unsecure [src] while it is active!"))
+ return TRUE
+ default_unfasten_wrench(user, I)
+ return TRUE
+
+/obj/machinery/power/ship_gravity/crowbar_act(mob/living/user, obj/item/I)
+ . = ..()
+ default_deconstruction_crowbar(I)
+ return TRUE
+
+/obj/machinery/power/ship_gravity/default_unfasten_wrench(mob/user, obj/item/I, time = 20)
+ . = ..()
+ if(. == SUCCESSFUL_UNFASTEN)
+ if(anchored)
+ connect_to_network()
+ else
+ disconnect_from_network()
+ charging = FALSE
+ set_state(FALSE)
+
+/obj/machinery/power/ship_gravity/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock)
+ . = ..()
+ port.gravgen_list |= WEAKREF(src)
+
+/obj/machinery/power/ship_gravity/interact(mob/user)
+ if(!powernet && active_power_usage)
+ to_chat(user, span_notice("[src] isn't connected to a wire!"))
+ return
+ if(panel_open)
+ return
+ charging = !charging
+ play_click_sound("switch")
+ user.visible_message(span_warning("[user] flips [src]'s power [charging ? "on" : "off"]!"), \
+ span_info("You flip [src]'s power lever, turning it [charging ? "on" : "off"]"), \
+ span_hear("You hear a heavy lever being pulled."))
+ update_appearance()
diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm
index 9f7831577d4c..6a5fa6e70a12 100644
--- a/code/game/objects/items/circuitboards/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm
@@ -389,6 +389,17 @@
name = "Freezer (Machine Board)"
build_path = PATH_FREEZER
+/obj/item/circuitboard/machine/ship_gravity
+ name = "Gravity Generator (Machine Board)"
+ icon_state = "engineering"
+ build_path = /obj/machinery/power/ship_gravity
+ req_components = list(
+ /obj/item/stock_parts/capacitor = 5,
+ /obj/item/stack/sheet/bluespace_crystal = 1,
+ /obj/item/stock_parts/micro_laser = 4
+ )
+ needs_anchored = FALSE
+
#undef PATH_FREEZER
#undef PATH_HEATER
diff --git a/code/modules/cargo/packs/machinery.dm b/code/modules/cargo/packs/machinery.dm
index 215b146fad43..0bf718fffdd5 100644
--- a/code/modules/cargo/packs/machinery.dm
+++ b/code/modules/cargo/packs/machinery.dm
@@ -136,6 +136,14 @@
Miscellaneous machines
*/
+/datum/supply_pack/machinery/gravgen
+ name = "Ship-Portable Gravity Generator Crate"
+ desc = "For those tired of their tools floating away from them. Contains a single gravity generator."
+ cost = 2000
+ contains = list(/obj/machinery/power/ship_gravity/unanchored)
+ crate_name = "gravity generator crate"
+ crate_type = /obj/structure/closet/crate/engineering/electrical
+
/datum/supply_pack/machinery/breach_shield_gen
name = "Anti-breach Shield Projector Crate"
desc = "Hull breaches again? Say no more with the Nanotrasen Anti-Breach Shield Projector! Uses forcefield technology to keep the air in, and the space out. Contains two shield projectors."
diff --git a/code/modules/overmap/objects/dynamic_datum.dm b/code/modules/overmap/objects/dynamic_datum.dm
index 69591c71dc8e..dcc62aad7424 100644
--- a/code/modules/overmap/objects/dynamic_datum.dm
+++ b/code/modules/overmap/objects/dynamic_datum.dm
@@ -35,6 +35,9 @@
/// The turf used as the backup baseturf for any reservations created by this datum. Should not be null.
var/turf/default_baseturf = /turf/open/space
+ ///The default gravity the virtual z will have
+ var/gravity = 0
+
///The weather the virtual z will have. If null, the planet will have no weather.
var/datum/weather_controller/weather_controller_type
@@ -139,6 +142,7 @@
token.color = planet.color
ruin_type = planet.ruin_type
default_baseturf = planet.default_baseturf
+ gravity = planet.gravity
mapgen = planet.mapgen
weather_controller_type = planet.weather_controller_type
landing_sound = planet.landing_sound
diff --git a/code/modules/overmap/objects/outpost/outpost.dm b/code/modules/overmap/objects/outpost/outpost.dm
index 774057b68a08..0e4c385651ee 100644
--- a/code/modules/overmap/objects/outpost/outpost.dm
+++ b/code/modules/overmap/objects/outpost/outpost.dm
@@ -24,10 +24,12 @@
// NOTE: "planetary" outposts should use baseturf specification and possibly different ztrait sun type, for both hangars and main level.
var/list/main_level_ztraits = list(
ZTRAIT_STATION = TRUE,
- ZTRAIT_SUN_TYPE = AZIMUTH
+ ZTRAIT_SUN_TYPE = AZIMUTH,
+ ZTRAIT_GRAVITY = STANDARD_GRAVITY
)
var/list/hangar_ztraits = list(
- ZTRAIT_SUN_TYPE = STATIC_EXPOSED
+ ZTRAIT_SUN_TYPE = STATIC_EXPOSED,
+ ZTRAIT_GRAVITY = STANDARD_GRAVITY
)
/// The mapzone used by the outpost level and hangars. Using a single mapzone means networked radio messages.
diff --git a/code/modules/overmap/planets/planet_types.dm b/code/modules/overmap/planets/planet_types.dm
index 2152d4efe5ef..74ea0165b357 100644
--- a/code/modules/overmap/planets/planet_types.dm
+++ b/code/modules/overmap/planets/planet_types.dm
@@ -5,6 +5,7 @@
var/ruin_type = null
var/mapgen = null
var/default_baseturf = null
+ var/gravity = 0
var/weather_controller_type = null
var/icon_state = "globe"
var/color = "#ffffff"
@@ -20,6 +21,7 @@
color = COLOR_ORANGE
mapgen = /datum/map_generator/planet_generator/lava
default_baseturf = /turf/open/floor/plating/asteroid/basalt/lava
+ gravity = STANDARD_GRAVITY
weather_controller_type = /datum/weather_controller/lavaland
ruin_type = RUINTYPE_LAVA
landing_sound = 'sound/effects/planet_landing_2.ogg'
@@ -33,6 +35,7 @@
color = COLOR_BLUE_LIGHT
mapgen = /datum/map_generator/planet_generator/snow
default_baseturf = /turf/open/floor/plating/asteroid/snow/icemoon
+ gravity = STANDARD_GRAVITY
weather_controller_type = /datum/weather_controller/snow_planet
ruin_type = RUINTYPE_ICE
landing_sound = 'sound/effects/planet_landing_2.ogg'
@@ -45,6 +48,7 @@
color = COLOR_LIME
mapgen = /datum/map_generator/planet_generator/jungle
default_baseturf = /turf/open/floor/plating/dirt/jungle
+ gravity = STANDARD_GRAVITY
weather_controller_type = /datum/weather_controller/lush
ruin_type = RUINTYPE_JUNGLE
landing_sound = 'sound/effects/planet_landing_1.ogg'
@@ -57,6 +61,7 @@
color = "#bd1313"
mapgen = /datum/map_generator/planet_generator/rock
default_baseturf = /turf/open/floor/plating/asteroid
+ gravity = STANDARD_GRAVITY
weather_controller_type = /datum/weather_controller/rockplanet
ruin_type = RUINTYPE_ROCK
landing_sound = 'sound/effects/planet_landing_2.ogg'
@@ -69,6 +74,7 @@
color = COLOR_GRAY
mapgen = /datum/map_generator/planet_generator/sand
default_baseturf = /turf/open/floor/plating/asteroid/whitesands
+ gravity = STANDARD_GRAVITY
weather_controller_type = /datum/weather_controller/desert
ruin_type = RUINTYPE_SAND
landing_sound = 'sound/effects/planet_landing_2.ogg'
@@ -81,6 +87,7 @@
color = "#c6b597"
mapgen = /datum/map_generator/planet_generator/beach
default_baseturf = /turf/open/floor/plating/asteroid/sand/lit
+ gravity = STANDARD_GRAVITY
weather_controller_type = /datum/weather_controller/lush
ruin_type = RUINTYPE_BEACH
landing_sound = 'sound/effects/planet_landing_1.ogg'
@@ -92,6 +99,7 @@
icon_state = "wormhole"
color = COLOR_YELLOW
mapgen = /datum/map_generator/single_biome/reebe
+ gravity = STANDARD_GRAVITY
default_baseturf = /turf/open/chasm/reebe_void
weather_controller_type = null
weight = 0
@@ -131,6 +139,7 @@
color = "#a9883e"
mapgen = /datum/map_generator/planet_generator/waste
default_baseturf = /turf/open/floor/plating/asteroid/wasteplanet
+ gravity = STANDARD_GRAVITY
weather_controller_type = /datum/weather_controller/chlorine
ruin_type = RUINTYPE_WASTE
landing_sound = 'sound/effects/planet_landing_2.ogg'
@@ -142,6 +151,7 @@
icon_state = "globe"
color = COLOR_DARK_MODERATE_ORANGE
mapgen = /datum/map_generator/single_biome/gas_giant
+ gravity = GAS_GIANT_GRAVITY
default_baseturf = /turf/open/chasm/gas_giant
weather_controller_type = null
ruin_type = null //it's a Gas Giant. Not Cloud fuckin City
@@ -155,6 +165,7 @@
planet = DYNAMIC_WORLD_PLASMA_GIANT
color = COLOR_PURPLE
mapgen = /datum/map_generator/single_biome/plasma_giant
+ gravity = GAS_GIANT_GRAVITY
default_baseturf = /turf/open/chasm/gas_giant/plasma
weight = 0
icon_state = "globe"
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index 1e4660c48953..a6020d0fae11 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -1,4 +1,3 @@
-
//
// Gravity Generator
//
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index 3cf848089652..e12db8a59738 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -247,7 +247,6 @@
build_path = /obj/item/circuitboard/machine/rdserver
category = list("Research Machinery", "initial", "Equipment")
-
/datum/design/board/mechfab
name = "Machine Design (Exosuit Fabricator Board)"
desc = "The circuit board for an Exosuit Fabricator."
@@ -471,6 +470,14 @@
category = list ("Misc. Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
+/datum/design/board/ship_gravity
+ name = "Machine Design (Ship Gravity Generator Board)"
+ desc = "The circuit board for a ship-sized gravity generator."
+ id = "ship_gravity"
+ build_type = AUTOLATHE | IMPRINTER
+ build_path = /obj/item/circuitboard/machine/ship_gravity
+ category = list("Misc. Machinery", "initial", "Equipment")
+
/datum/design/board/ntnet_relay
name = "Machine Design (NTNet Relay Board)"
desc = "The circuit board for a wireless network relay."
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 8bfe1f7e9bd8..14a7497728a9 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -318,6 +318,9 @@
///A list of all engines currently linked to the shuttle.
var/list/engine_list = list()
+ ///A list of all gravity generators currently linked to the shuttle.
+ var/list/gravgen_list = list()
+
///if this shuttle can move docking ports other than the one it is docked at
var/can_move_docking_ports = TRUE
diff --git a/html/changelogs/AutoChangeLog-pr-2770.yml b/html/changelogs/AutoChangeLog-pr-2770.yml
deleted file mode 100644
index 60d70bf52dd5..000000000000
--- a/html/changelogs/AutoChangeLog-pr-2770.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: meemofcourse
-changes:
- - {tweak: Identification Cards are now Access Cards. The only real difference is
- that your name only shows up on a double examine.}
- - {refactor: 'Anonymous mechanics. Characters no longer instantly recognize each
- other, and need to properly memorize each other in order. You can recognize
- an unmasked person by ctrl-shift-clicking them.'}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-2883.yml b/html/changelogs/AutoChangeLog-pr-2883.yml
new file mode 100644
index 000000000000..5ecc53ffe1ce
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2883.yml
@@ -0,0 +1,4 @@
+author: goober3
+changes:
+ - {bugfix: Wall lockers should be facing the right way again.}
+delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-2894.yml b/html/changelogs/AutoChangeLog-pr-2894.yml
deleted file mode 100644
index 4d0b7771519f..000000000000
--- a/html/changelogs/AutoChangeLog-pr-2894.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Gristlebee
-changes:
- - {tweak: Granularizes Outpost Spacesuits and Armor}
- - {balance: Reduces the cost of specialized space suits}
-delete-after: true
diff --git a/html/changelogs/archive/2024-04.yml b/html/changelogs/archive/2024-04.yml
index 277ae650feb3..aaaac8d6065f 100644
--- a/html/changelogs/archive/2024-04.yml
+++ b/html/changelogs/archive/2024-04.yml
@@ -74,3 +74,18 @@
- rscadd: Etherbor BG-12 Beam Rifle to cargo for 3000 credits
- rscadd: Etherbor civilian weapon cells for 600 credits, slightly higher capacity
than the generic cells
+2024-04-17:
+ Gristlebee:
+ - tweak: Granularizes Outpost Spacesuits and Armor
+ - balance: Reduces the cost of specialized space suits
+ SomeguyManperson:
+ - tweak: ships no longer have intrinsic gravity
+ - rscadd: new gravity generator machine for ships
+ - tweak: planetary gravity is now stored level-wide, a ship landing at a planet
+ will be effected by the planet's gravity
+ meemofcourse:
+ - tweak: Identification Cards are now Access Cards. The only real difference is
+ that your name only shows up on a double examine.
+ - refactor: Anonymous mechanics. Characters no longer instantly recognize each other,
+ and need to properly memorize each other in order. You can recognize an unmasked
+ person by ctrl-shift-clicking them.
diff --git a/icons/obj/machines/ship_gravity.dmi b/icons/obj/machines/ship_gravity.dmi
new file mode 100644
index 000000000000..276fcf2b6720
Binary files /dev/null and b/icons/obj/machines/ship_gravity.dmi differ
diff --git a/shiptest.dme b/shiptest.dme
index 7ae5b4b1121e..8111e833cfef 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -963,6 +963,7 @@
#include "code\game\machinery\porta_turret\portable_turret_construct.dm"
#include "code\game\machinery\porta_turret\portable_turret_cover.dm"
#include "code\game\machinery\shuttle\custom_shuttle.dm"
+#include "code\game\machinery\shuttle\ship_gravity.dm"
#include "code\game\machinery\shuttle\shuttle_engine.dm"
#include "code\game\machinery\shuttle\shuttle_engine_types.dm"
#include "code\game\machinery\shuttle\shuttle_heater.dm"
diff --git a/tools/UpdatePaths/Scripts/2883_wall_lockers.txt b/tools/UpdatePaths/Scripts/2883_wall_lockers.txt
new file mode 100644
index 000000000000..403deb69f119
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/2883_wall_lockers.txt
@@ -0,0 +1,71 @@
+/obj/structure/closet/wall {dir=@UNSET} : /obj/structure/closet/wall/directional/north {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall {dir=1} : /obj/structure/closet/wall/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall {dir=2} : /obj/structure/closet/wall/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall {dir=4} : /obj/structure/closet/wall/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall {dir=8} : /obj/structure/closet/wall/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+
+/obj/structure/closet/wall/blue {dir=@UNSET} : /obj/structure/closet/wall/blue/directional/north {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/blue {dir=1} : /obj/structure/closet/wall/blue/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/blue {dir=2} : /obj/structure/closet/wall/blue/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/blue {dir=4} : /obj/structure/closet/wall/blue/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/blue {dir=8} : /obj/structure/closet/wall/blue/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+
+/obj/structure/closet/wall/chem {dir=@UNSET} : /obj/structure/closet/wall/chem/directional/north {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/chem {dir=1} : /obj/structure/closet/wall/chem/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/chem {dir=2} : /obj/structure/closet/wall/chem/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/chem {dir=4} : /obj/structure/closet/wall/chem/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/chem {dir=8} : /obj/structure/closet/wall/chem/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+
+/obj/structure/closet/wall/med {dir=@UNSET} : /obj/structure/closet/wall/med/directional/north {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/med {dir=1} : /obj/structure/closet/wall/med/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/med {dir=2} : /obj/structure/closet/wall/med/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/med {dir=4} : /obj/structure/closet/wall/med/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/med {dir=8} : /obj/structure/closet/wall/med/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+
+/obj/structure/closet/wall/orange {dir=@UNSET} : /obj/structure/closet/wall/orange/directional/north {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/orange {dir=1} : /obj/structure/closet/wall/orange/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/orange {dir=2} : /obj/structure/closet/wall/orange/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/orange {dir=4} : /obj/structure/closet/wall/orange/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/orange {dir=8} : /obj/structure/closet/wall/orange/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+
+/obj/structure/closet/wall/red {dir=@UNSET} : /obj/structure/closet/wall/red/directional/north {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/red {dir=1} : /obj/structure/closet/wall/red/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/red {dir=2} : /obj/structure/closet/wall/red/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/red {dir=4} : /obj/structure/closet/wall/red/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/red {dir=8} : /obj/structure/closet/wall/red/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+
+/obj/structure/closet/wall/white {dir=@UNSET} : /obj/structure/closet/wall/white/directional/north {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/white {dir=1} : /obj/structure/closet/wall/white/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/white {dir=2} : /obj/structure/closet/wall/white/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/white {dir=4} : /obj/structure/closet/wall/white/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/white {dir=8} : /obj/structure/closet/wall/white/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+
+/obj/structure/closet/emcloset/wall {dir=@UNSET} : /obj/structure/closet/emcloset/wall/directional/north {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/emcloset/wall {dir=1} : /obj/structure/closet/emcloset/wall/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/emcloset/wall {dir=2} : /obj/structure/closet/emcloset/wall/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/emcloset/wall {dir=4} : /obj/structure/closet/emcloset/wall/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/emcloset/wall {dir=8} : /obj/structure/closet/emcloset/wall/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+
+/obj/structure/closet/firecloset/wall {dir=@UNSET} : /obj/structure/closet/firecloset/wall/directional/north {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/firecloset/wall {dir=1} : /obj/structure/closet/firecloset/wall/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/firecloset/wall {dir=2} : /obj/structure/closet/firecloset/wall/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/firecloset/wall {dir=4} : /obj/structure/closet/firecloset/wall/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/firecloset/wall {dir=8} : /obj/structure/closet/firecloset/wall/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+
+/obj/structure/closet/secure_closet/wall {dir=@UNSET} : /obj/structure/closet/secure_closet/wall/directional/north {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/secure_closet/wall {dir=1} : /obj/structure/closet/secure_closet/wall/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/secure_closet/wall {dir=2} : /obj/structure/closet/secure_closet/wall/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/secure_closet/wall {dir=4} : /obj/structure/closet/secure_closet/wall/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/secure_closet/wall {dir=8} : /obj/structure/closet/secure_closet/wall/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+
+/obj/structure/closet/secure_closet/brig/wall {dir=@UNSET} : /obj/structure/closet/secure_closet/brig/wall/directional/north {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/secure_closet/brig/wall {dir=1} : /obj/structure/closet/secure_closet/brig/wall/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/secure_closet/brig/wall {dir=2} : /obj/structure/closet/secure_closet/brig/wall/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/secure_closet/brig/wall {dir=4} : /obj/structure/closet/secure_closet/brig/wall/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/secure_closet/brig/wall {dir=8} : /obj/structure/closet/secure_closet/brig/wall/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+
+/obj/structure/closet/secure_closet/freezer/wall {dir=@UNSET} : /obj/structure/closet/secure_closet/freezer/wall/directional/north {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/secure_closet/freezer/wall {dir=1} : /obj/structure/closet/secure_closet/freezer/wall/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/secure_closet/freezer/wall {dir=2} : /obj/structure/closet/secure_closet/freezer/wall/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/secure_closet/freezer/wall {dir=4} : /obj/structure/closet/secure_closet/freezer/wall/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/secure_closet/freezer/wall {dir=8} : /obj/structure/closet/secure_closet/freezer/wall/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
\ No newline at end of file