cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-16 02:24:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tidied up the Toys tab (#5097)

Browse Source 
## About The Pull Request

As title. I moved the /tg/ toys (dice, plushies, cards) into the Toys
tab (for the longest time they've been in the Others tab). Also
categorised them into Plushies, Cards, Dice, Balls, Art tools.
## Why It's Good For The Game

## Proof Of Testing

<img width="400" alt="image"
src="https://github.com/user-attachments/assets/5f08006f-c096-4b1f-b57f-44987bdf09ce"
/>

</details>

## Changelog

🆑
code: Tidied up the Toys tab in the loadout menu.
/🆑

---------

Co-authored-by: Alexis <catmc8565@gmail.com>
This commit is contained in:
Mathilde
2026-01-16 15:09:49 +01:00
committed by GitHub
parent a99346185c
commit 585e2ffc55
4 changed files with 190 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/loadout/categories/pocket.dm
+39 -34
View File
@@ -37,135 +37,140 @@
return ..()
// BUBBER EDIT - START: Put toys in the toys category
/datum/loadout_item/pocket_items/plush
/datum/loadout_item/toys/plush
group = "Plushies"
abstract_type = /datum/loadout_item/pocket_items/plush
loadout_flags = LOADOUT_FLAG_ALLOW_NAMING
abstract_type = /datum/loadout_item/toys/plush
/datum/loadout_item/pocket_items/plush/bee
/datum/loadout_item/toys/plush/bee
name = "Plush (Bee)"
item_path = /obj/item/toy/plush/beeplushie
/datum/loadout_item/pocket_items/plush/carp
/datum/loadout_item/toys/plush/carp
name = "Plush (Carp)"
item_path = /obj/item/toy/plush/carpplushie
/datum/loadout_item/pocket_items/plush/lizard_greyscale
/datum/loadout_item/toys/plush/lizard_greyscale
name = "Plush (Lizard, Colorable)"
item_path = /obj/item/toy/plush/lizard_plushie/greyscale
/datum/loadout_item/pocket_items/plush/lizard_random
/datum/loadout_item/toys/plush/lizard_random
name = "Plush (Lizard, Random)"
loadout_flags = parent_type::loadout_flags | LOADOUT_FLAG_BLOCK_GREYSCALING
ui_icon = 'icons/obj/fluff/previews.dmi'
ui_icon_state = "plushie_lizard_random"
item_path = /obj/item/toy/plush/lizard_plushie
/datum/loadout_item/pocket_items/plush/moth
/datum/loadout_item/toys/plush/moth
name = "Plush (Moth)"
item_path = /obj/item/toy/plush/moth
/datum/loadout_item/pocket_items/plush/nukie
/datum/loadout_item/toys/plush/nukie
name = "Plush (Nukie)"
item_path = /obj/item/toy/plush/nukeplushie
/datum/loadout_item/pocket_items/plush/peacekeeper
/datum/loadout_item/toys/plush/peacekeeper
name = "Plush (Peacekeeper)"
item_path = /obj/item/toy/plush/pkplush
/datum/loadout_item/pocket_items/plush/plasmaman
/datum/loadout_item/toys/plush/plasmaman
name = "Plush (Plasmaman)"
item_path = /obj/item/toy/plush/plasmamanplushie
/datum/loadout_item/pocket_items/plush/human
/datum/loadout_item/toys/plush/human
name = "Plush (human)"
item_path = /obj/item/toy/plush/human
/datum/loadout_item/pocket_items/plush/rouny
/datum/loadout_item/toys/plush/rouny
name = "Plush (Rouny)"
item_path = /obj/item/toy/plush/rouny
/datum/loadout_item/pocket_items/plush/snake
/datum/loadout_item/toys/plush/snake
name = "Plush (Snake)"
item_path = /obj/item/toy/plush/snakeplushie
/datum/loadout_item/pocket_items/plush/horse
/datum/loadout_item/toys/plush/horse
name = "Plush (Horse)"
item_path = /obj/item/toy/plush/horse
/datum/loadout_item/pocket_items/dice
/datum/loadout_item/toys/dice
group = "Dice"
abstract_type = /datum/loadout_item/pocket_items/dice
/datum/loadout_item/pocket_items/dice/dice_bag
/datum/loadout_item/toys/dice/dice_bag
name = "Dice Bag"
item_path = /obj/item/storage/dice
/datum/loadout_item/pocket_items/dice/d1
/datum/loadout_item/toys/dice/d1
name = "D1"
item_path = /obj/item/dice/d1
/datum/loadout_item/pocket_items/dice/d2
/datum/loadout_item/toys/dice/d2
name = "D2"
item_path = /obj/item/dice/d2
/datum/loadout_item/pocket_items/dice/d4
/datum/loadout_item/toys/dice/d4
name = "D4"
item_path = /obj/item/dice/d4
/datum/loadout_item/pocket_items/dice/d6
/datum/loadout_item/toys/dice/d6
name = "D6"
item_path = /obj/item/dice/d6
/datum/loadout_item/pocket_items/dice/d6_ebony
/datum/loadout_item/toys/dice/d6_ebony
name = "D6 (Ebony)"
item_path = /obj/item/dice/d6/ebony
/datum/loadout_item/pocket_items/dice/d6_space
/datum/loadout_item/toys/dice/d6_space
name = "D6 (Space)"
item_path = /obj/item/dice/d6/space
/datum/loadout_item/pocket_items/dice/d8
/datum/loadout_item/toys/dice/d8
name = "D8"
item_path = /obj/item/dice/d8
/datum/loadout_item/pocket_items/dice/d10
/datum/loadout_item/toys/dice/d10
name = "D10"
item_path = /obj/item/dice/d10
/datum/loadout_item/pocket_items/dice/d12
/datum/loadout_item/toys/dice/d12
name = "D12"
item_path = /obj/item/dice/d12
/datum/loadout_item/pocket_items/dice/d20
/datum/loadout_item/toys/dice/d20
name = "D20"
item_path = /obj/item/dice/d20
/datum/loadout_item/pocket_items/dice/d100
/datum/loadout_item/toys/dice/d100
name = "D100"
item_path = /obj/item/dice/d100
/datum/loadout_item/pocket_items/dice/d00
/datum/loadout_item/toys/dice/d00
name = "D00"
item_path = /obj/item/dice/d00
/datum/loadout_item/pocket_items/card_binder
/datum/loadout_item/toys/cards
group = "Cards"
abstract_type = /datum/loadout_item/toys/cards
/datum/loadout_item/toys/cards/card_binder
name = "Card Binder"
item_path = /obj/item/storage/card_binder
/datum/loadout_item/pocket_items/card_deck
/datum/loadout_item/toys/cards/card_deck
name = "Playing Card Deck"
item_path = /obj/item/toy/cards/deck
/datum/loadout_item/pocket_items/kotahi_deck
/datum/loadout_item/toys/cards/kotahi_deck
name = "Kotahi Deck"
item_path = /obj/item/toy/cards/deck/kotahi
/datum/loadout_item/pocket_items/wizoff_deck
/datum/loadout_item/toys/cards/wizoff_deck
name = "Wizoff Deck"
item_path = /obj/item/toy/cards/deck/wizoff
// BUBBER EDIT - END
/datum/loadout_item/pocket_items/lipstick
name = "Lipstick"
item_path = /obj/item/lipstick