Xenosurge Master TM

.vscode/settings.json

@@ -4,6 +4,7 @@
 	"prettier.prettierPath": "./tgui/.yarn/sdks/prettier/index.cjs",
 	"typescript.tsdk": "./tgui/.yarn/sdks/typescript/lib",
 	"typescript.enablePromptUseWorkspaceTsdk": true,
+    "editor.rulers": [],
 	"search.exclude": {
 		"**/.yarn": true,
 		"**/.pnp.*": true

code/__DEFINES/access.dm

@@ -170,11 +170,11 @@ most of them are tied into map-placed objects. This should be reworked in the fu
 ///Well... everything (non Yautja).
 #define ACCESS_LIST_GLOBAL "EVERYTHING"
 
-///Most of the USCM Access Levels used on the USS Almayer, excluding highly restricted ones.
+///Most of the UACM Access Levels used on the USS Almayer, excluding highly restricted ones.
 #define ACCESS_LIST_MARINE_MAIN "Almayer (Main)"
-///All USCM Access levels used on the USS Almayer
+///All UACM Access levels used on the USS Almayer
 #define ACCESS_LIST_MARINE_ALL "Almayer (ALL)"
-///Used by the Wey-Yu - USCM Liaison
+///Used by the Wey-Yu - UACM Liaison
 #define ACCESS_LIST_MARINE_LIAISON "Wey-Yu (Liaison)"
 
 ///The accesses granted to emergency responders.

code/__DEFINES/chat.dm

@@ -23,3 +23,6 @@
 
 /// Adds a generic box around whatever message you're sending in chat. Really makes things stand out.
 #define examine_block(str) ("<div class='examine_block'>" + str + "</div>")
+
+#define narrate_head(str) ("<div class='narrate_head'><p>" + str + "</p></div>")
+#define narrate_body(str) ("<div class='narrate_body'><p>" + str + "</p></div>")

code/__DEFINES/dcs/signals/signals_global.dm

@@ -73,5 +73,3 @@
 /// From /obj/structure/machinery/power/fusion_engine/proc/set_overloading() : (set_overloading)
 #define COMSIG_GLOB_GENERATOR_SET_OVERLOADING "!generator_set_overloading"
 
-/// From /client/proc/rename_platoon()
-#define COMSIG_GLOB_PLATOON_NAME_CHANGE "platoon_name_change"

code/__DEFINES/job.dm

@@ -3,7 +3,7 @@
 #define GET_DEFAULT_ROLE(title) (RoleAuthority?.default_roles[title] ? RoleAuthority.default_roles[title] : title)
 
 // Squad name defines
-#define SQUAD_MARINE_1 "Sun Riders"
+#define SQUAD_MARINE_1 "Alpha"
 #define SQUAD_MARINE_2 "Bravo"
 #define SQUAD_MARINE_3 "Charlie"
 #define SQUAD_MARINE_4 "Delta"
@@ -40,6 +40,12 @@
 #define JOB_SQUAD_MARINE_FORECON "FORECON Rifleman"
 #define JOB_SQUAD_SMARTGUN_FORECON "FORECON Smartgunner"
 
+#define JOB_UER_MARINE "UER Marine Operator"
+#define JOB_UER_MARINE_POINT "UER Marine Point"
+#define JOB_UER_MARINE_LEAD "UER Marine Team Lead"
+
+#define JOB_UER_PO "UER Dropship Pilot"
+
 var/global/list/job_squad_roles = JOB_SQUAD_ROLES_LIST
 
 #define JOB_COLONIST "Colonist"
@@ -132,9 +138,9 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
 
 #define JOB_STOWAWAY "Stowaway"
 
-#define JOB_MARINE "USCM Marine" //generic marine
-#define JOB_COLONEL "USCM Colonel"
-#define JOB_GENERAL "USCM General"
+#define JOB_MARINE "UACM Marine" //generic marine
+#define JOB_COLONEL "UACM Colonel"
+#define JOB_GENERAL "UACM General"
 #define JOB_ACMC "Assistant Commandant of the Marine Corps"
 #define JOB_CMC "Commandant of the Marine Corps"
 

code/__DEFINES/minimap.dm

@@ -55,7 +55,7 @@ GLOBAL_LIST_INIT(all_minimap_flags, bitfield2list(MINIMAP_FLAG_ALL))
 #define MINIMAP_AREA_CONTESTED_ZONE "#0603c4ee"
 
 #define MINIMAP_SQUAD_UNKNOWN "#d8d8d8"
-#define MINIMAP_SQUAD_ALPHA "#4148c8"
+#define MINIMAP_SQUAD_ALPHA "#ed1c24"
 #define MINIMAP_SQUAD_BRAVO "#fbc70e"
 #define MINIMAP_SQUAD_CHARLIE "#76418a"
 #define MINIMAP_SQUAD_DELTA "#0c0cae"

code/__DEFINES/mode.dm

@@ -136,6 +136,8 @@ var/global/list/ROLES_GROUND = ROLES_XENO + ROLES_SPECIAL + ROLES_WHITELISTED
 var/global/list/ROLES_DISTRESS_SIGNAL = ROLES_USCM + ROLES_GROUND
 var/global/list/ROLES_FACTION_CLASH = ROLES_USCM + JOB_PREDATOR
 
+var/global/list/ROLES_PVE = list(JOB_UER_MARINE,JOB_UER_MARINE_POINT,JOB_UER_MARINE_LEAD)
+
 
 var/global/list/ROLES_UNASSIGNED = list(JOB_SQUAD_MARINE)
 var/global/list/ROLES_AI = list(JOB_SO, JOB_SQUAD_LEADER, JOB_SQUAD_MEDIC, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MARINE)
@@ -221,7 +223,7 @@ var/global/list/whitelist_hierarchy = list(WHITELIST_NORMAL, WHITELIST_COUNCIL,
 
 // Faction names
 #define FACTION_NEUTRAL "Neutral"
-#define FACTION_MARINE "USCM"
+#define FACTION_MARINE "UACM"
 #define FACTION_SURVIVOR "Survivor"
 #define FACTION_UPP "UPP"
 #define FACTION_TWE "TWE"

code/__DEFINES/origins.dm

@@ -4,7 +4,7 @@
 // Civilian / CLF
 #define ORIGIN_CIVILIAN "Colony-Born"
 
-// USCM
+// UACM
 #define ORIGIN_USCM "United Americas (United States)"
 #define ORIGIN_USCM_LUNA "United Americas (Luna)"
 #define ORIGIN_USCM_OTHER "United Americas (Other)"

code/__DEFINES/radio.dm

@@ -18,7 +18,7 @@
 
 //Radio channels
 #define RADIO_CHANNEL_BLANK "UNSET"
-#define RADIO_CHANNEL_ALMAYER "Almayer"
+#define RADIO_CHANNEL_ALMAYER "Arrowhead"
 #define RADIO_CHANNEL_ALAMO "Alamo"
 #define RADIO_CHANNEL_COMMAND "Command"
 #define RADIO_CHANNEL_COLONY "Colony"

code/__DEFINES/sentry_laptop_configurations.dm

@@ -1,4 +1,4 @@
-#define FACTION_USCM "USCM"
+#define FACTION_USCM "UACM"
 #define FACTION_WEYLAND "WY"
 #define FACTION_HUMAN "HUMAN"
 #define FACTION_COLONY "COLONY"

code/__DEFINES/shuttles.dm

@@ -117,12 +117,24 @@
 #define DROPSHIP_NORMANDY "dropship_normandy"
 #define DROPSHIP_UPP "dropship_upp"
 #define DROPSHIP_CYCLONE "dropship_cyclone"
+#define DROPSHIP_WRAITH "dropship_wraith"
 
 #define ALMAYER_DROPSHIP_LZ1 "almayer-hangar-lz1"
 #define ALMAYER_DROPSHIP_LZ2 "almayer-hangar-lz2"
 
 #define GOLDEN_ARROW_LZ "golden arrow lz"
 
+#define ARROWHEAD_LZ "arrowhead lz"
+#define MOBILE_ARROW_ELEVATOR "arrow_elevator"
+#define STAT_ARROW_EMPTY "arrow_empty"
+#define STAT_ARROW_OCCUPIED "arrow_occupied"
+#define STAT_ARROW_UPPER_PORT "UAS Arrowhead - Upper Port Elevator Dock"
+#define STAT_ARROW_UPPER_STAR "UAS Arrowhead - Upper Starboard Elevator Dock"
+#define STAT_ARROW_MID_PORT "UAS Arrowhead - Middle Port Elevator Dock"
+#define STAT_ARROW_MID_STAR "UAS Arrowhead - Middle Starboard Elevator Dock"
+#define STAT_ARROW_LOWER_PORT "UAS Arrowhead - Lower Port Elevator Dock"
+#define STAT_ARROW_LOWER_STAR "UAS Arrowhead - Lower Starboard Elevator Dock"
+
 #define DROPSHIP_FLYBY_ID "special_flight"
 #define DROPSHIP_LZ1 "dropship-lz1"
 #define DROPSHIP_LZ2 "dropship-lz2"

code/_globalvars/misc.dm

@@ -5,7 +5,7 @@ GLOBAL_VAR_INIT(perf_flags, NO_FLAGS)
 
 GLOBAL_LIST_INIT(bitflags, list((1<<0), (1<<1), (1<<2), (1<<3), (1<<4), (1<<5), (1<<6), (1<<7), (1<<8), (1<<9), (1<<10), (1<<11), (1<<12), (1<<13), (1<<14), (1<<15), (1<<16), (1<<17), (1<<18), (1<<19), (1<<20), (1<<21), (1<<22), (1<<23)))
 
-GLOBAL_VAR_INIT(master_mode, "Distress Signal: Lowpop")
+GLOBAL_VAR_INIT(master_mode, "Xenosurge")
 
 GLOBAL_VAR_INIT(timezoneOffset, 0)
 
@@ -54,4 +54,42 @@ GLOBAL_VAR(obfs_x)
 /// A number between -500 and 500.
 GLOBAL_VAR(obfs_y)
 
-GLOBAL_VAR_INIT(ai_xeno_weeding, TRUE)
+GLOBAL_VAR_INIT(ai_xeno_weeding, FALSE)
+
+GLOBAL_VAR_INIT(xenosurge_spawner_limit, 30)
+
+GLOBAL_VAR_INIT(xenosurge_surge_started, 0)
+GLOBAL_VAR_INIT(xenosurge_wave_xenos_max, 100)
+GLOBAL_VAR_INIT(xenosurge_wave_xenos_current, 0)
+GLOBAL_VAR_INIT(xenosurge_wave_veteran_xenos_current, 0)
+GLOBAL_VAR_INIT(xenosurge_veteran_xenos_max, 6)
+
+
+GLOBAL_VAR_INIT(xenosurge_wave_xenos_hp, 50)
+GLOBAL_VAR_INIT(xenosurge_wave_xenos_armor, 0)
+GLOBAL_VAR_INIT(xenosurge_wave_xenos_dam_min, 5)
+GLOBAL_VAR_INIT(xenosurge_wave_xenos_dam_max, 7)
+
+GLOBAL_VAR_INIT(xenosurge_spawner_xenos, 5)
+GLOBAL_VAR_INIT(xenosurge_spawner_delay, 100)
+GLOBAL_VAR_INIT(xenosurge_spawner_variance, 10)
+
+GLOBAL_VAR_INIT(xenosurge_veteran_spawner_xenos_max, 2)
+GLOBAL_VAR_INIT(xenosurge_veteran_spawner_delay, 100)
+GLOBAL_VAR_INIT(xenosurge_veteran_spawner_variance, 50)
+
+GLOBAL_VAR_INIT(xenosurge_veteran_type, 4)
+
+GLOBAL_LIST_EMPTY(xenosurge_configured_spawners)
+
+GLOBAL_VAR_INIT(spawner_number, 1)
+
+GLOBAL_VAR_INIT(quest_items_number, 0)
+GLOBAL_VAR_INIT(quest_items_found, 0)
+
+GLOBAL_VAR_INIT(ammo_restock_next, 0)
+GLOBAL_VAR_INIT(ammo_restock_full, 0)
+GLOBAL_VAR_INIT(ammo_restock_delay, 6000)
+
+GLOBAL_VAR_INIT(primary_objective, "Awaiting Orders")
+GLOBAL_VAR_INIT(secondary_objective, "Awaiting Orders")

code/_onclick/hud/fullscreen.dm

@@ -2,6 +2,7 @@
 
 /mob
 	var/list/fullscreens = list()
+	var/list/narration_settings = list("Name" = null, "Location" = null, "Position" = null)
 
 /mob/proc/overlay_fullscreen(category, type, severity)
 	var/atom/movable/screen/fullscreen/screen = fullscreens[category]

code/controllers/configuration/entries/game_options.dm

@@ -51,7 +51,7 @@
 	config_entry_value = TRUE
 
 /datum/config_entry/number/revive_grace_period
-	config_entry_value = 3000
+	config_entry_value = 50000
 	min_val = 0
 
 /datum/config_entry/flag/bones_can_break

code/controllers/configuration/entries/general.dm

@@ -256,7 +256,7 @@ Voting
 
 // Gamemode to auto-switch to at the start of the round
 /datum/config_entry/string/gamemode_default
-	config_entry_value = "Distress Signal: Lowpop"
+	config_entry_value = "Xenosurge"
 
 /datum/config_entry/number/rounds_until_hard_restart
 	config_entry_value = -1 // -1 is disabled by default, 0 is every round, x is after so many rounds

code/controllers/subsystem/communications.dm

@@ -103,7 +103,7 @@ var/const/MIN_FREQ = 1460 // ---------------------------------------------------
 var/const/PUB_FREQ = 1461
 var/const/MAX_FREQ = 1468 // ------------------------------------------------------
 
-//USCM High Command (USCM 1470-1499)
+//UACM High Command (UACM 1470-1499)
 var/const/HC_FREQ = 1471
 var/const/SOF_FREQ = 1472
 var/const/PVST_FREQ = 1473

code/controllers/subsystem/influxstats.dm

@@ -130,7 +130,7 @@ SUBSYSTEM_DEF(influxstats)
 				if(squad in squad_job_stats)
 					squad_job_stats[squad][job] = (squad_job_stats[squad][job] || 0) + 1
 					continue // Defer to squad stats instead
-			// else: So you're in the USCM and have a job but aren't an human? Tell me more Dr Jones...
+			// else: So you're in the UACM and have a job but aren't an human? Tell me more Dr Jones...
 		else if(ishuman(mob))
 			team = "humans_others"
 		else if(isxeno(mob))

code/controllers/subsystem/mapping.dm

@@ -197,7 +197,6 @@ SUBSYSTEM_DEF(mapping)
 
 /datum/controller/subsystem/mapping/proc/Loadship(list/errorList, name, path, files, list/traits, list/default_traits, silent = FALSE, override_map_path = "maps/")
 	LoadGroup(errorList, name, path, files, traits, default_traits, silent, override_map_path = override_map_path)
-	GLOB.gamemode_roles["Distress Signal: Lowpop"] = GLOB.platoon_to_role_list[MAIN_SHIP_PLATOON]
 
 /datum/controller/subsystem/mapping/proc/Loadground(list/errorList, name, path, files, list/traits, list/default_traits, silent = FALSE, override_map_path = "maps/")
 	LoadGroup(errorList, name, path, files, traits, default_traits, silent, override_map_path = override_map_path)

code/controllers/subsystem/minimap.dm

@@ -730,7 +730,7 @@ SUBSYSTEM_DEF(minimaps)
 	old_map = get_tacmap_data_png(faction)
 	current_svg = get_tacmap_data_svg(faction)
 
-	var/use_live_map = skillcheck(user, SKILL_LEADERSHIP, SKILL_LEAD_EXPERT) || is_xeno
+	var/use_live_map = skillcheck(user, SKILL_OVERWATCH, SKILL_OVERWATCH_TRAINED) || is_xeno
 
 	if(use_live_map && !map_holder)
 		var/level = SSmapping.levels_by_trait(targeted_ztrait)
@@ -740,15 +740,6 @@ SUBSYSTEM_DEF(minimaps)
 
 	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
-		if(!wiki_map_fallback)
-			var/wiki_url = CONFIG_GET(string/wikiurl)
-			var/obj/item/map/current_map/new_map = new
-			if(wiki_url && new_map.html_link)
-				wiki_map_fallback ="[wiki_url]/[new_map.html_link]"
-			else
-				debug_log("Failed to determine fallback wiki map! Attempted '[wiki_url]/[new_map.html_link]'")
-			qdel(new_map)
-
 		// Ensure we actually have the map image sent
 		resend_current_map_png(user)
 
@@ -811,9 +802,11 @@ SUBSYSTEM_DEF(minimaps)
 	data["canViewTacmap"] = is_xeno
 	data["canViewCanvas"] = (faction in FACTION_LIST_HUMANOID) || faction == XENO_HIVE_NORMAL
 
+	if(skillcheck(user, SKILL_OVERWATCH, SKILL_OVERWATCH_TRAINED) || faction == XENO_HIVE_NORMAL && isqueen(user))
+		data["canViewTacmap"] = TRUE
+
 	if(skillcheck(user, SKILL_LEADERSHIP, SKILL_LEAD_EXPERT) || faction == XENO_HIVE_NORMAL && isqueen(user))
 		data["canDraw"] = TRUE
-		data["canViewTacmap"] = TRUE
 
 	return data
 

code/controllers/subsystem/statpanel.dm

@@ -34,6 +34,14 @@ SUBSYSTEM_DEF(statpanels)
 			"Server Time: [time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")]",
 			"Round Time: [duration2text()]",
 			"Operation Time: [worldtime2text()]",
