cmss13-devs · CactusMouth · Apr 6, 2025 · Apr 6, 2025 · Apr 6, 2025 · Apr 6, 2025
diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm
@@ -422,6 +422,14 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 #define JOB_TIS_SA "UAAC-TIS Special Agent"
 
 #define TIS_JOB_LIST list(JOB_TIS_SA, JOB_TIS_IO)
+//-------- UACG -------//
+#define JOB_UACG_RIFLE "Colonial Militiaman"
+#define JOB_UACG_TECH "Colonial Militiaman Technician"
+#define JOB_UACG_MEDIC "Colonial Militiaman Medic"
+#define JOB_UACG_LEAD "Colonial Militiaman Unit Leader"
+#define JOB_UACG_OFFICER "Colonial Militiaman Officer"
+
+#define UACG_JOB_LIST list(JOB_UACG_RIFLE, JOB_UACG_TECH, JOB_UACG_MEDIC, JOB_UACG_LEAD, JOB_UACG_OFFICER)
 //-------- DUTCH'S DOZEN --------//
 #define JOB_DUTCH_ARNOLD "Dutch's Dozen - Dutch"
 #define JOB_DUTCH_RIFLEMAN "Dutch's Dozen - Rifleman"

diff --git a/code/__DEFINES/mob_hud.dm b/code/__DEFINES/mob_hud.dm
@@ -49,6 +49,7 @@
 #define MOB_HUD_HUNTER 18
 #define MOB_HUD_HUNTER_CLAN 19
 #define MOB_HUD_EXECUTE 20
+#define MOB_HUD_FACTION_UACG 21
 
 //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
