cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 13:34:49 +00: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
2020-08-10 21:50:42 +02:00
parent 9a7169cc0d 9dfb1ccd48
commit 81871a960e
212 changed files with 6916 additions and 3606 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
View File

@@ -183,12 +183,6 @@
ckeywhitelist = list("cockatricexl")
character_name = list("James Holder")
/datum/gear/fluff/jasmine_implant
path = /obj/item/weapon/implanter/reagent_generator/jasmine
display_name = "Jasmine's Implant"
ckeywhitelist = list("cameron653")
character_name = list("Jasmine Lizden")
/datum/gear/fluff/diana_robe
path = /obj/item/clothing/suit/fluff/purp_robes
display_name = "Diana's Robes"
@@ -310,11 +304,6 @@
allowed_roles = list("Explorer")
// G CKEYS
/datum/gear/fluff/eldi_implant
path = /obj/item/weapon/implanter/reagent_generator/eldi
display_name = "Eldi's Implant"
ckeywhitelist = list("gowst")
character_name = list("Eldi Moljir")
// H CKEYS
/datum/gear/fluff/lauren_medal
@@ -335,12 +324,6 @@
ckeywhitelist = list("hottokeeki")
character_name = list("Belle Day")
/datum/gear/fluff/belle_implant
path = /obj/item/weapon/implanter/reagent_generator/belle
display_name = "Belle's Implant"
ckeywhitelist = list("hottokeeki")
character_name = list("Belle Day")
// I CKEYS
/datum/gear/fluff/ruda_badge
path = /obj/item/clothing/accessory/badge/holo/detective/ruda
@@ -553,12 +536,6 @@
ckeywhitelist = list("kiwidaninja")
character_name = list("Chakat Taiga")
/datum/gear/fluff/rischi_implant
path = /obj/item/weapon/implanter/reagent_generator/rischi
display_name = "Rischi's Implant"
ckeywhitelist = list("konabird")
character_name = list("Rischi")
/datum/gear/fluff/ashley_medal
path = /obj/item/clothing/accessory/medal/nobel_science/fluff/ashley
display_name = "Ashley's Medal"
@@ -580,12 +557,6 @@
ckeywhitelist = list("luminescentring")
character_name = list("Briana Moore")
/datum/gear/fluff/savannah_implant
path = /obj/item/weapon/implanter/reagent_generator/savannah
display_name = "Savannah's Implant"
ckeywhitelist = list("lycanthorph")
character_name = list("Savannah Dixon")
// M CKEYS
/datum/gear/fluff/phi_box
path = /obj/item/weapon/storage/box/fluff/phi
@@ -842,12 +813,6 @@
ckeywhitelist = list("silvertalismen")
character_name = list("Tasy Ruffles")
/datum/gear/fluff/evian_implant
path = /obj/item/weapon/implanter/reagent_generator/evian
display_name = "Evian's Implant"
ckeywhitelist = list("silvertalismen")
character_name = list("Evian")
/datum/gear/fluff/fortune_backpack
path = /obj/item/weapon/storage/backpack/satchel/fluff/swat43bag
display_name = "Fortune's Backpack"
@@ -861,12 +826,6 @@
ckeywhitelist = list("stobarico")
character_name = list("Alexis Bloise")
/datum/gear/fluff/roiz_implant
path = /obj/item/weapon/implanter/reagent_generator/roiz
display_name = "Roiz's Implant"
ckeywhitelist = list("spoopylizz")
character_name = list("Roiz Lizden")
/datum/gear/fluff/roiz_coat
path = /obj/item/clothing/suit/storage/hooded/wintercoat/roiz
display_name = "Roiz's Coat"
@@ -1020,12 +979,6 @@
ckeywhitelist = list("vorrarkul")
character_name = list("Theodora Lindt")
/datum/gear/fluff/theodora_implant
path = /obj/item/weapon/implanter/reagent_generator/vorrarkul
display_name = "Theodora's Implant"
ckeywhitelist = list("vorrarkul")
character_name = list("Theodora Lindt")
/datum/gear/fluff/kaitlyn_plush
path = /obj/item/toy/plushie/mouse/fluff
display_name = "Kaitlyn's Mouse Plush"
@@ -1102,12 +1055,6 @@
ckeywhitelist = list("wickedtemp")
character_name = list("Chakat Tempest Venosare")
/datum/gear/fluff/tempest_implant
path = /obj/item/weapon/implanter/reagent_generator/tempest
display_name = "Tempest's Implant"
ckeywhitelist = list("wickedtemp")
character_name = list("Chakat Tempest Venosare")
// X CKEYS
/datum/gear/fluff/penelope_box
path = /obj/item/weapon/storage/box/fluff/penelope