From 55a6c23bc7ada125a8483a311eaf1fffe1f1cef2 Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Tue, 16 Nov 2021 13:49:08 -0500 Subject: [PATCH] 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 | 52 +++++++++--------- _maps/map_files/MetaStation/MetaStation.dmm | 36 ++++++------ _maps/map_files/cyberiad/cyberiad.dmm | 48 ++++++++-------- code/__DEFINES/job.dm | 2 +- code/__HELPERS/names.dm | 4 +- code/controllers/subsystem/jobs.dm | 24 ++++---- code/datums/mind.dm | 2 +- code/datums/outfits/outfit_admin.dm | 4 +- code/datums/uplink_item.dm | 2 +- .../jobs/job/{civilian.dm => assistant.dm} | 13 ++--- code/game/jobs/jobs.dm | 9 +-- code/game/machinery/computer/card.dm | 20 +++---- code/game/machinery/doors/brigdoors.dm | 2 +- code/game/machinery/tcomms/nttc.dm | 6 +- code/game/objects/items/weapons/cards_ids.dm | 8 +-- .../objects/items/weapons/holy_weapons.dm | 4 +- .../crates_lockers/closets/cardboardbox.dm | 2 +- code/game/objects/structures/misc.dm | 3 - .../admin/verbs/infiltratorteam_syndicate.dm | 4 +- code/modules/admin/verbs/randomverbs.dm | 2 +- code/modules/client/preference/character.dm | 10 ++-- code/modules/client/preference/preferences.dm | 4 +- code/modules/economy/Job_Departments.dm | 4 +- .../food_and_drinks/drinks/drinks/mugs.dm | 4 +- .../living/carbon/human/species/plasmaman.dm | 2 +- code/modules/mob/living/carbon/superheroes.dm | 6 +- .../hostile/terror_spiders/terror_ai.dm | 2 +- code/modules/mob/new_player/new_player.dm | 2 +- code/modules/newscaster/obj/newscaster.dm | 2 +- code/modules/paperwork/paper.dm | 4 +- code/modules/world_topic/manifest.dm | 2 +- icons/mob/hud.dmi | Bin 15931 -> 15944 bytes icons/obj/cardboard_boxes.dmi | Bin 24498 -> 24499 bytes paradise.dme | 2 +- tgui/packages/tgui/interfaces/CardComputer.js | 14 ++--- tgui/packages/tgui/public/tgui.bundle.js | 2 +- 36 files changed, 148 insertions(+), 159 deletions(-) rename code/game/jobs/job/{civilian.dm => assistant.dm} (73%) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 52e367c5b69..ed3fd6b31de 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_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 diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 99a70cb1379..ba85f7838b3 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_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 diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 9a0f94db0c3..3889070b89a 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_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) diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm index 62920ed2a40..76fe78e581a 100644 --- a/code/__DEFINES/job.dm +++ b/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) diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index 14add1b8308..2df7ee93c12 100644 --- a/code/__HELPERS/names.dm +++ b/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 diff --git a/code/controllers/subsystem/jobs.dm b/code/controllers/subsystem/jobs.dm index 04e1c5fb5df..50f97c1a8dd 100644 --- a/code/controllers/subsystem/jobs.dm +++ b/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 diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 1d802c2966c..394c94b0014 100644 --- a/code/datums/mind.dm +++ b/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) diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm index b76d92dc527..e465013853d 100644 --- a/code/datums/outfits/outfit_admin.dm +++ b/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)) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 174fa3741f0..b44a461e254 100644 --- a/code/datums/uplink_item.dm +++ b/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 diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/assistant.dm similarity index 73% rename from code/game/jobs/job/civilian.dm rename to code/game/jobs/job/assistant.dm index 7dddfd6a8d7..2b74290215b 100644 --- a/code/game/jobs/job/civilian.dm +++ b/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 diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index cf601af731d..d26872bacd0 100644 --- a/code/game/jobs/jobs.dm +++ b/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 diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 9d5b17e2d81..407d1de2405 100644 --- a/code/game/machinery/computer/card.dm +++ b/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() diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index ba2f836507a..a91e0ac78ba 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/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) diff --git a/code/game/machinery/tcomms/nttc.dm b/code/game/machinery/tcomms/nttc.dm index 1af0c00eacb..53633cd1b23 100644 --- a/code/game/machinery/tcomms/nttc.dm +++ b/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", diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 59d9c7c9138..5506040ded8 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/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 diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index 6eb7eb169fd..680bac78ecb 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -646,8 +646,8 @@ else to_chat(missionary, "You successfully convert [target] to your cause. The following grows because of your faith!") 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, "Your message seems to resound well with [target]; converting [target.p_them()] was much easier than expected.") faith -= 50 else //45% chance to take the normal 100 faith cost diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index d641c501d10..eca736152f9 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/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) diff --git a/code/game/objects/structures/misc.dm b/code/game/objects/structures/misc.dm index 051b3ddcf46..980cc1384b4 100644 --- a/code/game/objects/structures/misc.dm +++ b/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" diff --git a/code/modules/admin/verbs/infiltratorteam_syndicate.dm b/code/modules/admin/verbs/infiltratorteam_syndicate.dm index 6917c95d3b9..9f4222e0a73 100644 --- a/code/modules/admin/verbs/infiltratorteam_syndicate.dm +++ b/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" diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 07d5d1e5d7b..aad561fb6dd 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/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. diff --git a/code/modules/client/preference/character.dm b/code/modules/client/preference/character.dm index ec0fa2ee469..84b951691c6 100644 --- a/code/modules/client/preference/character.dm +++ b/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 += "[rank] \[IN [(available_in_days)] DAYS]" continue - if((job_support_low & JOB_CIVILIAN) && (job.title != "Civilian")) + if((job_support_low & JOB_ASSISTANT) && (job.title != "Assistant")) html += "[rank]" continue if((job.title in GLOB.command_positions) || (job.title == "AI"))//Bold head jobs @@ -2078,8 +2078,8 @@ // HTML += "" - 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 += " Yes" else html += " No" @@ -2109,7 +2109,7 @@ if(GET_RANDOM_JOB) html += "

