Removes civilian: Return of the Assistant King (#17103)

* Removes Civilian

* other alt-titles as well

* further resolution

* forgot these

* TGUI

* hud icon

_maps/map_files/Delta/delta.dmm

@@ -1093,7 +1093,7 @@
 	dir = 8
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /obj/effect/decal/warning_stripes/yellow,
 /turf/simulated/floor/plasteel,
@@ -1156,7 +1156,7 @@
 	dir = 4
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /obj/effect/decal/warning_stripes/yellow,
 /turf/simulated/floor/plasteel,
@@ -2945,7 +2945,7 @@
 "aqd" = (
 /obj/structure/chair/comfy/brown,
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -4510,7 +4510,7 @@
 	dir = 1
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "grimy"
@@ -10143,7 +10143,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /obj/machinery/newscaster{
@@ -13078,7 +13078,7 @@
 "aLS" = (
 /obj/structure/chair/stool,
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "bar"
@@ -17949,7 +17949,7 @@
 /area/atmos)
 "aVQ" = (
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /obj/structure/chair/stool/bar,
 /turf/simulated/floor/plasteel{
@@ -22771,7 +22771,7 @@
 	dir = 4
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -25811,7 +25811,7 @@
 	dir = 1
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "brown"
@@ -37177,7 +37177,7 @@
 /area/storage/primary)
 "bHd" = (
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -48788,7 +48788,7 @@
 "cfv" = (
 /obj/structure/chair/comfy/red,
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/wood,
 /area/library)
@@ -49937,7 +49937,7 @@
 	dir = 8
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/wood,
 /area/library)
@@ -54212,7 +54212,7 @@
 "crG" = (
 /obj/structure/chair/comfy/black,
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /obj/structure/cable{
 	d1 = 4;
@@ -54985,7 +54985,7 @@
 	dir = 4
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -55375,7 +55375,7 @@
 	dir = 1
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /obj/structure/cable{
 	d1 = 4;
@@ -57620,7 +57620,7 @@
 	dir = 8
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /obj/structure/cable{
 	d1 = 2;
@@ -58289,7 +58289,7 @@
 /area/crew_quarters/locker/locker_toilet)
 "cAd" = (
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /obj/item/bikehorn/rubberducky,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -60367,7 +60367,7 @@
 	},
 /obj/machinery/light/small,
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel,
@@ -62929,7 +62929,7 @@
 "cKA" = (
 /obj/structure/chair/sofa/corp/right,
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -62975,7 +62975,7 @@
 "cKG" = (
 /obj/structure/chair,
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -63013,7 +63013,7 @@
 "cKN" = (
 /obj/structure/chair/sofa/corp/left,
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -63091,7 +63091,7 @@
 "cKW" = (
 /obj/structure/chair/comfy/teal,
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -84634,7 +84634,7 @@
 	dir = 4
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/carpet,
 /area/hallway/primary/aft)
@@ -84840,7 +84840,7 @@
 	dir = 8
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -89466,7 +89466,7 @@
 	dir = 1
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel{
@@ -93787,7 +93787,7 @@
 /area/medical/surgery1)
 "fZU" = (
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /obj/structure/chair/stool/bar{
 	dir = 1

_maps/map_files/MetaStation/MetaStation.dmm

@@ -4892,7 +4892,7 @@
 	dir = 8
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/plasteel,
 /area/crew_quarters/fitness{
@@ -16537,7 +16537,7 @@
 	specialfunctions = 4
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "freezerfloor"
@@ -18929,7 +18929,7 @@
 	dir = 8
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /obj/structure/curtain/open/shower,
 /turf/simulated/floor/plasteel{
@@ -20084,7 +20084,7 @@
 	specialfunctions = 4
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "freezerfloor"
@@ -30088,7 +30088,7 @@
 	dir = 8
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -33816,7 +33816,7 @@
 	dir = 4
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "grimy"
@@ -35082,7 +35082,7 @@
 	dir = 4
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "grimy"
@@ -36906,7 +36906,7 @@
 "bBs" = (
 /obj/structure/chair,
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /obj/effect/decal/warning_stripes/north,
 /turf/simulated/floor/plasteel,
@@ -39794,7 +39794,7 @@
 "bHu" = (
 /obj/structure/chair/comfy/black,
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/wood,
 /area/library)
@@ -39969,7 +39969,7 @@
 /area/crew_quarters/bar)
 "bHQ" = (
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /obj/structure/chair/stool/bar,
 /turf/simulated/floor/plasteel{
@@ -40910,7 +40910,7 @@
 	pixel_y = 8
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -51282,7 +51282,7 @@
 "cgB" = (
 /obj/structure/chair,
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -53138,7 +53138,7 @@
 "cky" = (
 /obj/structure/chair,
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -70365,7 +70365,7 @@
 	dir = 4
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /obj/effect/decal/warning_stripes/west,
 /turf/simulated/floor/plasteel,
@@ -72053,7 +72053,7 @@
 "cXD" = (
 /obj/structure/chair,
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 4
@@ -73140,7 +73140,7 @@
 	dir = 8
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /obj/effect/decal/warning_stripes/east,
 /turf/simulated/floor/plasteel,
@@ -77055,7 +77055,7 @@
 	dir = 8
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plasteel,
@@ -77376,7 +77376,7 @@
 "ibR" = (
 /obj/structure/chair,
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /obj/machinery/light{
 	dir = 1

_maps/map_files/cyberiad/cyberiad.dmm

@@ -14912,7 +14912,7 @@
 "aIp" = (
 /obj/structure/chair/comfy/black,
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /obj/machinery/light/small{
 	dir = 8
@@ -16750,7 +16750,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/carpet/arcade,
 /area/crew_quarters/arcade)
@@ -18250,7 +18250,7 @@
 "aQo" = (
 /obj/structure/chair,
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
 	pixel_y = 32
@@ -19778,7 +19778,7 @@
 	layer = 2.9
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/dorms)
@@ -19914,7 +19914,7 @@
 	dir = 4
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "whitebluefull"
@@ -20056,7 +20056,7 @@
 	dir = 1
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /obj/effect/decal/warning_stripes/south,
 /turf/simulated/floor/plasteel,
@@ -22589,7 +22589,7 @@
 "aZD" = (
 /obj/effect/decal/warning_stripes/white,
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -23294,7 +23294,7 @@
 "bbm" = (
 /obj/structure/chair/stool,
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/plasteel,
 /area/storage/primary)
@@ -23711,7 +23711,7 @@
 	dir = 4
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/dorms)
@@ -23721,7 +23721,7 @@
 	dir = 8
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/dorms)
@@ -24446,7 +24446,7 @@
 /area/atmos)
 "bdH" = (
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/plasteel,
 /area/hallway/secondary/construction{
@@ -30818,7 +30818,7 @@
 	dir = 8
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/bar)
@@ -31614,7 +31614,7 @@
 	dir = 4
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/bar)
@@ -33714,7 +33714,7 @@
 	},
 /obj/machinery/light/small,
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/wood,
 /area/library)
@@ -33728,7 +33728,7 @@
 	dir = 8
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/wood,
 /area/library)
@@ -33961,7 +33961,7 @@
 /area/crew_quarters/locker/locker_toilet)
 "byp" = (
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -34495,7 +34495,7 @@
 	dir = 8
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "freezerfloor"
@@ -38893,7 +38893,7 @@
 	pixel_y = 32
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /obj/machinery/door_control{
 	id = "toilet_unit1";
@@ -40177,7 +40177,7 @@
 /area/hallway/secondary/entry)
 "bMa" = (
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /obj/effect/decal/warning_stripes/south,
 /turf/simulated/floor/plasteel,
@@ -44580,7 +44580,7 @@
 	dir = 8
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/plasteel,
 /area/quartermaster/office)
@@ -64550,7 +64550,7 @@
 	icon_state = "1-2"
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 8
@@ -70892,7 +70892,7 @@
 	dir = 4
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -72588,7 +72588,7 @@
 	dir = 8
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -81327,7 +81327,7 @@
 	dir = 8
 	},
 /obj/effect/landmark/start{
-	name = "Civilian"
+	name = "Assistant"
 	},
 /turf/simulated/floor/plasteel,
 /area/crew_quarters/dorms)

code/__DEFINES/job.dm

@@ -51,7 +51,7 @@
 #define JOB_CHAPLAIN			(1<<10)
 #define JOB_CLOWN				(1<<11)
 #define JOB_MIME				(1<<12)
-#define JOB_CIVILIAN			(1<<13)
+#define JOB_ASSISTANT			(1<<13)
 #define JOB_EXPLORER			(1<<14)
 
 #define JOBCAT_KARMA			(1<<3)

code/__HELPERS/names.dm

@@ -22,7 +22,7 @@ GLOBAL_VAR(religion_name)
 
 	var/name = ""
 
-	name += pick("bee", "science", "edu", "captain", "civilian", "monkey", "alien", "space", "unit", "sprocket", "gadget", "bomb", "revolution", "beyond", "station", "goon", "robot", "ivor", "hobnob")
+	name += pick("bee", "science", "edu", "captain", "assistant", "monkey", "alien", "space", "unit", "sprocket", "gadget", "bomb", "revolution", "beyond", "station", "goon", "robot", "ivor", "hobnob")
 	name += pick("ism", "ia", "ology", "istism", "ites", "ick", "ian", "ity")
 
 	return capitalize(name)
@@ -184,7 +184,7 @@ GLOBAL_VAR(syndicate_code_response) //Code response for traitors.
 /proc/GenerateKey()
 	var/newKey
 	newKey += pick("the", "if", "of", "as", "in", "a", "you", "from", "to", "an", "too", "little", "snow", "dead", "drunk", "rosebud", "duck", "al", "le")
-	newKey += pick("diamond", "beer", "mushroom", "civilian", "clown", "captain", "twinkie", "security", "nuke", "small", "big", "escape", "yellow", "gloves", "monkey", "engine", "nuclear", "ai")
+	newKey += pick("diamond", "beer", "mushroom", "assistant", "clown", "captain", "twinkie", "security", "nuke", "small", "big", "escape", "yellow", "gloves", "monkey", "engine", "nuclear", "ai")
 	newKey += pick("1", "2", "3", "4", "5", "6", "7", "8", "9", "0")
 	return newKey
 

code/controllers/subsystem/jobs.dm

@@ -151,7 +151,7 @@ SUBSYSTEM_DEF(jobs)
 		if(!job)
 			continue
 
-		if(istype(job, GetJob("Civilian"))) // We don't want to give him assistant, that's boring!
+		if(istype(job, GetJob("Assistant"))) // We don't want to give him assistant, that's boring!
 			continue
 
 		if(job.title in GLOB.command_positions) //If you want a command position, select it!
@@ -300,14 +300,14 @@ SUBSYSTEM_DEF(jobs)
 	HandleFeedbackGathering()
 
 	//People who wants to be assistants, sure, go on.
-	Debug("DO, Running Civilian Check 1")
-	var/datum/job/civ = new /datum/job/civilian()
-	var/list/civilian_candidates = FindOccupationCandidates(civ, 3)
-	Debug("AC1, Candidates: [civilian_candidates.len]")
-	for(var/mob/new_player/player in civilian_candidates)
+	Debug("DO, Running Assistant Check 1")
+	var/datum/job/ast = new /datum/job/assistant()
+	var/list/assistant_candidates = FindOccupationCandidates(ast, 3)
+	Debug("AC1, Candidates: [assistant_candidates.len]")
+	for(var/mob/new_player/player in assistant_candidates)
 		Debug("AC1 pass, Player: [player]")
-		AssignRole(player, "Civilian")
-		civilian_candidates -= player
+		AssignRole(player, "Assistant")
+		assistant_candidates -= player
 	Debug("DO, AC1 end")
 
 	//Select one head
@@ -393,15 +393,15 @@ SUBSYSTEM_DEF(jobs)
 			if(player.client.prefs.active_character.alternate_option != BE_ASSISTANT)
 				GiveRandomJob(player)
 				if(player in unassigned)
-					AssignRole(player, "Civilian")
+					AssignRole(player, "Assistant")
 			else
-				AssignRole(player, "Civilian")
+				AssignRole(player, "Assistant")
 
 	// Then we assign what we can to everyone else.
 	for(var/mob/new_player/player in unassigned)
 		if(player.client.prefs.active_character.alternate_option == BE_ASSISTANT)
 			Debug("AC2 Assistant located, Player: [player]")
-			AssignRole(player, "Civilian")
+			AssignRole(player, "Assistant")
 		else if(player.client.prefs.active_character.alternate_option == RETURN_TO_LOBBY)
 			player.ready = 0
 			unassigned -= player
@@ -624,7 +624,7 @@ SUBSYSTEM_DEF(jobs)
 				jobs_to_formats[job.title] = "grey" // jobs which are karma-locked and not unlocked for this player are discouraged
 			else if((job.title in GLOB.command_positions) && istype(M) && M.client && job.available_in_playtime(M.client))
 				jobs_to_formats[job.title] = "grey" // command jobs which are playtime-locked and not unlocked for this player are discouraged
-			else if(job.total_positions && !job.current_positions && job.title != "Civilian")
+			else if(job.total_positions && !job.current_positions && job.title != "Assistant")
 				jobs_to_formats[job.title] = "teal" // jobs with nobody doing them at all are encouraged
 			else if(job.total_positions >= 0 && job.current_positions >= job.total_positions)
 				jobs_to_formats[job.title] = "grey" // jobs that are full (no free positions) are discouraged

code/datums/mind.dm

@@ -1783,7 +1783,7 @@
 /mob/living/carbon/human/mind_initialize()
 	..()
 	if(!mind.assigned_role)
-		mind.assigned_role = "Civilian"	//defualt
+		mind.assigned_role = "Assistant"	//defualt
 
 /mob/proc/sync_mind()
 	mind_initialize()  //updates the mind (or creates and initializes one if one doesn't exist)

code/datums/outfits/outfit_admin.dm

@@ -253,8 +253,8 @@
 
 	var/obj/item/card/id/I = H.wear_id
 	if(istype(I))
-		apply_to_card(I, H, get_centcom_access("NT Undercover Operative"), "Civilian")
-	H.sec_hud_set_ID() // Force it to show as Civ on sec huds
+		apply_to_card(I, H, get_centcom_access("NT Undercover Operative"), "Assistant")
+	H.sec_hud_set_ID() // Force it to show as assistant on sec huds
 
 	var/obj/item/radio/R = H.l_ear
 	if(istype(R))

code/datums/uplink_item.dm

@@ -317,7 +317,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
 	reference = "PG"
 	item = /obj/item/clothing/gloves/color/black/thief
 	cost = 6
-	job = list("Civilian")
+	job = list("Assistant")
 
 //Bartender
 

code/game/jobs/job/assistant.dm

@@ -1,6 +1,6 @@
-/datum/job/civilian
-	title = "Civilian"
-	flag = JOB_CIVILIAN
+/datum/job/assistant
+	title = "Assistant"
+	flag = JOB_ASSISTANT
 	department_flag = JOBCAT_SUPPORT
 	total_positions = -1
 	spawn_positions = -1
@@ -9,18 +9,17 @@
 	selection_color = "#dddddd"
 	access = list()			//See /datum/job/assistant/get_access()
 	minimal_access = list()	//See /datum/job/assistant/get_access()
-	alt_titles = list("Tourist","Businessman","Trader","Assistant")
 	outfit = /datum/outfit/job/assistant
 
-/datum/job/civilian/get_access()
+/datum/job/assistant/get_access()
 	if(GLOB.configuration.jobs.assistant_maint_access)
 		return list(ACCESS_MAINT_TUNNELS)
 	else
 		return list()
 
 /datum/outfit/job/assistant
-	name = "Civilian"
-	jobtype = /datum/job/civilian
+	name = "Assistant"
+	jobtype = /datum/job/assistant
 
 	uniform = /obj/item/clothing/under/color/random
 	shoes = /obj/item/clothing/shoes/black

code/game/jobs/jobs.dm

@@ -1,7 +1,4 @@
 
-GLOBAL_LIST_EMPTY(assistant_occupations)
-
-
 GLOBAL_LIST_INIT(command_positions, list(
 	"Captain",
 	"Head of Personnel",
@@ -81,8 +78,8 @@ GLOBAL_LIST_INIT(security_positions, list(
 ))
 
 
-GLOBAL_LIST_INIT(civilian_positions, list(
-	"Civilian"
+GLOBAL_LIST_INIT(assistant_positions, list(
+	"Assistant"
 ))
 
 GLOBAL_LIST_INIT(nonhuman_positions, list(
@@ -127,7 +124,7 @@ GLOBAL_LIST_INIT(whitelisted_positions, list(
 
 GLOBAL_LIST_INIT(exp_jobsmap, list(
 	EXP_TYPE_LIVING = list(), // all living mobs
-	EXP_TYPE_CREW = list(titles = command_positions | engineering_positions | medical_positions | science_positions | support_positions | supply_positions | security_positions | civilian_positions | list("AI","Cyborg") | whitelisted_positions), // crew positions
+	EXP_TYPE_CREW = list(titles = command_positions | engineering_positions | medical_positions | science_positions | support_positions | supply_positions | security_positions | assistant_positions | list("AI","Cyborg") | whitelisted_positions), // crew positions
 	EXP_TYPE_SPECIAL = list(), // antags, ERT, etc
 	EXP_TYPE_GHOST = list(), // dead people, observers
 	EXP_TYPE_EXEMPT = list(), // special grandfather setting

code/game/machinery/computer/card.dm

@@ -31,7 +31,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 		/datum/job/ntnavyofficer,
 		/datum/job/ntspecops,
 		/datum/job/ntspecops/solgovspecops,
-		/datum/job/civilian,
+		/datum/job/assistant,
 		/datum/job/syndicateofficer,
 		/datum/job/explorer // blacklisted so that HOPs don't try prioritizing it, then wonder why that doesn't work
 	)
@@ -230,7 +230,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 /obj/machinery/computer/card/proc/has_idchange_access()
 	return scan && scan.access && (ACCESS_CHANGE_IDS in scan.access) ? TRUE : FALSE
 
-/obj/machinery/computer/card/proc/job_in_department(datum/job/targetjob, includecivs = TRUE)
+/obj/machinery/computer/card/proc/job_in_department(datum/job/targetjob, include_assistants = TRUE)
 	if(!scan || !scan.access)
 		return FALSE
 	if(!target_dept)
@@ -241,19 +241,19 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 		return TRUE
 	if(!targetjob || !targetjob.title)
 		return FALSE
-	if(targetjob.title in get_subordinates(scan.assignment, includecivs))
+	if(targetjob.title in get_subordinates(scan.assignment, include_assistants))
 		return TRUE
 	return FALSE
 
-/obj/machinery/computer/card/proc/get_subordinates(rank, addcivs)
+/obj/machinery/computer/card/proc/get_subordinates(rank, add_assistants)
 	var/list/jobs_returned = list()
 	for(var/datum/job/thisjob in SSjobs.occupations)
 		if(thisjob.title in GLOB.nonhuman_positions) // hides AI from list when Captain ID is inserted into dept console
 			continue
 		if(rank in thisjob.department_head)
 			jobs_returned += thisjob.title
-	if(addcivs)
-		jobs_returned += "Civilian"
+	if(add_assistants)
+		jobs_returned += "Assistant"
 	return jobs_returned
 
 /obj/machinery/computer/card/proc/get_employees(list/selectedranks)
@@ -341,7 +341,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 					data["jobs_security"] = GLOB.security_positions
 					data["jobs_service"] = GLOB.service_positions
 					data["jobs_supply"] = GLOB.supply_positions - "Head of Personnel"
-					data["jobs_civilian"] = GLOB.civilian_positions
+					data["jobs_assistant"] = GLOB.assistant_positions
 					data["jobs_karma"] = GLOB.whitelisted_positions
 					data["jobs_centcom"] = get_all_centcom_jobs()
 					data["jobFormats"] = SSjobs.format_jobs_for_id_computer(modify)
@@ -489,7 +489,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 
 				var/jobnamedata = modify.getRankAndAssignment()
 				log_game("[key_name(usr)] ([scan.assignment]) has reassigned \"[modify.registered_name]\" from \"[jobnamedata]\" to \"[t1]\".")
-				if(t1 == "Civilian")
+				if(t1 == "Assistant")
 					message_admins("[key_name_admin(usr)] has reassigned \"[modify.registered_name]\" from \"[jobnamedata]\" to \"[t1]\".")
 
 				SSjobs.log_job_transfer(modify.registered_name, jobnamedata, t1, scan.registered_name, null)
@@ -523,7 +523,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 			if(!reason || !is_authenticated(usr) || !modify)
 				return FALSE
 			var/list/access = list()
-			var/datum/job/jobdatum = new /datum/job/civilian
+			var/datum/job/jobdatum = new /datum/job/assistant
 			access = jobdatum.get_access()
 			var/jobnamedata = modify.getRankAndAssignment()
 			var/m_ckey = modify.getPlayerCkey()
@@ -535,7 +535,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 			modify.lastlog = "[station_time_timestamp()]: DEMOTED by \"[scan.registered_name]\" ([scan.assignment]) from \"[jobnamedata]\" for: \"[reason]\"."
 			SSjobs.notify_dept_head(modify.rank, "[scan.registered_name] ([scan.assignment]) has demoted \"[modify.registered_name]\" ([jobnamedata]) for \"[reason]\".")
 			modify.access = access
-			modify.rank = "Civilian"
+			modify.rank = "Assistant"
 			modify.assignment = "Demoted"
 			modify.icon_state = "id"
 			regenerate_id_name()

code/game/machinery/doors/brigdoors.dm

@@ -93,7 +93,7 @@
 	// Announcing it on radio isn't enough, as they're unlikely to have sec radio.
 	notify_prisoner("You have been incarcerated for [timetext] for the crime of: '[crimes]'.")
 
-	if(prisoner_trank != "unknown" && prisoner_trank != "Civilian")
+	if(prisoner_trank != "unknown" && prisoner_trank != "Assistant")
 		SSjobs.notify_dept_head(prisoner_trank, announcetext)
 
 	if(R)

code/game/machinery/tcomms/nttc.dm

@@ -23,12 +23,8 @@
 		"Cyborg" = "airadio",
 		"Personal AI" = "airadio",
 		"Robot" = "airadio",
-		// Civilian + Varients
+		// Assistant
 		"Assistant" = "radio",
-		"Businessman" = "radio",
-		"Civilian" = "radio",
-		"Tourist" = "radio",
-		"Trader" = "radio",
 		// Command (Solo command, not department heads)
 		"Blueshield" = "comradio",
 		"Captain" = "comradio",

code/game/objects/items/weapons/cards_ids.dm

@@ -483,7 +483,7 @@
 
 					if("Occupation")
 						var/list/departments =list(
-							"Civilian",
+							"Assistant",
 							"Engineering",
 							"Medical",
 							"Science",
@@ -494,11 +494,11 @@
 						)
 
 						var/department = input(user, "What job would you like to put on this card?\nChoose a department or a custom job title.\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in departments
-						var/new_job = "Civilian"
+						var/new_job = "Assistant"
 
 						if(department == "Custom")
-							new_job = sanitize(stripped_input(user,"Choose a custom job title:","Agent Card Occupation", "Civilian", MAX_MESSAGE_LEN))
-						else if(department != "Civilian")
+							new_job = sanitize(stripped_input(user,"Choose a custom job title:","Agent Card Occupation", "Assistant", MAX_MESSAGE_LEN))
+						else if(department != "Assistant")
 							switch(department)
 								if("Engineering")
 									new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in GLOB.engineering_positions

code/game/objects/items/weapons/holy_weapons.dm

@@ -646,8 +646,8 @@
 		else
 			to_chat(missionary, "<span class='notice'>You successfully convert [target] to your cause. The following grows because of your faith!</span>")
 			faith -= 100
-	else if(target.mind.assigned_role == "Civilian")
-		if(prob(55))	//55% chance to take LESS faith than normal, because civies are stupid and easily manipulated
+	else if(target.mind.assigned_role == "Assistant")
+		if(prob(55))	//55% chance to take LESS faith than normal, because assistants are stupid and easily manipulated
 			to_chat(missionary, "<span class='notice'>Your message seems to resound well with [target]; converting [target.p_them()] was much easier than expected.</span>")
 			faith -= 50
 		else		//45% chance to take the normal 100 faith cost

code/game/objects/structures/crates_lockers/closets/cardboardbox.dm

@@ -73,7 +73,7 @@
 			return
 		if(istype(W, /obj/item/pen))
 			var/decalselection = input("Please select a decal") as null|anything in list("Atmospherics", "Bartender", "Barber", "Blueshield",	"Brig Physician", "Captain",
-			"Cargo", "Chief Engineer",	"Chaplain",	"Chef", "Chemist", "Civilian", "Clown", "CMO", "Coroner", "Detective", "Engineering", "Genetics", "HOP",
+			"Cargo", "Chief Engineer",	"Chaplain",	"Chef", "Chemist", "Assistant", "Clown", "CMO", "Coroner", "Detective", "Engineering", "Genetics", "HOP",
 			"HOS", "Hydroponics", "Internal Affairs Agent", "Janitor",	"Magistrate", "Medical", "Mime", "Mining", "NT Representative", "Paramedic",
 			"Prisoner",	"Research Director", "Security", "Syndicate", "Therapist", "Virology", "Warden", "Xenobiology")
 			if(!decalselection)

code/game/objects/structures/misc.dm

@@ -11,9 +11,6 @@
 	anchored = 1
 	density = 1
 
-/obj/structure/signpost/attack_hand(mob/user as mob)
-	to_chat(user, "Civilians: NT is recruiting! Please head SOUTH to the NT Recruitment office to join the station's crew!")
-
 /obj/structure/ninjatele
 
 	name = "Long-Distance Teleportation Console"

code/modules/admin/verbs/infiltratorteam_syndicate.dm

@@ -181,8 +181,8 @@ GLOBAL_VAR_INIT(sent_syndicate_infiltration_team, 0)
 	else
 		W.icon_state = "id"
 	W.access = list(ACCESS_MAINT_TUNNELS,ACCESS_EXTERNAL_AIRLOCKS)
-	W.assignment = "Civilian"
-	W.access += get_access("Civilian")
+	W.assignment = "Assistant"
+	W.access += get_access("Assistant")
 	W.access += list(ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CARGO, ACCESS_RESEARCH)
 	if(flag_mgmt)
 		W.assignment = "Syndicate Management Consultant"

code/modules/admin/verbs/randomverbs.dm

@@ -412,7 +412,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		new_character.mind.special_verbs = list()
 	else
 		new_character.mind_initialize()
-	if(!new_character.mind.assigned_role)	new_character.mind.assigned_role = "Civilian"//If they somehow got a null assigned role.
+	if(!new_character.mind.assigned_role)	new_character.mind.assigned_role = "Assistant" //If they somehow got a null assigned role.
 
 	//DNA
 	if(record_found)//Pull up their name from database records if they did have a mind.

code/modules/client/preference/character.dm

@@ -974,7 +974,7 @@
 
 	var/icon/clothes_s = null
 	var/uniform_dmi='icons/mob/clothing/uniform.dmi'
-	if(job_support_low & JOB_CIVILIAN)//This gives the preview icon clothes depending on which job(if any) is set to 'high'
+	if(job_support_low & JOB_ASSISTANT) //This gives the preview icon clothes depending on which job(if any) is set to 'high'
 		clothes_s = new /icon(uniform_dmi, "grey_s")
 		clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
 		if(backbag == 2)
@@ -2037,7 +2037,7 @@
 				var/available_in_days = job.available_in_days(user.client)
 				html += "<del class='dark'>[rank]</del></td><td class='bad'><b> \[IN [(available_in_days)] DAYS]</b></td></tr>"
 				continue
-			if((job_support_low & JOB_CIVILIAN) && (job.title != "Civilian"))
+			if((job_support_low & JOB_ASSISTANT) && (job.title != "Assistant"))
 				html += "<font color=orange>[rank]</font></td><td></td></tr>"
 				continue
 			if((job.title in GLOB.command_positions) || (job.title == "AI"))//Bold head jobs
@@ -2078,8 +2078,8 @@
 
 	//			HTML += "<a href='?_src_=prefs;preference=job;task=input;text=[rank]'>"
 
-			if(job.title == "Civilian")//Civilian is special
-				if(job_support_low & JOB_CIVILIAN)
+			if(job.title == "Assistant") // Assistant is special
+				if(job_support_low & JOB_ASSISTANT)
 					html += " <font color=green>Yes</font></a>"
 				else
 					html += " <font color=red>No</font></a>"
@@ -2109,7 +2109,7 @@
 			if(GET_RANDOM_JOB)
 				html += "<center><br><u><a href='?_src_=prefs;preference=job;task=random'><font color=white>Get random job if preferences unavailable</font></a></u></center><br>"
 			if(BE_ASSISTANT)
-				html += "<center><br><u><a href='?_src_=prefs;preference=job;task=random'><font color=white>Be a civilian if preferences unavailable</font></a></u></center><br>"
+				html += "<center><br><u><a href='?_src_=prefs;preference=job;task=random'><font color=white>Be an assistant if preferences unavailable</font></a></u></center><br>"
 			if(RETURN_TO_LOBBY)
 				html += "<center><br><u><a href='?_src_=prefs;preference=job;task=random'><font color=white>Return to lobby if preferences unavailable</font></a></u></center><br>"
 

code/modules/client/preference/preferences.dm

@@ -520,7 +520,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
 		ShowChoices(user)
 		return
 
-	if(role == "Civilian")
+	if(role == "Assistant")
 		if(active_character.job_support_low & job.flag)
 			active_character.job_support_low &= ~job.flag
 		else
@@ -541,7 +541,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
 		ShowChoices(user)
 		return
 
-	if(role == "Civilian")
+	if(role == "Assistant")
 		if(active_character.job_support_low & job.flag)
 			active_character.job_support_low &= ~job.flag
 		else

code/modules/economy/Job_Departments.dm

@@ -1,4 +1,4 @@
-GLOBAL_LIST_INIT(station_departments, list("Command", "Medical", "Engineering", "Science", "Security", "Cargo", "Support", "Civilian"))
+GLOBAL_LIST_INIT(station_departments, list("Command", "Medical", "Engineering", "Science", "Security", "Cargo", "Support", "Assistant"))
 
 // The department the job belongs to.
 /datum/job/var/department = null
@@ -12,7 +12,7 @@ GLOBAL_LIST_INIT(station_departments, list("Command", "Medical", "Engineering",
 /datum/job/hop/department = "Support"
 /datum/job/hop/head_position = 1
 
-/datum/job/civilian/department = "Civilian"
+/datum/job/assistant/department = "Assistant"
 
 /datum/job/bartender/department = "Support"
 

code/modules/food_and_drinks/drinks/drinks/mugs.dm

@@ -34,7 +34,7 @@
 
 /datum/novelty_mug/best/New()
 	var/locale = pick("Room's", "Department's", "Station's", "World's", "Sector's", "System's", "Galaxy's", "Universe's", "Multi-verse's", "Nanotrasen's", "Syndicate's")
-	var/what = pick("Crewmember", "Spessman", "Employee", "Coffee", "Coffee-drinker", "Survivor", "Personality", "Lifeform", "Doctor", "Scientist", "Engineer", "Officer", "Civillian", "Captain", "Agent")
+	var/what = pick("Crewmember", "Spessman", "Employee", "Coffee", "Coffee-drinker", "Survivor", "Personality", "Lifeform", "Doctor", "Scientist", "Engineer", "Officer", "Assistant", "Captain", "Agent")
 	name = "\"[locale] Best [what]\" mug"
 
 /datum/novelty_mug/worst
@@ -44,7 +44,7 @@
 
 /datum/novelty_mug/worst/New()
 	var/locale = pick("Room's", "Department's", "Station's", "World's", "Sector's", "System's", "Galaxy's", "Universe's", "Multi-verse's", "Nanotrasen's", "Syndicate's")
-	var/what = pick("Crewmember", "Spessman", "Employee", "Coffee", "Coffee-drinker", "Survivor", "Personality", "Lifeform", "Doctor", "Scientist", "Engineer", "Officer", "Civillian", "Captain", "Agent")
+	var/what = pick("Crewmember", "Spessman", "Employee", "Coffee", "Coffee-drinker", "Survivor", "Personality", "Lifeform", "Doctor", "Scientist", "Engineer", "Officer", "Assistant", "Captain", "Agent")
 	name = "\"[locale] Worst [what]\" mug"
 
 /datum/novelty_mug/insult

code/modules/mob/living/carbon/human/species/plasmaman.dm

@@ -135,7 +135,7 @@
 		if("Blueshield")
 			O = new /datum/outfit/plasmaman/blueshield
 
-		if("Assistant", "Tourist", "Civilian", "Businessman", "Trader")
+		if("Assistant")
 			O = new /datum/outfit/plasmaman/assistant
 
 	H.equipOutfit(O, visualsOnly)

code/modules/mob/living/carbon/superheroes.dm

@@ -146,7 +146,7 @@
 //The Griffin's special recruit abilitiy
 /obj/effect/proc_holder/spell/targeted/click/recruit
 	name = "Recruit Greyshirt"
-	desc = "Allows you to recruit a conscious, non-braindead, non-catatonic human to be part of the Greyshirts, your personal henchmen. This works on Civilians only and you can recruit a maximum of 3!."
+	desc = "Allows you to recruit a conscious, non-braindead, non-catatonic human to be part of the Greyshirts, your personal henchmen. This works on Assistants only and you can recruit a maximum of 3!."
 	charge_max = 450
 	clothes_req = FALSE
 	range = 1 //Adjacent to user
@@ -177,8 +177,8 @@
 
 /obj/effect/proc_holder/spell/targeted/click/recruit/cast(list/targets,mob/living/user = usr)
 	var/mob/living/carbon/human/target = targets[1]
-	if(target.mind.assigned_role != "Civilian")
-		to_chat(user, "<span class='warning'>You can only recruit Civilians.</span>")
+	if(target.mind.assigned_role != "Assistant")
+		to_chat(user, "<span class='warning'>You can only recruit Assistants.</span>")
 		revert_cast(user)
 		return
 	recruiting = TRUE

code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_ai.dm

@@ -31,7 +31,7 @@
 				// Target prioritization by spider type. BRUTE spiders prioritize lower armor values, POISON spiders prioritize poisonable targets
 				if(ai_target_method == TS_DAMAGE_BRUTE)
 					var/theirarmor = C.getarmor(type = MELEE)
-					// Example values: Civilian: 2, Engineer w/ Hardsuit: 10, Sec Officer with armor: 19, HoS: 48, Deathsquad: 80
+					// Example values: Assistant: 2, Engineer w/ Hardsuit: 10, Sec Officer with armor: 19, HoS: 48, Deathsquad: 80
 					if(theirarmor < 10)
 						targets1 += C
 					else if(C in enemies)

code/modules/mob/new_player/new_player.dm

@@ -258,7 +258,7 @@
 		return 0
 
 	if(GLOB.configuration.jobs.assistant_limit)
-		if(job.title == "Civilian")
+		if(job.title == "Assistant")
 			var/count = 0
 			var/datum/job/officer = SSjobs.GetJob("Security Officer")
 			var/datum/job/warden = SSjobs.GetJob("Warden")

code/modules/newscaster/obj/newscaster.dm

@@ -79,7 +79,7 @@
 			/datum/job/ntnavyofficer,
 			/datum/job/ntspecops,
 			/datum/job/ntspecops/solgovspecops,
-			/datum/job/civilian,
+			/datum/job/assistant,
 			/datum/job/syndicateofficer
 		)
 

code/modules/paperwork/paper.dm

@@ -736,14 +736,14 @@
 					to_chat(H, "<span class='userdanger'>You feel surrounded by sadness. Sadness... and HONKS!</span>")
 					H.makeCluwne()
 			else if(myeffect == "Demote")
-				GLOB.event_announcement.Announce("[target.real_name] is hereby demoted to the rank of Civilian. Process this demotion immediately. Failure to comply with these orders is grounds for termination.","CC Demotion Order")
+				GLOB.event_announcement.Announce("[target.real_name] is hereby demoted to the rank of Assistant. Process this demotion immediately. Failure to comply with these orders is grounds for termination.","CC Demotion Order")
 				for(var/datum/data/record/R in sortRecord(GLOB.data_core.security))
 					if(R.fields["name"] == target.real_name)
 						R.fields["criminal"] = SEC_RECORD_STATUS_DEMOTE
 						R.fields["comments"] += "Central Command Demotion Order, given on [GLOB.current_date_string] [station_time_timestamp()]<BR> Process this demotion immediately. Failure to comply with these orders is grounds for termination."
 				update_all_mob_security_hud()
 			else if(myeffect == "Demote with Bot")
-				GLOB.event_announcement.Announce("[target.real_name] is hereby demoted to the rank of Civilian. Process this demotion immediately. Failure to comply with these orders is grounds for termination.","CC Demotion Order")
+				GLOB.event_announcement.Announce("[target.real_name] is hereby demoted to the rank of Assistant. Process this demotion immediately. Failure to comply with these orders is grounds for termination.","CC Demotion Order")
 				for(var/datum/data/record/R in sortRecord(GLOB.data_core.security))
 					if(R.fields["name"] == target.real_name)
 						R.fields["criminal"] = SEC_RECORD_STATUS_ARREST

code/modules/world_topic/manifest.dm

@@ -11,7 +11,7 @@
 		"sci" = GLOB.science_positions,
 		"car" = GLOB.supply_positions,
 		"srv" = GLOB.service_positions,
-		"civ" = GLOB.civilian_positions,
+		"ast" = GLOB.assistant_positions,
 		"bot" = GLOB.nonhuman_positions
 	)
 

paradise.dme

@@ -627,8 +627,8 @@
 #include "code\game\jobs\job_objective.dm"
 #include "code\game\jobs\jobs.dm"
 #include "code\game\jobs\whitelist.dm"
+#include "code\game\jobs\job\assistant.dm"
 #include "code\game\jobs\job\central.dm"
-#include "code\game\jobs\job\civilian.dm"
 #include "code\game\jobs\job\engineering.dm"
 #include "code\game\jobs\job\job.dm"
 #include "code\game\jobs\job\medical.dm"

tgui/packages/tgui/interfaces/CardComputer.js

@@ -108,16 +108,16 @@ export const CardComputer = (props, context) => {
               </LabeledList.Item>
               <LabeledList.Item label="Retirement">
                 <Button
-                  selected={"Civilian" === data.modify_rank}
-                  key="Civilian" content="Civilian"
+                  selected={"Assistant" === data.modify_rank}
+                  key="Assistant" content="Assistant"
                   onClick={() => act("assign",
-                    { assign_target: "Civilian" })} />
+                    { assign_target: "Assistant" })} />
               </LabeledList.Item>
               <LabeledList.Item label="Demotion">
                 <Button
                   selected={"Demoted" === data.modify_rank}
                   key="Demoted" content="Demoted"
-                  tooltip="Civilian access, 'demoted' title."
+                  tooltip="Assistant access, 'demoted' title."
                   color="red" icon="times"
                   onClick={() => act("demote")} />
               </LabeledList.Item>
@@ -227,8 +227,8 @@ export const CardComputer = (props, context) => {
                       onClick={() => act("assign", { assign_target: v })} />
                   ))}
                 </LabeledList.Item>
-                <LabeledList.Item label="Civilan">
-                  {data.jobs_civilian.map(v => (
+                <LabeledList.Item label="Assistant">
+                  {data.jobs_assistant.map(v => (
                     <Button
                       selected={v === data.modify_rank}
                       key={v} content={v}
@@ -263,7 +263,7 @@ export const CardComputer = (props, context) => {
                     disabled={"Terminated" === data.modify_rank}
                     key="Demoted" content="Demoted"
                     selected={"Demoted" === data.modify_rank}
-                    tooltip="Civilian access, 'demoted' title."
+                    tooltip="Assistant access, 'demoted' title."
                     color="red" icon="times"
                     onClick={() => act("demote")} />
                 </LabeledList.Item>