cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-13 16:13:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8887 from Heroman3003/xenobotany-remember

Browse Source 
Allows xenobotanist to actually take research's loadout items.
This commit is contained in:
Novacat
2020-08-28 16:08:02 -04:00
committed by GitHub
parent 9e994f481c 0a496c40ad
commit 81967dff01
6 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm
+1 -1
View File
@@ -21,7 +21,7 @@
/datum/gear/eyes/arglasses/sci
display_name = "AR-R glasses (Sci)"
path = /obj/item/clothing/glasses/omnihud/rnd
allowed_roles = list("Research Director","Scientist","Xenobiologist","Roboticist")
allowed_roles = list("Research Director","Scientist","Xenobiologist","Xenobotanist","Roboticist")
/datum/gear/eyes/arglasses/eng
display_name = "AR-E glasses (Eng)"
code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm
+1 -1
View File
@@ -1,5 +1,5 @@
/datum/gear/shoes/boots/winter/science
allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Explorer", "Pathfinder")
allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Explorer", "Pathfinder")
/datum/gear/shoes/boots/winter/medical
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic")
code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
+3 -3
View File
@@ -2,13 +2,13 @@
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic")
/datum/gear/suit/wintercoat/science
allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Explorer", "Pathfinder")
allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Explorer", "Pathfinder")
/datum/gear/suit/snowsuit/medical
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic")
/datum/gear/suit/snowsuit/science
allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Explorer", "Pathfinder")
allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Explorer", "Pathfinder")
/datum/gear/suit/labcoat_colorable
display_name = "labcoat, colorable"
@@ -61,7 +61,7 @@
/datum/gear/suit/roles/medical/ems_jacket/alt
display_name = "first responder jacket, alt."
path = /obj/item/clothing/suit/storage/toggle/fr_jacket/ems
//paramedic vest
/datum/gear/suit/roles/medical/paramedic_vest
display_name = "paramedic vest"
code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
+15 -8
View File
@@ -7,6 +7,13 @@
display_name = "pt uniform, planetside sec"
path = /obj/item/clothing/under/solgov/pt/sifguard
/datum/gear/uniform/job_skirt/sci
allowed_roles = list("Research Director","Scientist", "Xenobiologist", "Xenobotanist")
/datum/gear/uniform/job_turtle/science
allowed_roles = list("Research Director", "Scientist", "Roboticist", "Xenobiologist", "Xenobotanist")
//KHI Uniforms
/datum/gear/uniform/job_khi/cmd
display_name = "khi uniform, cmd"
@@ -31,7 +38,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", "Pathfinder", "Explorer")
allowed_roles = list("Research Director", "Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Pathfinder", "Explorer")
//Federation jackets
/datum/gear/suit/job_fed/sec
@@ -42,7 +49,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","Pathfinder","Explorer","Field Medic")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist","Xenobotanist","Pathfinder","Explorer","Field Medic")
/datum/gear/suit/job_fed/eng
display_name = "fed uniform, eng"
@@ -59,7 +66,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", "Pathfinder", "Explorer", "Field Medic")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Pathfinder", "Explorer", "Field Medic")
/datum/gear/uniform/job_trek/eng/tos
display_name = "TOS uniform, eng/sec"
@@ -75,7 +82,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", "Pathfinder", "Explorer", "Field Medic")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Pathfinder", "Explorer", "Field Medic")
/datum/gear/uniform/job_trek/eng/tng
display_name = "TNG uniform, eng/sec"
@@ -91,7 +98,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", "Pathfinder", "Explorer", "Field Medic")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Pathfinder", "Explorer", "Field Medic")
/datum/gear/uniform/job_trek/eng/voy
display_name = "VOY uniform, eng/sec"
@@ -105,7 +112,7 @@
path = /obj/item/clothing/suit/storage/trek/ds9
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","Atmospheric Technician",
"Scientist","Roboticist","Xenobiologist","Xenobotanist","Atmospheric Technician",
"Station Engineer","Warden","Detective","Security Officer", "Pathfinder", "Explorer", "Field Medic")
@@ -117,7 +124,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", "Pathfinder", "Explorer", "Field Medic")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Pathfinder", "Explorer", "Field Medic")
/datum/gear/uniform/job_trek/eng/ds9
display_name = "DS9 uniform, eng/sec"
@@ -134,7 +141,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", "Pathfinder", "Explorer", "Field Medic")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Pathfinder", "Explorer", "Field Medic")
/datum/gear/uniform/job_trek/eng/ent
display_name = "ENT uniform, eng/sec"
code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
+1 -1
View File
@@ -54,4 +54,4 @@
/datum/gear/utility/dufflebag/sci
display_name = "science dufflebag"
path = /obj/item/weapon/storage/backpack/dufflebag/sci
allowed_roles = list("Research Director","Scientist","Roboticist","Xenobiologist","Explorer","Pathfinder")
allowed_roles = list("Research Director","Scientist","Roboticist","Xenobiologist","Xenobotanist","Explorer","Pathfinder")
code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm
+11
View File
@@ -1,3 +1,14 @@
// Upstream things
/////
/datum/gear/suit/dept/cloak/research
allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist")
/datum/gear/uniform/dept/undercoat/research
allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist")
/////
/datum/gear/uniform/voxcasual
display_name = "casual wear (Vox)"
path = /obj/item/clothing/under/vox/vox_casual