Merge remote-tracking branch 'upstream/master' into ert

shiptest-ss13 · Nov 16, 2023 · f73483c · f73483c
2 parents 5bc9d92 + c3a7c0c
commit f73483c
Show file tree

Hide file tree

Showing 86 changed files with 1,532 additions and 589 deletions.
diff --git a/_maps/shuttles/roumain/srm_glaive.dmm b/_maps/shuttles/roumain/srm_glaive.dmm
@@ -208,9 +208,7 @@
 /obj/structure/flora/ausbushes/brflowers,
 /obj/structure/flora/ausbushes/sparsegrass,
 /obj/item/book/manual/trickwines_4_brewers,
-/turf/open/floor/grass{
-	icon_state = "junglegrass"
-	},
+/turf/open/floor/grass/ship/jungle,
 /area/ship/roumain)
 "cJ" = (
 /obj/structure/cable/orange{
@@ -255,6 +253,7 @@
 "ds" = (
 /obj/structure/flora/ausbushes/sparsegrass,
 /obj/structure/flora/ausbushes/brflowers,
+/obj/item/reagent_containers/food/drinks/breakawayflask,
 /turf/open/floor/grass/ship/jungle,
 /area/ship/roumain)
 "dt" = (
@@ -726,15 +725,7 @@
 /area/ship/engineering/engine)
 "jG" = (
 /obj/structure/flora/ausbushes/ppflowers,
-/obj/structure/flora/tree/jungle{
-	icon_state = "churchtree";
-	icon = 'icons/obj/flora/chapeltree.dmi';
-	randomize_icon = 0;
-	pixel_x = -16;
-	pixel_y = 0;
-	desc = "A sturdy oak tree imported directly from the homeworld of the Montagne who runs the ship it resides on. It is planted in soil from the same place.";
-	name = "Montagne's Oak"
-	},
+/obj/structure/flora/tree/srm,
 /turf/open/floor/grass/ship/jungle,
 /area/ship/roumain)
 "ko" = (
@@ -753,6 +744,12 @@
 	},
 /turf/open/floor/wood/maple,
 /area/ship/construction)
+"lb" = (
+/obj/structure/flora/ausbushes/brflowers,
+/obj/structure/flora/ausbushes/sparsegrass,
+/obj/structure/fermenting_barrel,
+/turf/open/floor/grass/ship/jungle,
+/area/ship/roumain)
 "lf" = (
 /obj/structure/cable/orange{
 	icon_state = "2-8"
@@ -1680,7 +1677,7 @@
 /area/ship/medical)
 "At" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/item/reagent_containers/food/drinks/drinkingglass/breakawayflask/vintageash,
+/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine,
 /turf/open/floor/plating{
 	icon_state = "greenerdirt"
 	},
@@ -1776,7 +1773,7 @@
 /obj/structure/railing{
 	dir = 1
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/breakawayflask/vintageash,
+/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine,
 /turf/open/floor/ship/dirt/dark,
 /area/ship/roumain)
 "BB" = (
@@ -2106,6 +2103,7 @@
 	name = "Body Holofield Switch";
 	id = "glaive_body_holo"
 	},
+/obj/structure/fermenting_barrel,
 /turf/open/floor/grass/ship/jungle,
 /area/ship/roumain)
 "FA" = (
@@ -2889,8 +2887,10 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "Sl" = (
-/obj/structure/fermenting_barrel,
-/turf/open/floor/ship/dirt/dark,
+/obj/structure/flora/ausbushes/brflowers,
+/obj/structure/flora/ausbushes/sparsegrass,
+/obj/structure/fermenting_barrel/distiller,
+/turf/open/floor/grass/ship/jungle,
 /area/ship/roumain)
 "Sx" = (
 /obj/structure/window/reinforced/spawner{
@@ -3951,8 +3951,8 @@ Lk
 cz
 YP
 ds
-aM
-aM
+lb
+Sl
 Fu
 wp
 wp
@@ -4177,7 +4177,7 @@ ZE
 MZ
 qN
 NL
-Sl
+NL
 NL
 NL
 NL

diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm
@@ -892,12 +892,25 @@
 /obj/effect/landmark/observer_start,
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/central)
+"tV" = (
+/obj/machinery/porta_turret/ship/syndicate/weak{
+	dir = 4;
+	pixel_x = 8
+	},
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/bridge)
 "uq" = (
 /obj/effect/turf_decal/spline/fancy/opaque/syndiered{
 	dir = 10
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
+"uR" = (
+/obj/machinery/porta_turret/ship/syndicate/weak{
+	dir = 9
+	},
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/bridge)
 "vk" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
@@ -1125,6 +1138,12 @@
 	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
+"Ah" = (
+/obj/machinery/porta_turret/ship/syndicate/weak{
+	dir = 6
+	},
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/bridge)
 "AM" = (
 /obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning,
 /obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{
@@ -1176,7 +1195,9 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/crew/dorm)
 "CR" = (
-/obj/machinery/porta_turret/ship,
+/obj/machinery/porta_turret/ship/syndicate/weak{
+	dir = 10
+	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
 "CU" = (
@@ -1293,7 +1314,11 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/bridge)
 "GV" = (
-/obj/machinery/porta_turret/ship/weak,
+/obj/machinery/porta_turret/ship/syndicate/weak{
+	dir = 4;
+	pixel_x = 8;
+	pixel_y = 4
+	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
 "Hd" = (
@@ -1396,6 +1421,12 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
+"KA" = (
+/obj/machinery/porta_turret/ship/syndicate/weak{
+	dir = 5
+	},
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/bridge)
 "KP" = (
 /obj/structure/closet/wall{
 	name = "emergency rum cabinet";
@@ -1966,7 +1997,7 @@
 /area/ship/engineering)
 
 (1,1,1) = {"
-CR
+uR
 YQ
 YQ
 ru
@@ -2069,7 +2100,7 @@ nO
 "}
 (7,1,1) = {"
 YQ
-CR
+KA
 kM
 kM
 kM
@@ -2081,7 +2112,7 @@ cZ
 jj
 jj
 jj
-CR
+Ah
 YQ
 "}
 (8,1,1) = {"
@@ -2276,7 +2307,7 @@ YQ
 YQ
 YQ
 YQ
-GV
+tV
 bO
 bO
 dA

diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm
@@ -1693,6 +1693,12 @@
 /obj/machinery/porta_turret/ship/ballistic,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
+"BR" = (
+/obj/machinery/porta_turret/ship/syndicate{
+	dir = 1
+	},
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/bridge)
 "BZ" = (
 /obj/structure/window/reinforced/tinted/frosted,
 /obj/machinery/suit_storage_unit/inherit{
@@ -2336,6 +2342,10 @@
 	},
 /turf/open/floor/carpet/red_gold,
 /area/ship/bridge)
+"NA" = (
+/obj/machinery/porta_turret/ship/syndicate,
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/bridge)
 "NF" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/cargo)
@@ -2500,7 +2510,9 @@
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/cargo)
 "Qz" = (
-/obj/machinery/porta_turret/ship/ballistic,
+/obj/machinery/porta_turret/ship/syndicate{
+	dir = 6
+	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
 "QW" = (
@@ -2876,6 +2888,12 @@
 	},
 /turf/open/floor/carpet/red_gold,
 /area/ship/bridge)
+"Up" = (
+/obj/machinery/porta_turret/ship/syndicate/heavy{
+	dir = 4
+	},
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/bridge)
 "UI" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -2886,6 +2904,12 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
+"UN" = (
+/obj/machinery/porta_turret/ship/syndicate{
+	dir = 1
+	},
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/bridge)
 "UX" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/crew)
@@ -3311,7 +3335,7 @@ sE
 "}
 (2,1,1) = {"
 nn
-BG
+BR
 ir
 PL
 SP
@@ -3328,7 +3352,7 @@ sE
 nX
 dU
 pi
-BG
+NA
 "}
 (3,1,1) = {"
 nn
@@ -3578,13 +3602,13 @@ UX
 GV
 GV
 GV
-BG
+NA
 nn
 Zb
 "}
 (15,1,1) = {"
 nn
-Qz
+UN
 cs
 cs
 XU
@@ -3836,13 +3860,13 @@ mL
 "}
 (27,1,1) = {"
 nn
-Qz
+Up
 Ap
 Jv
 oQ
 VC
 Ap
-Qz
+Up
 nn
 nn
 nn