Merge branch 'master' of https://github.com/tgstation/TerraGov-Marine…

…-Corps
Xander3359 · Jul 1, 2024 · 19b38be · 19b38be
2 parents 004dff6 + 2444d46
commit 19b38be
Show file tree

Hide file tree

Showing 450 changed files with 201,528 additions and 1,511 deletions.
diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm
@@ -8,6 +8,7 @@
 		#include "map_files\Debugdalus\TGS_Debugdalus.dmm"
 		#include "map_files\Ice_Colony_v2\Ice_Colony_v2.dmm"
 		#include "map_files\LV624\LV624.dmm"
+		#include "map_files\LV759\LV759.dmm"
 		#include "map_files\Prison_Station_FOP\Prison_Station_FOP.dmm"
 		#include "map_files\Theseus\TGS_Theseus.dmm"
 		#include "map_files\Vapor_Processing\Vapor_Processing.dmm"

diff --git a/_maps/lv759.json b/_maps/lv759.json
@@ -0,0 +1,14 @@
+{
+    "map_name": "LV759",
+    "map_path": "map_files/LV759",
+    "map_file": "LV759.dmm",
+	"disk_sets": {
+		"basic": 1
+	},
+	"quickbuilds": 2700,
+	"armor": "urban",
+	"announce_text": "A routine check of nearby second-generation colonies has identified an anomaly on designation Zeta-Echo-7b, otherwise known as LV759.  The colony beacon has been transmitting a constant, unchanging signal for 7 weeks. Attempts to establish communication via standard protocols have been unsuccessful. TGMC, gear up and get ready to respond!",
+	"traits":[{
+		"weather_rain": true
+	}]
+}
diff --git a/_maps/map_files/BigRed_v2/BigRed_v2.dmm b/_maps/map_files/BigRed_v2/BigRed_v2.dmm
@@ -4662,7 +4662,9 @@
 	},
 /area/bigredv2/caves/lambda_lab)
 "aSo" = (
-/obj/structure/curtain/medical,
+/obj/structure/curtain/medical{
+	dir = 4
+	},
 /turf/open/floor/tile/green/whitegreen{
 	dir = 9
 	},
@@ -4682,7 +4684,9 @@
 	},
 /area/bigredv2/caves/lambda_lab)
 "aSt" = (
-/obj/structure/curtain/medical,
+/obj/structure/curtain/medical{
+	dir = 4
+	},
 /turf/open/floor/tile/green/whitegreen{
 	dir = 5
 	},
@@ -4810,7 +4814,9 @@
 	},
 /area/bigredv2/caves/lambda_lab)
 "aTI" = (
-/obj/structure/curtain/medical,
+/obj/structure/curtain/medical{
+	dir = 4
+	},
 /turf/open/floor/tile/darkgreen/darkgreen2{
 	dir = 5
 	},
@@ -4891,7 +4897,9 @@
 	},
 /area/bigredv2/caves/lambda_lab)
 "aUI" = (
-/obj/structure/curtain/medical,
+/obj/structure/curtain/medical{
+	dir = 4
+	},
 /turf/open/floor/tile/darkgreen/darkgreen2{
 	dir = 6
 	},
@@ -4938,7 +4946,9 @@
 /turf/open/floor/tile/darkgreen/darkgreen2,
 /area/bigredv2/caves/lambda_lab)
 "aVB" = (
-/obj/structure/curtain/medical,
+/obj/structure/curtain/medical{
+	dir = 4
+	},
 /turf/open/floor/tile/green/whitegreen{
 	dir = 6
 	},

diff --git a/_maps/map_files/Campaign maps/nt_base/nt_base.dmm b/_maps/map_files/Campaign maps/nt_base/nt_base.dmm
@@ -937,11 +937,13 @@
 /turf/open/floor/plating/ground/snow/layer0,
 /area/gelida/outdoors/colony_streets/central_streets)
 "aLX" = (
-/obj/effect/spawner/random/misc/structure/curtain,
 /obj/machinery/atmospherics/pipe/simple/green/hidden{
 	dir = 4
 	},
 /obj/structure/cable,
+/obj/effect/spawner/random/misc/structure/curtain{
+	dir = 4
+	},
 /turf/open/floor/prison/plate,
 /area/gelida/indoors/a_block/executive)
 "aMR" = (
@@ -3579,19 +3581,19 @@
 /obj/structure/table/reinforced/prison,
 /obj/item/reagent_containers/jerrycan{
 	desc = "A jerry can. In space! Or maybe a colony.";
-	worn_icon_state = "caution";
 	name = "fuel can";
-	pixel_y = 10
+	pixel_y = 10;
+	worn_icon_state = "caution"
 	},
 /obj/item/ashtray/bronze{
 	pixel_y = -5
 	},
 /obj/item/reagent_containers/jerrycan{
 	desc = "A jerry can. In space! Or maybe a colony.";
-	worn_icon_state = "caution";
 	name = "fuel can";
 	pixel_x = 2;
-	pixel_y = 3
+	pixel_y = 3;
+	worn_icon_state = "caution"
 	},
 /turf/open/floor/prison/darkbrown/full,
 /area/gelida/indoors/c_block/garage)
