BoxStation Post-Merge Fixes 4.1 (#3405)

* BoxStation Post Merge Fixes 4.1 Continuation of PR 2213. * Fix 1 Thanks for finding these, Linter. * Fix 2 Thanks again, Linter. * Fix 3 Just some lights and other stuff I missed. * Fix 4 Cleaned up the disposal pipe system a bit. Did more stuff with lights. Miscellaneous things. * Fix 5 Missed some more stuff. * Fix 6 Miscellaneous stuff.
Monkestation · Sep 16, 2024 · de55beb · de55beb
1 parent 72a6197
commit de55beb
Show file tree

Hide file tree

Showing 10 changed files with 33,634 additions and 33,958 deletions.
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
diff --git a/_maps/~monkestation/RandomBars/Box/bloody_bar.dmm b/_maps/~monkestation/RandomBars/Box/bloody_bar.dmm
@@ -111,7 +111,6 @@
 /turf/open/floor/plating,
 /area/station/commons/lounge)
 "qb" = (
-/obj/machinery/camera/autoname/directional/north,
 /obj/machinery/light/small/directional/north,
 /turf/open/floor/cult,
 /area/station/commons/lounge)
@@ -149,11 +148,6 @@
 /obj/machinery/holopad,
 /turf/open/floor/cult,
 /area/station/commons/lounge)
-"vj" = (
-/obj/machinery/camera/autoname/directional/east,
-/obj/machinery/computer/slot_machine,
-/turf/open/floor/cult,
-/area/station/commons/lounge)
 "wp" = (
 /obj/structure/chair/wood{
 	dir = 8
@@ -208,12 +202,12 @@
 /turf/open/floor/cult,
 /area/station/commons/lounge)
 "DC" = (
+/obj/machinery/camera/autoname/directional/north,
 /obj/machinery/media/jukebox,
 /turf/open/floor/cult,
 /area/station/commons/lounge)
 "DJ" = (
-/obj/machinery/camera/autoname/directional/west,
-/obj/machinery/light/small/directional/west,
+/obj/machinery/light/directional/west,
 /turf/open/floor/cult,
 /area/station/commons/lounge)
 "DZ" = (
@@ -380,8 +374,7 @@
 /turf/open/floor/wood/large,
 /area/station/service/theater)
 "WG" = (
-/obj/machinery/camera/autoname/directional/east,
-/obj/machinery/light/small/directional/east,
+/obj/machinery/light/directional/east,
 /obj/item/radio/intercom/directional/east,
 /turf/open/floor/cult,
 /area/station/commons/lounge)
@@ -457,7 +450,7 @@ Bl
 FK
 eO
 ja
-vj
+ja
 es
 Sg
 kL

diff --git a/_maps/~monkestation/RandomBars/Box/clockwork_bar.dmm b/_maps/~monkestation/RandomBars/Box/clockwork_bar.dmm
@@ -69,6 +69,7 @@
 /turf/open/floor/bronze,
 /area/station/commons/lounge)
 "iB" = (
+/obj/machinery/camera/autoname/directional/north,
 /obj/machinery/media/jukebox,
 /turf/open/floor/bronze,
 /area/station/commons/lounge)
@@ -80,11 +81,6 @@
 /obj/machinery/vending/cigarette,
 /turf/open/floor/bronze,
 /area/station/commons/lounge)
-"ll" = (
-/obj/machinery/camera/autoname/directional/east,
-/obj/machinery/computer/slot_machine,
-/turf/open/floor/bronze,
-/area/station/commons/lounge)
 "mm" = (
 /obj/structure/chair/bronze,
 /obj/effect/landmark/start/hangover,
@@ -153,8 +149,7 @@
 /turf/open/floor/bronze,
 /area/station/commons/lounge)
 "uV" = (
-/obj/machinery/camera/autoname/directional/east,
-/obj/machinery/light/small/directional/east,
+/obj/machinery/light/directional/east,
 /obj/item/radio/intercom/directional/east,
 /turf/open/floor/bronze,
 /area/station/commons/lounge)
