Points defence (#4)

* upd_1 * shiza * some new * what * Update code/_compile_options.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: homexp13 <[email protected]> * crush respawn * fix * tunel * core * den * testing * ports * SUBSYSTEM * morecores * i kill * marks * round_statistics * boost_condition_sensors_amount * Extra points * bruh * Update code/modules/xenomorph/xeno_core.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: homexp13 <[email protected]> * Update code/modules/xenomorph/xeno_core.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: homexp13 <[email protected]> * Update code/modules/xenomorph/xeno_core.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: homexp13 <[email protected]> * Update code/modules/xenomorph/xeno_core.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: homexp13 <[email protected]> * Update code/modules/xenomorph/xeno_core.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: homexp13 <[email protected]> * examine * RP moment * undef * Update code/controllers/subsystem/xeno_den.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: homexp13 <[email protected]> * QDEL_LIST * _amount * Update code/game/objects/machinery/telecomms/ground_telecomms.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: homexp13 <[email protected]> * Update code/game/objects/machinery/telecomms/ground_telecomms.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: homexp13 <[email protected]> * xd * Update code/game/objects/machinery/telecomms/ground_telecomms.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: homexp13 <[email protected]> * undef * weldingtool * aaa * doc * Update code/modules/xenomorph/tunnel.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: homexp13 <[email protected]> * Update code/modules/xenomorph/tunnel.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: homexp13 <[email protected]> * Update code/modules/xenomorph/xeno_core.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: homexp13 <[email protected]> * here we go again --------- Signed-off-by: homexp13 <[email protected]> Co-authored-by: Helg2 <[email protected]>
PMC-Unga-Marines · Aug 23, 2024 · 38a8f71 · 38a8f71
1 parent 5be8134
commit 38a8f71
Show file tree

Hide file tree

Showing 30 changed files with 16,712 additions and 25 deletions.
diff --git a/_maps/map_files/Xeno_den/Xeno_den.dmm b/_maps/map_files/Xeno_den/Xeno_den.dmm
diff --git a/code/__DEFINES/_radio.dm b/code/__DEFINES/_radio.dm
@@ -107,6 +107,9 @@
 
 #define FREQ_COMMON 1437
 
+#define GROUND_FREQS list(FREQ_ALPHA, FREQ_BRAVO, FREQ_CHARLIE, FREQ_DELTA, FREQ_ECHO)
+#define TOWER_FREQS list(FREQ_CAS, FREQ_ENGINEERING, FREQ_MEDICAL, FREQ_REQUISITIONS, FREQ_AI, FREQ_COMMAND, FREQ_COMMON)
+
 #define MIN_FREQ 1441 // ------------------------------------------------------
 // Only the 1441 to 1489 range is freely available for general conversation.
 // This represents 1/8th of the available spectrum.

diff --git a/code/__DEFINES/_subsystems.dm b/code/__DEFINES/_subsystems.dm
@@ -109,6 +109,7 @@
 #define INIT_ORDER_ICON_SMOOTHING -16
 #define INIT_ORDER_LIGHTING -20
 #define INIT_ORDER_SHUTTLE -21
+#define INIT_ORDER_XENODEN -23
 #define INIT_ORDER_PATH -50
 #define INIT_ORDER_EXCAVATION -78
 #define INIT_ORDER_STATPANELS -97

diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm
@@ -12,6 +12,7 @@
 #define COMSIG_GLOB_OPEN_TIMED_SHUTTERS_XENO_HIVEMIND "!open_timed_shutters_xeno_hivemind"
 #define COMSIG_GLOB_OPEN_TIMED_SHUTTERS_CRASH "!open_timed_shutters_crash"
 #define COMSIG_GLOB_OPEN_SHUTTERS_EARLY "!open_shutters_early"
+#define COMSIG_GLOB_TELETOWER "!teletower"
 
 #define COMSIG_GLOB_TADPOLE_LAUNCHED "!tadpole_launched"
 #define COMSIG_GLOB_DROPPOD_LANDED "!pod_landed"

diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
@@ -285,6 +285,7 @@
 #define issensorcapturegamemode(O) (istype(O, /datum/game_mode/hvh/combat_patrol/sensor_capture))
 #define iscampaigngamemode(O) (istype(O, /datum/game_mode/hvh/campaign))
 #define isdistressgamemode(O) (istype(O, /datum/game_mode/infestation/distress))
+#define ispointsdefencegamemode(O) (istype(O, /datum/game_mode/infestation/distress/points_defence))
 
 #define isxenoresearcharea(A) (istype(A, /area/mainship/medical/medical_science))
 

diff --git a/code/__DEFINES/maps.dm b/code/__DEFINES/maps.dm
@@ -24,6 +24,7 @@ require only minor tweaks.
 #define ZTRAIT_STATION "Station"
 #define ZTRAIT_RESERVED "Transit/Reserved"
 #define ZTRAIT_GROUND "Ground"
+#define ZTRAIT_XENO "XENO"
 #define ZTRAIT_MARINE_MAIN_SHIP "Marine Main Ship"
 #define ZTRAIT_DOUBLE_SHIPS "Double Marine Ship"
 #define ZTRAIT_AWAY "Away"

diff --git a/code/__DEFINES/minimap.dm b/code/__DEFINES/minimap.dm
@@ -3,8 +3,9 @@
 #define MINIMAP_FLAG_MARINE (1<<1)
 #define MINIMAP_FLAG_MARINE_SOM (1<<2)
 #define MINIMAP_FLAG_EXCAVATION_ZONE (1<<3)
+#define MINIMAP_FLAG_UNIDENTIFIED (1<<4)
 #define MINIMAP_FLAG_YAUTJA (1<<5)
-#define MINIMAP_FLAG_ALL (1<<6) - 1 //RU TGMC EDIT
+#define MINIMAP_FLAG_ALL (1<<6) - 1
 
 GLOBAL_LIST_INIT(faction_to_minimap_flag, list(
 	FACTION_XENO = MINIMAP_FLAG_XENO,

diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm
@@ -49,6 +49,8 @@
 #define MODE_SILOS_SPAWN_MINIONS (1<<13)
 #define MODE_ALLOW_XENO_QUICKBUILD (1<<14)
 #define MODE_DISALLOW_RAILGUN (1<<15)
+#define MODE_TELETOWER (1<<16)
+#define MODE_XENO_DEN (1<<17)
 
 #define MODE_INFESTATION_X_MAJOR "Xenomorph Major Victory"
 #define MODE_INFESTATION_M_MAJOR "Marine Major Victory"
@@ -143,6 +145,9 @@
 #define INFESTATION_MARINE_DEPLOYMENT 0
 #define INFESTATION_MARINE_CRASHING 1
 #define INFESTATION_DROPSHIP_CAPTURED_XENOS 2
+#define INFESTATION_MARINE_MINOR 3
+#define INFESTATION_MARINE_DEN_RUSH 4
+#define INFESTATION_MARIN_RUSH_MAJOR 5
 
 #define NUCLEAR_WAR_LARVA_POINTS_NEEDED 8
 #define CRASH_LARVA_POINTS_NEEDED 10

diff --git a/code/_globalvars/game_modes.dm b/code/_globalvars/game_modes.dm
@@ -1 +1,2 @@
 GLOBAL_VAR_INIT(master_mode, "Nuclear War")
+GLOBAL_VAR_INIT(tower_relay, FALSE)
diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm
@@ -3,6 +3,20 @@ GLOBAL_LIST_INIT(ammo_list, init_ammo_list())						//List of all ammo types. Use
 
 GLOBAL_LIST_EMPTY(xeno_egg_hugger)
 
+GLOBAL_LIST_EMPTY(miners_phorone)
+GLOBAL_LIST_EMPTY(miners_platinum)
+
+GLOBAL_LIST_EMPTY(miner_phorone_locs)
+GLOBAL_LIST_EMPTY(miner_platinum_locs)
+
+GLOBAL_LIST_EMPTY(sensor_towers_infestation_ground)
+GLOBAL_LIST_EMPTY(sensor_towers_infestation_caves)
+
+GLOBAL_LIST_EMPTY(tower_relay_locs)
+
+GLOBAL_LIST_EMPTY(xenoden_docking_ports_locs)
+GLOBAL_LIST_EMPTY(xenoden_cores_locs)
+
 GLOBAL_VAR(waves_spawner_loc)
 
 GLOBAL_LIST_EMPTY(last_stand_nukes)

diff --git a/code/datums/gamemodes/_game_mode.dm b/code/datums/gamemodes/_game_mode.dm
@@ -463,6 +463,8 @@ GLOBAL_LIST_INIT(bioscan_locations, list(
 		parts += "[GLOB.round_statistics.larva_from_psydrain] larvas came from psydrain."
 	if(GLOB.round_statistics.larva_from_silo)
 		parts += "[GLOB.round_statistics.larva_from_silo] larvas came from silos."
+	if(GLOB.round_statistics.larva_from_xeno_core)
+		parts += "[GLOB.round_statistics.larva_from_xeno_core] larvas came from infestation towers."
 	if(GLOB.round_statistics.larva_from_cocoon)
 		parts += "[GLOB.round_statistics.larva_from_cocoon] larvas came from cocoons."
 	if(GLOB.round_statistics.larva_from_marine_spawning)
@@ -481,6 +483,8 @@ GLOBAL_LIST_INIT(bioscan_locations, list(
 		parts += "[GLOB.round_statistics.psy_shield_blasts] number of times Warlocks detonated a Psychic Shield."
 	if(GLOB.round_statistics.points_from_mining)
 		parts += "[GLOB.round_statistics.points_from_mining] requisitions points gained from mining."
+	if(GLOB.round_statistics.points_from_towers)
+		parts += "[GLOB.round_statistics.points_from_towers] requisitions points gained from infestation towers."
 	if(GLOB.round_statistics.points_from_research)
 		parts += "[GLOB.round_statistics.points_from_research] requisitions points gained from research."
 	if(length(GLOB.round_statistics.req_items_produced))
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		GLOBAL_VAR_INIT(master_mode, "Nuclear War")
		GLOBAL_VAR_INIT(tower_relay, FALSE)