@@ -8472,11 +8474,13 @@
 /turf/open/floor/tile/yellow/patch,
 /area/gelida/indoors/a_block/corpo)
 "gmV" = (
-/obj/effect/spawner/random/misc/structure/curtain,
 /obj/effect/landmark/corpsespawner/scientist,
 /obj/effect/decal/cleanable/blood{
 	dir = 1
 	},
+/obj/effect/spawner/random/misc/structure/curtain{
+	dir = 4
+	},
 /turf/open/floor/plating/plating_catwalk/prison,
 /area/gelida/indoors/a_block/dorms)
 "gnp" = (
@@ -9896,7 +9900,9 @@
 /turf/open/floor/plating/ground/desertdam/asphalt/edge/regular,
 /area/gelida/outdoors/colony_streets/central_streets)
 "hpl" = (
-/obj/effect/spawner/random/misc/structure/curtain,
+/obj/effect/spawner/random/misc/structure/curtain{
+	dir = 4
+	},
 /turf/open/floor/prison/plate,
 /area/gelida/indoors/a_block/executive)
 "hps" = (
@@ -17676,6 +17682,12 @@
 /obj/effect/landmark/xeno_tunnel_spawn,
 /turf/open/floor/prison/plate,
 /area/gelida/outdoors/colony_streets/north_west_street)
+"mZH" = (
+/obj/effect/spawner/random/misc/structure/curtain{
+	dir = 4
+	},
+/turf/open/floor/mainship/stripesquare,
+/area/gelida/indoors/a_block/executive)
 "nbt" = (
 /obj/effect/ai_node,
 /turf/open/floor/plating/ground/snow/layer1,
@@ -19002,10 +19014,12 @@
 /turf/open/floor/prison/cleanmarked,
 /area/gelida/landing_zone_2)
 "nXy" = (
-/obj/effect/spawner/random/misc/structure/curtain,
 /obj/machinery/atmospherics/pipe/simple/green/hidden{
 	dir = 4
 	},
+/obj/effect/spawner/random/misc/structure/curtain{
+	dir = 4
+	},
 /turf/open/floor/prison/plate,
 /area/gelida/indoors/a_block/executive)
 "nXE" = (
@@ -19476,7 +19490,9 @@
 	},
 /area/gelida/indoors/a_block/bridges)
 "oqb" = (
-/obj/effect/spawner/random/misc/structure/curtain,
+/obj/effect/spawner/random/misc/structure/curtain{
+	dir = 4
+	},
 /turf/open/floor/prison,
 /area/gelida/indoors/a_block/dorm_north)
 "oqj" = (
@@ -19850,10 +19866,10 @@
 "oEb" = (
 /obj/item/reagent_containers/jerrycan{
 	desc = "A jerry can. In space! Or maybe a colony.";
-	worn_icon_state = "caution";
 	name = "fuel can";
 	pixel_x = 4;
-	pixel_y = 16
+	pixel_y = 16;
+	worn_icon_state = "caution"
 	},
 /obj/effect/turf_decal/warning_stripes/thin{
 	dir = 1
@@ -22830,7 +22846,9 @@
 /turf/open/floor/prison,
 /area/gelida/indoors/a_block/dorms)
 "qIV" = (
-/obj/effect/spawner/random/misc/structure/curtain,
+/obj/effect/spawner/random/misc/structure/curtain{
+	dir = 4
+	},
 /turf/open/floor/prison/kitchen,
 /area/gelida/indoors/a_block/fitness)
 "qJo" = (
@@ -23782,6 +23800,12 @@
 	},
 /turf/open/floor/prison,
 /area/gelida/indoors/a_block/dorm_north)
+"roo" = (
+/obj/effect/spawner/random/misc/structure/curtain{
+	dir = 4
+	},
+/turf/open/floor/mainship/stripesquare,
+/area/gelida/indoors/c_block/casino)
 "rou" = (
 /obj/effect/turf_decal/warning_stripes/thin{
 	dir = 8
@@ -25705,11 +25729,13 @@
 	},
 /area/gelida/landing_zone_forecon/UD6_Tornado)
 "sJD" = (
-/obj/effect/spawner/random/misc/structure/curtain,
 /obj/machinery/atmospherics/pipe/simple/green/hidden{
 	dir = 4
 	},
 /obj/effect/ai_node,
+/obj/effect/spawner/random/misc/structure/curtain{
+	dir = 4
+	},
 /turf/open/floor/prison/whitepurple/full{
 	dir = 4
 	},
@@ -31463,8 +31489,8 @@
 /obj/structure/rack/nometal,
 /obj/effect/spawner/random/misc/earmuffs,
 /obj/item/clothing/ears/earmuffs{
-	worn_icon_state = "earmuffs2";
-	pixel_y = -4
+	pixel_y = -4;
+	worn_icon_state = "earmuffs2"
 	},
 /turf/open/floor/plating/ground/snow/layer2,
 /area/gelida/outdoors/colony_streets/north_east_street)
@@ -31837,6 +31863,14 @@
 /obj/effect/ai_node,
 /turf/open/floor/plating,
 /area/gelida/landing_zone_1)
