shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

man FUCK psychs

Browse Source
This commit is contained in:
Detective Google
2020-02-20 22:46:37 -06:00
parent b7baa6fad8
commit 141bd96430
9 changed files with 16 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/jobs.dm
+11 -13
View File
@@ -23,8 +23,7 @@
#define DOCTOR (1<<4)
#define GENETICIST (1<<5)
#define VIROLOGIST (1<<6)
#define PSYCH (1<<7)
#define PARAMEDIC (1<<8)
#define PARAMEDIC (1<<7)
#define CIVILIAN (1<<2)
@@ -80,14 +79,13 @@
#define JOB_DISPLAY_ORDER_CHEMIST 21
#define JOB_DISPLAY_ORDER_GENETICIST 22
#define JOB_DISPLAY_ORDER_VIROLOGIST 23
#define JOB_DISPLAY_ORDER_PSYCH 24
#define JOB_DISPLAY_ORDER_PARAMEDIC 25
#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 26
#define JOB_DISPLAY_ORDER_SCIENTIST 27
#define JOB_DISPLAY_ORDER_ROBOTICIST 28
#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 29
#define JOB_DISPLAY_ORDER_WARDEN 30
#define JOB_DISPLAY_ORDER_DETECTIVE 31
#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 32
#define JOB_DISPLAY_ORDER_AI 33
#define JOB_DISPLAY_ORDER_CYBORG 34
#define JOB_DISPLAY_ORDER_PARAMEDIC 24
#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 27
#define JOB_DISPLAY_ORDER_SCIENTIST 28
#define JOB_DISPLAY_ORDER_ROBOTICIST 29
#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 30
#define JOB_DISPLAY_ORDER_WARDEN 31
#define JOB_DISPLAY_ORDER_DETECTIVE 32
#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 33
#define JOB_DISPLAY_ORDER_AI 34
#define JOB_DISPLAY_ORDER_CYBORG 35
code/modules/events/wizard/departmentrevolt.dm
+1 -1
View File
@@ -19,7 +19,7 @@
jobs_to_revolt = list("Assistant")
nation_name = pick("Assa", "Mainte", "Tunnel", "Gris", "Grey", "Liath", "Grigio", "Ass", "Assi")
if("white")
jobs_to_revolt = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Psychologist", "Virologist")
jobs_to_revolt = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Virologist")
nation_name = pick("Mede", "Healtha", "Recova", "Chemi", "Geneti", "Viro", "Psych")
if("yellow")
jobs_to_revolt = list("Chief Engineer", "Station Engineer", "Atmospheric Technician")
code/modules/jobs/access.dm
+1 -1
View File
@@ -357,7 +357,7 @@
/proc/get_all_jobs()
return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Cook", "Botanist", "Quartermaster", "Cargo Technician",
"Shaft Miner", "Clown", "Mime", "Janitor", "Curator", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer",
"Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Psychologist", "Paramedic",
"Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Paramedic",
"Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer")
/proc/get_all_job_icons() //For all existing HUD icons
code/modules/jobs/job_types/paramedic.dm
+3 -3
View File
@@ -11,8 +11,8 @@
outfit = /datum/outfit/job/paramedic
access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS, ACCESS_EVA, ACCESS_ENGINE, ACCESS_CARGO, ACCESS_HYDROPONICS, ACCESS_RESEARCH)
minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS, ACCESS_EVA, ACCESS_ENGINE, ACCESS_CARGO, ACCESS_HYDROPONICS, ACCESS_RESEARCH)
access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS, ACCESS_EVA, ACCESS_ENGINE, ACCESS_CARGO, ACCESS_HYDROPONICS, ACCESS_RESEARCH)
minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS, ACCESS_EVA, ACCESS_ENGINE, ACCESS_CARGO, ACCESS_HYDROPONICS, ACCESS_RESEARCH)
display_order = JOB_DISPLAY_ORDER_PARAMEDIC
@@ -34,7 +34,7 @@
r_pocket = /obj/item/pinpointer/crew
l_pocket = /obj/item/pda/medical
backpack_contents = list(/obj/item/roller=1)
pda_slot = ITEM_SLOT_LPOCKET
pda_slot = ITEM_SLOT_POCKET
backpack = /obj/item/storage/backpack/medic
satchel = /obj/item/storage/backpack/satchel/med
code/modules/jobs/job_types/psychologist.dm
-36
View File
@@ -1,36 +0,0 @@
/datum/job/psych
title = "Psychologist"
flag = PSYCH
department_head = list("Chief Medical Officer")
department_flag = MEDSCI
faction = "Station"
total_positions = 1
spawn_positions = 1
supervisors = "the chief medical officer"
selection_color = "#74b5e0"
outfit = /datum/outfit/job/psych
access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM)
minimal_access = list(ACCESS_MEDICAL, ACCESS_SURGERY, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM)
display_order = JOB_DISPLAY_ORDER_PSYCH
/datum/outfit/job/psych
name = "Psychologist"
jobtype = /datum/job/psych
ears = /obj/item/radio/headset/headset_med
uniform = /obj/item/clothing/under/suit_jacket/green
shoes = /obj/item/clothing/shoes/laceup
l_hand = /obj/item/storage/briefcase/medical
r_hand = /obj/item/clipboard
l_pocket = /obj/item/laser_pointer
r_pocket = /obj/item/pda/medical
pda_slot = ITEM_SLOT_RPOCKET
backpack = /obj/item/storage/backpack/medic
satchel = /obj/item/storage/backpack/satchel/med
duffelbag = /obj/item/storage/backpack/duffelbag/med
chameleon_extras = /obj/item/gun/syringe
code/modules/jobs/jobs.dm
-1
View File
@@ -18,7 +18,6 @@ GLOBAL_LIST_INIT(medical_positions, list(
"Medical Doctor",
"Geneticist",
"Virologist",
"Psychologist",
"Paramedic",
"Chemist"))
icons/mob/hud.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

icons/mob/landmarks.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

strings/ion_laws.json
-1
View File
@@ -333,7 +333,6 @@
"CHIEF MEDICAL OFFICERS",
"MEDICAL DOCTORS",
"PARAMEDICS",
"PSYCHOLOGISTS",
"CHEMISTS",
"GENETICISTS",
"VIROLOGISTS",