Merge branch 'master' into radios

shiptest-ss13 · Apr 21, 2024 · 5e6231a · 5e6231a
2 parents 3d3b6e7 + cd0528e
commit 5e6231a
Show file tree

Hide file tree

Showing 267 changed files with 3,420 additions and 4,159 deletions.
diff --git a/_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm b/_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm
@@ -374,11 +374,8 @@
 	},
 /obj/item/gun/energy/lasercannon{
 	pixel_y = 5;
-	pin = /obj/item/firing_pin
-	},
-/obj/item/gun/energy/lasercannon{
-	pin = /obj/item/firing_pin
 	},
+/obj/item/gun/energy/lasercannon,
 /obj/effect/turf_decal/industrial/hatch,
 /turf/open/floor/plasteel/mono,
 /area/ruin/beach/complex)

diff --git a/_maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm b/_maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm
@@ -89,10 +89,8 @@
 	dir = 4;
 	color = "#808080"
 	},
-/obj/structure/closet/wall/red{
-	dir = 8;
+/obj/structure/closet/wall/red/directional/east{
 	name = "armory locker";
-	pixel_x = 28;
 	req_one_access_txt = "1"
 	},
 /obj/item/storage/box/slugshot,
@@ -1151,10 +1149,8 @@
 "sw" = (
 /obj/effect/turf_decal/siding/wood/end,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/closet/wall{
-	dir = 8;
-	icon_door = "grey_wall";
-	pixel_x = 28
+/obj/structure/closet/wall/directional/east{
+	icon_door = "grey_wall"
 	},
 /obj/item/flashlight/lantern{
 	pixel_x = 8
@@ -1471,10 +1467,7 @@
 "wx" = (
 /obj/structure/catwalk/over,
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/emcloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/west,
 /obj/machinery/atmospherics/pipe/simple/orange/hidden,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -2012,10 +2005,7 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/closet/emcloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/west,
 /obj/item/skub{
 	pixel_x = -5;
 	pixel_y = 6
@@ -2121,10 +2111,8 @@
 	dir = 8;
 	color = "#808080"
 	},
-/obj/structure/closet/wall/red{
-	dir = 4;
+/obj/structure/closet/wall/red/directional/west{
 	name = "armory locker";
-	pixel_x = -28;
 	req_one_access_txt = "1"
 	},
 /obj/item/storage/belt/military,
@@ -2425,10 +2413,7 @@
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "KC" = (
 /obj/structure/catwalk/over,
-/obj/structure/closet/firecloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/firecloset/wall/directional/west,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/yellow{
@@ -2766,7 +2751,7 @@
 /obj/effect/decal/cleanable/blood/old{
 	icon_state = "gib2-old"
 	},
-/obj/structure/chair/comfy/black{
+/obj/structure/chair/comfy/grey/directional/south{
 	desc = "It looks incredibly comfy, and expensive. Theres a little note on the side, explaining how its made of %100 real cow skin.";
 	name = "Cowskin chair"
 	},
@@ -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/BeachRuins/beach_fishing_hut.dmm b/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm
@@ -1,8 +1,6 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "ae" = (
-/obj/structure/chair/sofa/left{
-	dir = 8
-	},
+/obj/structure/chair/sofa/brown/left/directional/west,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/carpet,
 /area/ruin/beach)
@@ -483,7 +481,7 @@
 /turf/open/water/beach,
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "sN" = (
-/obj/structure/chair/sofa,
+/obj/structure/chair/sofa/brown/directional/south,
 /obj/machinery/light/small/directional/north{
 	light_color = "#694c12"
 	},
@@ -853,7 +851,7 @@
 /turf/open/floor/plastic,
 /area/ruin/beach)
 "GP" = (
-/obj/structure/chair/sofa/right,
+/obj/structure/chair/sofa/brown/right/directional/south,
 /obj/effect/decal/cleanable/cobweb,
 /mob/living/simple_animal/hostile/pirate/melee{
 	faction = list("beach","pirate")
@@ -1136,7 +1134,7 @@
 /turf/open/floor/wood,
 /area/ruin/beach)
 "Rh" = (
-/obj/structure/chair/sofa/corner,
+/obj/structure/chair/sofa/brown/corner/directional/south,
 /mob/living/simple_animal/hostile/pirate/melee{
 	faction = list("beach","pirate")
 	},

diff --git a/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm b/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm
@@ -163,9 +163,7 @@
 	},
 /area/ruin/beach/float_resort)
 "dZ" = (
-/obj/structure/chair/comfy/black{
-	dir = 1
-	},
+/obj/structure/chair/comfy/grey/directional/north,
 /turf/open/floor/wood{
 	light_range = 2
 	},
@@ -824,7 +822,7 @@
 /turf/open/floor/plating,
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "wn" = (
-/obj/structure/chair/comfy/black,
+/obj/structure/chair/comfy/grey/directional/south,
 /turf/open/floor/wood{
 	light_range = 2
 	},
@@ -1178,9 +1176,7 @@
 	},
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "Fk" = (
-/obj/structure/chair/sofa/right{
-	dir = 4
-	},
+/obj/structure/chair/sofa/brown/right/directional/east,
 /obj/machinery/light/small/directional/west,
 /turf/open/floor/wood{
 	light_range = 2
@@ -1313,9 +1309,7 @@
 	},
 /area/ruin/beach/float_resort)
 "Io" = (
-/obj/structure/chair/sofa/left{
-	dir = 4
-	},
+/obj/structure/chair/sofa/brown/left/directional/east,
 /turf/open/floor/wood{
 	light_range = 2
 	},

diff --git a/_maps/RandomRuins/BeachRuins/beach_knights_rest.dmm b/_maps/RandomRuins/BeachRuins/beach_knights_rest.dmm
@@ -35,7 +35,7 @@
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "dF" = (
 /obj/structure/mineral_door/iron,
-/turf/open/floor/plasteel/stairs/medium{
+/turf/open/floor/plasteel/stairs/mid{
 	dir = 4
 	},
 /area/ruin/beachplanet/knight)
@@ -940,7 +940,7 @@
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "ZS" = (
 /obj/structure/mineral_door/iron,
-/turf/open/floor/plasteel/stairs/medium{
+/turf/open/floor/plasteel/stairs/mid{
 	dir = 8
 	},
 /area/ruin/beachplanet/knight)

diff --git a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
@@ -175,9 +175,7 @@
 /obj/structure/railing{
 	dir = 8
 	},
-/obj/structure/chair/comfy/brown{
-	dir = 8
-	},
+/obj/structure/chair/comfy/orange/directional/west,
 /turf/open/floor/carpet/black,
 /area/ruin/beach/oceantown/bar)
 "cy" = (
@@ -266,9 +264,7 @@
 /turf/open/floor/plasteel/white,
 /area/ruin/beach/oceantown/bar)
 "dF" = (
-/obj/structure/chair/sofa{
-	dir = 4
-	},
+/obj/structure/chair/sofa/brown/directional/east,
 /turf/open/floor/carpet/green,
 /area/ruin/beach/oceantown/hotel)
 "dL" = (
@@ -393,9 +389,7 @@
 /turf/open/floor/plating/asteroid/sand/lit,
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "eN" = (
-/obj/structure/chair/sofa/corner{
-	dir = 1
-	},
+/obj/structure/chair/sofa/brown/corner/directional/north,
 /turf/open/floor/carpet/green,
 /area/ruin/beach/oceantown/hotel)
 "eV" = (
@@ -488,9 +482,7 @@
 	},
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "fJ" = (
-/obj/structure/chair/sofa/corner{
-	dir = 4
-	},
+/obj/structure/chair/sofa/brown/corner/directional/east,
 /turf/open/floor/carpet/green,
 /area/ruin/beach/oceantown/hotel)
 "fL" = (
@@ -708,7 +700,7 @@
 /turf/open/floor/carpet,
 /area/ruin/beach/oceantown/hotel)
 "iv" = (
-/obj/structure/chair/sofa/left,
+/obj/structure/chair/sofa/brown/left/directional/south,
 /turf/open/floor/carpet/green,
 /area/ruin/beach/oceantown/hotel)
 "iw" = (
@@ -1024,9 +1016,7 @@
 	},
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "mJ" = (
-/obj/structure/chair/sofa/right{
-	dir = 1
-	},
+/obj/structure/chair/sofa/brown/right/directional/north,
 /turf/open/floor/carpet/green,
 /area/ruin/beach/oceantown/hotel)
 "mR" = (
@@ -1395,9 +1385,7 @@
 /turf/open/floor/plating/asteroid/sand/lit,
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "sj" = (
-/obj/structure/chair/sofa/right{
-	dir = 4
-	},
+/obj/structure/chair/sofa/brown/right/directional/east,
 /turf/open/floor/wood,
 /area/ruin/beach/oceantown)
 "sp" = (
@@ -1416,9 +1404,7 @@
 /turf/open/floor/plasteel/mono,
 /area/ruin/beach/oceantown)
 "sr" = (
-/obj/structure/chair/comfy/brown{
-	dir = 8
-	},
+/obj/structure/chair/comfy/orange/directional/west,
 /turf/open/floor/carpet/black,
 /area/ruin/beach/oceantown/bar)
 "sy" = (
@@ -1477,7 +1463,7 @@
 /turf/open/floor/plasteel/tech,
 /area/ruin/beach/oceantown)
 "te" = (
-/obj/structure/chair/sofa/left,
+/obj/structure/chair/sofa/brown/left/directional/south,
 /turf/open/floor/wood,
 /area/ruin/beach/oceantown)
 "ti" = (
@@ -1969,7 +1955,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ruin/beach/oceantown/bar)
 "zk" = (
-/obj/structure/chair/sofa,
+/obj/structure/chair/sofa/brown/directional/south,
 /turf/open/floor/wood,
 /area/ruin/beach/oceantown)
 "zl" = (
@@ -2903,9 +2889,7 @@
 /turf/open/floor/plasteel,
 /area/ruin/beach/oceantown/bar)
 "IU" = (
-/obj/structure/chair/sofa/left{
-	dir = 4
-	},
+/obj/structure/chair/sofa/brown/left/directional/east,
 /turf/open/floor/wood,
 /area/ruin/beach/oceantown)
 "IX" = (
@@ -3563,7 +3547,7 @@
 	},
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "PE" = (
-/obj/structure/chair/sofa/right,
+/obj/structure/chair/sofa/brown/right/directional/south,
 /turf/open/floor/wood,
 /area/ruin/beach/oceantown)
 "PF" = (
@@ -3729,9 +3713,7 @@
 /turf/open/floor/plating,
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "Sv" = (
-/obj/structure/chair/comfy/brown{
-	dir = 4
-	},
+/obj/structure/chair/comfy/orange/directional/east,
 /turf/open/floor/carpet/black,
 /area/ruin/beach/oceantown/bar)
 "Sy" = (
@@ -3769,9 +3751,7 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ruin/beach/oceantown/shop)
 "SY" = (
-/obj/structure/chair/comfy/brown{
-	dir = 1
-	},
+/obj/structure/chair/comfy/orange/directional/north,
 /turf/open/floor/carpet/black,
 /area/ruin/beach/oceantown/bar)
 "Tj" = (
@@ -4012,9 +3992,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ruin/beach/oceantown)
 "VZ" = (
-/obj/structure/chair/sofa{
-	dir = 4
-	},
+/obj/structure/chair/sofa/brown/directional/east,
 /turf/open/floor/wood,
 /area/ruin/beach/oceantown)
 "Wd" = (
@@ -4274,7 +4252,7 @@
 /turf/open/floor/wood,
 /area/ruin/beach/oceantown/hotel)
 "Zr" = (
-/obj/structure/chair/comfy/brown,
+/obj/structure/chair/comfy/orange/directional/south,
 /turf/open/floor/carpet/black,
 /area/ruin/beach/oceantown/bar)
 "Zy" = (