TGS Test Merge (#7768)

cmss13-devs · Jan 17, 2025 · cc249bc · cc249bc
2 parents ab9f8b4 + 0af5b1a
commit cc249bc
Show file tree

Hide file tree

Showing 60 changed files with 99,861 additions and 35 deletions.
diff --git a/code/game/objects/structures/roof.dm b/code/game/objects/structures/roof.dm
@@ -51,6 +51,7 @@
 /obj/structure/roof/Destroy(force, ...)
 	if(linked_master)
 		linked_master.remove_roof(src)
+	linked_master = null;
 	for(var/icon in GLOB.player_list)
 		var/mob/mob = icon
 		mob.client.images -= normal_image
@@ -111,7 +112,7 @@
 	if(connected_nodes)
 		for(var/obj/effect/roof_node/roof_node in connected_nodes)
 			qdel(roof_node)
-	if(connected_nodes)
+	if(connected_roof)
 		for(var/obj/structure/roof/roof in connected_roof)
 			qdel(roof)
 	return ..()

diff --git a/code/modules/shuttle/shuttles/dropship.dm b/code/modules/shuttle/shuttles/dropship.dm
@@ -228,6 +228,8 @@
 	if(landing_lights)
 		landing_lights.Cut()
 	landing_lights = null // We didn't make them, so lets leave them
+	for(var/obj/structure/machinery/computer/shuttle/dropship/flight/flight_console in GLOB.machines)
+		flight_console.compatible_landing_zones -= src
 
 /obj/docking_port/stationary/marine_dropship/proc/link_landing_lights()
 	var/list/coords = return_coords()

diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm
@@ -46,6 +46,11 @@
 
 	turn_off() //so engine verbs are correctly set
 
+/obj/vehicle/train/cargo/engine/Destroy(force)
+	. = ..()
+	if(!QDELETED(key))
+		QDEL_NULL(key)
+
 /obj/vehicle/train/cargo/engine/Move()
 	if(on && cell.charge < charge_use)
 		turn_off()

diff --git a/code/modules/vehicles/train.dm b/code/modules/vehicles/train.dm
@@ -27,6 +27,11 @@
 	for(var/obj/vehicle/train/T in orange(1, src))
 		latch(T)
 
+/obj/vehicle/train/Destroy(force)
+	. = ..()
+	lead = null
+	tow = null
+
 /obj/vehicle/train/Move()
 	var/old_loc = get_turf(src)
 	. = ..()

diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm
@@ -38,6 +38,11 @@
 // Standard procs
 //-------------------------------------------
 
+/obj/vehicle/Destroy(force)
+	. = ..()
+	if(!QDELETED(cell))
+		QDEL_NULL(cell)
+
 /obj/vehicle/initialize_pass_flags(datum/pass_flags_container/PF)
 	..()
 	if (PF)

diff --git a/maps/Nightmare/maps/BigRed/nightmare.json b/maps/Nightmare/maps/BigRed/nightmare.json
@@ -22,5 +22,26 @@
 	{ "type": "pick",     "chance": 0.50, "choices": [
 		{ "weight": 3, "type": "map_insert", "landmark": "medbay-passage", "path": "standalone/medbay-passage.dmm" },
 		{ "weight": 1, "type": "map_insert", "landmark": "medbay-v3",   "path": "standalone/medbay-v3.dmm" }
-	]}
+	]},
+	{
+		"type": "map_insert",
+		"landmark": "hvhupplz1",
+		"chance": 1.0,
+		"path": "standalone/landingzone_solaris_upp_lz1.dmm",
+		"when": { "$gamemode": "Faction Clash UPP CM" }
+	},
+	{
+		"type": "map_insert",
+		"landmark": "hvhuscmlz1",
+		"chance": 1.0,
+		"path": "standalone/landingzone_solaris_uscm_lz1.dmm",
+		"when": { "$gamemode": "Faction Clash UPP CM" }
+	},
+	{
+		"type": "map_insert",
+		"landmark": "hvhuscmlz2",
+		"chance": 1.0,
+		"path": "standalone/landingzone_solaris_uscm_lz2.dmm",
+		"when": { "$gamemode": "Faction Clash UPP CM" }
+	}
 ]
diff --git a/maps/Nightmare/maps/DesertDam/nightmare.json b/maps/Nightmare/maps/DesertDam/nightmare.json
@@ -19,5 +19,26 @@
 		"chance": 1.0,
 		"path": "standalone/crashlanding-upp-alt1.dmm",
 		"when": { "lvevent": "uppcrash" }
+	},
+	{
+		"type": "map_insert",
+		"landmark": "hvhupplz1",
+		"chance": 1.0,
+		"path": "standalone/landingzone_desertdam_upp_lz1.dmm",
+		"when": { "$gamemode": "Faction Clash UPP CM" }
+	},
+	{
+		"type": "map_insert",
+		"landmark": "hvhuscmlz1",
+		"chance": 1.0,
+		"path": "standalone/landingzone_desertdam_uscm_lz1.dmm",
+		"when": { "$gamemode": "Faction Clash UPP CM" }
+	},
+	{
+		"type": "map_insert",
+		"landmark": "hvhuscmlz2",
+		"chance": 1.0,
+		"path": "standalone/landingzone_desertdam_uscm_lz2.dmm",
+		"when": { "$gamemode": "Faction Clash UPP CM" }
 	}
 ]
diff --git a/maps/Nightmare/maps/FOP_v3_Sciannex/nightmare.json b/maps/Nightmare/maps/FOP_v3_Sciannex/nightmare.json
@@ -6,5 +6,26 @@
     "chance": 0.5,
     "path": "standalone/riot_in_progress.dmm",
     "when": { "riot_in_progress": "true" }
+},
+{
+    "type": "map_insert",
+    "landmark": "hvhupplz1",
+    "chance": 1.0,
+    "path": "standalone/landingzone_fop_upp_lz1.dmm",
+    "when": { "$gamemode": "Faction Clash UPP CM" }
+},
+{
+    "type": "map_insert",
+    "landmark": "hvhuscmlz1",
+    "chance": 1.0,
+    "path": "standalone/landingzone_fop_uscm_lz1.dmm",
+    "when": { "$gamemode": "Faction Clash UPP CM" }
+},
+{
+    "type": "map_insert",
+    "landmark": "hvhuscmlz2",
+    "chance": 1.0,
+    "path": "standalone/landingzone_fop_uscm_lz2.dmm",
+    "when": { "$gamemode": "Faction Clash UPP CM" }
 }
 ]
diff --git a/maps/Nightmare/maps/Ice_Colony_v3/nightmare.json b/maps/Nightmare/maps/Ice_Colony_v3/nightmare.json
@@ -103,5 +103,19 @@
 		"chance": 0.5,
 		"path": "standalone/panic_room_hold.dmm",
         "when": { "panic_room": "full" }
+	},
+	{
+		"type": "map_insert",
+		"landmark": "hvhupplz1",
+		"chance": 1.0,
+		"path": "standalone/landingzone_ice_upp_lz1.dmm",
+		"when": { "$gamemode": "Faction Clash UPP CM" }
+	},
+	{
+		"type": "map_insert",
+		"landmark": "hvhuscmlz2",
+		"chance": 1.0,
+		"path": "standalone/landingzone_ice_uscm_lz2.dmm",
+		"when": { "$gamemode": "Faction Clash UPP CM" }
 	}
 ]
diff --git a/maps/Nightmare/maps/Kutjevo/nightmare.json b/maps/Nightmare/maps/Kutjevo/nightmare.json
@@ -2,5 +2,26 @@
     {
         "type": "map_sprinkle",
         "path": "sprinkles/"
-    }
+    },
+	{
+		"type": "map_insert",
+		"landmark": "hvhupplz1",
+		"chance": 1.0,
+		"path": "standalone/landingzone_kutjevo_upp_lz1.dmm",
+		"when": { "$gamemode": "Faction Clash UPP CM" }
+	},
+	{
+		"type": "map_insert",
+		"landmark": "hvhuscmlz1",
+		"chance": 1.0,
+		"path": "standalone/landingzone_kutjevo_uscm_lz1.dmm",
+		"when": { "$gamemode": "Faction Clash UPP CM" }
+	},
+	{
+		"type": "map_insert",
+		"landmark": "hvhuscmlz2",
+		"chance": 1.0,
+		"path": "standalone/landingzone_kutjevo_uscm_lz2.dmm",
+		"when": { "$gamemode": "Faction Clash UPP CM" }
+	}
 ]