+"xrH" = (
+/obj/effect/spawner/random/misc/structure/curtain{
+	dir = 4
+	},
+/turf/open/floor/prison/whitepurple/full{
+	dir = 4
+	},
+/area/gelida/indoors/a_block/dorms)
 "xsf" = (
 /obj/item/stack/rods,
 /obj/item/shard,
@@ -45522,7 +45556,7 @@ icP
 eKY
 stq
 yfp
-jNG
+xrH
 gmV
 sJD
 yfp
@@ -59521,8 +59555,8 @@ jIb
 gKW
 xvC
 xvC
-pwK
-pwK
+roo
+roo
 xvC
 xvC
 xvC
@@ -63073,8 +63107,8 @@ gKW
 hsx
 xvC
 xvC
-pwK
-pwK
+roo
+roo
 xvC
 xvC
 xvC
@@ -64127,9 +64161,9 @@ wsa
 wsa
 wsa
 wsa
-jfN
-jfN
-jfN
+mZH
+mZH
+mZH
 wsa
 wsa
 dtN

diff --git a/_maps/map_files/Campaign maps/tgmc_raid_base/tgmc_raiding_base.dmm b/_maps/map_files/Campaign maps/tgmc_raid_base/tgmc_raiding_base.dmm
@@ -5700,6 +5700,12 @@
 /obj/structure/reagent_dispensers/beerkeg,
 /turf/open/floor/plating/plating_catwalk,
 /area/campaign/tgmc_raiding/underground/tunnel/west)
+"wV" = (
+/obj/structure/curtain/medical{
+	dir = 4
+	},
+/turf/open/floor/mainship/sterile/dark,
+/area/campaign/tgmc_raiding/underground/medbay)
 "wW" = (
 /obj/effect/spawner/random/misc/structure/supplycrate,
 /turf/open/floor/prison,
@@ -5937,7 +5943,9 @@
 	},
 /area/campaign/tgmc_raiding/underground/command/east)
 "xS" = (
-/obj/structure/curtain/medical,
+/obj/structure/curtain/medical{
+	dir = 4
+	},
 /turf/open/floor/mainship/sterile/side{
 	dir = 1
 	},
@@ -20662,8 +20670,8 @@ Gz
 Lm
 ma
 xS
-Bl
-Bl
+wV
+wV
 Bl
 Hw
 Hw