cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-19 04:08:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-12-12 03:56:58 -05:00
committed by GitHub
parent 63af8e82c1
commit 58accf0791
1 changed files with 6 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
+6 -42
View File
@@ -82,19 +82,12 @@
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic")
/datum/gear/uniform/job_trek/eng/tos
<<<<<<< HEAD
display_name = "TOS uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value.
path = /obj/item/clothing/under/rank/trek/eng //CHOMPEdit: Engineering only
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
//CHOMPEdit: See loadout_uniform_vr_ch.dm for a security-specific variant that has standard armor values.
=======
display_name = "TOS uniform, eng/sec"
path = /obj/item/clothing/under/rank/trek/engsec
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer","Warden","Detective","Security Officer","Head of Security")
>>>>>>> 0502970c3f... Merge pull request #11752 from Heroman3003/jobstuff2
//TNG
/datum/gear/uniform/job_trek/cmd/tng
display_name = "TNG uniform, cmd"
@@ -107,17 +100,11 @@
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic")
/datum/gear/uniform/job_trek/eng/tng
<<<<<<< HEAD
display_name = "TNG uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value.
path = /obj/item/clothing/under/rank/trek/eng/next //CHOMPEdit: Engineering only
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
//CHOMPEdit: See loadout_uniform_vr_ch.dm for a security-specific variant that has standard armor values.
=======
display_name = "TNG uniform, eng/sec"
path = /obj/item/clothing/under/rank/trek/engsec/next
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer","Warden","Detective","Security Officer","Head of Security")
>>>>>>> 0502970c3f... Merge pull request #11752 from Heroman3003/jobstuff2
//VOY
/datum/gear/uniform/job_trek/cmd/voy
@@ -131,19 +118,12 @@
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic")
/datum/gear/uniform/job_trek/eng/voy
<<<<<<< HEAD
display_name = "VOY uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value.
path = /obj/item/clothing/under/rank/trek/eng/voy //CHOMPEdit: Engineering only
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
//CHOMPEdit: See loadout_uniform_vr_ch.dm for a security-specific variant that has standard armor values.
=======
display_name = "VOY uniform, eng/sec"
path = /obj/item/clothing/under/rank/trek/engsec/voy
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer","Warden","Detective","Security Officer","Head of Security")
>>>>>>> 0502970c3f... Merge pull request #11752 from Heroman3003/jobstuff2
//DS9
/datum/gear/suit/job_trek/ds9_coat
@@ -152,11 +132,7 @@
allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director",
"Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist",
"Scientist","Roboticist","Xenobiologist","Xenobotanist","Atmospheric Technician",
<<<<<<< HEAD
"Station Engineer","Warden","Detective","Security Officer", "Pathfinder", "Explorer", "Field Medic", "Blueshield Guard","Security Pilot") //YW ADDITIONS
=======
"Engineer","Warden","Detective","Security Officer", "Pathfinder", "Explorer", "Field Medic")
>>>>>>> 0502970c3f... Merge pull request #11752 from Heroman3003/jobstuff2
"Engineer","Warden","Detective","Security Officer", "Pathfinder", "Explorer", "Field Medic", "Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/uniform/job_trek/cmd/ds9
@@ -170,15 +146,9 @@
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic")
/datum/gear/uniform/job_trek/eng/ds9
<<<<<<< HEAD
display_name = "DS9 uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value.
path = /obj/item/clothing/under/rank/trek/eng/ds9 //CHOMPEdit: Engineering only
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
=======
display_name = "DS9 uniform, eng/sec"
path = /obj/item/clothing/under/rank/trek/engsec/ds9
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer","Warden","Detective","Security Officer","Head of Security")
>>>>>>> 0502970c3f... Merge pull request #11752 from Heroman3003/jobstuff2
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
//CHOMPEdit: See loadout_uniform_vr_ch.dm for a security-specific variant that has standard armor values.
@@ -194,18 +164,12 @@
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic")
/datum/gear/uniform/job_trek/eng/ent
<<<<<<< HEAD
display_name = "ENT uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value.
path = /obj/item/clothing/under/rank/trek/eng/ent //CHOMPEdit: Engineering only
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
//CHOMPEdit: See loadout_uniform_vr_ch.dm for a security-specific variant that has standard armor values.
=======
display_name = "ENT uniform, eng/sec"
path = /obj/item/clothing/under/rank/trek/engsec/ent
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer","Warden","Detective","Security Officer","Head of Security")
>>>>>>> 0502970c3f... Merge pull request #11752 from Heroman3003/jobstuff2
/*
Swimsuits
*/