thwompa · thwompa · Jun 27, 2025 · Jun 25, 2025 · Jun 25, 2025 · Jun 25, 2025
diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm
@@ -4,7 +4,7 @@ It's best not to mess with the numbers of the regular access levels because
 most of them are tied into map-placed objects. This should be reworked in the future.*/
 //WE NEED TO REWORK THIS ONE DAY.  Access levels make me cry - Apophis
 #define ACCESS_MARINE_SENIOR 1
-#define ACCESS_MARINE_DATABASE 2
+#define ACCESS_MARINE_GENERAL 2
 #define ACCESS_MARINE_BRIG 3
 #define ACCESS_MARINE_ARMORY 4
 #define ACCESS_MARINE_CMO 5
@@ -46,6 +46,11 @@ most of them are tied into map-placed objects. This should be reworked in the fu
 #define ACCESS_MARINE_CHAPLAIN 38
 #define ACCESS_MARINE_FIELD_DOC 39
 
+/// Grants access to Marine record databases
+#define ACCESS_MARINE_DATABASE 40
+/// Grants administrator access to Marine record databases
+#define ACCESS_MARINE_DATABASE_ADMIN 41
+
 // AI Core Accesses
 /// Used in temporary passes
 #define ACCESS_MARINE_AI_TEMP 90

diff --git a/code/__DEFINES/dcs/signals/atom/mob/living/signals_human.dm b/code/__DEFINES/dcs/signals/atom/mob/living/signals_human.dm
@@ -86,3 +86,6 @@
 
 /// From /mob/living/carbon/human/UnarmedAttack()
 #define COMSIG_HUMAN_UNARMED_ATTACK "human_unarmed_attack"
+
+/// From /mob/living/carbon/human/hud_set_holocard()
+#define COMSIG_HUMAN_TRIAGE_CARD_UPDATED "human_triage_card_updated"
diff --git a/code/__DEFINES/dcs/signals/atom/mob/living/signals_xeno.dm b/code/__DEFINES/dcs/signals/atom/mob/living/signals_xeno.dm
@@ -95,3 +95,6 @@
 
 /// From /mob/living/carbon/xenomorph/proc/do_evolve()
 #define COMSIG_XENO_EVOLVE_TO_NEW_CASTE "xeno_evolve_to_new_caste"
+
+/// From /mob/living/carbon/human/death(cause, gibbed)
+#define COMSIG_XENO_REVEAL_TACMAP "xeno_reveal_tacmap"
diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm
@@ -412,6 +412,25 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 //-------- TWE --------//
 #define JOB_TWE_REPRESENTATIVE "TWE Representative"
 
+//IASF
+
+#define JOB_TWE_IASF_PARA "IASF Paratrooper"
+#define JOB_TWE_IASF_PARA_SNIPER "IASF Paratrooper (Marksman)"
+#define JOB_TWE_IASF_PARA_PILOT "IASF Fleet Air Arm (Dropship Pilot)"
+#define JOB_TWE_IASF_PARA_SMARTGUNNER "IASF Paratrooper (Smartgunner)"
+#define JOB_TWE_IASF_PARA_SPECIALIST "IASF Paratrooper (Specialist)"
+#define JOB_TWE_IASF_PARA_ENGI "IASF Paratrooper (Combat Engineer)"
+#define JOB_TWE_IASF_PARA_MEDIC "IASF Paratrooper (Combat Medical Technician)"
+#define JOB_TWE_IASF_PARA_SQUAD_LEADER "IASF Paratrooper (Squad Leader)"
+#define JOB_TWE_IASF_PARA_LIEUTENANT "IASF Lieutenant"
+#define JOB_TWE_IASF_PARA_CAPTAIN "IASF Captain"
+#define JOB_TWE_IASF_PARA_MAJOR "IASF Major"
+#define JOB_TWE_IASF_PARA_COMMANDER "IASF Commanding Officer"
+
+#define JOB_TWE_IASF_PARA_SYNTH "IASF Support Synth"
+
+#define TWE_IASF_JOB_LIST list(JOB_TWE_IASF_PARA, JOB_TWE_IASF_PARA_ENGI, JOB_TWE_IASF_PARA_MEDIC, JOB_TWE_IASF_PARA_PILOT, JOB_TWE_IASF_PARA_SMARTGUNNER, JOB_TWE_IASF_PARA_SPECIALIST, JOB_TWE_IASF_PARA_SNIPER , JOB_TWE_IASF_PARA_SQUAD_LEADER, JOB_TWE_IASF_PARA_LIEUTENANT, JOB_TWE_IASF_PARA_CAPTAIN, JOB_TWE_IASF_PARA_MAJOR, JOB_TWE_IASF_PARA_COMMANDER)
+
 //RMC
 #define JOB_TWE_RMC_RIFLEMAN "RMC Rifleman"
 #define JOB_TWE_RMC_MARKSMAN "RMC Marksman"

diff --git a/code/__DEFINES/mob_hud.dm b/code/__DEFINES/mob_hud.dm
@@ -44,17 +44,18 @@
 #define MOB_HUD_FACTION_WY 12
 #define MOB_HUD_FACTION_HC 13
 #define MOB_HUD_FACTION_TWE 14
-#define MOB_HUD_FACTION_CLF 15
-#define MOB_HUD_FACTION_PMC 16
-#define MOB_HUD_FACTION_CMB 17
-#define MOB_HUD_FACTION_NSPA 18
-#define MOB_HUD_FACTION_PAP 19
-#define MOB_HUD_FACTION_WO 20
-#define MOB_HUD_HUNTER 21
-#define MOB_HUD_HUNTER_CLAN 22
-#define MOB_HUD_EXECUTE 23
-#define MOB_HUD_NEW_PLAYER 24
-#define MOB_HUD_SPYCAMS 25
+#define MOB_HUD_FACTION_IASF 15
+#define MOB_HUD_FACTION_CLF 16
+#define MOB_HUD_FACTION_PMC 17
+#define MOB_HUD_FACTION_CMB 18
+#define MOB_HUD_FACTION_NSPA 19
+#define MOB_HUD_FACTION_PAP 20
+#define MOB_HUD_FACTION_WO 21
+#define MOB_HUD_HUNTER 22
+#define MOB_HUD_HUNTER_CLAN 23
+#define MOB_HUD_EXECUTE 24
+#define MOB_HUD_NEW_PLAYER 25
+#define MOB_HUD_SPYCAMS 26
 
 //for SL/FTL/LZ targeting on locator huds
 #define TRACKER_SL "track_sl"

diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm
@@ -249,6 +249,7 @@ DEFINE_BITFIELD(whitelist_status, list(
 #define FACTION_CONTRACTOR "VAI"
 #define FACTION_MARSHAL "Colonial Marshal"
 #define FACTION_NSPA "NSPA"
+#define FACTION_IASF "Imperial Armed Space Force"
 #define FACTION_PAP "People's Armed Police"
 #define FACTION_HYPERDYNE "Hyperdyne Corporation"
 #define FACTION_WY_DEATHSQUAD "WY Death Squad"
@@ -287,6 +288,7 @@ DEFINE_BITFIELD(whitelist_status, list(
 #define FACTION_LIST_DUTCH list(FACTION_DUTCH)
 #define FACTION_LIST_SURVIVOR_WY list(FACTION_SURVIVOR, FACTION_PMC, FACTION_WY)
 #define FACTION_LIST_SURVIVOR_NSPA list(FACTION_SURVIVOR, FACTION_NSPA, FACTION_TWE)
+#define FACTION_LIST_SURVIVOR_IASF list(FACTION_SURVIVOR, FACTION_IASF, FACTION_TWE)
 #define FACTION_LIST_SURVIVOR_PAP list(FACTION_SURVIVOR, FACTION_PAP, FACTION_UPP)
 #define FACTION_LIST_SURVIVOR_UPP list(FACTION_SURVIVOR, FACTION_UPP)
 #define FACTION_LIST_MARINE_WY list(FACTION_MARINE, FACTION_PMC, FACTION_WY)

diff --git a/code/controllers/subsystem/minimap.dm b/code/controllers/subsystem/minimap.dm
@@ -769,9 +769,10 @@ SUBSYSTEM_DEF(minimaps)
 	if(faction == FACTION_NEUTRAL && isobserver(user))
 		faction = allowed_flags == MINIMAP_FLAG_XENO ? XENO_HIVE_NORMAL : FACTION_MARINE
 
-	if(is_xeno && xeno.hive.see_humans_on_tacmap && targeted_ztrait != ZTRAIT_MARINE_MAIN_SHIP)
+	if(is_xeno && xeno.hive.see_humans_on_tacmap)
+		if(targeted_ztrait != ZTRAIT_MARINE_MAIN_SHIP && !xeno.hive.need_round_end_check)
+			targeted_ztrait = ZTRAIT_MARINE_MAIN_SHIP
 		allowed_flags |= MINIMAP_FLAG_USCM|MINIMAP_FLAG_WY|MINIMAP_FLAG_UPP|MINIMAP_FLAG_CLF
-		targeted_ztrait = ZTRAIT_MARINE_MAIN_SHIP
 		map_holder = null
 
 	new_current_map = get_unannounced_tacmap_data_png(faction)
@@ -1048,7 +1049,7 @@ SUBSYSTEM_DEF(minimaps)
 		return UI_CLOSE
 
 	var/mob/living/carbon/xenomorph/xeno = user
-	if(!xeno.hive?.living_xeno_queen?.ovipositor)
+	if(!xeno.hive?.living_xeno_queen?.ovipositor && xeno.hive?.tacmap_requires_queen_ovi)
 		return UI_CLOSE
 
 	return UI_INTERACTIVE

diff --git a/code/datums/ammo/bullet/pistol.dm b/code/datums/ammo/bullet/pistol.dm
@@ -285,3 +285,5 @@
 	penetration = 20
 	shrapnel_chance = SHRAPNEL_CHANCE_TIER_2
 
+/datum/ammo/bullet/pistol/l54_custom
+	penetration= ARMOR_PENETRATION_TIER_3
diff --git a/code/datums/ammo/bullet/smg.dm b/code/datums/ammo/bullet/smg.dm
@@ -159,7 +159,7 @@
 /datum/ammo/bullet/smg/p90/twe_ap
 	name = "armor-piercing submachinegun bullet"
 
-	damage = 26
+	damage = 20
 	accurate_range = 5
 	effective_range_max = 8
 	penetration = ARMOR_PENETRATION_TIER_4

diff --git a/code/datums/ammo/rocket.dm b/code/datums/ammo/rocket.dm
@@ -342,6 +342,11 @@
 	INVOKE_ASYNC(src,PROC_REF(prime), null, projectile)
 
 /datum/ammo/rocket/brute/proc/prime(atom/atom, obj/projectile/projectile)
+	if(istype(projectile.firer,/mob/living/carbon))
+		var/mob/living/carbon/firer = projectile.firer
+		firer.attack_log += "\[[time_stamp()]\] <font color='red'> [key_name(projectile.firer)] fired [name] on [atom]</font>"
+		msg_admin_niche("[key_name(firer, firer.client)] fired [src.name] on [atom.name] at ([atom.x],[atom.y],[atom.z]) [ADMIN_JMP(atom)] ")
+		log_game("[key_name(firer)] fired [src.name] on [atom.name] at ([atom.x],[atom.y],[atom.z])")
 	var/angle = projectile.angle
 	var/right_angle = (angle + 90 ) % 360
 	var/left_angle = (angle -90) % 360

diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm
@@ -112,15 +112,15 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new)
 	record_medical.fields["id"] = id
 	record_medical.fields["name"] = target.real_name
 	record_medical.name = target.name
-	record_medical.fields["b_type"] = target.blood_type
-	record_medical.fields["mi_dis"] = "None"
-	record_medical.fields["mi_dis_d"] = "No minor disabilities have been declared."
-	record_medical.fields["ma_dis"] = "None"
-	record_medical.fields["ma_dis_d"] = "No major disabilities have been diagnosed."
-	record_medical.fields["alg"] = "None"
-	record_medical.fields["alg_d"] = "No allergies have been detected in this patient."
-	record_medical.fields["cdi"] = "None"
-	record_medical.fields["cdi_d"] = "No diseases have been diagnosed at the moment."
+	record_medical.fields["blood_type"] = target.blood_type
+	record_medical.fields["minor_disability"] = "None"
+	record_medical.fields["minor_disability_details"] = "No minor disabilities have been declared."
+	record_medical.fields["major_disability"] = "None"
+	record_medical.fields["major_disability_details"] = "No major disabilities have been diagnosed."
+	record_medical.fields["allergies"] = "None"
+	record_medical.fields["allergies_details"] = "No allergies have been detected in this patient."
+	record_medical.fields["diseases"] = "None"
+	record_medical.fields["diseases_details"] = "No diseases have been diagnosed at the moment."
 	record_medical.fields["last_scan_time"] = null
 	record_medical.fields["last_scan_result"] = "No scan data on record" // body scanner results
 	record_medical.fields["autodoc_data"] = list()
@@ -156,7 +156,7 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new)
 	record_locked.fields["rank"] = target.job
 	record_locked.fields["age"] = target.age
 	record_locked.fields["sex"] = target.gender
-	record_locked.fields["b_type"] = target.b_type
+	record_locked.fields["blood_type"] = target.blood_type
 	record_locked.fields["species"] = target.get_species()
 	record_locked.fields["origin"] = target.origin
 	record_locked.fields["faction"] = target.personal_faction

diff --git a/code/datums/effects/heal_over_time.dm b/code/datums/effects/heal_over_time.dm
@@ -32,3 +32,11 @@
 	affected_mob.updatehealth()
 
 	return TRUE
+
+/datum/effects/heal_over_time/Destroy()
+	if(affected_atom)
+		var/mob/living/carbon/xenomorph/xeno = affected_atom
+		if(istype(xeno))
+			xeno.balloon_alert(xeno, "our regeneration speed returns to normal.", text_color = "#17991b80")
+			playsound(xeno, 'sound/effects/squish_and_exhaust.ogg', 25, 1)
+	return ..()
diff --git a/code/datums/effects/plasma_over_time.dm b/code/datums/effects/plasma_over_time.dm
@@ -31,3 +31,11 @@
 	affected_mob.gain_plasma(plasma_each_process)
 
 	return TRUE
+
+/datum/effects/plasma_over_time/Destroy()
+	if(affected_atom)
+		var/mob/living/carbon/xenomorph/xeno = affected_atom
+		if(istype(xeno))
+			xeno.balloon_alert(xeno, "our plasma rush subsides.", text_color = "#1e6072")
+			playsound(xeno, 'sound/effects/squish_and_exhaust.ogg', 25, 1)
+	return ..()
diff --git a/code/datums/effects/xeno_strains/gain_xeno_cooldown_reduction_on_slash.dm b/code/datums/effects/xeno_strains/gain_xeno_cooldown_reduction_on_slash.dm
@@ -26,19 +26,21 @@
 
 /datum/effects/gain_xeno_cooldown_reduction_on_slash/Destroy()
 	if(affected_atom)
-		var/mob/living/carbon/xenomorph/X  = affected_atom
-		X.cooldown_reduction_percentage -= current_reduction
-		to_chat(X, SPAN_XENOWARNING("You feel your frenzy wanes! Your cooldowns are back to normal."))
-		if(X.cooldown_reduction_percentage < 0)
-			X.cooldown_reduction_percentage = 0
+		var/mob/living/carbon/xenomorph/xeno  = affected_atom
+		xeno.cooldown_reduction_percentage -= current_reduction
+		to_chat(xeno, SPAN_XENOWARNING("We feel our frenzy wane! Our cooldowns are back to normal."))
+		xeno.balloon_alert(xeno, "we feel our frenzy wane!", text_color = "#99461780")
+		playsound(xeno, 'sound/effects/squish_and_exhaust.ogg', 25, 1)
+		if(xeno.cooldown_reduction_percentage < 0)
+			xeno.cooldown_reduction_percentage = 0
 
 	return ..()
 
 /datum/effects/gain_xeno_cooldown_reduction_on_slash/proc/increase_cooldown_reduction()
 	SIGNAL_HANDLER
 	if(affected_atom && current_reduction < max_reduction_amount)
-		var/mob/living/carbon/xenomorph/X  = affected_atom
+		var/mob/living/carbon/xenomorph/xeno  = affected_atom
 		var/previous_reduction = current_reduction
 		current_reduction = min(current_reduction + reduction_amount_per_slash, max_reduction_amount)
 		var/delta = current_reduction - previous_reduction
-		X.cooldown_reduction_percentage += delta
+		xeno.cooldown_reduction_percentage += delta
diff --git a/code/datums/effects/xeno_strains/xeno_speed.dm b/code/datums/effects/xeno_strains/xeno_speed.dm
@@ -44,4 +44,6 @@
 			LAZYREMOVE(xeno.modifier_sources, effect_modifier_source)
 		if(effect_end_message)
 			to_chat(xeno, effect_end_message)
+		xeno.balloon_alert(xeno, "our speed fall back to normal.", text_color = "#5B248C")
+		playsound(xeno, 'sound/effects/squish_and_exhaust.ogg', 25, 1)
 	return ..()
diff --git a/code/datums/elements/_element.dm b/code/datums/elements/_element.dm
@@ -28,9 +28,9 @@
 /// Deactivates the functionality defines by the element on the given datum
 /datum/element/proc/Detach(datum/source, force)
 	SIGNAL_HANDLER
+	SHOULD_CALL_PARENT(TRUE)
 
 	SEND_SIGNAL(source, COMSIG_ELEMENT_DETACH, src)
-	SHOULD_CALL_PARENT(TRUE)
 	UnregisterSignal(source, COMSIG_PARENT_QDELETING)
 
 /datum/element/Destroy(force)

diff --git a/code/datums/emergency_calls/bodyguard.dm b/code/datums/emergency_calls/bodyguard.dm
@@ -68,8 +68,8 @@
 	spawn_header_leader = "You are a Weyland-Yutani PMC Lead Investigator!"
 
 /datum/emergency_call/wy_bodyguard/commando
-	equipment_preset = /datum/equipment_preset/pmc/commando/standard
-	equipment_preset_leader = /datum/equipment_preset/pmc/commando/leader
+	equipment_preset = /datum/equipment_preset/pmc/commando/standard/low_threat
+	equipment_preset_leader = /datum/equipment_preset/pmc/commando/leader/low_threat
 	spawn_header = "You are a Weyland-Yutani Commando!"
 	spawn_header_leader = "You are a Weyland-Yutani Commando Leader!"
 

diff --git a/code/datums/factions/iasf.dm b/code/datums/factions/iasf.dm
@@ -0,0 +1,41 @@
+/datum/faction/iasf
+	name = "TWE - Imperial Armed Space Force"
+	faction_tag = FACTION_IASF
+
+/datum/faction/iasf/modify_hud_holder(image/holder, mob/living/carbon/human/human)
+	var/hud_icon_state
+	var/obj/item/card/id/dogtag/ID = human.get_idcard()
+	var/_role
+	if(human.mind)
+		_role = human.job
+	else if(ID)
+		_role = ID.rank
+	switch(_role)
+		if(JOB_TWE_IASF_PARA_LIEUTENANT)
+			hud_icon_state = "lieutenant"
+		if(JOB_TWE_IASF_PARA_SQUAD_LEADER)
+			hud_icon_state = "teamleader"
+		if(JOB_TWE_IASF_PARA_SNIPER)
+			hud_icon_state = "sniper"
+		if(JOB_TWE_IASF_PARA_MEDIC)
+			hud_icon_state = "medic"
+		if(JOB_TWE_IASF_PARA)
+			hud_icon_state = "rifleman"
+		if(JOB_TWE_IASF_PARA_SMARTGUNNER)
+			hud_icon_state = "smartgunner"
+		if(JOB_TWE_IASF_PARA_SPECIALIST)
+			hud_icon_state = "spec"
+		if(JOB_TWE_IASF_PARA_PILOT)
+			hud_icon_state = "pilot"
+		if(JOB_TWE_IASF_PARA_ENGI)
+			hud_icon_state = "engi"
+		if(JOB_TWE_IASF_PARA_CAPTAIN)
+			hud_icon_state = "commander"
+		if(JOB_TWE_IASF_PARA_MAJOR)
+			hud_icon_state = "major"
+		if (JOB_TWE_IASF_PARA_COMMANDER)
+			hud_icon_state = "commander"
+		if (JOB_TWE_IASF_PARA_SYNTH)
+			hud_icon_state = "synth"
+	if(hud_icon_state)
+		holder.overlays += image('icons/mob/hud/marine_hud.dmi', human, "iasf_[hud_icon_state]")
diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm
@@ -45,6 +45,10 @@
 	var/list/synth_survivor_types_by_variant
 
 	var/list/CO_survivor_types
+	var/list/CO_survivor_types_by_variant
+
+	var/list/CO_insert_survivor_types
+	var/list/CO_insert_survivor_types_by_variant
 
 	var/list/defcon_triggers = list(5150, 4225, 2800, 1000, 0.0)
 
@@ -278,6 +282,23 @@
 		pathed_CO_survivor_types += CO_survivor_typepath
 	CO_survivor_types = pathed_CO_survivor_types.Copy()
 
+	if(islist(json["CO_insert_survivor_types"]))
+		CO_insert_survivor_types = json["CO_insert_survivor_types"]
+	else if ("CO_insert_survivor_types" in json)
+		log_world("map_config CO_insert_survivor_types is not a list!")
+		return
+
+	var/list/pathed_CO_insert_survivor_types = list()
+	for(var/CO_insert_surv_type in CO_insert_survivor_types)
+		var/CO_insert_survivor_typepath = CO_insert_surv_type
+		if(!ispath(CO_insert_survivor_typepath))
+			CO_insert_survivor_typepath = text2path(CO_insert_surv_type)
+			if(!ispath(CO_insert_survivor_typepath))
+				log_world("[CO_insert_surv_type] isn't a proper typepath, removing from CO_insert_survivor_types list")
+				continue
+		pathed_CO_insert_survivor_types += CO_insert_survivor_typepath
+	CO_insert_survivor_types = pathed_CO_insert_survivor_types.Copy()
+
 	if (islist(json["monkey_types"]))
 		monkey_types = list()
 		for(var/monkey in json["monkey_types"])

diff --git a/code/datums/mob_hud.dm b/code/datums/mob_hud.dm
@@ -16,6 +16,7 @@ GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, list(
 	MOB_HUD_FACTION_WY = new /datum/mob_hud/faction/wy(),
 	MOB_HUD_FACTION_HC = new /datum/mob_hud/faction/hyperdyne(),
 	MOB_HUD_FACTION_TWE = new /datum/mob_hud/faction/twe(),
+	MOB_HUD_FACTION_IASF = new /datum/mob_hud/faction/iasf(),
 	MOB_HUD_FACTION_CLF = new /datum/mob_hud/faction/clf(),
 	MOB_HUD_FACTION_PMC = new /datum/mob_hud/faction/pmc(),
 	MOB_HUD_FACTION_CMB = new /datum/mob_hud/faction/cmb(),
@@ -216,6 +217,9 @@ GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, list(
 /datum/mob_hud/faction/twe
 	faction_to_check = FACTION_TWE
 
+/datum/mob_hud/faction/iasf
+	faction_to_check = FACTION_IASF
+
 /datum/mob_hud/faction/clf
 	faction_to_check = FACTION_CLF
 
@@ -798,6 +802,7 @@ GLOBAL_DATUM_INIT(hud_icon_hudfocus, /image, image('icons/mob/hud/marine_hud.dmi
 /mob/living/carbon/human/hud_set_holocard()
 	var/image/holder = hud_list[HOLOCARD_HUD]
 	holder.icon_state = holo_card_color ? "holo_card_[holo_card_color]" : "hudblank"
+	SEND_SIGNAL(src, COMSIG_HUMAN_TRIAGE_CARD_UPDATED)
 
 // Vampire Execute HUD
 /mob/living/carbon/human/proc/update_execute_hud()