@@ -243,8 +238,7 @@
 /turf/open/floor/bronze,
 /area/station/commons/lounge)
 "LJ" = (
-/obj/machinery/camera/autoname/directional/west,
-/obj/machinery/light/small/directional/west,
+/obj/machinery/light/directional/west,
 /turf/open/floor/bronze,
 /area/station/commons/lounge)
 "Mm" = (
@@ -320,7 +314,6 @@
 /turf/open/floor/bronze,
 /area/station/commons/lounge)
 "Tu" = (
-/obj/machinery/camera/autoname/directional/north,
 /obj/machinery/light/small/directional/north,
 /turf/open/floor/bronze,
 /area/station/commons/lounge)
@@ -435,7 +428,7 @@ TL
 ZZ
 UM
 tZ
-ll
+tZ
 yC
 Ya
 Wj

diff --git a/_maps/~monkestation/RandomBars/Box/default_bar.dmm b/_maps/~monkestation/RandomBars/Box/default_bar.dmm
@@ -220,8 +220,7 @@
 /area/station/commons/lounge)
 "zm" = (
 /obj/effect/turf_decal/tile/bar/opposingcorners,
-/obj/machinery/camera/autoname/directional/east,
-/obj/machinery/light/small/directional/east,
+/obj/machinery/light/directional/east,
 /obj/item/radio/intercom/directional/east,
 /turf/open/floor/iron,
 /area/station/commons/lounge)
@@ -311,7 +310,6 @@
 /area/station/commons/lounge)
 "EP" = (
 /obj/effect/turf_decal/tile/bar/opposingcorners,
-/obj/machinery/camera/autoname/directional/north,
 /obj/machinery/light/small/directional/north,
 /turf/open/floor/iron,
 /area/station/commons/lounge)
@@ -345,12 +343,6 @@
 /obj/machinery/light/directional/east,
 /turf/open/floor/iron,
 /area/station/commons/lounge)
-"Jm" = (
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/obj/machinery/camera/autoname/directional/east,
-/obj/machinery/computer/slot_machine,
-/turf/open/floor/iron,
-/area/station/commons/lounge)
 "JF" = (
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/effect/spawner/random/entertainment/arcade{
@@ -368,6 +360,7 @@
 /area/station/commons/lounge)
 "Lc" = (
 /obj/effect/turf_decal/tile/bar/opposingcorners,
+/obj/machinery/camera/autoname/directional/north,
 /obj/machinery/media/jukebox,
 /turf/open/floor/iron,
 /area/station/commons/lounge)
@@ -432,8 +425,7 @@
 /area/station/commons/lounge)
 "PD" = (
 /obj/effect/turf_decal/tile/bar/opposingcorners,
-/obj/machinery/camera/autoname/directional/west,
-/obj/machinery/light/small/directional/west,
+/obj/machinery/light/directional/west,
 /turf/open/floor/iron,
 /area/station/commons/lounge)
 "QZ" = (
@@ -446,7 +438,6 @@
 "Tq" = (
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/structure/table/wood/poker,
-/obj/item/toy/cards/deck,
 /obj/item/clothing/mask/cigarette/cigar,
 /turf/open/floor/iron,
 /area/station/commons/lounge)
@@ -533,7 +524,7 @@ tH
 Nm
 QZ
 vO
-Jm
+vO
 IP
 JF
 sZ
@@ -546,8 +537,8 @@ tH
 TB
 TB
 EF
-Ly
 Tq
+ZX
 tH
 tH
 cL

diff --git a/_maps/~monkestation/RandomBars/Box/vietmoth_bar.dmm b/_maps/~monkestation/RandomBars/Box/vietmoth_bar.dmm
@@ -59,7 +59,6 @@
 /turf/open/floor/grass,
 /area/station/commons/lounge)
 "gY" = (
-/obj/machinery/camera/autoname/directional/north,
 /obj/machinery/light/small/directional/north,
 /turf/open/water/jungle,
 /area/station/commons/lounge)
