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

Merge branch 'self' of https://github.com/Yawn-Wider/YWPolarisVore into self

Browse Source
This commit is contained in:
Repede
2019-09-30 14:30:12 -04:00
parent 6c0e8a9728 1de78fa2d8
commit 041da2cfbd
113 changed files with 17144 additions and 7953 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_ears.dm
+29 -1
View File
@@ -11,4 +11,32 @@
/datum/gear/ears/circuitry
display_name = "earwear, circuitry (empty)"
path = /obj/item/clothing/ears/circuitry
path = /obj/item/clothing/ears/circuitry
/datum/gear/ears/earrings
display_name = "earring selection"
description = "A selection of eye-catching earrings."
path = /obj/item/clothing/ears/earring
/datum/gear/ears/earrings/New()
..()
var/earrings = list()
earrings["stud, pearl"] = /obj/item/clothing/ears/earring/stud
earrings["stud, glass"] = /obj/item/clothing/ears/earring/stud/glass
earrings["stud, wood"] = /obj/item/clothing/ears/earring/stud/wood
earrings["stud, iron"] = /obj/item/clothing/ears/earring/stud/iron
earrings["stud, steel"] = /obj/item/clothing/ears/earring/stud/steel
earrings["stud, silver"] = /obj/item/clothing/ears/earring/stud/silver
earrings["stud, gold"] = /obj/item/clothing/ears/earring/stud/gold
earrings["stud, platinum"] = /obj/item/clothing/ears/earring/stud/platinum
earrings["stud, diamond"] = /obj/item/clothing/ears/earring/stud/diamond
earrings["dangle, glass"] = /obj/item/clothing/ears/earring/dangle/glass
earrings["dangle, wood"] = /obj/item/clothing/ears/earring/dangle/wood
earrings["dangle, iron"] = /obj/item/clothing/ears/earring/dangle/iron
earrings["dangle, steel"] = /obj/item/clothing/ears/earring/dangle/steel
earrings["dangle, silver"] = /obj/item/clothing/ears/earring/dangle/silver
earrings["dangle, gold"] = /obj/item/clothing/ears/earring/dangle/gold
earrings["dangle, platinum"] = /obj/item/clothing/ears/earring/dangle/platinum
earrings["dangle, diamond"] = /obj/item/clothing/ears/earring/dangle/diamond
gear_tweaks += new/datum/gear_tweak/path(earrings)
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+6
View File
@@ -771,6 +771,12 @@
ckeywhitelist = list("vorrarkul")
character_name = list("Lucina Dakarim")
/datum/gear/fluff/melanie_skeleton
path = /obj/item/clothing/under/fluff/slime_skeleton
display_name = "Melanie's Skeleton"
ckeywhitelist = list("vorrarkul")
character_name = list("Melanie Farmer")
/datum/gear/fluff/nyssa_coat
path = /obj/item/clothing/suit/storage/hooded/wintercoat/cargo
display_name = "Nyssa's Coat"