diff --git a/maps/Nightmare/maps/LV522_Chances_Claim/nightmare.json b/maps/Nightmare/maps/LV522_Chances_Claim/nightmare.json
@@ -0,0 +1,16 @@
+[
+	{
+		"type": "map_insert",
+		"landmark": "hvhupplz1",
+		"chance": 1.0,
+		"path": "standalone/landingzone_chance_upp_lz1.dmm",
+		"when": { "$gamemode": "Faction Clash UPP CM" }
+	},
+	{
+		"type": "map_insert",
+		"landmark": "hvhuscmlz2",
+		"chance": 1.0,
+		"path": "standalone/landingzone_chance_uscm_lz2.dmm",
+		"when": { "$gamemode": "Faction Clash UPP CM" }
+	}
+]
diff --git a/maps/Nightmare/maps/LV522_Chances_Claim/scenario.json b/maps/Nightmare/maps/LV522_Chances_Claim/scenario.json
@@ -0,0 +1 @@
+[]
diff --git a/maps/Nightmare/maps/LV624/nightmare.json b/maps/Nightmare/maps/LV624/nightmare.json
@@ -45,5 +45,19 @@
 	{
 		"type": "include", "name": "Standalone variations",
 		"file": "mapgen_variations.json"
+	},
+	{
+		"type": "map_insert",
+		"landmark": "hvhupplz1",
+		"chance": 1.0,
+		"path": "standalone/landingzone_624_upp_lz1.dmm",
+		"when": { "$gamemode": "Faction Clash UPP CM" }
+	},
+	{
+		"type": "map_insert",
+		"landmark": "hvhuscmlz1",
+		"chance": 1.0,
+		"path": "standalone/landingzone_624_uscm_lz1.dmm",
+		"when": { "$gamemode": "Faction Clash UPP CM" }
 	}
 ]
diff --git a/maps/Nightmare/maps/LV759_Hybrisa_Prospera/nightmare.json b/maps/Nightmare/maps/LV759_Hybrisa_Prospera/nightmare.json
@@ -0,0 +1,23 @@
+[
+	{
+		"type": "map_insert",
+		"landmark": "hvhupplz1",
+		"chance": 1.0,
+		"path": "standalone/landingzone_hybrisa_upp_lz1.dmm",
+		"when": { "$gamemode": "Faction Clash UPP CM" }
+	},
+	{
+		"type": "map_insert",
+		"landmark": "hvhuscmlz1",
+		"chance": 1.0,
+		"path": "standalone/landingzone_hybrisa_uscm_lz1.dmm",
+		"when": { "$gamemode": "Faction Clash UPP CM" }
+	},
+	{
+		"type": "map_insert",
+		"landmark": "hvhuscmlz2",
+		"chance": 1.0,
+		"path": "standalone/landingzone_hybrisa_uscm_lz2.dmm",
+		"when": { "$gamemode": "Faction Clash UPP CM" }
+	}
+]
diff --git a/maps/Nightmare/maps/LV759_Hybrisa_Prospera/scenario.json b/maps/Nightmare/maps/LV759_Hybrisa_Prospera/scenario.json
@@ -0,0 +1,2 @@
+[]
+
diff --git a/maps/Nightmare/maps/New_Varadero/nightmare.json b/maps/Nightmare/maps/New_Varadero/nightmare.json
@@ -0,0 +1,23 @@
+[
+	{
+		"type": "map_insert",
+		"landmark": "hvhupplz1",
+		"chance": 1.0,
+		"path": "standalone/landingzone_varadero_upp_lz1.dmm",
+		"when": { "$gamemode": "Faction Clash UPP CM" }
+	},
+	{
+		"type": "map_insert",
+		"landmark": "hvhuscmlz1",
+		"chance": 1.0,
+		"path": "standalone/landingzone_varadero_uscm_lz1.dmm",
+		"when": { "$gamemode": "Faction Clash UPP CM" }
+	},
+	{
+		"type": "map_insert",
+		"landmark": "hvhuscmlz2",
+		"chance": 1.0,
+		"path": "standalone/landingzone_varadero_uscm_lz2.dmm",
+		"when": { "$gamemode": "Faction Clash UPP CM" }
+	}
+]
diff --git a/maps/Nightmare/maps/New_Varadero/scenario.json b/maps/Nightmare/maps/New_Varadero/scenario.json
@@ -0,0 +1 @@
+[]
diff --git a/maps/Nightmare/maps/Sorokyne_Strata/nightmare.json b/maps/Nightmare/maps/Sorokyne_Strata/nightmare.json
@@ -2,5 +2,26 @@
     {
         "type": "map_sprinkle",
         "path": "sprinkles/"
-    }
+    },
+	{
+		"type": "map_insert",
+		"landmark": "hvhupplz1",
+		"chance": 1.0,
+		"path": "standalone/landingzone_sorokyne_upp_lz1.dmm",
+		"when": { "$gamemode": "Faction Clash UPP CM" }
+	},
+	{
+		"type": "map_insert",
+		"landmark": "hvhuscmlz1",
+		"chance": 1.0,
+		"path": "standalone/landingzone_sorokyne_uscm_lz1.dmm",
+		"when": { "$gamemode": "Faction Clash UPP CM" }
+	},
+	{
+		"type": "map_insert",
+		"landmark": "hvhuscmlz2",
+		"chance": 1.0,
+		"path": "standalone/landingzone_sorokyne_uscm_lz2.dmm",
+		"when": { "$gamemode": "Faction Clash UPP CM" }
+	}
 ]
