TGS Test Merge (#7525)

cmss13-devs · Feb 3, 2025 · f11046d · f11046d
2 parents b40fc6a + a73ec46
commit f11046d
Show file tree

Hide file tree

Showing 74 changed files with 65,989 additions and 103 deletions.
diff --git a/code/__DEFINES/__game.dm b/code/__DEFINES/__game.dm
@@ -35,6 +35,7 @@
 #define MAP_LV759_HYBRISA_PROSPERA "LV-759 Hybrisa Prospera" // Highpop Only
 #define MAP_NEW_VARADERO "New Varadero"//ice colony underground but as its own map
 #define MAP_CHINOOK "Chinook 91 GSO" //admin level
+#define MAP_ROSTOCK "SSV Rostock" //UPP Warship
 
 #define GAMEMODE_WHISKEY_OUTPOST "Whiskey Outpost"
 #define GAMEMODE_HIVE_WARS "Hive Wars"
@@ -391,6 +392,8 @@
 #define WALL_DEVWALL_R "devwall_r"
 #define WALL_HUNTERSHIP "metal"//DMI specific name
 #define WALL_AICORE "aiwall"
+#define WALL_UPP_SHIP "uppwall_interior"
+#define WALL_UPP_BASE "uppwall"
 
 //Defines for dropship weapon gimbals
 #define GIMBAL_LEFT -1

diff --git a/code/__DEFINES/gamemode.dm b/code/__DEFINES/gamemode.dm
@@ -15,4 +15,7 @@
 #define MODE_BATTLEFIELD_DRAW_STALEMATE "DRAW: Stalemate"
 #define MODE_BATTLEFIELD_DRAW_DEATH "DRAW: My Friends Are Dead"
 
+#define MODE_FACTION_CLASH_UPP_MAJOR "UPP Major Victory"
+#define MODE_FACTION_CLASH_UPP_MINOR "UPP Minor Victory"
+
 #define MODE_GENERIC_DRAW_NUKE "DRAW: Nuclear Explosion"
diff --git a/code/__DEFINES/shuttles.dm b/code/__DEFINES/shuttles.dm
@@ -109,6 +109,7 @@
 
 #define MOBILE_SHUTTLE_LIFEBOAT_PORT "lifeboat-port"
 #define MOBILE_SHUTTLE_LIFEBOAT_STARBOARD "lifeboat-starboard"
+#define MOBILE_SHUTTLE_LIFEBOAT_ROSTOCK "lifeboat-rostock"
 #define MOBILE_SHUTTLE_VEHICLE_ELEVATOR "vehicle_elevator"
 
 #define DROPSHIP_ALAMO "dropship_alamo"
@@ -120,7 +121,8 @@
 #define ALMAYER_DROPSHIP_LZ1 "almayer-hangar-lz1"
 #define ALMAYER_DROPSHIP_LZ2 "almayer-hangar-lz2"
 
-#define UPP_DROPSHIP_LZ2 "upp-hangar-lz1"
+#define UPP_DROPSHIP_LZ1 "upp-hangar-lz1"
+#define UPP_DROPSHIP_LZ2 "upp-hangar-lz2"
 
 #define DROPSHIP_FLYBY_ID "special_flight"
 #define DROPSHIP_LZ1 "dropship-lz1"

diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
@@ -234,6 +234,7 @@ SUBSYSTEM_DEF(mapping)
 		INIT_ANNOUNCE("Loading [ship_map.map_name]...")
 		Loadship(FailedZs, ship_map.map_name, ship_map.map_path, ship_map.map_file, ship_map.traits, ZTRAITS_MAIN_SHIP, override_map_path = ship_base_path)
 
+	Loadship(FailedZs, "ssv_rostock", "templates/", list("ssv_rostock.dmm") , list(),ZTRAITS_MAIN_SHIP , override_map_path = "maps/")
 	if(LAZYLEN(FailedZs)) //but seriously, unless the server's filesystem is messed up this will never happen
 		var/msg = "RED ALERT! The following map files failed to load: [FailedZs[1]]"
 		if(length(FailedZs) > 1)

diff --git a/code/datums/emergency_calls/ert_stations.dm b/code/datums/emergency_calls/ert_stations.dm
@@ -21,3 +21,6 @@
 
 /datum/lazy_template/fax_response_base
 	map_name = "fax_responder_base"
+
+/datum/lazy_template/ssv_rostock
+	map_name = "ssv_rostock"