@@ -172,6 +171,7 @@
 /turf/open/floor/grass,
 /area/station/commons/lounge)
 "py" = (
+/obj/machinery/camera/autoname/directional/north,
 /obj/machinery/media/jukebox,
 /turf/open/floor/grass,
 /area/station/commons/lounge)
@@ -265,11 +265,6 @@
 "yJ" = (
 /turf/template_noop,
 /area/template_noop)
-"zh" = (
-/obj/machinery/camera/autoname/directional/east,
-/obj/machinery/computer/slot_machine,
-/turf/open/floor/grass,
-/area/station/commons/lounge)
 "zv" = (
 /obj/structure/table/wood,
 /obj/item/instrument/saxophone,
@@ -325,8 +320,7 @@
 /turf/open/floor/grass,
 /area/station/commons/lounge)
 "GX" = (
-/obj/machinery/camera/autoname/directional/east,
-/obj/machinery/light/small/directional/east,
+/obj/machinery/light/directional/east,
 /obj/item/radio/intercom/directional/east,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 1
@@ -411,8 +405,7 @@
 /turf/open/floor/grass,
 /area/station/commons/lounge)
 "OY" = (
-/obj/machinery/camera/autoname/directional/west,
-/obj/machinery/light/small/directional/west,
+/obj/machinery/light/directional/west,
 /obj/structure/flora/bush/fullgrass/style_random,
 /obj/structure/flora/bush/flowers_br/style_random,
 /turf/open/floor/grass,
@@ -508,7 +501,7 @@ vy
 Dg
 xk
 AS
-zh
+AS
 oa
 EB
 yJ

diff --git a/_maps/~monkestation/RandomEngines/BoxStation/empty.dmm b/_maps/~monkestation/RandomEngines/BoxStation/empty.dmm
@@ -47,7 +47,7 @@
 	},
 /obj/effect/mapping_helpers/airlock/access/all/engineering/general,
 /turf/open/floor/plating,
-/area/station/maintenance/department/engine)
+/area/station/maintenance/department/engineering/central)
 "m" = (
 /obj/structure/lattice/catwalk,
 /turf/open/space/basic,
@@ -78,7 +78,7 @@
 	},
 /obj/effect/spawner/structure/window/reinforced/plasma,
 /turf/open/floor/plating,
-/area/station/maintenance/department/engine)
+/area/station/maintenance/department/engineering/central)
 "A" = (
 /obj/structure/lattice,
 /turf/open/space/basic,
@@ -88,7 +88,7 @@
 /area/station/engineering/main)
 "C" = (
 /turf/closed/wall/r_wall,
-/area/station/maintenance/department/engine)
+/area/station/maintenance/department/engineering/central)
 "D" = (
 /obj/machinery/light/directional/north,
 /obj/machinery/airalarm/directional/north,
@@ -167,7 +167,7 @@
 "Z" = (
 /obj/effect/spawner/structure/window/reinforced/plasma,
 /turf/open/floor/plating,
-/area/station/maintenance/department/engine)
+/area/station/maintenance/department/engineering/central)
 
 (1,1,1) = {"
 R
@@ -875,7 +875,7 @@ Z
 l
 z
 C
-C
+a
 a
 a
 a
@@ -902,7 +902,6 @@ f
 f
 f
 f
-f
 C
 a
 a
@@ -911,6 +910,7 @@ a
 a
 a
 a
+a
 R
 r
 r
@@ -930,7 +930,6 @@ f
 f
 f
 f
-f
 C
 a
 a
@@ -939,6 +938,7 @@ a
 a
 a
 a
+a
 R
 f
 f
@@ -958,17 +958,17 @@ f
 f
 f
 f
-f
 C
-R
-R
-R
-R
-Y
-Y
-Y
-R
-A
+C
+C
+C
+C
+C
+C
+C
+C
+C
+C
 A
 A
 A