+			"------",
+			"Primary Objective:",
+			"",
+			"[GLOB.primary_objective]",
+			"",
+			"Secondary Objective:",
+			"",
+			"[GLOB.secondary_objective]"
 		)
 
 		src.currentrun = GLOB.clients.Copy()

code/controllers/subsystem/ticker.dm

@@ -246,7 +246,7 @@ SUBSYSTEM_DEF(ticker)
 	save_mode(CONFIG_GET(string/gamemode_default))
 
 	if(round_statistics)
-		to_chat_spaced(world, html = FONT_SIZE_BIG(SPAN_ROLE_BODY("<B>Welcome to [round_statistics.round_name]</B>")))
+		to_chat_spaced(world, html = narrate_head("<B>Welcome to [round_statistics.round_name]</B>"))
 
 	supply_controller.process() //Start the supply shuttle regenerating points -- TLE
 
@@ -327,7 +327,7 @@ SUBSYSTEM_DEF(ticker)
 	if(mode)
 		GLOB.master_mode = SSmapping.configs[GROUND_MAP].force_mode ? SSmapping.configs[GROUND_MAP].force_mode : mode
 	else
-		GLOB.master_mode = "Distress Signal: Lowpop"
+		GLOB.master_mode = "Xenosurge"
 	log_game("Saved mode is '[GLOB.master_mode]'")
 
 

