shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15966 from SandPoot/accessory-equip

Browse Source 
Adds accessory quick-equip, a tab for it on the loadout and previews for accessories on the prefs screen
This commit is contained in:
Timothy Teakettle
2023-02-09 21:39:05 +00:00
committed by GitHub
parent 7e77bc8023 9e2851b76b
commit 390dcbcea0
16 changed files with 125 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/client/loadout/__donator.dm
+2 -1
View File
@@ -54,9 +54,10 @@
/datum/gear/donator/kiaramedal
name = "Insignia of Steele"
slot = ITEM_SLOT_BACKPACK
slot = ITEM_SLOT_ACCESSORY
path = /obj/item/clothing/accessory/medal/steele
ckeywhitelist = list("inferno707")
handle_post_equip = TRUE
/datum/gear/donator/hheart
name = "The Hollow Heart"
modular_citadel/code/modules/client/loadout/_loadout.dm
+1
View File
@@ -55,6 +55,7 @@ GLOBAL_LIST_EMPTY(loadout_whitelist_ids)
var/geargroupID //defines the ID that the gear inherits from the config
var/loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION
var/list/loadout_initial_colors = list()
var/handle_post_equip = FALSE
//NEW DONATOR SYTSEM STUFF
var/donoritem //autoset on new if null
modular_citadel/code/modules/client/loadout/accessory.dm
+20
View File
@@ -0,0 +1,20 @@
/datum/gear/accessory
category = LOADOUT_CATEGORY_ACCESSORY
slot = ITEM_SLOT_ACCESSORY
handle_post_equip = TRUE
/datum/gear/accessory/necklace
name = "A renameable necklace"
path = /obj/item/clothing/accessory/necklace
/datum/gear/accessory/polymaidapron
name = "Polychromic maid apron"
path = /obj/item/clothing/accessory/maidapron/polychromic
loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
loadout_initial_colors = list("#333333", "#FFFFFF")
/datum/gear/accessory/pridepin
name = "Pride pin"
path = /obj/item/clothing/accessory/pride
loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION
cost = 0
modular_citadel/code/modules/client/loadout/backpack.dm
+1 -19
View File
@@ -2,6 +2,7 @@
category = LOADOUT_CATEGORY_BACKPACK
subcategory = LOADOUT_SUBCATEGORY_BACKPACK_GENERAL
slot = ITEM_SLOT_BACKPACK
handle_post_equip = TRUE
/datum/gear/backpack/plushbox
name = "Plushie Choice Box"
@@ -172,25 +173,6 @@
path = /obj/item/storage/fancy/ringbox/diamond
cost = 5
/datum/gear/backpack/necklace //this is here because loadout doesn't support proper accessories
name = "A renameable necklace"
path = /obj/item/clothing/accessory/necklace
subcategory = LOADOUT_SUBCATEGORY_BACKPACK_ACCESSORIES
/datum/gear/backpack/polymaidapron //this is ALSO here because loadout doesn't support proper accessories
name = "Polychromic maid apron"
path = /obj/item/clothing/accessory/maidapron/polychromic
loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
loadout_initial_colors = list("#333333", "#FFFFFF")
subcategory = LOADOUT_SUBCATEGORY_BACKPACK_ACCESSORIES
/datum/gear/backpack/pridepin //what the two comments above said
name = "Pride pin"
path = /obj/item/clothing/accessory/pride
loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION
subcategory = LOADOUT_SUBCATEGORY_BACKPACK_ACCESSORIES
cost = 0
// Moved here from quirks
/datum/gear/backpack/dyespray
name = "Hair dye spray"