cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-08-27 15:06:35 +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
2021-01-09 16:51:07 +01:00
parent 9dbce25aca ead074dc64
commit c00bd33b4b
45 changed files with 4561 additions and 4868 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+19
View File
@@ -959,6 +959,25 @@
// U CKEYS
// V CKEYS
/datum/gear/fluff/verie_suit
path = /obj/item/clothing/under/fluff/verie
display_name = "Verie's Salacious Suit"
ckeywhitelist = list("vitoras")
character_name = list("Verie")
/datum/gear/fluff/verie_hoodie
path = /obj/item/clothing/suit/storage/hooded/fluff/verie
display_name = "Verie's Helluva Hoodie"
ckeywhitelist = list("vitoras")
character_name = list("Verie")
/datum/gear/fluff/verie_comb
path = /obj/item/weapon/fluff/verie
display_name = "Verie's Crazy Comb"
description = "(Note: The highlights this gives you will be placed above EVERYTHING... including mobs!)"
ckeywhitelist = list("vitoras")
character_name = list("Verie")
/datum/gear/fluff/cameron_glasses
path = /obj/item/clothing/glasses/fluff/science_proper
display_name = "Cameron's Science Glasses"
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+1 -1
View File
@@ -65,7 +65,7 @@
..()
var/list/skirts = list()
for(var/skirt in (typesof(/obj/item/clothing/under/skirt)))
if(skirt in typesof(/obj/item/clothing/under/skirt/fluff)) //VOREStation addition
if((skirt in typesof(/obj/item/clothing/under/skirt/fluff)) || (skirt in typesof(/obj/item/clothing/under/skirt/outfit/fluff))) //VOREStation addition
continue //VOREStation addition
var/obj/item/clothing/under/skirt/skirt_type = skirt
skirts[initial(skirt_type.name)] = skirt_type