Victory branch (#6762)

## About The Pull Request This is the initial pull request for the new map under rapid development. Everything is currently a work in progress, with a lot of work yet to go. But, this will allow this effort to be rolled together with ongoing system improvements. ## Why It's Good For The Game It's a NEW MAP! ## Changelog --------- Co-authored-by: Niezann <[email protected]> Co-authored-by: Shikarasu <[email protected]> Co-authored-by: silicons <[email protected]>
Citadel-Station-13 · Sep 20, 2024 · 102cb6f · 102cb6f
1 parent 59d7d44
commit 102cb6f
Show file tree

Hide file tree

Showing 34 changed files with 376,741 additions and 51 deletions.
diff --git a/_mapload/victory.dm b/_mapload/victory.dm
@@ -0,0 +1,5 @@
+#ifdef FORCE_MAP
+	#error Duplicate FORCE_MAP, what are you doing!?
+#endif
+
+#define FORCE_MAP "victory"
diff --git a/citadel.dme b/citadel.dme
@@ -3319,11 +3319,9 @@
 #include "code\modules\maps\overmap\space\talon\talon_areas.dm"
 #include "code\modules\maps\overmap\space\trade_station\trade_station.dm"
 #include "code\modules\maps\overmap\space\trade_station\trade_station_jobs.dm"
-#include "code\modules\maps\overmap\space\triumph\triumph.dm"
 #include "code\modules\maps\templates\badmin_misc\fun.dm"
 #include "code\modules\maps\templates\badmin_misc\templates.dm"
 #include "code\modules\maps\templates\misc_presets\rift_shuttle_landmarks.dm"
-#include "code\modules\maps\templates\misc_presets\triumph_shuttle_landmarks.dm"
 #include "code\modules\maps\templates\shuttles\admin_spawn\_generic_shuttles.dm"
 #include "code\modules\maps\templates\shuttles\admin_spawn\abductor.dm"
 #include "code\modules\maps\templates\shuttles\admin_spawn\bearcat.dm"
@@ -5312,5 +5310,19 @@
 #include "maps\triumph\sectors.dm"
 #include "maps\triumph\shuttles.dm"
 #include "maps\triumph\telecomms.dm"
+#include "maps\triumph\triumph-overmap.dm"
+#include "maps\triumph\triumph-sectors.dm"
+#include "maps\triumph\triumph-shuttle-landmarks.dm"
+#include "maps\triumph\triumph-turbolifts.dm"
 #include "maps\triumph\triumph.dm"
+#include "maps\victory\engines.dm"
+#include "maps\victory\sectors.dm"
+#include "maps\victory\shuttles.dm"
+#include "maps\victory\telecomms.dm"
+#include "maps\victory\victory-areas.dm"
+#include "maps\victory\victory-overmap.dm"
+#include "maps\victory\victory-sectors.dm"
+#include "maps\victory\victory-shuttle-landmarks.dm"
+#include "maps\victory\victory-turbolifts.dm"
+#include "maps\victory\victory.dm"
 // END_INCLUDE
diff --git a/code/game/area/Off Station Areas.dm b/code/game/area/Off Station Areas.dm
@@ -160,13 +160,6 @@
 	name = "\improper Reading Room"
 /area/triumph/surfacebase/vacant_site
 	name = "\improper Vacant Site"
-//Shuttle crashes
-/area/shuttle/triumph/crash1
-	name = "\improper Crash Site 1"
-	icon_state = "shuttle2"
-/area/shuttle/triumph/crash2
-	name = "\improper Crash Site 2"
-	icon_state = "shuttle2"
 
 // Class D world areas
 /area/class_d

diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm
@@ -997,9 +997,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Tool Storage Maintenance"
 	icon_state = "maint_tool_storage"
 
-/area/maintenance/triumph_midpoint
-	name = "\improper Triumph Midpoint Maint"
-
 /area/maintenance/locker_room
 	name = "\improper Locker Room Maintenance"
 

diff --git a/code/modules/maps/overmap/space/centcom.dm b/code/modules/maps/overmap/space/centcom.dm
@@ -33,20 +33,6 @@
 		start_y = pick(8, 9, 11, 12)
 */
 
-/obj/overmap/entity/visitable/sector/centcom_triumph
-	name = "NDV Marksman"
-	desc = "The NDV Marksman is a Nanotrasen supercarrier that serves as the flagship for the eponymous Marksman Fleet."
-	scanner_desc = @{"[i]Information[/i]: The NDV Marksman is a Nanotrasen supercarrier that serves as the flagship for the eponymous Marksman Fleet."}
-	in_space = 1
-	known = TRUE
-	icon = 'icons/modules/overmap/tiled.dmi'
-	icon_state = "fleet"
-	color = "#007396"
-
-	initial_restricted_waypoints = list(
-		"NDV Quicksilver" = list("specops_hangar")
-		)
-
 // ERT Shuttle can be found at '/maps/overmap/shuttles/specialops.dm'
 
 // EXCLUSIVE NAV POINT FOR DOCKING INSIDE (ERT SHUTTLE ONLY)

diff --git a/code/modules/maps/overmap/space/trade_station/trade_station.dm b/code/modules/maps/overmap/space/trade_station/trade_station.dm
@@ -69,47 +69,47 @@
 
 // Shuttle landmarks. Need to be removed at some point and generic waypoints used
 
-/obj/effect/shuttle_landmark/triumph/trade
+/obj/effect/shuttle_landmark/trade
 	name = "Near Nebula Gas Food Mart"
 	landmark_tag = "nebula_space_SW"
 	base_turf = /turf/space
 	base_area = /area/space
 
 // EXCLUSIVE TRADE PORT NAV POINTS
 
-/obj/effect/shuttle_landmark/triumph/trade/mining
+/obj/effect/shuttle_landmark/trade/mining
 	name = "Nebula Gas Landing Pad 2"
 	landmark_tag = "nebula_pad_2"
 	base_turf = /turf/simulated/shuttle/floor/black/airless
 	base_area = /area/tradeport/pads
 
-/obj/effect/shuttle_landmark/triumph/trade/excursion
+/obj/effect/shuttle_landmark/trade/excursion
 	name = "Nebula Gas Landing Pad 3"
 	landmark_tag = "nebula_pad_3"
 	base_turf = /turf/simulated/shuttle/floor/black/airless
 	base_area = /area/tradeport/pads
 
-/obj/effect/shuttle_landmark/triumph/trade/pirate
+/obj/effect/shuttle_landmark/trade/pirate
 	name = "Nebula Gas Landing Pad 4"
 	landmark_tag = "nebula_pad_4"
 	base_turf = /turf/simulated/shuttle/floor/black/airless
 	base_area = /area/tradeport/pads
 
-/obj/effect/shuttle_landmark/triumph/trade/emt
+/obj/effect/shuttle_landmark/trade/emt
 	name = "Nebula Gas Landing Pad 5"
 	landmark_tag = "nebula_pad_5"
 	base_turf = /turf/simulated/shuttle/floor/black/airless
 	base_area = /area/tradeport/pads
 
-/obj/effect/shuttle_landmark/triumph/trade/civvie
+/obj/effect/shuttle_landmark/trade/civvie
 	name = "Nebula Gas Landing Pad 6"
 	landmark_tag = "nebula_pad_6"
 	base_turf = /turf/simulated/shuttle/floor/black/airless
 	base_area = /area/tradeport/pads
 
 // EXCLUSIVE TRADE PORT NAV POINT FOR DOCKING INSIDE
 
-/obj/effect/shuttle_landmark/triumph/trade/hangar
+/obj/effect/shuttle_landmark/trade/hangar
 	name = "Beruang Hangar"
 	landmark_tag = "tradeport_hangar"
 	docking_controller = "tradeport_hangar_dock"

diff --git a/maps/generic/turbolifts.dm b/maps/generic/turbolifts.dm
@@ -61,22 +61,6 @@
 		/area/turbolift/rwest_mining/surface
 		)
 
