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

Merge branch 'master' into upstream-merge-5654

Browse Source
This commit is contained in:
Spades
2019-03-01 05:42:07 -05:00
committed by GitHub
parent dd6949a779 71d1a05531
commit 6e2172a5ae
736 changed files with 29915 additions and 32830 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_accessories.dm
+18 -1
View File
@@ -243,4 +243,21 @@
/datum/gear/accessory/locket
display_name = "locket"
path = /obj/item/clothing/accessory/locket
path = /obj/item/clothing/accessory/locket
/datum/gear/accessory/asym
display_name = "asymmetric jacket selection"
path = /obj/item/clothing/accessory/asymmetric
cost = 1
/datum/gear/accessory/asym/New()
..()
var/list/asyms = list()
for(var/asym in typesof(/obj/item/clothing/accessory/asymmetric))
var/obj/item/clothing/accessory/asymmetric_type = asym
asyms[initial(asymmetric_type.name)] = asymmetric_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(asyms))
/datum/gear/accessory/cowledvest
display_name = "cowled vest"
path = /obj/item/clothing/accessory/cowledvest
code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
+28 -3
View File
@@ -30,11 +30,36 @@
display_name = "collar, holo"
path = /obj/item/clothing/accessory/collar/holo
/datum/gear/accessory/white_drop_pouches
allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist")
/datum/gear/accessory/holster
display_name = "holster selection (Security, CD, HoP, Exploration)"
allowed_roles = list("Colony Director", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Explorer","Pathfinder")
/datum/gear/accessory/brown_vest
display_name = "webbing, brown"
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Pathfinder")
/datum/gear/accessory/black_vest
display_name = "webbing, black"
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Pathfinder")
/datum/gear/accessory/white_vest
allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist")
display_name = "webbing, white (Medical)"
allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic")
/datum/gear/accessory/brown_drop_pouches
display_name = "drop pouches, brown"
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Pathfinder")
/datum/gear/accessory/black_drop_pouches
display_name = "drop pouches, black"
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Pathfinder")
/datum/gear/accessory/white_drop_pouches
display_name = "drop pouches, white (Medical)"
allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic")
/datum/gear/accessory/stethoscope
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic")
/datum/gear/accessory/khcrystal
display_name = "KH Life Crystal"
code/modules/client/preference_setup/loadout/loadout_eyes.dm
+17 -1
View File
@@ -124,4 +124,20 @@
/datum/gear/eyes/circuitry
display_name = "goggles, circuitry (empty)"
path = /obj/item/clothing/glasses/circuitry
path = /obj/item/clothing/glasses/circuitry
/datum/gear/eyes/glasses/rimless
display_name = "Glasses, rimless"
path = /obj/item/clothing/glasses/rimless
/datum/gear/eyes/glasses/prescriptionrimless
display_name = "Glasses, prescription rimless"
path = /obj/item/clothing/glasses/regular/rimless
/datum/gear/eyes/glasses/thin
display_name = "Glasses, thin frame"
path = /obj/item/clothing/glasses/thin
/datum/gear/eyes/glasses/prescriptionrimless
display_name = "Glasses, prescription thin frame"
path = /obj/item/clothing/glasses/regular/thin
code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm
+7
View File
@@ -1,3 +1,10 @@
/datum/gear/eyes/medical
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic")
/datum/gear/eyes/meson
display_name = "Optical Meson Scanners (Engineering, Science)"
allowed_roles = list("Station Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director", "Explorer", "Pathfinder")
/datum/gear/eyes/arglasses
display_name = "AR glasses"
path = /obj/item/clothing/glasses/omnihud
code/modules/client/preference_setup/loadout/loadout_head.dm
+9 -1
View File
@@ -370,4 +370,12 @@
/datum/gear/head/circuitry
display_name = "headwear, circuitry (empty)"
path = /obj/item/clothing/head/circuitry
path = /obj/item/clothing/head/circuitry
/datum/gear/head/maangtikka
display_name = "maang tikka"
path = /obj/item/clothing/head/maangtikka
/datum/gear/head/jingasa
display_name = "jingasa"
path = /obj/item/clothing/head/jingasa
code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm
+6
View File
@@ -1,3 +1,9 @@
/datum/gear/shoes/boots/winter/science
allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Explorer", "Pathfinder")
/datum/gear/shoes/boots/winter/medical
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic")
/datum/gear/shoes/black/cuffs
display_name = "legwraps, black"
path = /obj/item/clothing/shoes/black/cuffs
code/modules/client/preference_setup/loadout/loadout_suit.dm
+4
View File
@@ -463,6 +463,10 @@ datum/gear/suit/duster
..()
gear_tweaks = list(gear_tweak_free_color_choice)
/datum/gear/suit/miscellaneous/kamishimo
display_name = "kamishimo"
path = /obj/item/clothing/suit/kamishimo
/datum/gear/suit/snowsuit
display_name = "snowsuit"
path = /obj/item/clothing/suit/storage/snowsuit
code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
+18
View File
@@ -1,3 +1,21 @@
/datum/gear/suit/roles/poncho/cloak/research
allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Explorer", "Pathfinder")
/datum/gear/suit/roles/poncho/cloak/medical
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic")
/datum/gear/suit/wintercoat/medical
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")
/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")
/datum/gear/suit/labcoat_colorable
display_name = "labcoat, colorable"
path = /obj/item/clothing/suit/storage/toggle/labcoat
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+22 -1
View File
@@ -462,4 +462,25 @@
/datum/gear/uniform/circuitry
display_name = "jumpsuit, circuitry (empty)"
path = /obj/item/clothing/under/circuitry
path = /obj/item/clothing/under/circuitry
/datum/gear/uniform/sleekoverall
display_name = "sleek overalls"
path = /obj/item/clothing/under/overalls/sleek
/datum/gear/uniform/sarired
display_name = "sari, red"
path = /obj/item/clothing/under/dress/sari
/datum/gear/uniform/sarigreen
display_name = "sari, green"
path = /obj/item/clothing/under/dress/sari/green
/datum/gear/uniform/wrappedcoat
display_name = "modern wrapped coat"
path = /obj/item/clothing/under/moderncoat
/datum/gear/uniform/ascetic
display_name = "plain ascetic garb"
path = /obj/item/clothing/under/ascetic
code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
+2 -2
View File
@@ -35,7 +35,7 @@
/datum/gear/utility/dufflebag/med
display_name = "medical dufflebag"
path = /obj/item/weapon/storage/backpack/dufflebag/med
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist","Psychiatrist","Search and Rescue")
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist","Psychiatrist","Field Medic")
/datum/gear/utility/dufflebag/med/emt
display_name = "EMT dufflebag"
@@ -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")
allowed_roles = list("Research Director","Scientist","Roboticist","Xenobiologist","Explorer","Pathfinder")