code/datums/ammo/bullet/shotgun.dm

@@ -155,7 +155,7 @@
 	knockback(M,P)
 
 /datum/ammo/bullet/shotgun/buckshot/special
-	name = "buckshot shell, USCM special type"
+	name = "buckshot shell, UACM special type"
 	handful_state = "special_buck"
 	bonus_projectiles_type = /datum/ammo/bullet/shotgun/spread/special
 
@@ -192,7 +192,7 @@
 	damage = 20
 
 /datum/ammo/bullet/shotgun/spread/special
-	name = "additional buckshot, USCM special type"
+	name = "additional buckshot, UACM special type"
 
 	accurate_range = 8
 	max_range = 8

code/datums/ammo/xeno.dm

@@ -394,3 +394,18 @@
 
 /datum/ammo/xeno/oppressor_tail/proc/remove_tail_overlay(mob/overlayed_mob, image/tail_image)
 	overlayed_mob.overlays -= tail_image
+
+
+/datum/ammo/xeno/surge_proj
+
+	name = "surge projectile"
+	icon_state = "shrapnel_light"
+	ping = null
+	flags_ammo_behavior = AMMO_XENO|AMMO_SKIPS_ALIENS|AMMO_STOPPED_BY_COVER
+	damage_type = BRUTE
+
+	damage = 20
+	max_range = 10
+	accuracy = 100
+	shrapnel_type = /obj/item/shard/shrapnel/surge_chip
+	shrapnel_chance = 100

