Merge pull request #544 from wraith-54321/tram-bar-collection

Mapping contest map
Monkestation · Nov 12, 2023 · f0f0a7e · f0f0a7e
2 parents ed54cf2 + 3e67d73
commit f0f0a7e
Show file tree

Hide file tree

Showing 11 changed files with 115,671 additions and 53 deletions.
diff --git a/code/game/area/areas/station.dm b/code/game/area/areas/station.dm
@@ -4,6 +4,7 @@
 	name = "Station Areas"
 	icon = 'icons/area/areas_station.dmi'
 	icon_state = "station"
+	area_flags = UNIQUE_AREA //TEMP EDIT FOR TM, DO NOT KEEP
 
 //Maintenance
 

diff --git a/monkestation/_maps/RandomBars/Tram/tram_bar_beachside.dmm b/monkestation/_maps/RandomBars/Tram/tram_bar_beachside.dmm
@@ -62,12 +62,6 @@
 	},
 /turf/open/floor/fakesand,
 /area/station/commons/lounge)
-"cg" = (
-/obj/structure/railing/corner{
-	dir = 1
-	},
-/turf/open/water/beach/biodome/sinking,
-/area/station/commons/lounge)
 "cZ" = (
 /obj/machinery/requests_console/directional/north{
 	name = "Kitchen Requests Console"
@@ -1249,10 +1243,6 @@
 /obj/effect/spawner/random/entertainment/lighter,
 /turf/open/floor/wood,
 /area/station/service/bar)
-"LC" = (
-/obj/structure/railing/corner,
-/turf/open/water/beach/biodome/sinking,
-/area/station/commons/lounge)
 "LD" = (
 /turf/open/misc/beach/coastline_b{
 	dir = 8
@@ -1495,22 +1485,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/fakesand,
 /area/station/commons/lounge)
-"Rr" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 8
-	},
-/obj/structure/table/reinforced/titaniumglass,
-/obj/item/plate,
-/obj/item/food/fishmeat,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "playerscantreadthis";
-	name = "Kitchen Counter Shutters"
-	},
-/obj/structure/railing/corner{
-	dir = 8
-	},
-/turf/open/floor/wood,
-/area/station/service/kitchen)
 "Rv" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -1641,9 +1615,6 @@
 /obj/structure/desk_bell{
 	pixel_x = 7
 	},
-/obj/structure/railing/corner{
-	dir = 1
-	},
 /turf/open/floor/wood,
 /area/station/service/kitchen)
 "Vg" = (
@@ -1700,12 +1671,6 @@
 /obj/effect/turf_decal/sand,
 /turf/open/misc/beach/sand,
 /area/station/commons/lounge)
-"Wx" = (
-/obj/structure/railing/corner{
-	dir = 4
-	},
-/turf/open/water/beach/biodome/sinking,
-/area/station/commons/lounge)
 "WJ" = (
 /obj/structure/chair{
 	dir = 1
@@ -1788,7 +1753,10 @@
 /area/station/commons/lounge)
 "ZG" = (
 /obj/structure/railing{
-	dir = 9
+	dir = 1
+	},
+/obj/structure/railing{
+	dir = 8
 	},
 /turf/open/water/beach/biodome/sinking,
 /area/station/commons/lounge)
@@ -2161,13 +2129,13 @@ zC
 "}
 (14,1,1) = {"
 jm
-LC
+jm
 dP
 dP
 dP
 dP
 dP
-Wx
+jm
 hh
 KJ
 Hk
@@ -2221,7 +2189,7 @@ HN
 ZG
 Xc
 Xc
-cg
+jm
 hh
 KJ
 WJ
@@ -2245,7 +2213,7 @@ jm
 HB
 RL
 ZG
-cg
+jm
 jm
 jm
 jm
@@ -2377,7 +2345,7 @@ lL
 "}
 (22,1,1) = {"
 xw
-Rr
+ek
 sa
 Vb
 xw

diff --git a/...maps/RandomBars/Tram/biodome_tram_bar.dmm → ...maps/RandomBars/Tram/tram_bar_biodome.dmm b/...maps/RandomBars/Tram/biodome_tram_bar.dmm → ...maps/RandomBars/Tram/tram_bar_biodome.dmm
diff --git a/monkestation/_maps/RandomBars/Tram/tram_bar_ocean.dmm b/monkestation/_maps/RandomBars/Tram/tram_bar_ocean.dmm
@@ -676,8 +676,8 @@
 /turf/open/floor/fake_seafloor/medium,
 /area/station/commons/lounge)
 "EF" = (
-/obj/structure/railing/corner{
-	dir = 4
+/obj/structure/railing{
+	dir = 1
 	},
 /turf/open/floor/fake_seafloor,
 /area/station/commons/lounge)
@@ -1108,12 +1108,6 @@
 	},
 /turf/open/floor/fake_seafloor/ironsand,
 /area/station/service/theater)
-"Yv" = (
-/obj/structure/railing/corner{
-	dir = 1
-	},
-/turf/open/floor/fake_seafloor,
-/area/station/commons/lounge)
 "YG" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -1560,7 +1554,7 @@ Um
 pR
 pR
 pR
-Yv
+EF
 BO
 jZ
 Uk