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

Merge branch 'master' of https://github.com/ZomgPonies/Baystation12

Browse Source
This commit is contained in:
ZomgPonies
2013-09-06 06:42:31 -04:00
parent 34820b915a 4e7b8599e3
commit 2d868b1b37
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/jobs/job/civilian.dm
+4 -3
View File
@@ -52,7 +52,7 @@
selection_color = "#dddddd"
access = list(access_hydroponics, access_bar, access_kitchen, access_morgue)
minimal_access = list(access_kitchen)
alt_titles = list("Cook")
alt_titles = list("Cook","Culinary Artist","Butcher")
equip(var/mob/living/carbon/human/H)
@@ -170,7 +170,7 @@
selection_color = "#dddddd"
access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station)
minimal_access = list(access_mining, access_mint, access_mining_station, access_mailsorting)
alt_titles = list("Spelunker")
equip(var/mob/living/carbon/human/H)
if(!H) return 0
@@ -290,6 +290,7 @@
selection_color = "#dddddd"
access = list(access_janitor, access_maint_tunnels)
minimal_access = list(access_janitor, access_maint_tunnels)
alt_titles = list("Custodial Technician")
equip(var/mob/living/carbon/human/H)
@@ -347,7 +348,7 @@
selection_color = "#dddddd"
access = list(access_lawyer, access_court, access_sec_doors, access_maint_tunnels)
minimal_access = list(access_lawyer, access_court, access_sec_doors)
alt_titles = list("Lawyer","Public Defender")
equip(var/mob/living/carbon/human/H)
if(!H) return 0
code/game/jobs/job/civilian_chaplain.dm
+2 -2
View File
@@ -10,7 +10,7 @@
selection_color = "#dddddd"
access = list(access_morgue, access_chapel_office, access_crematorium, access_maint_tunnels)
minimal_access = list(access_morgue, access_chapel_office, access_crematorium)
alt_titles = list("Counselor")
alt_titles = list("Counselor","Pastor","Space Shaman")
equip(var/mob/living/carbon/human/H)
@@ -152,4 +152,4 @@
ticker.Bible_deity_name = B.deity_name
feedback_set_details("religion_deity","[new_deity]")
feedback_set_details("religion_book","[new_book_style]")
return 1
return 1
code/game/jobs/job/medical.dm
+3 -3
View File
@@ -49,7 +49,7 @@
selection_color = "#ffeef0"
access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics)
minimal_access = list(access_medical, access_morgue, access_surgery, access_virology)
alt_titles = list("Surgeon","Emergency Physician","Nurse","Virologist")
alt_titles = list("Surgeon","Emergency Physician","Nurse","Virologist","Medical Intern","Orderly","First Responder")
equip(var/mob/living/carbon/human/H)
if(!H) return 0
@@ -110,7 +110,7 @@
selection_color = "#ffeef0"
access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics)
minimal_access = list(access_medical, access_chemistry)
alt_titles = list("Pharmacist")
alt_titles = list("Pharmacist","Drug Dealer")
equip(var/mob/living/carbon/human/H)
@@ -199,7 +199,7 @@
selection_color = "#ffeef0"
access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_psychiatrist)
minimal_access = list(access_medical, access_psychiatrist)
alt_titles = list("Psychologist")
alt_titles = list("Psychologist","Therapist")
equip(var/mob/living/carbon/human/H)