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.

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

Adds a Plushie Delivery Beacon to the game. #10398

Merged
merged 37 commits into from
Jan 14, 2024

Conversation

ClownMoff
Copy link
Contributor

@ClownMoff ClownMoff commented Dec 26, 2023

About The Pull Request

Adds a Plushie Delivery Beacon

Why It's Good For The Game

"Oh man I wish I had a moth plushie right now" is no longer a problem. With this NEW system you can INMEDIATLY call a plushie to any location! The donator plushies are out of the pool. This PR asumes this PR is already merged #10387 as it includes the plushies inside.

Testing Photographs and Procedure

Screenshots&Videos

imagen
imagen
imagen
imagen
imagen
imagen
imagen
imagen
imagen
1226
imagen

Changelog

🆑 Varo (with the help of the good people in discord)
add: Adds a plushie delivery beacon.
add: Adds a plushie lover trait (+1)
tweak: changes the instrument delivery beacon sprite
tweak: changes the "musician" trait description to be more representative of its actual use.
/:cl:

@ClownMoff ClownMoff marked this pull request as draft December 26, 2023 15:07
@ClownMoff ClownMoff changed the title Radial plushie Adds a Plushie Delivery Beacon to the game. Dec 26, 2023
@ClownMoff ClownMoff marked this pull request as ready for review December 26, 2023 17:30
@Rukofamicom
Copy link
Contributor

The instrument delivery beacon is tied to a trait that players select and should not be added to a vending machine.

Plushie beacon would be a good choice for such a trait as well instead of available directly from a vending machine.

Plushies (random assortments or otherwise) are one of the things I think would be best suited to a cargo crate order - someone you work to earn money for and could be aiming to collect, especially with the associated trait I am suggesting.

code/game/objects/items/plushes.dm Outdated Show resolved Hide resolved
icon_state = "gangtool-plushie"
var/static/list/plushie_list

/obj/item/choice_beacon/radial/plushie/Initialize(mapload)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you don't even need to stick this in /Initialize, can just put the = list(...) right next to the static declaration

code/game/objects/items/plushes.dm Show resolved Hide resolved
code/game/objects/items/plushes.dm Outdated Show resolved Hide resolved
@ClownMoff ClownMoff requested a review from Rukofamicom January 10, 2024 14:25
@Nakalon
Copy link
Contributor

Nakalon commented Jan 13, 2024

You should get a positive mood buff as long as you have the plushie in your inventory similar to Family Heirloom if this is worth 1 point, I think!

code/game/objects/items/plushes.dm Outdated Show resolved Hide resolved
code/datums/traits/positive_quirk.dm Show resolved Hide resolved
code/modules/vending/games.dm Show resolved Hide resolved
Copy link
Contributor

@Rukofamicom Rukofamicom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't really have to remove both of the god plushies, but it is definitely safer this way in the long run.

@Rukofamicom Rukofamicom added this pull request to the merge queue Jan 14, 2024
Merged via the queue into BeeStation:master with commit 55965c3 Jan 14, 2024
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants