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 'master' into izac

Browse Source
This commit is contained in:
Izac Joof Forsgren
2020-11-02 20:50:18 +01:00
committed by GitHub
parent 2404db12e5 dadf780acd
commit 180ca0c41e
24 changed files with 671 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm
+15
View File
@@ -641,6 +641,21 @@
description = "You're such a goggle head!"
ckeywhitelist = list("kbraid")
character_name = list("Eili") //Character name. this variable is required, or the item doesn't show in loadout. Change to "character_name = null" if not character restricted.
/datum/gear/fluff/jeanscrystelchime
path = /obj/item/clothing/accessory/fluff/jeanscrystelchime
display_name = "valhollide chimes"
description = "a precious gift from a precious friend"
ckeywhitelist = list("kbraid")
character_name = list("Eili") //Character name. this variable is required, or the item doesn't show in loadout. Change to "character_name = null" if not character restricted.
/datum/gear/fluff/jeansplushie
path = /obj/item/toy/plushie/jeans
display_name = "Jeans Plushi"
description = "Pupper Pitite"
ckeywhitelist = list("dopiotl","kbraid")
character_name = list("Jeanne Petite","Eili","Braid")
//Braid
/datum/gear/fluff/kbraidoutfit
path = /obj/item/clothing/suit/storage/hooded/fluff/kbraid
code/modules/client/preference_setup/loadout/loadout_xeno_yw.dm
+13
View File
@@ -77,6 +77,11 @@
path = /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/jani
allowed_roles = list("Janitor")
/datum/gear/suit/dept/beltcloak/rd
display_name = "research director belted cloak (Teshari)"
path = /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/rd
allowed_roles = list("Research Director")
/datum/gear/suit/dept/cloak/command/New()
..()
var/list/cloaks = list()
@@ -213,6 +218,14 @@
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/beltcloak/rd/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/rd,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/rd/black))
var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/rd/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/uniform/harness_white
display_name = "white gear harness (Full Body Prosthetic, Diona)"
path = /obj/item/clothing/under/harness_white