cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 17:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/customitems/item_defines.dm
This commit is contained in:
skull132
2017-09-09 21:38:02 +03:00
parent 0d8fe2e6a4 4199d3a2d8
commit 16d33365c2
79 changed files with 1476 additions and 907 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/client/preference_setup/loadout/loadout_accessories.dm
View File

@@ -66,7 +66,7 @@
/datum/gear/accessory/white_vest
display_name = "webbing, medical"
path = /obj/item/clothing/accessory/storage/white_vest
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Nursing Intern")
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Medical Resident")
/datum/gear/accessory/webbing
display_name = "webbing, simple"
@@ -86,7 +86,7 @@
/datum/gear/accessory/white_pouches
display_name = "drop pouches, medical"
path = /obj/item/clothing/accessory/storage/white_pouches
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist","Geneticist", "Paramedic", "Nursing Intern")
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist","Geneticist", "Paramedic", "Medical Resident")
/datum/gear/accessory/pouches
display_name = "drop pouches, simple"

2
code/modules/client/preference_setup/loadout/loadout_eyes.dm
View File

@@ -46,7 +46,7 @@
/datum/gear/eyes/medical
display_name = "medical HUD"
path = /obj/item/clothing/glasses/hud/health
allowed_roles = list("Medical Doctor", "Chief Medical Officer", "Chemist", "Paramedic", "Geneticist", "Nursing Intern")
allowed_roles = list("Medical Doctor", "Chief Medical Officer", "Chemist", "Paramedic", "Geneticist", "Medical Resident")
/datum/gear/eyes/shades
display_name = "sunglasses, fat"

2
code/modules/client/preference_setup/loadout/loadout_head.dm
View File

@@ -154,7 +154,7 @@
/datum/gear/head/surgical
display_name = "surgical cap selection"
path = /obj/item/clothing/head/surgery/blue
allowed_roles = list("Scientist", "Chief Medical Officer", "Medical Doctor", "Geneticist", "Chemist", "Paramedic", "Nursing Intern", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")
allowed_roles = list("Scientist", "Chief Medical Officer", "Medical Doctor", "Geneticist", "Chemist", "Paramedic", "Medical Resident", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")
/datum/gear/head/surgical/New()
..()

4
code/modules/client/preference_setup/loadout/loadout_suit.dm
View File

@@ -72,7 +72,7 @@
display_name = "surgical apron"
path = /obj/item/clothing/suit/apron/surgery
cost = 1
allowed_roles = list("Scientist", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Nursing Intern", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")
allowed_roles = list("Scientist", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Medical Resident", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")
/datum/gear/suit/poncho
display_name = "poncho selection"
@@ -132,7 +132,7 @@
/datum/gear/suit/winter/medical
display_name = "winter coat, medical"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Paramedic", "Nursing Intern", "Psychiatrist", "Chemist")
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Paramedic", "Medical Resident", "Psychiatrist", "Chemist")
/datum/gear/suit/winter/engineering
display_name = "winter coat, engineering"

2
code/modules/client/preference_setup/loadout/loadout_uniform.dm
View File

@@ -82,7 +82,7 @@
/datum/gear/uniform/scrubs
display_name = "scrubs selection"
path = /obj/item/clothing/under/rank/medical/black
allowed_roles = list("Scientist","Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Nursing Intern", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")
allowed_roles = list("Scientist","Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Medical Resident", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")
/datum/gear/uniform/scrubs/New()
..()

2
code/modules/client/preference_setup/loadout/loadout_xeno.dm
View File

@@ -133,7 +133,7 @@
display_name = "PRA medical coat (Tajara)"
path = /obj/item/clothing/suit/storage/toggle/labcoat/tajaran
whitelisted = list("Tajara")
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Nursing Intern")
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Medical Resident")
sort_category = "Xenowear"
//other things