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

New Blood Based Soda! #2250

Merged
merged 19 commits into from
Dec 18, 2024
Merged

New Blood Based Soda! #2250

merged 19 commits into from
Dec 18, 2024
+83 −0

Conversation

BlitzTheSquishy
Copy link
Contributor

@BlitzTheSquishy BlitzTheSquishy commented Nov 21, 2024 •
edited
Loading

About the PR

New drink! Made by the same people that brought you Dr Gibb, a new alternative that is for all you blood drinkers! Primarily for if Arachne get added

Why / Balance

Interesting new type of drink that fits the vague theming of Dr Gibb, as well as being a sort of "not contraband what so ever but can be mistaken as syndicate when its not" type thing being called Blood Red (without the dash)

Technical details

Media

image
image

Requirements

  • I have tested all added content and changes.
  • I have added media to this PR or it does not require an ingame showcase.

Breaking changes

Changelog

🆑 BlitzTheSquishy & Yuukitten

  • add: Brand new drink from the people that brought you Dr. Gibb, Dr Gibb Blood-Red! In a Dr. Gibb vendor near you!

@BlitzTheSquishy BlitzTheSquishy requested review from IamVelcroboy and a team as code owners November 21, 2024 04:25
@github-actions github-actions bot added S: Needs Review Changes: YML Changes any yml files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi S: Merge Conflict Fix your PR! labels Nov 21, 2024
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 21, 2024 •
edited
Loading

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

Resources/Textures/DeltaV/Objects/Consumable/Drinks/drgibbbloodred.rsi

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

Edit: diff updated after 226d057

@Unkn0wnGh0st333
Copy link
Contributor

Does this imply that Dr. Gibb is actually apart of the syndicate franchise openly enough to put their name on the cans... yet Nanotrasen still have them on station

@BlitzTheSquishy
Copy link
Contributor Author

Does this imply that Dr. Gibb is actually apart of the syndicate franchise openly enough to put their name on the cans... yet Nanotrasen still have them on station

Nope just, unintentional

Note: syndicate blood red is "Blood-red"

@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Nov 21, 2024
@Unkn0wnGh0st333
Copy link
Contributor

Unkn0wnGh0st333 commented Nov 21, 2024 •
edited
Loading

Nope just, unintentional

Note: syndicate blood red is "Blood-red"

So it HAS to have the dash? that is utterly stupid lowkey

@BlitzTheSquishy
Copy link
Contributor Author

Nope just, unintentional
Note: syndicate blood red is "Blood-red"
So it HAS to have the dash? that is utterly stupid lowkey

Evil >:3 also its just normally stocked in Dr Gibb vendors, sec shouldnt really give a shit about blood-red brew anyway, so this should really be LESS of a concern than that

@BlitzTheSquishy
Copy link
Contributor Author

FUCKING LINTER
OH MY GOD

@BlitzTheSquishy
Copy link
Contributor Author

Oh cool, build and test debug errors- well its only yaml not whatever is causing build fail so not my problem

@Bonktrauma
Copy link
Contributor

Does this imply that Dr. Gibb is actually apart of the syndicate franchise openly enough to put their name on the cans... yet Nanotrasen still have them on station

Why would a color imply relation to the syndicate? It's a blood based branding

@BlitzTheSquishy
Copy link
Contributor Author

Does this imply that Dr. Gibb is actually apart of the syndicate franchise openly enough to put their name on the cans... yet Nanotrasen still have them on station

Why would a color imply relation to the syndicate? It's a blood based branding

EXACTLY

@BlitzTheSquishy
Milons annoyances :blunt:
100df8e
@BlitzTheSquishy
"untouch"
b6d681d 
I dont like using the web interface, its also superfluous spaces

Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com>
@BlitzTheSquishy
Update drinks_cans.yml
a74adb1 
Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com>
@BlitzTheSquishy
Update flavor-profiles.ftl
a54fef9 
Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com>
@BlitzTheSquishy
Merge branch 'master' into dr-gibb-blood-red
34d4172
@BlitzTheSquishy
Update meta.json
bd57468 
Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com>
@BlitzTheSquishy
Merge branch 'master' into dr-gibb-blood-red
f3af311
@BlitzTheSquishy
Copy link
Contributor Author

I think thats everything for soder

@github-actions github-actions bot added the size/M 64-255 lines label Nov 24, 2024
@deltanedas deltanedas requested review from a team as code owners December 17, 2024 04:52
Lyndomen
Lyndomen previously approved these changes Dec 17, 2024
View reviewed changes
@deltanedas deltanedas merged commit 9de9a17 into DeltaV-Station:master Dec 18, 2024
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deltanedas deltanedas deltanedas approved these changes

@Lyndomen Lyndomen Lyndomen left review comments

@IamVelcroboy IamVelcroboy Awaiting requested review from IamVelcroboy

@MilonPL MilonPL Awaiting requested review from MilonPL

Assignees
No one assigned
Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review size/M 64-255 lines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@BlitzTheSquishy @Unkn0wnGh0st333 @Bonktrauma @deltanedas @Lyndomen @MilonPL