cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 07:27:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* Removes Civilian

* other alt-titles as well

* further resolution

* forgot these

* TGUI

* hud icon
This commit is contained in:
Fox McCloud
2021-11-16 19:49:08 +01:00
committed by GitHub
parent e8add7384e
commit 55a6c23bc7
36 changed files with 148 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/infiltratorteam_syndicate.dm
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+5 -5
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+3 -3
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
)