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

Merge branch 'master' into kk-misc

Browse Source
This commit is contained in:
Novacat
2020-08-18 09:27:06 -04:00
committed by GitHub
parent 8b92138c1f cb9d6f47e8
commit b52cf2b991
1223 changed files with 88545 additions and 34934 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_accessories.dm
+13
View File
@@ -115,6 +115,15 @@
scarfs[initial(scarf_type.name)] = scarf_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(scarfs))
/datum/gear/accessory/scarfcolor
display_name = "scarf (recolorable)"
path = /obj/item/clothing/accessory/scarf/white
cost = 1
/datum/gear/accessory/scarfcolor/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
/datum/gear/accessory/jacket
display_name = "suit jacket selection"
path = /obj/item/clothing/accessory/jacket
@@ -279,3 +288,7 @@
/datum/gear/accessory/cowledvest
display_name = "cowled vest"
path = /obj/item/clothing/accessory/cowledvest
/datum/gear/accessory/asymovercoat
display_name = "orange asymmetrical overcoat"
path = /obj/item/clothing/accessory/asymovercoat
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
-53
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
code/modules/client/preference_setup/loadout/loadout_general_vr.dm
+12
View File
@@ -0,0 +1,12 @@
/datum/gear/ball
display_name = "tennis ball selection"
description = "Choose from a num- BALL!"
path = /obj/item/toy/tennis
/datum/gear/ball/New()
..()
var/list/balls = list()
for(var/ball in typesof(/obj/item/toy/tennis/))
var/obj/item/toy/tennis/ball_type = ball
balls[initial(ball_type.name)] = ball_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(balls))
code/modules/client/preference_setup/loadout/loadout_head.dm
+17 -1
View File
@@ -366,4 +366,20 @@
/datum/gear/head/jingasa
display_name = "jingasa"
path = /obj/item/clothing/head/jingasa
path = /obj/item/clothing/head/jingasa
/datum/gear/head/sunflower_crown
display_name = "sunflower crown"
path = /obj/item/clothing/head/sunflower_crown
/datum/gear/head/lavender_crown
display_name = "lavender crown"
path = /obj/item/clothing/head/lavender_crown
/datum/gear/head/poppy_crown
display_name = "poppy crown"
path = /obj/item/clothing/head/poppy_crown
/datum/gear/head/rose_crown
display_name = "rose crown"
path = /obj/item/clothing/head/rose_crown
code/modules/client/preference_setup/loadout/loadout_mask.dm
+5 -1
View File
@@ -20,4 +20,8 @@
/datum/gear/mask/sterile
display_name = "sterile mask"
path = /obj/item/clothing/mask/surgical
cost = 2
cost = 2
/datum/gear/mask/veil
display_name = "black veil"
path = /obj/item/clothing/mask/veil
code/modules/client/preference_setup/loadout/loadout_suit.dm
+1 -1
View File
@@ -77,7 +77,7 @@
/datum/gear/suit/mil
display_name = "military jacket selection"
path = /obj/item/clothing/suit/storage/miljacket
/datum/gear/suit/mil/New()
..()
var/list/mil_jackets = list()
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+33 -1
View File
@@ -556,4 +556,36 @@
/datum/gear/uniform/haltertop
display_name = "halter top"
path = /obj/item/clothing/under/haltertop
path = /obj/item/clothing/under/haltertop
/datum/gear/uniform/revealingdress
display_name = "revealing dress"
path = /obj/item/clothing/under/dress/revealingdress
/datum/gear/uniform/rippedpunk
display_name = "ripped punk jeans"
path = /obj/item/clothing/under/rippedpunk
/datum/gear/uniform/gothic
display_name = "gothic dress"
path = /obj/item/clothing/under/dress/gothic
/datum/gear/uniform/formalred
display_name = "formal red dress"
path = /obj/item/clothing/under/dress/formalred
/datum/gear/uniform/pentagram
display_name = "pentagram dress"
path = /obj/item/clothing/under/dress/pentagram
/datum/gear/uniform/yellowswoop
display_name = "yellow swooped dress"
path = /obj/item/clothing/under/dress/yellowswoop
/datum/gear/uniform/greenasym
display_name = "green asymmetrical jumpsuit"
path = /obj/item/clothing/under/greenasym
/datum/gear/uniform/cyberpunkharness
display_name = "cyberpunk strapped harness"
path = /obj/item/clothing/under/cyberpunkharness
code/modules/client/preference_setup/loadout/loadout_xeno.dm
+10
View File
@@ -411,5 +411,15 @@
sort_category = "Xenowear"
/datum/gear/suit/teshcoatwhite/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
/datum/gear/accessory/teshneckscarf
display_name = "neckscarf, recolorable (Teshari)"
path = /obj/item/clothing/accessory/scarf/teshari/neckscarf
whitelisted = SPECIES_TESHARI
sort_category = "Xenowear"
/datum/gear/accessory/teshneckscarf/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)