Get random job if preferences unavailable

" if(BE_ASSISTANT) - html += "

Be a civilian if preferences unavailable

" + html += "

Be an assistant if preferences unavailable

" if(RETURN_TO_LOBBY) html += "

Return to lobby if preferences unavailable

" diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm index 4a3c01d41ed..62f8020d574 100644 --- a/code/modules/client/preference/preferences.dm +++ b/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 diff --git a/code/modules/economy/Job_Departments.dm b/code/modules/economy/Job_Departments.dm index f2accab8541..44a12dae02e 100644 --- a/code/modules/economy/Job_Departments.dm +++ b/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" diff --git a/code/modules/food_and_drinks/drinks/drinks/mugs.dm b/code/modules/food_and_drinks/drinks/drinks/mugs.dm index 4ce42a4822c..d9700eee9d2 100644 --- a/code/modules/food_and_drinks/drinks/drinks/mugs.dm +++ b/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 diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm index fceda9035f6..eddb6b67f2b 100644 --- a/code/modules/mob/living/carbon/human/species/plasmaman.dm +++ b/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) diff --git a/code/modules/mob/living/carbon/superheroes.dm b/code/modules/mob/living/carbon/superheroes.dm index e1cd8b668be..e3f534421df 100644 --- a/code/modules/mob/living/carbon/superheroes.dm +++ b/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, "You can only recruit Civilians.") + if(target.mind.assigned_role != "Assistant") + to_chat(user, "You can only recruit Assistants.") revert_cast(user) return recruiting = TRUE diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_ai.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_ai.dm index 3c5772017d2..03f13469ae0 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_ai.dm +++ b/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) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index d4524f62550..eee2b99da0d 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/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") diff --git a/code/modules/newscaster/obj/newscaster.dm b/code/modules/newscaster/obj/newscaster.dm index d257f2ba06d..6294573a439 100644 --- a/code/modules/newscaster/obj/newscaster.dm +++ b/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 ) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 226869e69f7..f9d1be27d66 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -736,14 +736,14 @@ to_chat(H, "You feel surrounded by sadness. Sadness... and HONKS!") 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()]
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 diff --git a/code/modules/world_topic/manifest.dm b/code/modules/world_topic/manifest.dm index f7b334efc28..8f7384ede8e 100644 --- a/code/modules/world_topic/manifest.dm +++ b/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 ) diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index 80d2b820e15ecf24c3c5acea8031c79b22179e60..0244ecaa44ab7f35fef78154995d83f4c116038e 100644 GIT binary patch delta 13829 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 delta 13811 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 JSjRc?{{h$9v5Eiy diff --git a/icons/obj/cardboard_boxes.dmi b/icons/obj/cardboard_boxes.dmi index e30e00a0830708fbdb5dc9aea2cc5ea1064754e3..6d9f6381b3852e615e130fbf9f9084f2fa15f691 100644 GIT binary patch delta 435 zcmV;k0Zjg~zX7wq0gxmC+mR(L2((079IQW}*pXTte+%o7R>Lv;`0{l+TqRi!$ME!h zI%JkD+vmkFG7iV^5J}V0NYku5m^9{x>5xQ6IEHW2VO1*p`S~BDb*>)Ab(6}hQa3cs zM++y3w4-4-8yw$N?1m;eT#@RiAFT2%Y3r>@9B7u0#=TuD8ik@?RK=R2F*qYDZS>6Q zsGrkDf6}eN1q4yd)OQm6kHTFirNT)fn&pAxR+B_BhCA2+ixfBqG_l}Y0V0vQdG-O! za_jH_f=F)ogoDVRlX6a?93A85o&{nSUjH7Sc-uO4%v@v`o`W;19fx9e9e<}ozDG$`PG*1y7?t^Pvr0s2kpE!Lq zW?mh=jF@V(a#tQ)jXYg;&jQQ-&La!&2~BlLsm5AqpJ`o5bj-9d-syL*QfQN5>UipL z$=K90sd2WD8rOtJdEk{aF+5;kbrE&-yTdJ{i>r2+T2!{V=i89zn9y!LI!8fX?!i0z d6yMh$!}HrIoL`0{l+Ts4jqj^XM1 zbV#CG8lM+^(2#Hp4@?%9N)~66E@Ye@rbATg;TXP6ht(*{=jVTr+N5}#lue6>Y1z;; zAI%b#X-C6w)`j0q#|=$#xU9udKUk$(wAyM>?r4^e@?Nh6jY82cDmtp6F*u`MRd3iDRt4h*A0H&^ifW- zIyxCKWy~hcq)Qp(>9KnjSoU}6No9{{s!M7aVukjZ)|J%yOq&$ABko=$)24lx(f|Me diff --git a/paradise.dme b/paradise.dme index 387f53106eb..5e94a56943d 100644 --- a/paradise.dme +++ b/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" diff --git a/tgui/packages/tgui/interfaces/CardComputer.js b/tgui/packages/tgui/interfaces/CardComputer.js index 0dcd44e8b2c..c1956e88fba 100644 --- a/tgui/packages/tgui/interfaces/CardComputer.js +++ b/tgui/packages/tgui/interfaces/CardComputer.js @@ -108,16 +108,16 @@ export const CardComputer = (props, context) => {