diff --git a/maps/lv522_chances_claim.json b/maps/lv522_chances_claim.json
@@ -31,6 +31,7 @@
     ],
     "environment_traits": { "Fog": true },
     "traits": [{ "Ground": true }],
+    "nightmare_path": "maps/Nightmare/maps/LV522_Chances_Claim/",
     "xvx_hives": {
         "xeno_hive_alpha": 0,
         "xeno_hive_bravo": 0,

diff --git a/maps/lv759_hybrisa_prospera.json b/maps/lv759_hybrisa_prospera.json
@@ -51,6 +51,8 @@
     ],
     "environment_traits": { "Fog": true },
     "traits": [{ "Ground": true }],
+    "nightmare_path": "maps/Nightmare/maps/LV759_Hybrisa_Prospera/",
+
     "xvx_hives": {
         "xeno_hive_alpha": 0,
         "xeno_hive_bravo": 0,

diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm
@@ -719,6 +719,18 @@
 /obj/structure/surface/table,
 /turf/open/floor/white,
 /area/bigredv2/outside/marshal_office)
+"acN" = (
+/obj/effect/landmark/nightmare{
+	insert_tag = "hvhupplz1"
+	},
+/turf/open/mars_cave/mars_cave_2,
+/area/bigredv2/caves_research)
+"acO" = (
+/obj/effect/landmark/nightmare{
+	insert_tag = "hvhuscmlz2"
+	},
+/turf/open/floor/plating,
+/area/bigredv2/outside/space_port_lz2)
 "acP" = (
 /turf/open/mars,
 /area/bigredv2/outside/n)
@@ -757,6 +769,12 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/white,
 /area/bigredv2/outside/marshal_office)
+"acW" = (
+/obj/effect/landmark/nightmare{
+	insert_tag = "hvhuscmlz1"
+	},
+/turf/closed/wall/solaris/rock,
+/area/bigredv2/caves)
 "acX" = (
 /obj/structure/machinery/washing_machine,
 /turf/open/floor/white,
@@ -39916,7 +39934,7 @@ aao
 aao
 aao
 aao
-aao
+acW
 aao
 aao
 aao
@@ -46276,7 +46294,7 @@ bie
 bie
 bie
 bmM
-bie
+acO
 bie
 bie
 bie
@@ -58291,7 +58309,7 @@ jrD
 jcR
 jrD
 jrD
-jrD
+acN
 jrD
 jrD
 jrD