cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-08-25 22:17:21 +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
2022-02-20 23:23:34 +01:00
parent 7e542483d8 d194266613
commit d1e595e7e7
150 changed files with 3583 additions and 2303 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+6
View File
@@ -851,6 +851,12 @@
ckeywhitelist = list("pastelprincedan", "hatterhat")
character_name = list("Masumi Maki", "Harold Robinson")
/datum/gear/fluff/slimecat_rd_plush
path = /obj/item/toy/plushie/fluff/slimeowshi
display_name = "slimecat RD plushie"
ckeywhitelist = list("pastelprincedan")
character_name = list("Kiyoshi Maki", "Masumi Maki")
// Q CKEYS
// R CKEYS
code/modules/client/preference_setup/loadout/loadout_general.dm
+5 -1
View File
@@ -53,7 +53,11 @@
/datum/gear/plushie/New()
..()
var/list/plushies = list()
for(var/obj/item/toy/plushie/plushie_type as anything in subtypesof(/obj/item/toy/plushie) - /obj/item/toy/plushie/therapy)
var/list/blacklisted_types = list()
// look if theres a better way to do this im all ears
blacklisted_types += subtypesof(/obj/item/toy/plushie/therapy)
blacklisted_types += subtypesof(/obj/item/toy/plushie/fluff)
for(var/obj/item/toy/plushie/plushie_type as anything in subtypesof(/obj/item/toy/plushie) - blacklisted_types)
plushies[initial(plushie_type.name)] = plushie_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(plushies))