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

[Christmas] Y'all want a Smite Cranberry? #33922

Merged
merged 6 commits into from
Dec 19, 2024
Merged

[Christmas] Y'all want a Smite Cranberry? #33922

merged 6 commits into from
Dec 19, 2024
+120 −5

Conversation

FairlySadPanda
Copy link
Contributor

@FairlySadPanda FairlySadPanda commented Dec 18, 2024 •
edited
Loading

About the PR

image

Why / Balance

image

(Mostly a thank-you to the mods and admins for their work this year)

Technical details

  1. Added Smite Cranberry, including both the can and the re-agent.
  2. Renamed Lemon-Lime to Smite to match; there's no other changes.
  3. Between one and three Smite Cranberry cans are ejected from a Christmas anomaly on its pulse.
  4. Smite Cranberry cans, and only Smite Cranberry cans, have a plunger-like effect when thrown. When fired out of a gun, such as a Christmas anomaly or improvised pneumatic cannon, the cans do 1 blunt and 2 cold damage each. This theoretically allows someone, with a sufficient supply of Smite Cranberry, to create the equivalent of a plunger gun.

Media

image

Sprite by @august-sun

Updated anomaly effect:
https://github.com/user-attachments/assets/256939fb-db82-4bee-b532-ccc9a4765d8c

Requirements

Changelog

🆑 FairlySadPanda August-Sun Eric156

  • add: Smite Cranberry is now available wherever lemon-lime soda is sold, just for the holidays. This includes a certain jolly anomaly.

@github-actions github-actions bot added S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. size/M Denotes a PR that changes 100-999 lines. Changes: No C# Changes: Requires no C# knowledge to review or fix this item. Changes: Sprites Changes: Might require knowledge of spriting or visual design. labels Dec 18, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 18, 2024 •
edited
Loading

RSI Diff Bot; head commit 7c4de99 merging into ecc2ede
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi

State Old New Status
icon Added
icon_open Added
inhand-left Added
inhand-right Added

Edit: diff updated after 7c4de99

@FairlySadPanda
Copy link
Contributor Author

Immediate suggestion from @IProduceWidgets - an alcoholic variant to put in the booze-o-mat.

@FairlySadPanda
Copy link
Contributor Author

It would be good to have some way of marking up items and vending machine contents as seasonal, and being able to hang these features off of a seasonal cvar setting.

@FairlySadPanda
Copy link
Contributor Author

Other name suggestions

  1. Slips/Slips Cranberry @august-sun
  2. Smite/Cranberry Smite @Plykiya

@FairlySadPanda
Copy link
Contributor Author

I should like to point out that after my extended break and vow to only review stuff on here for a long while, this stupid meme has brought me back

curse you all

FairlySadPanda
FairlySadPanda commented Dec 18, 2024
View reviewed changes
Resources/Prototypes/Recipes/Reactions/drinks.yml
ZombieCocktail: 4
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This added newline is so minor I really don't want to have to faff removing it...

@beck-thompson beck-thompson added P1: High Priority: Higher priority than other items, but isn't an emergency. T: New Feature Type: New feature or content, or extending existing content S: Needs Review Status: Requires additional reviews before being fully accepted DB: Beginner Friendly Difficulty: Great for beginners. Unambiguous in scope, and explains how to achieve the result. A: General Interactions Area: General in-game interactions that don't relate to another area. and removed S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. labels Dec 18, 2024
@beck-thompson
Copy link
Contributor

(High because it needs to be added before christmas!)

@august-sun
Copy link
Contributor

I should like to point out that after my extended break and vow to only review stuff on here for a long while, this stupid meme has brought me back

curse you all

that's why we do this 😎

@Emisse
Copy link
Contributor

Emisse commented Dec 18, 2024

arbitrage fail

@TeenSarlacc
Copy link

it's the thirst thirstiest time

@FairlySadPanda
Copy link
Contributor Author

The acceptance test is presumably hard-coded, I will fix it in a bit.

@FairlySadPanda
Copy link
Contributor Author

OK y'all I may have slightly more to this PR

@FairlySadPanda
Copy link
Contributor Author

Smitecranberry-1.mp4

@slarticodefast slarticodefast merged commit c33d335 into space-wizards:master Dec 19, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@slarticodefast slarticodefast slarticodefast approved these changes

@Emisse Emisse Emisse approved these changes

Assignees
No one assigned
Labels
A: General Interactions Area: General in-game interactions that don't relate to another area. Changes: No C# Changes: Requires no C# knowledge to review or fix this item. Changes: Sprites Changes: Might require knowledge of spriting or visual design. DB: Beginner Friendly Difficulty: Great for beginners. Unambiguous in scope, and explains how to achieve the result. P1: High Priority: Higher priority than other items, but isn't an emergency. S: Needs Review Status: Requires additional reviews before being fully accepted size/M Denotes a PR that changes 100-999 lines. T: New Feature Type: New feature or content, or extending existing content
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@FairlySadPanda @beck-thompson @august-sun @Emisse @TeenSarlacc @slarticodefast