Merge remote-tracking branch 'upstream/master'

SPLURT-Station · Feb 20, 2023 · ccf4480 · ccf4480
2 parents 342ffea + f75eab9
commit ccf4480
Show file tree

Hide file tree

Showing 198 changed files with 6,489 additions and 2,187 deletions.
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
diff --git a/_maps/map_files/BoxedInStation/BoxedInStation.dmm b/_maps/map_files/BoxedInStation/BoxedInStation.dmm
@@ -10914,7 +10914,7 @@
 /area/service/kitchen)
 "fGo" = (
 /obj/machinery/vending/dinnerware{
-	contraband = list(/obj/item/kitchen/rollingpin = 2, /obj/item/kitchen/knife/butcher = 2, /obj/item/reagent_containers/food/condiment/flour = 4)
+	contraband = list(/obj/item/kitchen/rollingpin=2,/obj/item/kitchen/knife/butcher=2,/obj/item/reagent_containers/food/condiment/flour=4)
 	},
 /obj/machinery/power/apc{
 	areastring = "/area/service/kitchen";
@@ -13326,11 +13326,11 @@
 /area/service/bar)
 "gUI" = (
 /obj/machinery/vending/dinnerware{
-	contraband = list(/obj/item/reagent_containers/food/condiment/flour = 4);
+	contraband = list(/obj/item/reagent_containers/food/condiment/flour=4);
 	desc = "This vendor is full of condiments to put on food.";
 	name = "\improper Condiments Vendor";
 	product_ads = "Get your sauces here!;No slave labour was used to make these products!;Nanotrasen Approved?!";
-	products = list(/obj/item/storage/bag/tray = 8, /obj/item/reagent_containers/food/drinks/drinkingglass = 10, /obj/item/storage/box/cups = 5, /obj/item/reagent_containers/food/condiment/pack/ketchup = 20, /obj/item/reagent_containers/food/condiment/pack/mustard = 20, /obj/item/reagent_containers/food/condiment/pack/hotsauce = 20, /obj/item/reagent_containers/food/condiment/pack/astrotame = 20, /obj/item/reagent_containers/food/condiment/saltshaker = 20, /obj/item/reagent_containers/food/condiment/peppermill = 20)
+	products = list(/obj/item/storage/bag/tray=8,/obj/item/reagent_containers/food/drinks/drinkingglass=10,/obj/item/storage/box/cups=5,/obj/item/reagent_containers/food/condiment/pack/ketchup=20,/obj/item/reagent_containers/food/condiment/pack/mustard=20,/obj/item/reagent_containers/food/condiment/pack/hotsauce=20,/obj/item/reagent_containers/food/condiment/pack/astrotame=20,/obj/item/reagent_containers/food/condiment/saltshaker=20,/obj/item/reagent_containers/food/condiment/peppermill=20)
 	},
 /turf/open/floor/plasteel/cafeteria,
 /area/service/kitchen)
@@ -18857,6 +18857,10 @@
 	},
 /turf/open/floor/plating,
 /area/hallway/secondary/exit)
+"jMk" = (
+/obj/effect/landmark/start/stowaway,
+/turf/open/floor/plating,
+/area/maintenance/port/fore)
 "jMy" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -31800,6 +31804,10 @@
 	},
 /turf/open/floor/plasteel,
 /area/engineering/main)
+"qyg" = (
+/obj/effect/landmark/start/stowaway,
+/turf/open/floor/plating,
+/area/maintenance/central/secondary)
 "qyp" = (
 /obj/structure/disposalpipe/segment{
 	dir = 6
@@ -46274,6 +46282,13 @@
 	dir = 4
 	},
 /area/service/theater)
+"xIk" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/landmark/start/stowaway,
+/turf/open/floor/plating,
+/area/maintenance/port/fore)
 "xIu" = (
 /obj/effect/spawner/structure/window,
 /obj/machinery/door/firedoor,
@@ -66642,7 +66657,7 @@ kED
 kED
 gXk
 dQv
-lRs
+jMk
 gXk
 kED
 cwy
@@ -68912,7 +68927,7 @@ oCD
 mhf
 nzv
 lRs
-dQv
+xIk
 lRs
 seE
 qaQ
@@ -70455,7 +70470,7 @@ vBu
 vBu
 cTZ
 aye
-mjY
+qyg
 mjY
 jzy
 mjY
@@ -73255,7 +73270,7 @@ nOA
 pAn
 mjY
 kZA
-mjY
+qyg
 mjY
 rTW
 aye

diff --git a/_maps/map_files/CogStation/CogStation.dmm b/_maps/map_files/CogStation/CogStation.dmm
@@ -1678,12 +1678,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/commons/lounge)
-"aen" = (
-/obj/machinery/atmospherics/pipe/simple/general/visible{
-	dir = 9
-	},
-/turf/open/floor/plating,
-/area/maintenance/fore)
 "aeo" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/item/circuitboard/machine/sleeper,
@@ -5124,20 +5118,6 @@
 	},
 /turf/open/floor/carpet/arcade,
 /area/commons/arcade)
-"ani" = (
-/obj/machinery/disposal/bin,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
-	dir = 8
-	},
-/obj/structure/disposalpipe/trunk{
-	dir = 8
-	},
-/obj/structure/sign/poster/official/bless_this_spess{
-	pixel_y = -32
-	},
-/turf/open/floor/plasteel,
-/area/security/brig)
 "anj" = (
 /obj/machinery/holopad,
 /obj/effect/turf_decal/bot,
@@ -68150,6 +68130,13 @@
 /obj/machinery/atmospherics/pipe/layer_manifold,
 /turf/open/floor/plating,
 /area/engineering/atmos)
+"dXW" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/landmark/start/stowaway,
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
 "dYm" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /obj/effect/turf_decal/stripes/line{
@@ -68888,6 +68875,10 @@
 /obj/structure/chair/stool,
 /turf/open/floor/plasteel,
 /area/cargo/office)
+"iEf" = (
+/obj/effect/landmark/start/stowaway,
+/turf/open/floor/plating,
+/area/maintenance/port/central)
 "iLw" = (
 /obj/machinery/door/airlock/security/glass{
 	name = "Advanced Interrogation"
@@ -69175,6 +69166,16 @@
 	},
 /turf/open/floor/plating,
 /area/cargo/storage)
+"kPi" = (
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/landmark/start/stowaway,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
 "kTm" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/landmark/start/prisoner,
@@ -69337,6 +69338,20 @@
 	},
 /turf/closed/wall/mineral/wood,
 /area/commons/fitness/cogpool)
+"maU" = (
+/obj/machinery/disposal/bin,
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/obj/structure/disposalpipe/trunk{
+	dir = 8
+	},
+/obj/structure/sign/poster/official/bless_this_spess{
+	pixel_y = -32
+	},
+/turf/open/floor/plasteel,
+/area/security/brig)
 "mfj" = (
 /obj/machinery/firealarm{
 	pixel_y = 26
@@ -70601,6 +70616,15 @@
 	},
 /turf/open/floor/plasteel,
 /area/cargo/storage)
+"ulg" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/effect/landmark/start/stowaway,
+/turf/open/floor/plating,
+/area/maintenance/port/fore)
 "unW" = (
 /obj/effect/landmark/navigate_destination/med,
 /turf/open/floor/plasteel/white,
@@ -70978,6 +71002,13 @@
 /obj/structure/filingcabinet,
 /turf/open/floor/carpet,
 /area/medical/psychology)
+"wUe" = (
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 9
+	},
+/obj/effect/landmark/start/stowaway,
+/turf/open/floor/plating,
+/area/maintenance/fore)
 "wUI" = (
 /obj/effect/turf_decal/tile/neutral,
 /obj/structure/table,
@@ -71172,6 +71203,16 @@
 	},
 /turf/open/floor/plasteel,
 /area/security/brig)
+"xWP" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+	dir = 4
+	},
+/obj/effect/landmark/start/stowaway,
+/turf/open/floor/plating,
+/area/maintenance/fore)
 "xXs" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -95231,7 +95272,7 @@ adb
 anU
 aeQ
 aeM
-ani
+maU
 aew
 aeJ
 aeJ
@@ -98104,7 +98145,7 @@ aQL
 aQL
 aQL
 aTS
-aRW
+iEf
 bcR
 bjG
 blk
@@ -98581,7 +98622,7 @@ amS
 amS
 aDE
 amS
-amS
+ulg
 aKR
 apY
 bRa
@@ -103448,7 +103489,7 @@ hzz
 aaa
 acb
 acS
-aen
+wUe
 afi
 agg
 ahj
@@ -107053,7 +107094,7 @@ ajw
 ajw
 ajw
 awN
-bGc
+xWP
 bGl
 ahA
 aiQ
@@ -111936,7 +111977,7 @@ ahP
 ahP
 akj
 ahP
-aif
+kPi
 aiB
 afK
 ahU
@@ -113319,7 +113360,7 @@ bqM
 btL
 bBm
 btC
-bPm
+dXW
 bta
 btV
 cfG