-/obj/turbolift_map_holder/triumph
-	name = "Triumph Climber"
-	depth = 4
-	lift_size_x = 3
-	lift_size_y = 1
-	icon = 'icons/obj/turbolift_preview_3x3.dmi'
-	wall_type = null // Don't make walls
-
-	areas_to_use = list(
-		/area/turbolift/t_ship/level1,
-		/area/turbolift/t_ship/level2,
-		/area/turbolift/t_ship/level3,
-		/area/turbolift/t_ship/level4
-		)
-
-
 /obj/turbolift_map_holder/tether
 	name = "Tether Climber"
 	depth = 6

diff --git a/maps/sectors/tradeport_140/levels/tradeport_140.dmm b/maps/sectors/tradeport_140/levels/tradeport_140.dmm
@@ -2070,7 +2070,7 @@
 	id_tag = "tradeport_hangar_docker";
 	pixel_x = -25
 	},
-/obj/effect/shuttle_landmark/triumph/trade/hangar,
+/obj/effect/shuttle_landmark/trade/hangar,
 /obj/overmap/entity/visitable/ship/landable/trade,
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/trade_ship/general)

diff --git a/maps/sectors/tradeport_192/levels/tradeport_192.dmm b/maps/sectors/tradeport_192/levels/tradeport_192.dmm
@@ -10419,7 +10419,7 @@
 	id_tag = "tradeport_hangar_docker";
 	pixel_x = -25
 	},