@@ -267,6 +267,7 @@ DEFINE_BITFIELD(whitelist_status, list(
 #define FACTION_NEUTRAL "Neutral"
 #define FACTION_MARINE "USCM"
 #define FACTION_ARMY "USA"
+#define FACTION_UACG "UACG"
 #define FACTION_NAVY "USASF"
 #define FACTION_SURVIVOR "Survivor"
 #define FACTION_UPP "UPP"
@@ -293,14 +294,14 @@ DEFINE_BITFIELD(whitelist_status, list(
 #define FACTION_ZOMBIE "Zombie"
 #define FACTION_MONKEY "Monkey" // Nanu
 
-#define FACTION_LIST_MARINE list(FACTION_MARINE, FACTION_ARMY, FACTION_NAVY)
-#define FACTION_LIST_HUMANOID list(FACTION_MARINE, FACTION_PMC, FACTION_WY, FACTION_WY_DEATHSQUAD, FACTION_CLF, FACTION_CONTRACTOR, FACTION_MARSHAL, FACTION_UPP, FACTION_FREELANCER, FACTION_SURVIVOR, FACTION_NEUTRAL, FACTION_COLONIST, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_YAUTJA, FACTION_ZOMBIE, FACTION_TWE, FACTION_ARMY, FACTION_NAVY, FACTION_CANC, FACTION_UA_REBEL, FACTION_TWE_REBEL)
+#define FACTION_LIST_MARINE list(FACTION_MARINE, FACTION_ARMY, FACTION_NAVY, FACTION_UACG)
+#define FACTION_LIST_HUMANOID list(FACTION_MARINE, FACTION_PMC, FACTION_WY, FACTION_WY_DEATHSQUAD, FACTION_CLF, FACTION_UACG, FACTION_CONTRACTOR, FACTION_MARSHAL, FACTION_UPP, FACTION_FREELANCER, FACTION_SURVIVOR, FACTION_NEUTRAL, FACTION_C
6DB6
OLONIST, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_YAUTJA, FACTION_ZOMBIE, FACTION_TWE, FACTION_ARMY, FACTION_NAVY, FACTION_CANC, FACTION_UA_REBEL, FACTION_TWE_REBEL)
 #define FACTION_LIST_ERT_OTHER list(FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO)
 #define FACTION_LIST_ERT_ALL list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY, FACTION_CLF, FACTION_CONTRACTOR, FACTION_UPP, FACTION_FREELANCER, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_MARSHAL, FACTION_TWE)
 #define FACTION_LIST_WY list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY)
 #define FACTION_LIST_UPP list(FACTION_UPP)
 #define FACTION_LIST_UPP_COLONY list(FACTION_COLONIST, FACTION_UPP)
-#define FACTION_LIST_UA_COLONY list(FACTION_COLONIST, FACTION_MARINE, FACTION_ARMY, FACTION_NAVY, FACTION_MARSHAL)
+#define FACTION_LIST_UA_COLONY list(FACTION_COLONIST, FACTION_MARINE, FACTION_UACG, FACTION_ARMY, FACTION_NAVY, FACTION_MARSHAL)
 #define FACTION_LIST_WY_COLONY list(FACTION_COLONIST, FACTION_WY)
 #define FACTION_LIST_CLF list(FACTION_COLONIST, FACTION_CLF)
 #define FACTION_LIST_TWE_REBEL list(FACTION_COLONIST, FACTION_TWE_REBEL)

diff --git a/code/__DEFINES/radio.dm b/code/__DEFINES/radio.dm
@@ -43,7 +43,6 @@
 //CLF Comms
 #define RADIO_CHANNEL_CLF_GEN "CLF"
 #define RADIO_CHANNEL_CLF_CMD "CLF Command"
-#define RADIO_CHANNEL_CLF_CCT "CLF CCT"
 #define RADIO_CHANNEL_CLF_MED "CLF Med"
 #define RADIO_CHANNEL_CLF_ENGI "CLF Engi"
 

diff --git a/code/controllers/subsystem/communications.dm b/code/controllers/subsystem/communications.dm
@@ -212,7 +212,6 @@ GLOBAL_LIST_INIT(radiochannels, list(
 	RADIO_CHANNEL_CLF_CMD = CLF_CMD_FREQ,
 	RADIO_CHANNEL_CLF_ENGI = CLF_ENGI_FREQ,
 	RADIO_CHANNEL_CLF_MED = CLF_MED_FREQ,
-	RADIO_CHANNEL_CLF_CCT = CLF_CCT_FREQ,
 
 	RADIO_CHANNEL_BUG_A = BUG_A_FREQ,
 	RADIO_CHANNEL_BUG_B = BUG_B_FREQ,

diff --git a/code/datums/factions/cmb.dm b/code/datums/factions/cmb.dm
@@ -1,3 +1,8 @@
 /datum/faction/cmb
 	name = "Colonial Marshal Bureau"
 	faction_tag = FACTION_MARINE
+
+//UACG included
+/datum/faction/uacg
+	name = "United Americas Colonial Guard"
+	faction_tag = FACTION_UACG
diff --git a/code/datums/mob_hud.dm b/code/datums/mob_hud.dm
@@ -22,6 +22,7 @@ GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, list(
 	MOB_HUD_HUNTER = new /datum/mob_hud/hunter_hud(),
 	MOB_HUD_HUNTER_CLAN = new /datum/mob_hud/hunter_clan(),
 	MOB_HUD_EXECUTE = new /datum/mob_hud/execute_hud(),
+	MOB_HUD_FACTION_UACG = new /datum/mob_hud/faction/guard(),
 	))
 
 /datum/mob_hud
@@ -220,6 +221,9 @@ GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, list(
 /datum/mob_hud/faction/pmc
 	faction_to_check = FACTION_PMC
 
+/datum/mob_hud/faction/guard
+	faction_to_check = FACTION_UACG
+
 /datum/mob_hud/faction/observer
 	hud_icons = list(FACTION_HUD, ORDER_HUD, HUNTER_CLAN, HOLOCARD_HUD)
 

diff --git a/code/datums/skills/civilian.dm b/code/datums/skills/civilian.dm
@@ -205,6 +205,43 @@ CIVILIAN
 		SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
 	)
 
+/datum/skills/civilian/survivor/marshal/medic
+	name = "Survivor Marshal Medic"
+	skills = list(
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
+		SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
+		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED,
+		SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR,
+		SKILL_CQC = SKILL_CQC_SKILLED,
+		SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
+		SKILL_POLICE = SKILL_POLICE_SKILLED,
+		SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
+		SKILL_ENGINEER = SKILL_ENGINEER_NOVICE,
+		SKILL_CQC = SKILL_CQC_SKILLED,
+		SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
+		SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR,
+		SKILL_SURGERY = SKILL_SURGERY_TRAINED,
+	)
+
+/datum/skills/civilian/survivor/marshal/tech
+	name = "Survivor Marshal Technician"
+	skills = list(
+		SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
+		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
+		SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR,
+		SKILL_CQC = SKILL_CQC_SKILLED,
+		SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
+		SKILL_POLICE = SKILL_POLICE_SKILLED,
+		SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
+		SKILL_ENGINEER = SKILL_ENGINEER_NOVICE,
+		SKILL_CQC = SKILL_CQC_SKILLED,
+		SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
+		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
+		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
+		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
+	)
+
 /datum/skills/civilian/survivor/prisoner
 	name = "Survivor Prisoner"
 	additional_skills = list(

diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm
@@ -335,15 +335,15 @@
 
 /obj/item/device/encryptionkey/clf/engi
 	name = "\improper CLF Engineering Radio Encryption Key"
-	channels = list(RADIO_CHANNEL_CLF_GEN = TRUE, RADIO_CHANNEL_CLF_ENGI = TRUE, RADIO_CHANNEL_CLF_CCT = TRUE)
+	channels = list(RADIO_CHANNEL_CLF_GEN = TRUE, RADIO_CHANNEL_CLF_ENGI = TRUE)
 
 /obj/item/device/encryptionkey/clf/medic
 	name = "\improper CLF Medical Radio Encryption Key"
 	channels = list(RADIO_CHANNEL_CLF_GEN = TRUE, RADIO_CHANNEL_CLF_MED = TRUE)
 
 /obj/item/device/encryptionkey/clf/command
 	name = "\improper CLF Command Radio Encryption Key"
-	channels = list(RADIO_CHANNEL_CLF_CMD = TRUE, RADIO_CHANNEL_CLF_GEN = TRUE, RADIO_CHANNEL_CLF_ENGI = TRUE, RADIO_CHANNEL_CLF_MED = TRUE, RADIO_CHANNEL_CLF_CCT = TRUE)
+	channels = list(RADIO_CHANNEL_CLF_CMD = TRUE, RADIO_CHANNEL_CLF_GEN = TRUE, RADIO_CHANNEL_CLF_ENGI = TRUE, RADIO_CHANNEL_CLF_MED = TRUE)
 //---------------------------------------------------
 /obj/item/device/encryptionkey/highcom
 	name = "\improper USCM High Command Radio Encryption Key"

diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
@@ -1109,7 +1109,7 @@
 
 /obj/item/device/radio/headset/distress/CLF/cct
 	name = "CLF-CCT headset"
-	desc = "A special headset used by small groups of trained operatives. Or terrorists. Channels are as follows: :o - colony, #d - combat controller, #b - engineering"
+	desc = "A special headset used by small groups of trained operatives. Or terrorists. Channels are as follows: :o - colony, #b - engineering"
 	initial_keys = list(/obj/item/device/encryptionkey/colony, /obj/item/device/encryptionkey/clf/engi)
 
 /obj/item/device/radio/headset/distress/CLF/medic
@@ -1275,12 +1275,12 @@
 
 /obj/item/device/radio/headset/distress/guard
 	name = "\improper Colonial Guard radio headset"
-	desc = "A robust headset used by members of the UA's Colonial Guard. Built to outlast those it's issued to. Featured channels include: ; - Colonial Guard, :o - Colony."
+	desc = "A robust headset used by members of the UA's Colonial Guard. Built to outlast those it's issued to. Featured channels include: #d - Colonial Guard, :o - Colony."
 	frequency = GRD_FREQ
 	icon_state = "generic_headset"
 	initial_keys = list(/obj/item/device/encryptionkey/guard)
 	has_hud = TRUE
-	hud_type = MOB_HUD_FACTION_MARINE
+	hud_type = MOB_HUD_FACTION_UACG
 
 /obj/item/device/radio/headset/distress/rebel_ua
 	name = "colony headset"

diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm
@@ -667,6 +667,12 @@
 	new /obj/item/storage/pill_bottle/kelotane(src)
 	new /obj/item/storage/pill_bottle/dexalin(src)
 
+/obj/item/storage/pouch/medical/full/surgery/fill_preset_inventory()
+	new /obj/item/tool/surgery/synthgraft(src)
+	new /obj/item/tool/surgery/surgical_line(src)
+	new /obj/item/stack/medical/advanced/ointment(src)
+	new /obj/item/stack/medical/advanced/bruise_pack(src)
+
 /obj/item/storage/pouch/medical/socmed
 	name = "tactical medical pouch"
 	desc = "A heavy pouch containing everything one needs to get themselves back on their feet. Quite the selection."

diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm
@@ -689,6 +689,8 @@
 			H = GLOB.huds[MOB_HUD_FACTION_TWE]
 		if("Faction CLF HUD")
 			H = GLOB.huds[MOB_HUD_FACTION_CLF]
+		if("Faction UACG HUD")
+			H = GLOB.huds[MOB_HUD_FACTION_UACG]
 
 	observer_user.HUD_toggled[hud_choice] = prefs.observer_huds[hud_choice]
 	if(observer_user.HUD_toggled[hud_choice])