Merge branch 'master' into master

cmss13-devs · Feb 28, 2024 · 1e55108 · 1e55108
2 parents 0d3f8a6 + 3cac2d9
commit 1e55108
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 0 deletions.
diff --git a/code/__DEFINES/mob_hud.dm b/code/__DEFINES/mob_hud.dm
@@ -52,6 +52,7 @@
 #define TRACKER_CO "track_co"
 #define TRACKER_XO "track_xo"
 #define TRACKER_CL "track_cl"
+#define TRACKER_PLTCO "track_pltco"
 
 #define TRACKER_ASL "_asl" // Alpha Squad Leader
 #define TRACKER_BSL "_bsl" // Bravo Squad Leader

diff --git a/code/game/jobs/job/command/cic/staffofficer.dm b/code/game/jobs/job/command/cic/staffofficer.dm
@@ -58,5 +58,14 @@ AddTimelock(/datum/job/command/bridge, list(
 /datum/job/command/bridge/ai/get_total_positions(latejoin = 0)
 	return latejoin ? total_positions : spawn_positions
 
+/datum/job/command/bridge/ai/generate_entry_conditions(mob/living/M, whitelist_status)
+	. = ..()
+	GLOB.marine_leaders[JOB_SO] = M
+	RegisterSignal(M, COMSIG_PARENT_QDELETING, PROC_REF(cleanup_leader_candidate))
+
+/datum/job/command/bridge/ai/proc/cleanup_leader_candidate(mob/M)
+	SIGNAL_HANDLER
+	GLOB.marine_leaders -= JOB_SO
+
 #undef SECOND_LT_VARIANT
 #undef FIRST_LT_VARIANT
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
@@ -20,6 +20,7 @@
 	maxf = 1489
 
 	var/list/inbuilt_tracking_options = list(
+		"Platoon Commander" = TRACKER_PLTCO,
 		"Platoon Sergeant" = TRACKER_SL,
 		"Squad Sergeant" = TRACKER_FTL,
 		"Landing Zone" = TRACKER_LZ

diff --git a/code/game/objects/items/storage/misc.dm b/code/game/objects/items/storage/misc.dm
@@ -138,6 +138,20 @@
 	new /obj/item/ammo_magazine/pistol/t73(src)
 	new /obj/item/ammo_magazine/pistol/t73(src)
 
+/obj/item/storage/box/M1911_loadout
+	name = "M1911 storage case"
+	desc = "A relatively large storage case containing the 1911 and additional magazines. Purchased by enlisted or aspiring PMCs looking to carry a timeless classic"
+	icon = 'icons/obj/items/storage.dmi'
+	icon_state = "matebacase"
+	w_class = SIZE_MEDIUM
+	max_w_class = SIZE_MEDIUM
+	storage_slots = 3
+
+/obj/item/storage/box/M1911_loadout/fill_preset_inventory()
+	new /obj/item/weapon/gun/pistol/m1911(src)
+	new /obj/item/ammo_magazine/pistol/m1911(src)
+	new /obj/item/ammo_magazine/pistol/m1911(src)
+
 /obj/item/storage/box/co2_knife
 	name = "M8 cartridge bayonet packaging"
 	desc = "Contains one M8 Cartridge Bayonet and two sister CO2 cartridges. Thanks for being a dedicated Boots magazine subscriber!"

diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm
@@ -623,6 +623,11 @@ var/global/list/gear_datums_by_name = list()
 	path = /obj/item/weapon/gun/revolver/m44/custom
 	allowed_origins = USCM_ORIGINS
 
+/datum/gear/weapon/m1911
+	display_name = "M1911 Service Pistol"
+	path = /obj/item/storage/box/M1911_loadout
+	allowed_origins = USCM_ORIGINS
+
 /datum/gear/drink
 	category = "Canned drinks"
 

diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
@@ -1255,6 +1255,9 @@
 		if(TRACKER_XO)
 			H = GLOB.marine_leaders[JOB_XO]
 			tracking_suffix = "_xo"
+		if(TRACKER_PLTCO)
+			H = GLOB.marine_leaders[JOB_SO]
+			tracking_suffix = "_co"
 		if(TRACKER_CL)
 			var/datum/job/civilian/liaison/liaison_job = RoleAuthority.roles_for_mode[JOB_CORPORATE_LIAISON]
 			if(liaison_job?.active_liaison)

diff --git a/icons/obj/items/clothing/belts.dmi b/icons/obj/items/clothing/belts.dmi
diff --git a/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi b/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi