Adds industrial chair & parts (#15536)

Co-authored-by: TobleroneSwordfish <20713227+TobleroneSwordfish@users.noreply.github.com>
goonstation · Sep 2, 2023 · ce2aeb6 · ce2aeb6
1 parent 41767df
commit ce2aeb6
Show file tree

Hide file tree

Showing 50 changed files with 36,230 additions and 36,200 deletions.
diff --git a/+secret b/+secret
diff --git a/assets/maps/prefabs/space/prefab_artist_studio.dmm b/assets/maps/prefabs/space/prefab_artist_studio.dmm
@@ -77,7 +77,7 @@
 /turf/simulated/floor/darkblue,
 /area/prefab/art_workshop)
 "gY" = (
-/obj/stool/chair/wooden{
+/obj/stool/chair/dining/wood{
 	dir = 8
 	},
 /turf/simulated/floor/darkblue,
@@ -102,7 +102,7 @@
 /turf/simulated/floor/darkblue,
 /area/prefab/art_workshop)
 "kU" = (
-/obj/stool/chair/wooden{
+/obj/stool/chair/dining/wood{
 	dir = 1
 	},
 /turf/simulated/floor/longtile/red,
@@ -178,7 +178,7 @@
 /turf/simulated/floor/plating,
 /area/prefab/art_workshop)
 "sy" = (
-/obj/stool/chair/wooden{
+/obj/stool/chair/dining/wood{
 	dir = 8
 	},
 /obj/machinery/light/incandescent/harsh{

diff --git a/assets/maps/prefabs/space/prefab_cannibal.dmm b/assets/maps/prefabs/space/prefab_cannibal.dmm
@@ -53,7 +53,7 @@
 /turf/simulated/floor/wood/two,
 /area/noGenerate)
 "j" = (
-/obj/stool/chair/wooden{
+/obj/stool/chair/dining/wood{
 	dir = 4;
 	icon_state = "chair_wooden"
 	},
@@ -80,7 +80,7 @@
 /turf/simulated/floor/wood/two,
 /area/noGenerate)
 "m" = (
-/obj/stool/chair/wooden{
+/obj/stool/chair/dining/wood{
 	dir = 8;
 	icon_state = "chair_wooden"
 	},

diff --git a/assets/maps/prefabs/space/prefab_customs_shuttle.dmm b/assets/maps/prefabs/space/prefab_customs_shuttle.dmm
@@ -652,7 +652,7 @@
 	},
 /area/prefab/crashed_hop_shuttle)
 "Op" = (
-/obj/stool/chair/wooden/regal{
+/obj/stool/chair/dining/regal{
 	dir = 8
 	},
 /turf/simulated/floor/carpet/purple/standard/edge,

diff --git a/assets/maps/prefabs/space/prefab_dans_asteroid.dmm b/assets/maps/prefabs/space/prefab_dans_asteroid.dmm
@@ -1220,7 +1220,7 @@
 /turf/simulated/floor/airless/neutral,
 /area/prefab/discount_dans_asteroid)
 "Tk" = (
-/obj/stool/chair/wooden{
+/obj/stool/chair/dining/wood{
 	dir = 1
 	},
 /turf/simulated/floor/carpet/blue/standard/edge/nw,

diff --git a/assets/maps/prefabs/space/prefab_dreamplaza.dmm b/assets/maps/prefabs/space/prefab_dreamplaza.dmm
@@ -675,7 +675,7 @@
 	dir = 1;
 	pixel_y = 12
 	},
-/obj/stool/chair/wooden/regal,
+/obj/stool/chair/dining/regal,
 /turf/simulated/floor/marble/border_wb,
 /area/prefab/dreamplaza)
 "wA" = (

diff --git a/assets/maps/prefabs/space/prefab_larrys_laundromat.dmm b/assets/maps/prefabs/space/prefab_larrys_laundromat.dmm
@@ -448,7 +448,7 @@
 /turf/simulated/floor/twotone/black,
 /area/prefab/larrys_laundry)
 "Uq" = (
-/obj/stool/chair/wooden{
+/obj/stool/chair/dining/wood{
 	dir = 1
 	},
 /turf/simulated/floor/carpet/grime,

diff --git a/assets/maps/prefabs/space/prefab_secbot_academy.dmm b/assets/maps/prefabs/space/prefab_secbot_academy.dmm
@@ -608,7 +608,7 @@
 /turf/simulated/floor/wood/two,
 /area/prefab/secbot_academy)
 "CV" = (
-/obj/stool/chair/wooden{
+/obj/stool/chair/dining/wood{
 	dir = 1
 	},
 /turf/simulated/floor/wood,
@@ -893,7 +893,7 @@
 /turf/simulated/floor/carpet/purple/fancy/edge/west,
 /area/prefab/secbot_academy)
 "Pq" = (
-/obj/stool/chair/wooden{
+/obj/stool/chair/dining/wood{
 	dir = 8
 	},
 /turf/simulated/floor/carpet/purple/fancy,

diff --git a/assets/maps/prefabs/underwater/nadir/prefab_water_nadirelevator.dmm b/assets/maps/prefabs/underwater/nadir/prefab_water_nadirelevator.dmm
@@ -242,9 +242,9 @@
 "hf" = (
 /turf/unsimulated/wall/auto/lead/blue,
 /area/shuttle/sea_elevator)
-"hk" = (
-/obj/stool/chair/wooden{
-	dir = 8
+"hB" = (
+/obj/stool/chair/dining/wood{
+	dir = 1
 	},
 /turf/simulated/floor/black/grime,
 /area/diner/dining)
@@ -639,6 +639,14 @@
 	},
 /turf/simulated/floor/industrial,
 /area/shuttle/sea_elevator)
+"xz" = (
+/obj/stool/chair/dining/wood{
+	dir = 4
+	},
+/obj/decal/cleanable/dirt/dirt2,
+/mob/living/carbon/human/fathergrife,
+/turf/simulated/floor/black/grime,
+/area/diner/dining)
 "xI" = (
 /turf/unsimulated/wall/setpieces/leadwindow{
 	dir = 8
@@ -910,6 +918,12 @@
 /area/diner/hallway{
 	name = "Space Diner Backhall"
 	})
+"FP" = (
+/obj/stool/chair/dining/wood{
+	dir = 4
+	},
+/turf/simulated/floor/black/grime,
+/area/diner/dining)
 "FW" = (
 /obj/stool/chair/couch{
 	dir = 4
@@ -977,12 +991,6 @@
 /obj/marker/supplymarker,
 /turf/simulated/floor/black/grime,
 /area/skeleton_trader)
-"IQ" = (
-/obj/stool/chair/wooden{
-	dir = 1
-	},
-/turf/simulated/floor/black/grime,
-/area/diner/dining)
 "Jj" = (
 /obj/machinery/chem_dispenser/soda,
 /turf/simulated/floor/black/grime,
@@ -1021,6 +1029,10 @@
 /obj/decal/tile_edge/check/purple,
 /turf/simulated/floor/black/grime,
 /area/diner/dining)
+"KO" = (
+/obj/stool/chair/dining/wood,
+/turf/simulated/floor/black/grime,
+/area/diner/dining)
 "KS" = (
 /turf/simulated/floor/grime,
 /area/diner/dining)
@@ -1201,6 +1213,13 @@
 /obj/decal/cleanable/dirt,
 /turf/simulated/floor/black/grime,
 /area/diner/dining)
+"OE" = (
+/obj/stool/chair/dining/wood{
+	dir = 8
+	},
+/mob/living/carbon/human/don_glab,
+/turf/simulated/floor/black/grime,
+/area/diner/dining)
 "OI" = (
 /obj/mapping_helper/wingrille_spawn/auto/crystal,
 /turf/simulated/floor/engine,
@@ -1274,6 +1293,12 @@
 /obj/machinery/door/airlock/pyro/external,
 /turf/simulated/floor/engine/caution/east,
 /area/diner/dining)
+"Sg" = (
+/obj/stool/chair/dining/wood{
+	dir = 8
+	},
+/turf/simulated/floor/black/grime,
+/area/diner/dining)
 "Sh" = (
 /obj/machinery/door/airlock/pyro,
 /turf/simulated/floor/black/grime,
@@ -1409,10 +1434,6 @@
 /obj/machinery/light/small/floor/netural,
 /turf/simulated/floor/engine/caution,
 /area/shuttle/sea_elevator)
-"Vq" = (
-/obj/stool/chair/wooden,
-/turf/simulated/floor/black/grime,
-/area/diner/dining)
 "Vu" = (
 /turf/simulated/wall/auto/reinforced/supernorn,
 /area/skeleton_trader)
@@ -1448,12 +1469,6 @@
 /area/tech_outpost{
 	name = "The Recluse"
 	})
-"WK" = (
-/obj/stool/chair/wooden{
-	dir = 4
-	},
-/turf/simulated/floor/black/grime,
-/area/diner/dining)
 "WN" = (
 /obj/machinery/light/incandescent/warm{
 	dir = 1;
@@ -1541,13 +1556,6 @@
 	dir = 5
 	},
 /area/diner/dining)
-"Yn" = (
-/obj/stool/chair/wooden{
-	dir = 8
-	},
-/mob/living/carbon/human/don_glab,
-/turf/simulated/floor/black/grime,
-/area/diner/dining)
 "YC" = (
 /obj/machinery/door/airlock/pyro{
 	dir = 4
@@ -1632,14 +1640,6 @@
 /area/tech_outpost{
 	name = "The Recluse"
 	})
-"ZM" = (
-/obj/decal/cleanable/dirt/dirt2,
-/obj/stool/chair/wooden{
-	dir = 4
-	},
-/mob/living/carbon/human/fathergrife,
-/turf/simulated/floor/black/grime,
-/area/diner/dining)
 "ZZ" = (
 /obj/decal/cleanable/dirt/dirt3,
 /turf/simulated/floor/caution/south,
@@ -3155,7 +3155,7 @@ Vf
 Vf
 Vf
 Oz
-ZM
+xz
 uP
 XP
 XP
@@ -3253,7 +3253,7 @@ Vf
 Vf
 Vf
 Vf
-hk
+Sg
 uP
 Nl
 XP
@@ -3300,7 +3300,7 @@ XK
 NO
 Vf
 Vf
-WK
+FP
 Vf
 Uw
 LU
@@ -3348,9 +3348,9 @@ ER
 Lo
 Fw
 Vf
-Vq
+KO
 Tx
-IQ
+hB
 Oz
 uP
 Nl
@@ -3398,7 +3398,7 @@ VR
 Ql
 lZ
 Vf
-Yn
+OE
 Wr
 tR
 Wr