cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-08-28 23:51:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate

Browse Source
This commit is contained in:
izac112
2025-01-14 02:20:30 +01:00
parent eeddf8f793 35172fd5eb
commit aa8016bddd
815 changed files with 7129 additions and 8204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+3 -3
View File
@@ -1517,7 +1517,7 @@
display_name = "Tempest's Medical Hud"
slot = slot_glasses
ckeywhitelist = list("wickedtemp")
character_name = list("Chakat Tempest Venosare")
character_name = list("Chakat Tempest Trismaer")
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PSYCHIATRIST,JOB_PARAMEDIC, JOB_OFFDUTY_MEDIC)
/datum/gear/fluff/tempest_hypospray
@@ -1525,7 +1525,7 @@
display_name = "Tempest's Hypospray"
slot = slot_belt
ckeywhitelist = list("wickedtemp")
character_name = list("Chakat Tempest Venosare")
character_name = list("Chakat Tempest Trismaer")
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PSYCHIATRIST,JOB_PARAMEDIC, JOB_OFFDUTY_MEDIC)
/datum/gear/fluff/tempest_backpack
@@ -1533,7 +1533,7 @@
display_name = "Tempest's Saddlebag"
slot = slot_back
ckeywhitelist = list("wickedtemp")
character_name = list("Chakat Tempest Venosare")
character_name = list("Chakat Tempest Trismaer")
// X CKEYS
/datum/gear/fluff/penelope_box
code/modules/client/preference_setup/loadout/loadout_xeno.dm
+1 -1
View File
@@ -8,7 +8,7 @@
/datum/gear/head/zhan_scarf
display_name = "Zhan headscarf"
path = /obj/item/clothing/head/tajaran/scarf
whitelisted = SPECIES_TAJ
whitelisted = SPECIES_TAJARAN
/datum/gear/suit/unathi_mantle
display_name = "hide mantle (Unathi)"
code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm
+5 -5
View File
@@ -59,31 +59,31 @@
/datum/gear/eyes/tajblind
display_name = "embroidered veil"
path = /obj/item/clothing/glasses/tajblind
//whitelisted = SPECIES_TAJ
//whitelisted = SPECIES_TAJARAN
sort_category = "Xenowear"
/datum/gear/eyes/medical/tajblind
display_name = "medical veil (Tajara) (Medical)"
path = /obj/item/clothing/glasses/hud/health/tajblind
//whitelisted = SPECIES_TAJ
//whitelisted = SPECIES_TAJARAN
sort_category = "Xenowear"
/datum/gear/eyes/meson/tajblind
display_name = "industrial veil (Tajara) (Engineering, Science)"
path = /obj/item/clothing/glasses/meson/prescription/tajblind
//whitelisted = SPECIES_TAJ
//whitelisted = SPECIES_TAJARAN
sort_category = "Xenowear"
/datum/gear/eyes/material/tajblind
display_name = "mining veil (Tajara) (Mining)"
path = /obj/item/clothing/glasses/material/prescription/tajblind
//whitelisted = SPECIES_TAJ
//whitelisted = SPECIES_TAJARAN
sort_category = "Xenowear"
/datum/gear/eyes/security/tajblind
display_name = "sleek veil (Tajara) (Security)"
path = /obj/item/clothing/glasses/sunglasses/sechud/tajblind
//whitelisted = SPECIES_TAJ
//whitelisted = SPECIES_TAJARAN
sort_category = "Xenowear"
/datum/gear/mask/altevian_breath