cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +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/game/objects/items/weapons/cards_ids.dm
+4 -4
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
-3
View File
@@ -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"