cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Hawk_v3
2019-04-14 19:44:13 +01:00
parent e077b626c4 629748faec
commit 41f0bd9f6d
286 changed files with 7235 additions and 5506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -274,6 +274,14 @@ datum/gear/suit/duster
display_name = "cloak, medical"
path = /obj/item/clothing/accessory/poncho/roles/cloak/medical
/datum/gear/suit/roles/poncho/cloak/custom //A colorable cloak
display_name = "cloak (colorable)"
path = /obj/item/clothing/accessory/poncho/roles/cloak/custom
/datum/gear/suit/roles/poncho/cloak/custom/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
/datum/gear/suit/unathi_robe
display_name = "roughspun robe"
path = /obj/item/clothing/suit/unathi/robe

18
code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
View File

@@ -21,7 +21,7 @@
/datum/gear/uniform/job_khi/med
display_name = "khi uniform, med"
path = /obj/item/clothing/under/rank/khi/med
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Field Medic")
/datum/gear/uniform/job_khi/eng
display_name = "khi uniform, eng"
@@ -31,7 +31,7 @@
/datum/gear/uniform/job_khi/sci
display_name = "khi uniform, sci"
path = /obj/item/clothing/under/rank/khi/sci
allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist")
allowed_roles = list("Research Director", "Scientist", "Roboticist", "Xenobiologist", "Pathfinder", "Explorer")
//Federation jackets
/datum/gear/suit/job_fed/sec
@@ -42,7 +42,7 @@
/datum/gear/suit/job_fed/medsci
display_name = "fed uniform, med/sci"
path = /obj/item/clothing/suit/storage/fluff/fedcoat/fedblue
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist","Pathfinder","Explorer","Field Medic")
/datum/gear/suit/job_fed/eng
display_name = "fed uniform, eng"
@@ -59,7 +59,7 @@
/datum/gear/uniform/job_trek/medsci/tos
display_name = "TOS uniform, med/sci"
path = /obj/item/clothing/under/rank/trek/medsci
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Pathfinder", "Explorer", "Field Medic")
/datum/gear/uniform/job_trek/eng/tos
display_name = "TOS uniform, eng/sec"
@@ -75,7 +75,7 @@
/datum/gear/uniform/job_trek/medsci/tng
display_name = "TNG uniform, med/sci"
path = /obj/item/clothing/under/rank/trek/medsci/next
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Pathfinder", "Explorer", "Field Medic")
/datum/gear/uniform/job_trek/eng/tng
display_name = "TNG uniform, eng/sec"
@@ -91,7 +91,7 @@
/datum/gear/uniform/job_trek/medsci/voy
display_name = "VOY uniform, med/sci"
path = /obj/item/clothing/under/rank/trek/medsci/voy
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Pathfinder", "Explorer", "Field Medic")
/datum/gear/uniform/job_trek/eng/voy
display_name = "VOY uniform, eng/sec"
@@ -106,7 +106,7 @@
allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director",
"Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist",
"Scientist","Roboticist","Xenobiologist","Atmospheric Technician",
"Station Engineer","Warden","Detective","Security Officer","Blueshield Guard")
"Station Engineer","Warden","Detective","Security Officer", "Pathfinder", "Explorer", "Field Medic", "Blueshield Guard")
/datum/gear/uniform/job_trek/cmd/ds9
@@ -117,7 +117,7 @@
/datum/gear/uniform/job_trek/medsci/ds9
display_name = "DS9 uniform, med/sci"
path = /obj/item/clothing/under/rank/trek/medsci/ds9
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Pathfinder", "Explorer", "Field Medic")
/datum/gear/uniform/job_trek/eng/ds9
display_name = "DS9 uniform, eng/sec"
@@ -134,7 +134,7 @@
/datum/gear/uniform/job_trek/medsci/ent
display_name = "ENT uniform, med/sci"
path = /obj/item/clothing/under/rank/trek/medsci/ent
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Pathfinder", "Explorer", "Field Medic")
/datum/gear/uniform/job_trek/eng/ent
display_name = "ENT uniform, eng/sec"