Merge branch 'Monkestation:master' into other-fixes

Monkestation · Jan 27, 2024 · 6fc575d · 6fc575d
2 parents e5c49c7 + ba194b6
commit 6fc575d
Show file tree

Hide file tree

Showing 104 changed files with 678 additions and 500 deletions.
diff --git a/...station/_maps/RandomBars/Icebox/BarSM.dmm → ...~monkestation/RandomBars/Icebox/BarSM.dmm b/...station/_maps/RandomBars/Icebox/BarSM.dmm → ...~monkestation/RandomBars/Icebox/BarSM.dmm
diff --git a/...n/_maps/RandomBars/Icebox/Drunkopsbar.dmm → ...station/RandomBars/Icebox/Drunkopsbar.dmm b/...n/_maps/RandomBars/Icebox/Drunkopsbar.dmm → ...station/RandomBars/Icebox/Drunkopsbar.dmm
@@ -239,7 +239,6 @@
 /area/station/service/bar)
 "ox" = (
 /obj/structure/cable,
-/obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/fakespace,
@@ -366,7 +365,7 @@
 /area/station/commons/lounge)
 "tX" = (
 /obj/machinery/door/poddoor/shutters/preopen{
-	id = WEWBAR
+	id = "WEWBAR"
 	},
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -445,7 +444,7 @@
 /obj/item/toy/plush/nukeplushie{
 	desc = "A stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious. Has crude nametag - Bar-Dweetos toy, return if found.";
 	name = "DrunkOps plushie";
-	squeak_override = sssssssssssssssssssssssssssssssssssssslist('sound/effects/hit_punch.ogg'=1)
+	squeak_override = list('sound/effects/hit_punch.ogg'=1)
 	},
 /turf/open/floor/catwalk_floor/iron_dark,
 /area/station/service/bar)
@@ -720,7 +719,7 @@
 /obj/item/toy/plush/nukeplushie{
 	desc = "A stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious. Has crude nametag - Bar-Dweetos toy, return if found.";
 	name = "DrunkOps plushie";
-	squeak_override = sssssssssssssssssssssssssssssssssssssslist('sound/effects/hit_punch.ogg'=1)
+	squeak_override = list('sound/effects/hit_punch.ogg'=1)
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/station/commons/lounge)
@@ -941,7 +940,6 @@
 /area/station/service/bar/backroom)
 "TT" = (
 /obj/structure/cable,
-/obj/structure/cable,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 1
 	},

diff --git a/...tation/_maps/RandomBars/Icebox/Magbar.dmm → ...monkestation/RandomBars/Icebox/Magbar.dmm b/...tation/_maps/RandomBars/Icebox/Magbar.dmm → ...monkestation/RandomBars/Icebox/Magbar.dmm
diff --git a/...tion/_maps/RandomBars/Icebox/MaidCafe.dmm → ...nkestation/RandomBars/Icebox/MaidCafe.dmm b/...tion/_maps/RandomBars/Icebox/MaidCafe.dmm → ...nkestation/RandomBars/Icebox/MaidCafe.dmm
@@ -135,11 +135,6 @@
 	},
 /turf/open/floor/carpet/black,
 /area/station/service/bar)
-"oY" = (
-/obj/structure/cable,
-/obj/structure/cable,
-/turf/open/floor/bamboo,
-/area/station/commons/lounge)
 "pA" = (
 /turf/open/floor/wood/tile,
 /area/station/service/bar)
@@ -865,7 +860,7 @@ xW
 EK
 "}
 (5,1,1) = {"
-oY
+Qu
 XZ
 XZ
 XZ

diff --git a/...ps/RandomBars/Icebox/clockwork_icebox.dmm → ...on/RandomBars/Icebox/clockwork_icebox.dmm b/...ps/RandomBars/Icebox/clockwork_icebox.dmm → ...on/RandomBars/Icebox/clockwork_icebox.dmm
@@ -91,8 +91,8 @@
 	},
 /obj/machinery/door/poddoor/shutters/window/preopen{
 	dir = 1;
-	color = #c09e13;
-	name = "Bar shutters"
+	color = "#c09e13";
+	name = "Bar Shutters"
 	},
 /turf/open/floor/bronze/filled,
 /area/station/service/bar)