-/obj/effect/shuttle_landmark/triumph/trade/hangar,
+/obj/effect/shuttle_landmark/trade/hangar,
 /obj/overmap/entity/visitable/ship/landable/trade,
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/trade_ship/general)

diff --git a/...les/maps/overmap/space/triumph/triumph.dm → maps/triumph/triumph-overmap.dm b/...les/maps/overmap/space/triumph/triumph.dm → maps/triumph/triumph-overmap.dm
diff --git a/maps/triumph/triumph-sectors.dm b/maps/triumph/triumph-sectors.dm
@@ -0,0 +1,14 @@
+
+/obj/overmap/entity/visitable/sector/centcom_triumph
+	name = "NDV Marksman"
+	desc = "The NDV Marksman is a Nanotrasen supercarrier that serves as the flagship for the eponymous Marksman Fleet."
+	scanner_desc = @{"[i]Information[/i]: The NDV Marksman is a Nanotrasen supercarrier that serves as the flagship for the eponymous Marksman Fleet."}
+	in_space = 1
+	known = TRUE
+	icon = 'icons/modules/overmap/tiled.dmi'
+	icon_state = "fleet"
+	color = "#007396"
+
+	initial_restricted_waypoints = list(
+		"NDV Quicksilver" = list("specops_hangar")
+		)
diff --git a/...misc_presets/triumph_shuttle_landmarks.dm → maps/triumph/triumph-shuttle-landmarks.dm b/...misc_presets/triumph_shuttle_landmarks.dm → maps/triumph/triumph-shuttle-landmarks.dm
diff --git a/maps/triumph/triumph-turbolifts.dm b/maps/triumph/triumph-turbolifts.dm
@@ -0,0 +1,15 @@
+
+/obj/turbolift_map_holder/triumph
+	name = "Triumph Climber"
+	depth = 4
+	lift_size_x = 3
+	lift_size_y = 1
+	icon = 'icons/obj/turbolift_preview_3x3.dmi'
+	wall_type = null // Don't make walls
+
+	areas_to_use = list(
+		/area/turbolift/t_ship/level1,
+		/area/turbolift/t_ship/level2,
+		/area/turbolift/t_ship/level3,
+		/area/turbolift/t_ship/level4
+		)
diff --git a/maps/victory/engines.dm b/maps/victory/engines.dm
@@ -0,0 +1,30 @@
+/datum/map_template/engine/victory
+	abstract_type = /datum/map_template/engine/victory
+	prefix = "maps/victory/engines/"
+	for_map = /datum/map/station/victory
+
+/datum/map_template/engine/victory/rust
+	name = "ProcEngine_Victory_RUST"
+	desc = "R-UST Fusion Tokamak Engine"
+	suffix = "rust.dmm"
+	display_name = list("Budget Star", "Bane of Synthetics", "Glowy Field", "Funny Spinny EM Field", "Protean Rarity Enforcement")
+
+/datum/map_template/engine/victory/supermatter
+	name = "ProcEngine_Victory_SME"
+	desc = "Old Faithful Supermatter"
+	suffix = "sme.dmm"
+	display_name = list("Angry Rock", "The Forbidden Rock Candy", "Death Crystal", "Spicy Crystal")
+
+/datum/map_template/engine/victory/burnchamber
+	name = "ProcEngine_Victory_Burn"
+	desc = "Burn Chamber Engine"
+	suffix = "burn.dmm"
+	display_name = list("Toxins Lab", "We Knew You Liked Tether Fires, so we Brought One in a Box", "100 Solarmoths", "Teshari's Bane")
+
+/*
+/datum/map_template/engine/victory/fission
+	name = "ProcEngine_Victory_Fission"
+	desc = "The Fission Reactor"
+	suffix = "fission.dmm"
+	display_name = list("Chernobyl", "Not as Cool as the Stormdrive", "Radiation Rework", "Spicy Sticks")
+*/