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

Jump to bottom

Cleans up plushies in the loadout. #3170

Closed
wants to merge 2 commits into from
Closed

Cleans up plushies in the loadout. #3170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a7d6af
mothable
Sadhorizon Jul 1, 2024
dff0607
Three
Sadhorizon Jul 1, 2024
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
73 changes: 73 additions & 0 deletions code/game/objects/items/plushes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,3 +863,76 @@
var/mutable_appearance/base_overlay_among = mutable_appearance(icon, "plushie_among_visor")
base_overlay_among.appearance_flags = RESET_COLOR
add_overlay(base_overlay_among)

/obj/item/choice_beacon/plushie
name = "box of plushes"
desc = "Contains a little friend!"

/obj/item/choice_beacon/plushie/generate_display_names()
var/static/list/plushies
if(!plushies)
plushies = list()
var/list/templist = list(
/obj/item/toy/plush/carpplushie,
/obj/item/toy/plush/lizardplushie,
/obj/item/toy/plush/snakeplushie,
/obj/item/toy/plush/slimeplushie,
/obj/item/toy/plush/beeplushie,
/obj/item/toy/plush/goatplushie,
/obj/item/toy/plush/realgoat,
/obj/item/toy/plush/spider,
/obj/item/toy/plush/flushed,
/obj/item/toy/plush/blahaj)
for(var/V in templist)
var/atom/A = V
plushies[initial(A.name)] = A
return plushies

/obj/item/choice_beacon/plushie/rilena
name = "box of RILENA plushes"
desc = "Contains merch from the hit webcomic!"

/obj/item/choice_beacon/plushie/rilena/generate_display_names()
var/static/list/plushies
if(!plushies)
plushies = list()
var/list/templist = list(
/obj/item/toy/plush/rilena,
/obj/item/toy/plush/tali,
/obj/item/toy/plush/sharai,
/obj/item/toy/plush/xader,
/obj/item/toy/plush/mora,
/obj/item/toy/plush/kari)
for(var/V in templist)
var/atom/A = V
plushies[initial(A.name)] = A
return plushies

/obj/item/choice_beacon/plushie/moth
name = "box of moth plushes"
desc = "Contains an exceptionally fuzzy plushie."

/obj/item/choice_beacon/plushie/moth/generate_display_names()
var/static/list/plushies
if(!plushies)
plushies = list()
var/list/templist = list(
/obj/item/toy/plush/moth,
/obj/item/toy/plush/moth/luna,
/obj/item/toy/plush/moth/atlas,
/obj/item/toy/plush/moth/redish,
/obj/item/toy/plush/moth/royal,
/obj/item/toy/plush/moth/gothic,
/obj/item/toy/plush/moth/lovers,
/obj/item/toy/plush/moth/whitefly,
/obj/item/toy/plush/moth/punished,
/obj/item/toy/plush/moth/firewatch,
/obj/item/toy/plush/moth/deadhead,
/obj/item/toy/plush/moth/poison,
/obj/item/toy/plush/moth/ragged,
/obj/item/toy/plush/moth/snow,
/obj/item/toy/plush/moth/moonfly)
for(var/V in templist)
var/atom/A = V
plushies[initial(A.name)] = A
return plushies
56 changes: 11 additions & 45 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 @@ -94,49 +94,17 @@
display_name = "cane"
path = /obj/item/cane

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

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

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

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

/datum/gear/gayhornet
display_name = "toy, gay hornet plushie"
path = /obj/item/toy/plush/hornet/gay
description = "Hornet says lesbian rights."

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

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

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

// Shiptest edit
/datum/gear/amongus
display_name = "toy, suspicious pill plushie"
path = /obj/item/toy/plush/among

/datum/gear/amongus/New()
. = ..()
var/obj/item/toy/plush/among/temp = new path()
description = "[capitalize(pick(temp.among_colors))] sus."
qdel(temp)
/datum/gear/plushie
display_name = "box of plushes, standard"
path = /obj/item/choice_beacon/plushie

/datum/gear/plushie/rilena
display_name = "box of plushes, RILENA"
path = /obj/item/choice_beacon/plushie/rilena

/datum/gear/plushie/moth
display_name = "box of plushes, moths"
path = /obj/item/choice_beacon/plushie/moth

/datum/gear/hairspray
display_name = "hair dye"
Expand All @@ -150,8 +118,6 @@
display_name = "table bell, brass"
path = /obj/item/table_bell/brass

// End Shiptest

/datum/gear/flashlight
display_name = "tool, flashlight"
path = /obj/item/flashlight
Expand Down
Loading