Fax Responder Names, Announcements and Huds (#7658)

# About the pull request

Allows people to set preferences for differing names for each fax
responder role. This will not change appearance or physical gender at
the moment.

# Explain why it's good for the game

Ideally I'd rather people not use main names but I'm not against it.
This also makes it easier to have different names for different factions
without a lot of hassle.


# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
add: Added Fax Responder name preferences in Special Roles section of
character preferences.
add: Added the correct factions to Fax Responder faction_groups, so they
get correct announcements.
add: Added health huds to Fax Responders.
/:cl:

---------

Co-authored-by: harryob <[email protected]>

code/datums/skills/civilian.dm

@@ -250,8 +250,9 @@ CIVILIAN
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
 		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
 		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
-		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
-		SKILL_ENGINEER = SKILL_ENGINEER_NOVICE,
+		SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
 		SKILL_INTEL = SKILL_INTEL_EXPERT,
+		SKILL_POLICE = SKILL_POLICE_MAX,
 	)

code/game/gamemodes/cm_initialize.dm

@@ -351,7 +351,7 @@ Additional game mode variables.
 	GLOB.RoleAuthority.equip_role(new_responder, fax_responder_job, new_responder.loc)
 	SSticker.minds += new_responder.mind
 
-	message_admins(FONT_SIZE_XL(SPAN_RED("([new_responder.key]) joined as a [sub_job], [new_responder.real_name].")))
+	message_admins(FONT_SIZE_XL(SPAN_RED("[key_name(new_responder)] joined as a [sub_job].")))
 	new_responder.add_fax_responder()
 
 	return TRUE

code/game/objects/items/devices/radio/encryptionkey.dm

@@ -310,12 +310,12 @@
 /obj/item/device/encryptionkey/highcom
 	name = "\improper USCM High Command Radio Encryption Key"
 	icon_state = "binary_key"
-	channels = list(RADIO_CHANNEL_HIGHCOM = TRUE, SQUAD_SOF = TRUE, RADIO_CHANNEL_PROVOST = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = FALSE, RADIO_CHANNEL_JTAC = FALSE, RADIO_CHANNEL_INTEL = TRUE)
+	channels = list(RADIO_CHANNEL_HIGHCOM = TRUE, SQUAD_SOF = TRUE, RADIO_CHANNEL_PROVOST = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = FALSE, RADIO_CHANNEL_JTAC = FALSE, RADIO_CHANNEL_INTEL = TRUE, RADIO_CHANNEL_ALMAYER = TRUE)
 
 /obj/item/device/encryptionkey/provost
 	name = "\improper USCM Provost Radio Encryption Key"
 	icon_state = "sec_key"
-	channels = list(RADIO_CHANNEL_PROVOST = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = FALSE, RADIO_CHANNEL_JTAC = FALSE, RADIO_CHANNEL_INTEL = TRUE)
+	channels = list(RADIO_CHANNEL_PROVOST = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = FALSE, RADIO_CHANNEL_JTAC = FALSE, RADIO_CHANNEL_INTEL = TRUE, RADIO_CHANNEL_ALMAYER = TRUE)
 
 
 /obj/item/device/encryptionkey/contractor

code/modules/client/preferences.dm

