cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14894 from Heroman3003/aria-medal

Browse Source 
Adds Aria's medal
This commit is contained in:
Heroman3003
2023-05-25 10:55:38 +10:00
committed by CHOMPStation2
parent 5f07c2a152
commit c83f29cf13
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/items/weapons/storage/backpack_vr.dm
View File

@@ -6,7 +6,7 @@
item_state = "saddlebag" item_state = "saddlebag"
icon_state = "saddlebag" icon_state = "saddlebag"
max_storage_space = INVENTORY_DUFFLEBAG_SPACE //Saddlebags can hold more, like dufflebags 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/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!" var/no_message = "You aren't the appropriate taur type to wear this!"
@@ -35,7 +35,7 @@
icon_state = "saddlebag" icon_state = "saddlebag"
var/icon_base = "saddlebag" var/icon_base = "saddlebag"
max_storage_space = INVENTORY_DUFFLEBAG_SPACE //Saddlebags can hold more, like dufflebags 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!" 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) /obj/item/weapon/storage/backpack/saddlebag_common/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)

6
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
View File

@@ -425,6 +425,12 @@
ckeywhitelist = list("hunterbirk") ckeywhitelist = list("hunterbirk")
character_name = list("Amaryll") 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 // I CKEYS
/datum/gear/fluff/ruda_badge /datum/gear/fluff/ruda_badge
path = /obj/item/clothing/accessory/badge/holo/detective/ruda path = /obj/item/clothing/accessory/badge/holo/detective/ruda