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

Merge remote-tracking branch 'upstream/master' into Colourable-flannel

Browse Source
This commit is contained in:
SatinIsle
2023-07-20 10:04:19 +01:00
parent 935c8e56da 6411ba078f
commit b4d0c76e07
51 changed files with 993 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+13
View File
@@ -521,6 +521,12 @@
ckeywhitelist = list("hunterbirk")
character_name = list("Aria Blue")
/datum/gear/fluff/mercury_vopal_ring
path = /obj/item/clothing/gloves/ring/material/void_opal/fluff/mercury
display_name = "Mercury's Mate Ring"
ckeywhitelist = list("haloren")
character_name = list("Mercury")
// I CKEYS
/datum/gear/fluff/ruda_badge
path = /obj/item/clothing/accessory/badge/holo/detective/ruda
@@ -1212,6 +1218,13 @@
ckeywhitelist = list("suicidalpickles")
character_name = list("Silent Stripes")
/datum/gear/fluff/parrizjacket
path = /obj/item/clothing/suit/storage/toggle/labcoat/fluff/parrizjacket
display_name = "pink crop bomber"
slot = slot_wear_suit
ckeywhitelist = list("satinisle")
character_name = list("Parriz Tavakdavi")
// T CKEYS
/datum/gear/fluff/ascian_medal
path = /obj/item/clothing/accessory/medal/silver/unity/tabiranth