@@ -124,6 +124,16 @@ GLOBAL_LIST_INIT(bgstate_options, list(
 	var/commander_status = WHITELIST_NORMAL
 	var/synth_status = WHITELIST_NORMAL
 
+	// Fax Responder Names
+	var/fax_name_uscm
+	var/fax_name_pvst
+	var/fax_name_wy
+	var/fax_name_upp
+	var/fax_name_twe
+	var/fax_name_cmb
+	var/fax_name_press
+	var/fax_name_clf
+
 	//character preferences
 	var/real_name //our character's name
 	var/be_random_name = FALSE //whether we are a random name every round
@@ -655,6 +665,18 @@ GLOBAL_LIST_INIT(bgstate_options, list(
 				dat += "<b>Spawn as Synth:</b> <a href='?_src_=prefs;preference=toggles_ert;flag=[PLAY_SYNTH]'><b>[toggles_ert & PLAY_SYNTH ? "Yes" : "No"]</b></a><br>"
 			dat += "<b>Spawn as Miscellaneous:</b> <a href='?_src_=prefs;preference=toggles_ert;flag=[PLAY_MISC]'><b>[toggles_ert & PLAY_MISC ? "Yes" : "No"]</b></a><br>"
 			dat += "</div>"
+			if(owner.check_whitelist_status(WHITELIST_FAX_RESPONDER))
+				dat += "<div id='column3'>"
+				dat += "<h2><b><u>Fax Responder Names:</u></b></h2>"
+				dat += "<b>USCM High Command:</b> <a href='?_src_=prefs;preference=fax_name;task=input;fax_faction=uscm'><b>[fax_name_uscm]</b></a><br>"
+				dat += "<b>USCM Provost:</b> <a href='?_src_=prefs;preference=fax_name;task=input;fax_faction=pvst'><b>[fax_name_pvst]</b></a><br>"
+				dat += "<b>Weyland-Yutani:</b> <a href='?_src_=prefs;preference=fax_name;task=input;fax_faction=wy'><b>[fax_name_wy]</b></a><br>"
+				dat += "<b>UPP Command:</b> <a href='?_src_=prefs;preference=fax_name;task=input;fax_faction=upp'><b>[fax_name_upp]</b></a><br>"
+				dat += "<b>TWE Command:</b> <a href='?_src_=prefs;preference=fax_name;task=input;fax_faction=twe'><b>[fax_name_twe]</b></a><br>"
+				dat += "<b>Colonial Marshal Bureau:</b> <a href='?_src_=prefs;preference=fax_name;task=input;fax_faction=cmb'><b>[fax_name_cmb]</b></a><br>"
+				dat += "<b>Free Press:</b> <a href='?_src_=prefs;preference=fax_name;task=input;fax_faction=press'><b>[fax_name_press]</b></a><br>"
+				dat += "<b>CLF Command:</b> <a href='?_src_=prefs;preference=fax_name;task=input;fax_faction=clf'><b>[fax_name_clf]</b></a><br>"
+				dat += "</div>"
 
 	dat += "</div></body>"
 
@@ -1366,6 +1388,33 @@ GLOBAL_LIST_INIT(bgstate_options, list(
 
 					synth_status = options[new_synth_status]
 
+				if("fax_name")
+					var/faction = href_list["fax_faction"]
+					var/raw_name = tgui_input_text(user, "Choose your Fax Responder's name:", "Responder Name")
+					if(raw_name) // Check to ensure that the user entered text (rather than cancel.)
+						var/new_name = reject_bad_name(raw_name)
+						if(!new_name)
+							to_chat(user, SPAN_RED("Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z, -, ' and ."))
+							return
+
+						switch(faction)
+							if("uscm")
+								fax_name_uscm = new_name
+							if("pvst")
+								fax_name_pvst = new_name
+							if("wy")
+								fax_name_wy = new_name
+							if("upp")
+								fax_name_upp = new_name
+							if("twe")
+								fax_name_twe = new_name
+							if("cmb")
+								fax_name_cmb = new_name
+							if("press")
+								fax_name_press = new_name
+							if("clf")
+								fax_name_clf = new_name
+
 				if("xeno_prefix")
 					if(xeno_name_ban)
 						to_chat(user, SPAN_WARNING(FONT_SIZE_BIG("You are banned from xeno name picking.")))
@@ -2225,3 +2274,37 @@ GLOBAL_LIST_INIT(bgstate_options, list(
 #undef MENU_MENTOR
 #undef MENU_SETTINGS
 #undef MENU_SPECIAL
+
+/datum/preferences/proc/generate_name(faction = FACTION_MARINE)
+	var/female = prob(50)
+	var/name = "John Doe"
+	if(female)
+		name = "Jane Doe"
+
+	switch(faction)
+		if(FACTION_MARINE)
+			if(female)
+				name = "[pick(GLOB.first_names_female)] [pick(GLOB.last_names)]"
+			else
+				name = "[pick(GLOB.first_names_male)] [pick(GLOB.last_names)]"
+		if(FACTION_WY, FACTION_TWE)
+			if(female)
+				name = "[pick(GLOB.first_names_female_pmc)] [pick(GLOB.last_names_pmc)]"
+			else
+				name = "[pick(GLOB.first_names_male_pmc)] [pick(GLOB.last_names_pmc)]"
+		if(FACTION_COLONIST, FACTION_MARSHAL)
+			if(female)
+				name = "[pick(GLOB.first_names_female_colonist)] [pick(GLOB.last_names_colonist)]"
+			else
+				name = "[pick(GLOB.first_names_male_colonist)] [pick(GLOB.last_names_colonist)]"
+		if(FACTION_UPP)
+			if(female)
+				name = "[pick(GLOB.first_names_female_upp)] [pick(GLOB.last_names_upp)]"
+			else
+				name = "[pick(GLOB.first_names_male_upp)] [pick(GLOB.last_names_upp)]"
+		if(FACTION_CLF)
+			if(female)
+				name = "[pick(GLOB.first_names_female_clf)] [pick(GLOB.last_names_clf)]"
+			else
+				name = "[pick(GLOB.first_names_male_clf)] [pick(GLOB.last_names_clf)]"
+	return name

code/modules/client/preferences_savefile.dm

@@ -296,6 +296,15 @@
 	S["yautja_status"] >> yautja_status
 	S["synth_status"] >> synth_status
 
+	S["fax_name_uscm"] >> fax_name_uscm
+	S["fax_name_pvst"] >> fax_name_pvst
+	S["fax_name_wy"] >> fax_name_wy
+	S["fax_name_upp"] >> fax_name_upp
+	S["fax_name_twe"] >> fax_name_twe
+	S["fax_name_cmb"] >> fax_name_cmb
+	S["fax_name_press"] >> fax_name_press
+	S["fax_name_clf"] >> fax_name_clf
+
 	S["lang_chat_disabled"] >> lang_chat_disabled
 	S["show_permission_errors"] >> show_permission_errors
 	S["hear_vox"] >> hear_vox
@@ -380,6 +389,16 @@
 	affiliation = sanitize_inlist(affiliation, FACTION_ALLEGIANCE_USCM_COMMANDER, initial(affiliation))
 	yautja_status = sanitize_inlist(yautja_status, GLOB.whitelist_hierarchy + list("Elder"), initial(yautja_status))
 	synth_status = sanitize_inlist(synth_status, GLOB.whitelist_hierarchy, initial(synth_status))
+
+	fax_name_uscm = fax_name_uscm ? sanitize_text(fax_name_uscm, initial(fax_name_uscm)) : generate_name(FACTION_MARINE)
+	fax_name_pvst = fax_name_pvst ? sanitize_text(fax_name_pvst, initial(fax_name_pvst)) : generate_name(FACTION_MARINE)
+	fax_name_wy = fax_name_wy ? sanitize_text(fax_name_wy, initial(fax_name_wy)) : generate_name(FACTION_WY)
+	fax_name_upp = fax_name_upp ? sanitize_text(fax_name_upp, initial(fax_name_upp)) : generate_name(FACTION_UPP)
+	fax_name_twe = fax_name_twe ? sanitize_text(fax_name_twe, initial(fax_name_twe)) : generate_name(FACTION_TWE)
+	fax_name_cmb = fax_name_cmb ? sanitize_text(fax_name_cmb, initial(fax_name_cmb)) : generate_name(FACTION_MARSHAL)
+	fax_name_press = fax_name_press ? sanitize_text(fax_name_press, initial(fax_name_press)) : generate_name(FACTION_COLONIST)
+	fax_name_clf = fax_name_clf ? sanitize_text(fax_name_clf, initial(fax_name_clf)) : generate_name(FACTION_CLF)
+
 	key_bindings = sanitize_keybindings(key_bindings)
 	remembered_key_bindings = sanitize_islist(remembered_key_bindings, null)
 	hotkeys = sanitize_integer(hotkeys, FALSE, TRUE, TRUE)
@@ -498,6 +517,15 @@
 	S["yautja_status"] << yautja_status
 	S["synth_status"] << synth_status
 
+	S["fax_name_uscm"] << fax_name_uscm
+	S["fax_name_pvst"] << fax_name_pvst
+	S["fax_name_wy"] << fax_name_wy
+	S["fax_name_upp"] << fax_name_upp
+	S["fax_name_twe"] << fax_name_twe
+	S["fax_name_cmb"] << fax_name_cmb
+	S["fax_name_press"] << fax_name_press
+	S["fax_name_clf"] << fax_name_clf
+
 	S["lang_chat_disabled"] << lang_chat_disabled
 	S["show_permission_errors"] << show_permission_errors
 	S["key_bindings"] << key_bindings

code/modules/gear_presets/fax_responders.dm

@@ -7,6 +7,9 @@
 
 	flags = EQUIPMENT_PRESET_EXTRA
 	faction = FACTION_FAX
+	faction_group = list(FACTION_FAX)
+
+	uses_special_name = TRUE
 
 	access = list(ACCESS_CIVILIAN_PUBLIC)
 	skills = /datum/skills/civilian/fax_responder
@@ -28,16 +31,51 @@
 		uniform.has_sensor = UNIFORM_HAS_SENSORS
 	return ..()
 
+/datum/equipment_preset/fax_responder/load_name(mob/living/carbon/human/new_human, randomise)
+	var/final_name = "John Doe"
+	if(new_human.gender == FEMALE)
+		final_name = "Jane Doe"
+
+	if(new_human.client && new_human.client.prefs)
+		var/new_name = get_fax_responder_name(new_human.client)
+		if(new_name)
+			final_name = new_name
+
+	new_human.change_real_name(new_human, final_name)
+
+/datum/equipment_preset/fax_responder/proc/get_fax_responder_name(client/target_client)
+	var/datum/preferences/target_prefs = target_client.prefs
+	var/new_name
+	switch(assignment)
+		if(JOB_FAX_RESPONDER_USCM_HC)
+			new_name = target_prefs.fax_name_uscm
+		if(JOB_FAX_RESPONDER_USCM_PVST)
+			new_name = target_prefs.fax_name_pvst
+		if(JOB_FAX_RESPONDER_WY)
+			new_name = target_prefs.fax_name_wy
+		if(JOB_FAX_RESPONDER_UPP)
+			new_name = target_prefs.fax_name_upp
+		if(JOB_FAX_RESPONDER_CLF)
+			new_name = target_prefs.fax_name_clf
+		if(JOB_FAX_RESPONDER_CMB)
+			new_name = target_prefs.fax_name_cmb
+		if(JOB_FAX_RESPONDER_PRESS)
+			new_name = target_prefs.fax_name_press
+		if(JOB_FAX_RESPONDER_TWE)
+			new_name = target_prefs.fax_name_twe
+
+	return new_name
+
 //*****************************************************************************************************/
 
 /datum/equipment_preset/fax_responder/uscm
 	name = "Fax Responder - USCM HC"
 	assignment = JOB_FAX_RESPONDER_USCM_HC
 	rank = JOB_FAX_RESPONDER_USCM_HC
+	faction_group = list(FACTION_FAX, FACTION_MARINE)
 
 	paygrades = list(PAY_SHORT_MO2 = JOB_PLAYTIME_TIER_0, PAY_SHORT_MO3 = JOB_PLAYTIME_TIER_1, PAY_SHORT_MO4 = JOB_PLAYTIME_TIER_3)
 	idtype = /obj/item/card/id/gold
-	skills = /datum/skills/XO
 	access = list(ACCESS_MARINE_COMMAND, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_DATABASE, ACCESS_MARINE_MEDBAY, ACCESS_MARINE_BRIG, ACCESS_MARINE_AI)
 	headset_type = /obj/item/device/radio/headset/almayer/highcom
 	idtype = /obj/item/card/id/gold
@@ -50,12 +88,14 @@
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/dress(new_human), WEAR_HANDS)
 
 	new_human.equip_to_slot_or_del(new /obj/item/notepad/blue(new_human), WEAR_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES)
 	. = ..()
 
 /datum/equipment_preset/fax_responder/uscm/provost
 	name = "Fax Responder - USCM Provost"
 	assignment = JOB_FAX_RESPONDER_USCM_PVST
 	rank = JOB_FAX_RESPONDER_USCM_PVST
+	faction_group = list(FACTION_FAX, FACTION_MARINE)
 	idtype = /obj/item/card/id/provost
 
 /datum/equipment_preset/fax_responder/uscm/provost/load_gear(mob/living/carbon/human/new_human)
@@ -67,7 +107,9 @@
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud, WEAR_EYES)
 
+
 	new_human.equip_to_slot_or_del(new /obj/item/notepad/red(new_human), WEAR_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_L_STORE)
 	. = ..()
 
 //*****************************************************************************************************/
@@ -76,6 +118,7 @@
 	name = "Fax Responder - WY"
 	assignment = JOB_FAX_RESPONDER_WY
 	rank = JOB_FAX_RESPONDER_WY
+	faction_group = list(FACTION_FAX, FACTION_MARINE, FACTION_WY, FACTION_WY_DEATHSQUAD, FACTION_PMC)
 	paygrades = list(PAY_SHORT_WYC5 = JOB_PLAYTIME_TIER_0, PAY_SHORT_WYC6 = JOB_PLAYTIME_TIER_1, PAY_SHORT_WYC7 = JOB_PLAYTIME_TIER_3)
 	access = list(ACCESS_MARINE_COMMAND, ACCESS_WY_COLONIAL, ACCESS_WY_EXEC, ACCESS_WY_GENERAL, ACCESS_WY_LEADERSHIP)
 	headset_type = /obj/item/device/radio/headset/distress/pmc/command
@@ -86,6 +129,7 @@
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/corporate/blue(new_human), WEAR_JACKET)
 
 	new_human.equip_to_slot_or_del(new /obj/item/notepad/black(new_human), WEAR_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES)
 
 	..()
 
@@ -95,8 +139,8 @@
 	name = "Fax Responder - UPP"
 	assignment = JOB_FAX_RESPONDER_UPP
 	rank = JOB_FAX_RESPONDER_UPP
+	faction_group = list(FACTION_FAX, FACTION_UPP)
 	paygrades = list(PAY_SHORT_UO2 = JOB_PLAYTIME_TIER_0, PAY_SHORT_UO3 = JOB_PLAYTIME_TIER_1, PAY_SHORT_UO4 = JOB_PLAYTIME_TIER_3)
-	skills = /datum/skills/upp/kapitan
 	headset_type = /obj/item/device/radio/headset/distress/UPP/kdo/command
 	idtype = /obj/item/card/id/gold
 
@@ -115,6 +159,7 @@
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
 
 	new_human.equip_to_slot_or_del(new /obj/item/notepad/green(new_human), WEAR_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES)
 
 	..()
 
@@ -125,6 +170,7 @@
 	name = "Fax Responder - TWE"
 	assignment = JOB_FAX_RESPONDER_TWE
 	rank = JOB_FAX_RESPONDER_TWE
+	faction_group = list(FACTION_FAX, FACTION_MARINE, FACTION_TWE)
 	headset_type = /obj/item/device/radio/headset/distress/royal_marine
 	idtype = /obj/item/card/id/gold
 	paygrades = list(PAY_SHORT_RNO2 = JOB_PLAYTIME_TIER_0, PAY_SHORT_RNO3 = JOB_PLAYTIME_TIER_1, PAY_SHORT_RNO4 = JOB_PLAYTIME_TIER_3)
@@ -136,6 +182,7 @@
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/white(new_human), WEAR_HANDS)
 
 	new_human.equip_to_slot_or_del(new /obj/item/notepad/blue(new_human), WEAR_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES)
 
 	..()
 
@@ -145,6 +192,7 @@
 	name = "Fax Responder - CLF"
 	assignment = JOB_FAX_RESPONDER_CLF
 	rank = JOB_FAX_RESPONDER_CLF
+	faction_group = list(FACTION_FAX, FACTION_CLF)
 	headset_type = /obj/item/device/radio/headset/distress/CLF/command
 	paygrades = list(PAY_SHORT_REBC = JOB_PLAYTIME_TIER_0)
 
@@ -157,6 +205,9 @@
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(new_human), WEAR_FEET)
 
+	new_human.equip_to_slot_or_del(new /obj/item/notepad/black(new_human), WEAR_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES)
+
 	..()
 
 //*****************************************************************************************************/
@@ -165,6 +216,7 @@
 	name = "Fax Responder - CMB"
 	assignment = JOB_FAX_RESPONDER_CMB
 	rank = JOB_FAX_RESPONDER_CMB
+	faction_group = list(FACTION_FAX, FACTION_MARINE, FACTION_MARSHAL)
 	headset_type = /obj/item/device/radio/headset/distress/CMB
 	idtype = /obj/item/card/id/marshal
 	paygrades = list(PAY_SHORT_CMBM = JOB_PLAYTIME_TIER_0)
@@ -182,6 +234,9 @@
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc, WEAR_FEET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud, WEAR_EYES)
 
+	new_human.equip_to_slot_or_del(new /obj/item/notepad/red(new_human), WEAR_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES)
+
 	..()
 
 //*****************************************************************************************************/
@@ -190,6 +245,7 @@
 	name = "Fax Responder - Press"
 	assignment = JOB_FAX_RESPONDER_PRESS
 	rank = JOB_FAX_RESPONDER_PRESS
+	faction_group = list(FACTION_FAX, FACTION_MARINE, FACTION_COLONIST)
 	headset_type = /obj/item/device/radio/headset/almayer/reporter
 	idtype = /obj/item/card/id/silver/cl
 	paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0)
@@ -202,6 +258,8 @@
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/reporter(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/reporter(new_human), WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_L_STORE)
+
+	new_human.equip_to_slot_or_del(new /obj/item/notepad/blue(new_human), WEAR_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES)
 
 	..()