cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-08-26 14:36:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
izac112
2022-03-15 20:01:19 +01:00
parent 8bbd6c9fd6 c3c3411f34
commit 37e909fe88
38 changed files with 297 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
+3 -3
View File
@@ -81,9 +81,9 @@
allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Talon Doctor")
/datum/gear/accessory/bluespace
display_name = "bluespace badge (Eng, Sec, Med, Exploration, Miner)"
display_name = "bluespace badge (Eng, Sec, Med, Exploration, Miner, Pilot)"
path = /obj/item/clothing/accessory/storage/bluespace
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner")
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard","Talon Miner","Pilot")
cost = 2
/datum/gear/accessory/webbing
@@ -123,4 +123,4 @@ Talon pin
/datum/gear/accessory/talonpin
display_name = "Talon pin"
description = "A small enamel pin of the Talon logo."
path = /obj/item/clothing/accessory/talon
path = /obj/item/clothing/accessory/talon
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+6
View File
@@ -380,6 +380,12 @@
ckeywhitelist = list("erikthedog")
character_name = list("Erik Ramadwood")
/datum/gear/fluff/salvage_id
path = /obj/item/weapon/card/id/event/polymorphic/itg
display_name = "Salvage's ITG-ID card"
ckeywhitelist = list("essbie")
character_name = list("Savage")
// F CKEYS
/datum/gear/fluff/yikatihaki_armor
path = /obj/item/clothing/suit/armor/vox_scrap