From 96805bdc487c20da91b7bdf858366855d1c9214d Mon Sep 17 00:00:00 2001 From: randy <88034663+randy10122@users.noreply.github.com> Date: Tue, 4 Mar 2025 04:09:30 +0800 Subject: [PATCH] Adds every single moth plushie variant to loadout (#4242) ## 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. ## 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. ## 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: --- code/game/objects/items/miscellaneous.dm | 33 +++++++++++++++++++ code/game/objects/items/plushes.dm | 2 +- .../modules/client/loadout/loadout_general.dm | 4 +-- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm index 03f3797c4c49..aea918bb46f8 100644 --- a/code/game/objects/items/miscellaneous.dm +++ b/code/game/objects/items/miscellaneous.dm @@ -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" diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 03c37fbce833..44d231518317 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -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 diff --git a/code/modules/client/loadout/loadout_general.dm b/code/modules/client/loadout/loadout_general.dm index f6d271212bb1..7a07a6ca1e0b 100644 --- a/code/modules/client/loadout/loadout_general.dm +++ b/code/modules/client/loadout/loadout_general.dm @@ -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"