Skip to content

Commit

Permalink
Adds every single moth plushie variant to loadout (shiptest-ss13#4242)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Adds a box containing every single moth plushie to the loadout. Every.
Single. One.

![image](https://github.com/user-attachments/assets/1165b39a-f274-4655-8821-2e29f08510b7)

![image](https://github.com/user-attachments/assets/d18de79a-db43-4ed5-b8c8-33de1fb470d3)

![image](https://github.com/user-attachments/assets/a7ad05a6-b56b-4fb6-b51d-3e8e04626116)

Also, fixes an ancient typo in `plushes.dm`. I wonder how long that's
been there for.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

![image](https://github.com/user-attachments/assets/ebe80501-820b-423a-9185-b1bec1d8c97d)
It's soul. It's so much soul. You love moths. Everyone loves moths.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
add: A considerable amount of new moth plushies may now be brought with
you out of cryogenic storage.
fix: Minor typo on the lovers moth plushie.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
randy10122 authored Mar 3, 2025
1 parent 9f1af37 commit 96805bd
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 3 deletions.
33 changes: 33 additions & 0 deletions code/game/objects/items/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,39 @@
augment_list[initial(A.name)] = A
return augment_list

/obj/item/choice_beacon/mothplushies
name = "moth box"
desc = "Contains your favourite moth plushie!"

/obj/item/choice_beacon/mothplushies/generate_display_names()
var/static/list/moth_list
if(!moth_list)
moth_list = list()
var/list/templist = list(
/obj/item/toy/plush/moth,
/obj/item/toy/plush/moth/atlas,
/obj/item/toy/plush/moth/clockwork,
/obj/item/toy/plush/moth/deadhead,
/obj/item/toy/plush/moth/error,
/obj/item/toy/plush/moth/firewatch,
/obj/item/toy/plush/moth/gothic,
/obj/item/toy/plush/moth/lovers,
/obj/item/toy/plush/moth/luna,
/obj/item/toy/plush/moth/monarch,
/obj/item/toy/plush/moth/moonfly,
/obj/item/toy/plush/moth/poison,
/obj/item/toy/plush/moth/punished,
/obj/item/toy/plush/moth/ragged,
/obj/item/toy/plush/moth/rainbow,
/obj/item/toy/plush/moth/redish,
/obj/item/toy/plush/moth/royal,
/obj/item/toy/plush/moth/snow,
/obj/item/toy/plush/moth/whitefly)
for(var/V in templist)
var/atom/A = V
moth_list[initial(A.name)] = A
return moth_list

/obj/item/skub
desc = "It's skub."
name = "skub"
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/plushes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@

/obj/item/toy/plush/moth/lovers
name = "lovers moth plushie"
desc = "An adorable mothperson plushy. It's a loveley bug!"
desc = "An adorable mothperson plushy. It's a lovely bug!"
icon_state = "moffplush_lovers"

/obj/item/toy/plush/moth/whitefly
Expand Down
4 changes: 2 additions & 2 deletions code/modules/client/loadout/loadout_general.dm
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@
path = /obj/item/toy/plush/snakeplushie

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

/datum/gear/bee
display_name = "toy, bee plushie"
Expand Down

0 comments on commit 96805bd

Please sign in to comment.