@@ -132,8 +132,8 @@
 	},
 /obj/machinery/door/poddoor/shutters/window/preopen{
 	dir = 1;
-	color = #c09e13;
-	name = "Bar shutters"
+	color = "#c09e13";
+	name = "Bar Shutters"
 	},
 /turf/open/floor/bronze/filled,
 /area/station/service/bar)
@@ -175,8 +175,8 @@
 	},
 /obj/machinery/door/poddoor/shutters/window/preopen{
 	dir = 1;
-	color = #c09e13;
-	name = "Bar shutters"
+	color = "#c09e13";
+	name = "Bar Shutters"
 	},
 /turf/open/floor/bronze/filled,
 /area/station/service/bar)
@@ -199,8 +199,8 @@
 /obj/machinery/computer/security/telescreen/entertainment/directional/south,
 /obj/machinery/door/poddoor/shutters/window/preopen{
 	dir = 8;
-	color = #c09e13;
-	name = "Bar shutters"
+	color = "#c09e13";
+	name = "Bar Shutters"
 	},
 /turf/open/floor/bronze/filled,
 /area/station/service/bar)
@@ -322,16 +322,6 @@
 /obj/machinery/disposal/bin,
 /turf/open/floor/bronze/filled,
 /area/station/service/bar)
-"qu" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/structure/cable,
-/obj/structure/cable,
-/turf/open/floor/bronze,
-/area/station/commons/lounge)
 "rs" = (
 /obj/structure/chair/sofa/right/brown{
 	dir = 1
@@ -418,8 +408,8 @@
 "uH" = (
 /obj/structure/table/bronze,
 /obj/machinery/door/poddoor/shutters/window/preopen{
-	color = #c09e13;
-	name = "Bar shutters"
+	color = "#c09e13";
+	name = "Bar Shutters"
 	},
 /turf/open/floor/bronze/filled,
 /area/station/service/bar)
@@ -493,8 +483,8 @@
 	},
 /obj/machinery/door/poddoor/shutters/window/preopen{
 	dir = 8;
-	color = #c09e13;
-	name = "Bar shutters"
+	color = "#c09e13";
+	name = "Bar Shutters"
 	},
 /turf/open/floor/bronze/filled,
 /area/station/service/bar)
@@ -562,8 +552,8 @@
 	},
 /obj/machinery/door/poddoor/shutters/window/preopen{
 	dir = 8;
-	color = #c09e13;
-	name = "Bar shutters"
+	color = "#c09e13";
+	name = "Bar Shutters"
 	},
 /turf/open/floor/bronze/filled,
 /area/station/service/bar)
@@ -642,8 +632,8 @@
 /area/station/commons/lounge)
 "Hj" = (
 /obj/machinery/door/window{
-	color = #c09e13;
-	name = "bronze windoor"
+	color = "#c09e13";
+	name = "Bronze Windoor"
 	},
 /obj/machinery/door/firedoor/border_only,
 /obj/structure/disposalpipe/segment,
@@ -726,8 +716,8 @@
 	},
 /obj/machinery/door/poddoor/shutters/window/preopen{
 	dir = 8;
-	color = #c09e13;
-	name = "Bar shutters"
+	color = "#c09e13";
+	name = "Bar Shutters"
 	},
 /turf/open/floor/bronze/filled,
 /area/station/service/bar)
@@ -905,8 +895,8 @@
 	},
 /obj/machinery/door/poddoor/shutters/window/preopen{
 	dir = 8;
-	color = #c09e13;
-	name = "Bar shutters"
+	color = "#c09e13";
+	name = "Bar Shutters"
 	},
 /turf/open/floor/bronze/filled,
 /area/station/service/bar)
@@ -948,7 +938,7 @@ kU
 Xo
 mI
 Xx
-qu
+Xp
 GP
 ME
 Vw

diff --git a/...maps/RandomBars/Icebox/cultbar_icebox.dmm → ...tion/RandomBars/Icebox/cultbar_icebox.dmm b/...maps/RandomBars/Icebox/cultbar_icebox.dmm → ...tion/RandomBars/Icebox/cultbar_icebox.dmm
@@ -563,7 +563,6 @@
 /obj/structure/disposalpipe/segment{
 	dir = 8
 	},
-/obj/structure/cable,
 /obj/structure/sink/kitchen/directional/south,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/cult,

