From c83f29cf13e5b2c9cf36764c2781e917c769e37d Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Thu, 25 May 2023 10:55:38 +1000 Subject: [PATCH 1/2] Merge pull request #14894 from Heroman3003/aria-medal Adds Aria's medal --- code/game/objects/items/weapons/storage/backpack_vr.dm | 4 ++-- .../preference_setup/loadout/loadout_fluffitems_vr.dm | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/storage/backpack_vr.dm b/code/game/objects/items/weapons/storage/backpack_vr.dm index 1a872e99ac..80c760c3f9 100644 --- a/code/game/objects/items/weapons/storage/backpack_vr.dm +++ b/code/game/objects/items/weapons/storage/backpack_vr.dm @@ -6,7 +6,7 @@ item_state = "saddlebag" icon_state = "saddlebag" max_storage_space = INVENTORY_DUFFLEBAG_SPACE //Saddlebags can hold more, like dufflebags - slowdown = 1 //And are slower, too... + slowdown = 0.5 //And are slower, too... var/taurtype = /datum/sprite_accessory/tail/taur/horse //Acceptable taur type to be wearing this var/no_message = "You aren't the appropriate taur type to wear this!" @@ -35,7 +35,7 @@ icon_state = "saddlebag" var/icon_base = "saddlebag" max_storage_space = INVENTORY_DUFFLEBAG_SPACE //Saddlebags can hold more, like dufflebags - slowdown = 1 //And are slower, too... + slowdown = 0.5 //And are slower, too... var/no_message = "You aren't the appropriate taur type to wear this!" /obj/item/weapon/storage/backpack/saddlebag_common/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index fcac8c55bd..b54a76f586 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -425,6 +425,12 @@ ckeywhitelist = list("hunterbirk") character_name = list("Amaryll") +/datum/gear/fluff/aria_conduct_medal + path = /obj/item/clothing/accessory/medal/conduct + display_name = "Aria's Distinguished Conduct Medal" + ckeywhitelist = list("hunterbirk") + character_name = list("Aria Blue") + // I CKEYS /datum/gear/fluff/ruda_badge path = /obj/item/clothing/accessory/badge/holo/detective/ruda