Pushes a missing commit from (#14144)

code/game/jobs/faction/admin.dm

@@ -1,7 +1,7 @@
 /datum/faction/admin
 	name = "Admin Jobs"
 	description = {"<p>
-	This faction is used exclusively for administrative jobs used by Staff Roles
+	This faction is for IC administrative jobs used by staff.
 	</p>
 	"}
 
@@ -14,5 +14,5 @@
 		/datum/species/skrell
 	)
 
-/datum/faction/admin/is_visible(var/user)
+/datum/faction/admin/is_visible(var/mob/user)
 	return check_rights(R_CCIAA,FALSE,user)

code/game/jobs/faction/faction.dm

@@ -45,7 +45,7 @@
 				role.blacklisted_species = J.blacklisted_species
 			. += role
 
-/datum/faction/proc/get_selection_error(datum/preferences/prefs, var/user=usr)
+/datum/faction/proc/get_selection_error(datum/preferences/prefs, var/mob/user)
 	if (!length(allowed_species_types))
 		return null
 
@@ -57,12 +57,12 @@
 	if (!is_type_in_typecache(S, allowed_species_types))
 		return "Invalid species selected."
 
-	if(!is_visible(user))
+	if (!is_visible(user))
 		return "This faction is not available to you."
 
 	return null
 
-/datum/faction/proc/can_select(datum/preferences/prefs, var/user)
+/datum/faction/proc/can_select(datum/preferences/prefs, var/mob/user)
 	return !get_selection_error(prefs, user)
 
 /datum/faction/proc/get_logo_name()
@@ -83,6 +83,5 @@
 
 	return objective
 
-
-/datum/faction/proc/is_visible(var/user)
+/datum/faction/proc/is_visible(var/mob/user)
 	return TRUE

code/game/jobs/job/hra.dm

@@ -1,12 +1,12 @@
 /datum/job/hra
 	title = "Human Resources Assistant"
 	faction = "Station"
-	flag = CCIA
+	flag = HRA
 	departments = SIMPLEDEPT(DEPARTMENT_COMMAND)
 	department_flag = ENGSEC
 	total_positions = 2
 	spawn_positions = 0
-	supervisors = "SCC and Internal Affairs"
+	supervisors = "SCC and the Internal Affairs department"
 	minimal_player_age = 10
 	economic_modifier = 10
 	ideal_character_age = list(
@@ -17,9 +17,9 @@
 
 	selection_color = "#c9ad12"
 
-	access = list(access_sec_doors, access_medical, access_engine, access_eva, access_heads, access_all_personal_lockers, access_maint_tunnels,
+	access = list(access_sec_doors, access_medical, access_engine, access_eva, access_heads, access_maint_tunnels,
 			            access_construction, access_research, access_gateway, access_weapons, access_bridge_crew, access_intrepid, access_cent_ccia)
-	minimal_access = list(access_sec_doors, access_medical, access_engine, access_eva, access_heads, access_all_personal_lockers, access_maint_tunnels,
+	minimal_access = list(access_sec_doors, access_medical, access_engine, access_eva, access_heads, access_maint_tunnels,
 			            access_construction, access_research, access_gateway, access_weapons, access_bridge_crew, access_intrepid, access_cent_ccia)
 
 	outfit = /datum/outfit/job/hra
@@ -50,5 +50,4 @@
 	l_pocket = /obj/item/reagent_containers/spray/pepper
 	r_pocket = /obj/item/device/taperecorder/cciaa
 	l_hand = /obj/item/storage/lockbox/cciaa
-	//pda = /obj/item/modular_computer/handheld/pda/command/cciaa
 	id = /obj/item/card/id/gold

code/game/jobs/jobs.dm

@@ -17,7 +17,7 @@ var/const/INTERN_SEC		=(1<<10)
 var/const/INTERN_ENG		=(1<<11)
 var/const/BRIDGE_CREW		=(1<<12)
 var/const/OPERATIONS_MANAGER =(1<<13)
-var/const/CCIA              =(1<<14)
+var/const/HRA              =(1<<14)
 
 // MEDSCI
 var/const/MEDSCI			=(1<<1)

code/modules/cciaa/cciaa_items.dm

@@ -3,7 +3,7 @@
 	name = "Human Resources Recorder"
 	desc = "A recorder modified for the specific use-cases of human resource departments around the galaxy."
 	desc_info = "This recorder records the fingerprints of the interviewee, to do so, interact with this recorder when asked."
-	desc_fluff = "This recorder is a modified version of the standard universal recorder. It features additional audit-proof records keeping, access controls and is tied to a central management system."
+	desc_fluff = "This recorder is a modified version of a standard universal recorder. It features additional audit-proof records keeping, access controls and is tied to a central management system."
 	w_class = ITEMSIZE_TINY
 	timestamp = list()	//This actually turns timestamp into a string later on
 

code/modules/client/preference_setup/occupation/occupation.dm

@@ -450,9 +450,9 @@
 	dat += "You can learn more about this faction on <a href='?src=\ref[user.client];JSlink=wiki;wiki_page=[replacetext(faction.name, " ", "_")]'>the wiki</a>.</center>"
 
 	if (selected_faction == pref.faction)
-		dat += "<br>\[Faction already selected\]"
+		dat += "<br>\[Faction Already Selected\]"
 	else if (faction.can_select(pref,user))
-		dat += "<br>\[<a href='?src=\ref[src];faction_select=[html_encode(selected_faction)]'>Select faction</a>\]"
+		dat += "<br>\[<a href='?src=\ref[src];faction_select=[html_encode(selected_faction)]'>Select Faction</a>\]"
 	else
 		dat += "<br><span class='warning'>[faction.get_selection_error(pref, user)]</span>"
 

code/modules/clothing/factions/scc.dm

@@ -35,7 +35,7 @@
 
 /obj/item/clothing/accessory/tie/corporate/scc
 	name = "SCC tie"
-	desc = "A tie made to the exact specifications of the SCC"
+	desc = "A sleek corporate tie, worn by SCC employees."
 	contained_sprite = TRUE
 	icon = 'icons/obj/contained_items/scc.dmi'
 	icon_state = "scc_tie"
@@ -43,7 +43,7 @@
 
 /obj/item/clothing/head/beret/scc
 	name = "SCC beret"
-	desc = "A snazzy beret in SCC colors"
+	desc = "A corporate beret in the colours of the Stellar Corporate Conglomerate."
 	contained_sprite = TRUE
 	icon = 'icons/obj/contained_items/scc.dmi'
 	icon_state = "scc_beret"