diff --git a/.../_maps/RandomBars/Icebox/disco_icebox.dmm → ...tation/RandomBars/Icebox/disco_icebox.dmm b/.../_maps/RandomBars/Icebox/disco_icebox.dmm → ...tation/RandomBars/Icebox/disco_icebox.dmm
@@ -70,10 +70,9 @@
 /area/station/commons/lounge)
 "gm" = (
 /obj/effect/mapping_helpers/airlock/access/all/service,
-/obj/machinery/door/airlock{
+/obj/machinery/door/airlock/wood{
 	name = "Service Hall"
 	},
-/obj/machinery/door/airlock/wood,
 /obj/machinery/door/firedoor,
 /obj/structure/cable,
 /turf/open/floor/wood,
@@ -149,14 +148,13 @@
 /area/station/commons/lounge)
 "pW" = (
 /obj/effect/mapping_helpers/airlock/access/all/service,
-/obj/machinery/door/airlock{
-	name = "Service Hall"
-	},
-/obj/machinery/door/airlock/wood,
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
+/obj/machinery/door/airlock/wood{
+	name = "Bar"
+	},
 /turf/open/floor/wood,
 /area/station/service/bar/backroom)
 "qx" = (
@@ -272,10 +270,11 @@
 "BL" = (
 /obj/effect/mapping_helpers/airlock/access/all/service/bar,
 /obj/structure/cable,
-/obj/machinery/door/airlock/silver/glass,
-/obj/machinery/door/airlock/wood,
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/airlock/wood{
+	name = "Service Hall"
+	},
 /turf/open/floor/eighties/red,
 /area/station/service/bar)
 "BO" = (
@@ -291,7 +290,7 @@
 "Cf" = (
 /obj/structure/table/wood,
 /obj/item/food/pie/cream/nostun{
-	desc = thisone...looks...different....
+	desc = "this one looks... different..."
 	},
 /turf/open/floor/light/colour_cycle/dancefloor_b,
 /area/station/commons/lounge)

diff --git a/...aps/RandomBars/Icebox/green_bar_disco.dmm → ...ion/RandomBars/Icebox/green_bar_disco.dmm b/...aps/RandomBars/Icebox/green_bar_disco.dmm → ...ion/RandomBars/Icebox/green_bar_disco.dmm
diff --git a/...RandomBars/Icebox/icebox_bar_abductor.dmm → ...RandomBars/Icebox/icebox_bar_abductor.dmm b/...RandomBars/Icebox/icebox_bar_abductor.dmm → ...RandomBars/Icebox/icebox_bar_abductor.dmm
@@ -466,19 +466,15 @@
 /area/station/commons/lounge)
 "yP" = (
 /obj/structure/table/fake_abductor,
-/obj/machinery/door/window{
-	base_state = "right";
-	dir = 4;
-	icon_state = "right";
-	name = "bar mixing area";
-	req_access = list("bar")
-	},
 /obj/structure/desk_bell{
 	desc = "Why, I'm always here! I should get absolute service. Pronto, garcon!";
 	name = "The Regular's Bell";
 	pixel_x = -6
 	},
 /mob/living/carbon/human/species/monkey/punpun,
+/obj/machinery/door/window/left/directional/east{
+	name = "Bar Mixing Area"
+	},
 /turf/open/floor/mineral/fake_abductor,
 /area/station/service/bar)
 "zj" = (
@@ -733,16 +729,12 @@
 	dir = 4
 	},
 /obj/structure/table/fake_abductor,
-/obj/machinery/door/window{
-	base_state = "right";
-	dir = 4;
-	icon_state = "right";
-	name = "bar mixing area";
-	req_access = list("bar")
-	},
 /obj/structure/displaycase/forsale/kitchen{
 	pixel_y = 8
 	},
+/obj/machinery/door/window/right/directional/east{
+	name = "Bar Mixing Area"
+	},
 /turf/open/floor/mineral/fake_abductor,
 /area/station/service/bar)
 "Jh" = (

diff --git a/...s/RandomBars/Icebox/icebox_bar_arcade.dmm → ...n/RandomBars/Icebox/icebox_bar_arcade.dmm b/...s/RandomBars/Icebox/icebox_bar_arcade.dmm → ...n/RandomBars/Icebox/icebox_bar_arcade.dmm
@@ -130,7 +130,7 @@
 /obj/effect/spawner/random/entertainment/gambling,
 /obj/structure/sign/poster/random/directional/east,
 /turf/open/floor/carpet/neon/simple/yellow,
-/area/station/commons/lounge)
+/area/station/service/bar)
 "gc" = (
 /obj/machinery/firealarm/directional/west,
 /obj/machinery/computer/arcade/amputation/bar,
@@ -283,7 +283,7 @@
 /obj/machinery/duct,
 /obj/structure/cable,
 /turf/open/floor/carpet/neon/simple/yellow,
-/area/station/commons/lounge)
+/area/station/service/bar)
 "pH" = (
 /obj/effect/turf_decal/siding/purple,
 /turf/open/floor/eighties,
@@ -622,14 +622,10 @@
 	dir = 8
 	},
 /obj/machinery/airalarm/directional/north,