code/datums/datacore.dm

@@ -7,18 +7,6 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new)
 	//This list tracks characters spawned in the world and cannot be modified in-game. Currently referenced by respawn_character().
 	var/locked[] = list()
 
-/datum/datacore/New()
-	. = ..()
-
-	RegisterSignal(SSdcs, COMSIG_GLOB_PLATOON_NAME_CHANGE, PROC_REF(rename_platoon))
-
-/datum/datacore/proc/rename_platoon(datum/source, new_name, old_name)
-	SIGNAL_HANDLER
-
-	for(var/datum/data/record/cycled_data_record in general)
-		if(cycled_data_record.fields["squad"] == old_name)
-			cycled_data_record.fields["squad"] = new_name
-
 /datum/datacore/proc/get_manifest(monochrome, OOC, nonHTML)
 	var/list/cic = ROLES_CIC.Copy()
 	var/list/auxil = ROLES_AUXIL_SUPPORT.Copy()
@@ -141,7 +129,7 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new)
 				continue
 			dept_flags |= FLAG_SHOW_MARINES
 			squad_sublists[squad_name] = TRUE
-			///If it is a real squad in the USCM squad list to prevent the crew manifest from breaking
+			///If it is a real squad in the UACM squad list to prevent the crew manifest from breaking
 			if(!(squad_name in ROLES_SQUAD_ALL))
 				continue
 			LAZYSET(marines_by_squad[squad_name][real_rank], name, rank)