Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Loadout General Tab Additions #4156

Merged
merged 2 commits into from
Feb 13, 2025
Merged

Loadout General Tab Additions #4156

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3c65a7
touys
MemeSnorfer Feb 8, 2025
9f7e895
Merge branch 'shiptest-ss13:master' into play_toys_with_me
MemeSnorfer Feb 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions code/modules/client/loadout/loadout_general.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,14 @@
display_name = "Clockwork Zippo"
path = /obj/item/lighter/clockwork

/datum/gear/matches
display_name = "matchbox"
path = /obj/item/storage/box/matches

/datum/gear/candles
display_name = "candle pack"
path = /obj/item/storage/fancy/candle_box

/datum/gear/cards
display_name = "toy, deck of cards"
path = /obj/item/toy/cards/deck
Expand All @@ -54,6 +62,10 @@
display_name = "toy, deck of KOTAHI cards"
path = /obj/item/toy/cards/deck/kotahi

/datum/gear/tarot_cards
display_name = "toy, deck of tarot cards"
path = /obj/item/toy/cards/deck/tarot

/datum/gear/eightball
display_name = "toy, magic eight ball"
path = /obj/item/toy/eightball
Expand Down Expand Up @@ -91,6 +103,14 @@
display_name = "paper bin"
path = /obj/item/paper_bin

/datum/gear/spraycan
display_name = "spray can"
path = /obj/item/toy/crayon/spraycan

/datum/gear/crayons
display_name = "box of crayons"
path = /obj/item/storage/crayons

/datum/gear/cane
display_name = "cane"
path = /obj/item/cane
Expand All @@ -107,6 +127,22 @@
display_name = "toy, moth plushie"
path = /obj/item/toy/plush/moth

/datum/gear/bee
display_name = "toy, bee plushie"
path = /obj/item/toy/plush/beeplushie

/datum/gear/spider
display_name = "toy, spider plushie"
path = /obj/item/toy/plush/spider

/datum/gear/flushed
display_name = "toy, flushed plushie"
path = /obj/item/toy/plush/flushed

/datum/gear/blahaj
display_name = "toy, Solarian Marine Society mascot plushie"
path = /obj/item/toy/plush/blahaj

/datum/gear/hornet
display_name = "toy, marketable hornet plushie"
path = /obj/item/toy/plush/hornet
Expand All @@ -132,6 +168,10 @@
display_name = "toy, suspicious pill plushie"
path = /obj/item/toy/plush/among

/datum/gear/dice_bag
display_name = "toy, bag of die"
path = /obj/item/storage/pill_bottle/dice

/datum/gear/amongus/New()
. = ..()
var/obj/item/toy/plush/among/temp = new path()
Expand All @@ -147,6 +187,10 @@
path = /obj/item/colorsalve

/datum/gear/tablebell
display_name = "table bell"
path = /obj/item/table_bell

/datum/gear/brasstablebell
display_name = "table bell, brass"
path = /obj/item/table_bell/brass

Expand All @@ -166,3 +210,7 @@
/datum/gear/camera
display_name = "polaroid camera"
path = /obj/item/camera

/datum/gear/hourglass
display_name = "hourglass"
path = /obj/item/hourglass
Loading