mirror of
https://github.com/Yawn-Wider/YWPolarisVore.git
synced 2026-08-31 09:01:24 +01:00
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
This commit is contained in:
@@ -419,10 +419,6 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
|
||||
pref.body_descriptors[entry] = descriptor.default_value // Species datums have initial default value.
|
||||
else
|
||||
pref.body_descriptors[entry] = CLAMP(last_descriptors[entry], 1, LAZYLEN(descriptor.standalone_value_descriptors))
|
||||
|
||||
character.update_emotes()
|
||||
|
||||
return
|
||||
|
||||
/datum/category_item/player_setup_item/general/body/content(var/mob/user)
|
||||
. = list()
|
||||
|
||||
@@ -139,6 +139,13 @@
|
||||
ckeywhitelist = list("storesund97")
|
||||
character_name = list("Aurora")
|
||||
|
||||
/datum/gear/fluff/ashling
|
||||
path = /obj/item/clothing/accessory/storage/ritualharness/fluff/antoinette
|
||||
display_name = "Ritual Harness"
|
||||
description = "Antoinette's ritual supplies."
|
||||
ckeywhitelist = list("ashling")
|
||||
character_name = list("Antoinette DeKaultieste")
|
||||
|
||||
// B CKEYS
|
||||
/datum/gear/fluff/yuuko_kimono
|
||||
path = /obj/item/clothing/under/fluff/sakura_hokkaido_kimono
|
||||
@@ -835,7 +842,7 @@
|
||||
display_name = "LUNA's Nobel Science Award"
|
||||
ckeywhitelist = list("residentcody")
|
||||
character_name = list("LUNA")
|
||||
|
||||
|
||||
/datum/gear/fluff/luna_conduct_medal
|
||||
path = /obj/item/clothing/accessory/medal/conduct
|
||||
display_name = "LUNA's Distinguished Conduct Medal"
|
||||
|
||||
Reference in New Issue
Block a user