cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-08-26 22:46:47 +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
2020-11-17 16:26:30 +01:00
parent 180ca0c41e cb5d4e3190
commit 5d64303087
380 changed files with 45872 additions and 27318 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
@@ -8,7 +8,7 @@
/datum/gear/choker/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/collar
display_name = "collar, silver"
@@ -18,7 +18,7 @@
/datum/gear/collar/New()
..()
gear_tweaks = list(gear_tweak_collar_tag)
gear_tweaks += gear_tweak_collar_tag
/datum/gear/collar/golden
display_name = "collar, golden"
@@ -106,4 +106,4 @@
/datum/gear/accessory/flops/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
gear_tweaks += gear_tweak_free_color_choice
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+14 -1
View File
@@ -25,7 +25,7 @@
/datum/gear/fluff/collar/New()
..()
gear_tweaks = list(gear_tweak_collar_tag)
gear_tweaks += gear_tweak_collar_tag
// 0-9 CKEYS
/datum/gear/fluff/malady_crop
@@ -66,6 +66,12 @@
ckeywhitelist = list("argobargsoup")
character_name = list("Lynn Shady")
/datum/gear/fluff/felina_witchhat
path = /obj/item/clothing/head/wizard/marisa/fake
display_name = "Felina's Witch Hat"
ckeywhitelist = list("argobargsoup")
character_name = list("Felina Belliger")
/datum/gear/fluff/aronai_ccmeduniform
path = /obj/item/clothing/under/solgov/utility/sifguard/officer/medical
display_name = "centcom medical uniform"
@@ -732,6 +738,13 @@
character_name = list("Tiemli Kroto")
allowed_roles = list("Roboticist")
/datum/gear/fluff/clara_flask
path = /obj/item/weapon/reagent_containers/food/drinks/glass2/fluff/claraflask
display_name = "Clara's Vacuum Flask"
ckeywhitelist = list("rboys2")
character_name = list("Clara Mali")
cost = 1
// S CKEYS
/datum/gear/fluff/brynhild_medal
path = /obj/item/clothing/accessory/medal/silver/valor
code/modules/client/preference_setup/loadout/loadout_gloves_vr.dm
+2 -2
View File
@@ -12,7 +12,7 @@
/datum/gear/gloves/colored/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/gloves/latex/colorable
@@ -21,7 +21,7 @@
/datum/gear/gloves/latex/colorable/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/gloves/siren
display_name = "gloves, Siren"
code/modules/client/preference_setup/loadout/loadout_head.dm
+4
View File
@@ -383,3 +383,7 @@
/datum/gear/head/rose_crown
display_name = "rose crown"
path = /obj/item/clothing/head/rose_crown
/datum/gear/head/blackngoldheaddress
display_name = "black and gold headdress"
path = /obj/item/clothing/head/blackngoldheaddress
code/modules/client/preference_setup/loadout/loadout_head_vr.dm
+1 -1
View File
@@ -12,7 +12,7 @@
/datum/gear/head/headbando/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
gear_tweaks += gear_tweak_free_color_choice
//Detective alternative
/datum/gear/head/detective_alt
code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
+1 -1
View File
@@ -16,7 +16,7 @@
/datum/gear/suit/labcoat_colorable/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/suit/jacket_modular
display_name = "jacket, modular"
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+57 -1
View File
@@ -588,4 +588,60 @@
/datum/gear/uniform/cyberpunkharness
display_name = "cyberpunk strapped harness"
path = /obj/item/clothing/under/cyberpunkharness
path = /obj/item/clothing/under/cyberpunkharness
/datum/gear/uniform/whitegown
display_name = "white gown"
path = /obj/item/clothing/under/wedding/whitegown
/datum/gear/uniform/floofdress
display_name = "floofy dress"
path = /obj/item/clothing/under/wedding/floofdress
/datum/gear/uniform/floofdress/New()
..()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/uniform/blackngold
display_name = "black and gold gown"
path = /obj/item/clothing/under/blackngold
/datum/gear/uniform/sheerblue
display_name = "sheer blue dress"
path = /obj/item/clothing/under/sheerblue
/datum/gear/uniform/disheveled
display_name = "disheveled suit"
path = /obj/item/clothing/under/disheveled
/datum/gear/uniform/orangedress
display_name = "orange dress"
path = /obj/item/clothing/under/dress/dress_orange
/datum/gear/uniform/sundress_pink
display_name = "pink sundress"
path = /obj/item/clothing/under/dress/sundress_pink
/datum/gear/uniform/sundress_white
display_name = "white sundress"
path = /obj/item/clothing/under/dress/sundress_white
/datum/gear/uniform/sundress_pinkbow
display_name = "bowed pink sundress"
path = /obj/item/clothing/under/dress/sundress_pinkbow
/datum/gear/uniform/sundress_blue
display_name = "long blue sundress"
path = /obj/item/clothing/under/dress/sundress_blue
/datum/gear/uniform/sundress_pinkshort
display_name = "short pink sundress"
path = /obj/item/clothing/under/dress/sundress_pinkshort
/datum/gear/uniform/twopiece
display_name = "two-piece dress"
path = /obj/item/clothing/under/dress/twopiece
/datum/gear/uniform/gothic2
display_name = "lacey gothic dress"
path = /obj/item/clothing/under/dress/gothic2