-/obj/machinery/door/window{
-	base_state = "right";
-	dir = 8;
-	icon_state = "right";
-	name = "bar mixing area";
-	req_access = list("bar")
-	},
 /obj/structure/cable,
+/obj/machinery/door/window/right/directional/west{
+	name = "Bar Mixing Area"
+	},
 /turf/open/floor/carpet/neon/simple/yellow,
 /area/station/service/bar)
 "FR" = (
@@ -757,7 +753,7 @@
 /obj/structure/disposalpipe/trunk,
 /obj/machinery/disposal/bin,
 /turf/open/floor/carpet/neon/simple/yellow,
-/area/station/commons/lounge)
+/area/station/service/bar)
 "Kq" = (
 /obj/machinery/door/airlock{
 	name = "Bar"

diff --git a/...aps/RandomBars/Icebox/icebox_bar_base.dmm → ...ion/RandomBars/Icebox/icebox_bar_base.dmm b/...aps/RandomBars/Icebox/icebox_bar_base.dmm → ...ion/RandomBars/Icebox/icebox_bar_base.dmm
diff --git a/...ion/_maps/RandomBars/Icebox/junglebar.dmm → ...kestation/RandomBars/Icebox/junglebar.dmm b/...ion/_maps/RandomBars/Icebox/junglebar.dmm → ...kestation/RandomBars/Icebox/junglebar.dmm
@@ -492,14 +492,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/closed/wall,
 /area/station/service/bar)
-"YA" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood,
-/area/station/commons/lounge)
 "YU" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -519,7 +511,7 @@ xY
 OC
 Vc
 TK
-YA
+Ke
 pl
 zS
 nX

diff --git a/...tion/_maps/RandomBars/Icebox/mime_bar.dmm → ...nkestation/RandomBars/Icebox/mime_bar.dmm b/...tion/_maps/RandomBars/Icebox/mime_bar.dmm → ...nkestation/RandomBars/Icebox/mime_bar.dmm
diff --git a/...aps/RandomBars/Icebox/template_icebox.dmm → ...ion/RandomBars/Icebox/template_icebox.dmm b/...aps/RandomBars/Icebox/template_icebox.dmm → ...ion/RandomBars/Icebox/template_icebox.dmm
diff --git a/...n/_maps/RandomBars/Tram/tram_bar_base.dmm → ...station/RandomBars/Tram/tram_bar_base.dmm b/...n/_maps/RandomBars/Tram/tram_bar_base.dmm → ...station/RandomBars/Tram/tram_bar_base.dmm
diff --git a/...ps/RandomBars/Tram/tram_bar_beachside.dmm → ...on/RandomBars/Tram/tram_bar_beachside.dmm b/...ps/RandomBars/Tram/tram_bar_beachside.dmm → ...on/RandomBars/Tram/tram_bar_beachside.dmm
@@ -426,7 +426,7 @@
 "nN" = (
 /obj/structure/ladder,
 /obj/machinery/door/window/left/directional/north{
-	name = "Bar backroom Access";
+	name = "Bar Backroom Access";
 	req_one_access = list("bar")
 	},
 /obj/structure/window/reinforced/spawner/directional/west,

diff --git a/...maps/RandomBars/Tram/tram_bar_biodome.dmm → ...tion/RandomBars/Tram/tram_bar_biodome.dmm b/...maps/RandomBars/Tram/tram_bar_biodome.dmm → ...tion/RandomBars/Tram/tram_bar_biodome.dmm