BoxStation Post-Merge Fixes 2

Re-enables the TEG engine. Adjusts the TEG engine room layout slightly. Adjusts the template engine room layout slightly. Removes all custom notes on the map. Makes many other miscellaneous minor additions, changes, and fixes.
Monkestation · Apr 5, 2024 · 61d4514 · 61d4514
1 parent 5c765c1
commit 61d4514
Show file tree

Hide file tree

Showing 9 changed files with 881 additions and 697 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,7 @@
 /turf/open/floor/cult,
 /area/station/commons/lounge)
 "rV" = (
-/obj/effect/decal/cleanable/blood/old,
+/obj/effect/decal/cleanable/blood/splatter,
 /turf/open/floor/cult,
 /area/station/commons/lounge)
 "sW" = (
@@ -333,14 +333,6 @@
 	},
 /turf/open/floor/cult,
 /area/station/commons/lounge)
-"SU" = (
-/obj/structure/table/wood/fancy/red,
-/obj/item/paper/crumpled/bloody{
-	name = "Bloody Crumpled Note";
-	default_raw_text = "<p style="text-align:center"><i>It calls me<br>in a sea of flesh<br>we will become one<br>but I can never go back<br>to being me<p>"
-	},
-/turf/open/floor/cult,
-/area/station/commons/lounge)
 "Uu" = (
 /obj/machinery/light/directional/east,
 /turf/open/floor/wood/large,
@@ -368,6 +360,7 @@
 /area/station/commons/lounge)
 "UO" = (
 /obj/effect/decal/remains/human,
+/obj/effect/decal/cleanable/blood/old,
 /turf/open/floor/cult,
 /area/station/commons/lounge)
 "VJ" = (
@@ -477,7 +470,7 @@ QE
 uS
 ue
 uS
-SU
+uS
 Bl
 Bl
 zU

diff --git a/_maps/~monkestation/RandomBars/Box/clockwork_bar.dmm b/_maps/~monkestation/RandomBars/Box/clockwork_bar.dmm
@@ -153,11 +153,6 @@
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/bronze,
 /area/station/commons/lounge)
-"wY" = (
-/obj/structure/chair/bronze,
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/bronze,
-/area/station/commons/lounge)
 "xT" = (
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
@@ -346,13 +341,6 @@
 /obj/structure/fluff/clockwork/alloy_shards/large,
 /turf/open/floor/bronze,
 /area/station/commons/lounge)
-"Up" = (
-/obj/structure/chair/bronze{
-	dir = 1
-	},
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/bronze,
-/area/station/commons/lounge)
 "Uz" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -514,9 +502,9 @@ RG
 TL
 mm
 Jy
-Up
+cu
 qG
-wY
+si
 Jy
 JZ
 TL
@@ -567,7 +555,7 @@ zp
 "}
 (10,1,1) = {"
 OD
-wY
+si
 Jy
 JZ
 OD
@@ -577,7 +565,7 @@ cr
 OD
 mm
 Jy
-Up
+cu
 Rp
 ca
 jv

diff --git a/_maps/~monkestation/RandomBars/Box/vietmoth_bar.dmm b/_maps/~monkestation/RandomBars/Box/vietmoth_bar.dmm
@@ -1,4 +1,8 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ak" = (
+/obj/structure/flora/bush/jungle/c/style_random,
+/turf/open/floor/grass,
+/area/station/commons/lounge)
 "cc" = (
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
@@ -21,7 +25,6 @@
 /obj/structure/chair/wood{
 	dir = 1
 	},
-/obj/effect/landmark/start/assistant,
 /turf/open/floor/grass,
 /area/station/commons/lounge)
 "dx" = (
@@ -53,6 +56,11 @@
 	},
 /turf/open/misc/dirt/jungle,
 /area/station/service/theater)
+"gM" = (
+/obj/structure/flora/bush/fullgrass/style_random,
+/obj/structure/flora/bush/flowers_pp/style_random,
+/turf/open/floor/grass,
+/area/station/commons/lounge)
 "gY" = (
 /obj/machinery/media/jukebox,
 /obj/machinery/light/directional/north,
@@ -156,6 +164,7 @@
 /turf/open/floor/grass,
 /area/station/commons/lounge)
 "pg" = (
+/obj/structure/flora/bush/fullgrass/style_random,
 /obj/structure/flora/bush/leavy/style_random,
 /turf/open/floor/grass,
 /area/station/commons/lounge)
@@ -177,7 +186,6 @@
 /area/station/service/theater)
 "qi" = (
 /obj/structure/chair/wood,
-/obj/effect/landmark/start/assistant,
 /turf/open/floor/grass,
 /area/station/commons/lounge)
 "tT" = (
@@ -231,6 +239,7 @@
 /turf/open/floor/grass,
 /area/station/service/theater)
 "wF" = (
+/obj/structure/flora/bush/fullgrass/style_random,
 /obj/structure/flora/bush/grassy/style_random,
 /turf/open/floor/grass,
 /area/station/commons/lounge)
@@ -290,6 +299,14 @@
 /obj/machinery/restaurant_portal/bar,
 /turf/open/floor/grass,
 /area/station/commons/lounge)
+"CE" = (
+/obj/structure/flora/rock/pile/style_random,
+/turf/open/floor/grass,
+/area/station/commons/lounge)
+"CX" = (
+/obj/structure/flora/bush/jungle/a/style_random,
+/turf/open/floor/grass,
+/area/station/commons/lounge)
 "Dd" = (
 /obj/structure/chair/wood{
 	dir = 8
@@ -356,6 +373,10 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/grass,
 /area/station/commons/lounge)
+"Ke" = (
+/obj/structure/flora/rock/style_random,
+/turf/open/floor/grass,
+/area/station/commons/lounge)
 "Mu" = (
 /obj/machinery/light/directional/east,
 /turf/open/misc/dirt/jungle,
@@ -397,10 +418,12 @@
 /obj/machinery/camera/autoname/directional/west,
 /obj/machinery/light/small/directional/west,
 /obj/structure/flora/bush/fullgrass/style_random,
+/obj/structure/flora/bush/flowers_br/style_random,
 /turf/open/floor/grass,
 /area/station/commons/lounge)
 "QO" = (
-/obj/structure/flora/bush/sparsegrass/style_random,
+/obj/structure/flora/bush/fullgrass/style_random,
+/obj/structure/flora/bush/flowers_yw/style_random,
 /turf/open/floor/grass,
 /area/station/commons/lounge)
 "QW" = (
@@ -452,8 +475,8 @@ YM
 ir
 nj
 OP
-nj
-nj
+gM
+CE
 yJ
 "}
 (2,1,1) = {"
@@ -477,13 +500,13 @@ yJ
 "}
 (3,1,1) = {"
 Ub
-nj
+CX
 TV
 nj
 vy
 nj
 jK
-nj
+QO
 dx
 dx
 Dg
@@ -525,7 +548,7 @@ fg
 nR
 Oz
 pg
-nj
+CE
 uo
 wM
 QW
@@ -537,7 +560,7 @@ Ub
 gY
 nj
 lY
-nj
+Ke
 mL
 MI
 fm
@@ -582,7 +605,7 @@ wF
 nj
 nj
 ZB
-nj
+ak
 wd
 pP
 jB
@@ -591,7 +614,7 @@ NP
 "}
 (9,1,1) = {"
 Ub
-nj
+gM
 ir
 nj
 mC