New Blood Based Soda! #2250

BlitzTheSquishy · 2024-11-21T04:25:16Z

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

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!

github-actions · 2024-11-21T04:25:31Z

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

github-actions · 2024-11-21T04:25:52Z

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 · 2024-11-21T04:29:10Z

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

…nto dr-gibb-blood-red

BlitzTheSquishy · 2024-11-21T04:32:05Z

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"

Unkn0wnGh0st333 · 2024-11-21T04:33:51Z

Nope just, unintentional

Note: syndicate blood red is "Blood-red"

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

BlitzTheSquishy · 2024-11-21T04:35:53Z

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

…y/Delta-v into dr-gibb-blood-red

BlitzTheSquishy · 2024-11-21T04:42:34Z

FUCKING LINTER
OH MY GOD

BlitzTheSquishy · 2024-11-21T05:08:25Z

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

Bonktrauma · 2024-11-21T05:20:55Z

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 · 2024-11-21T05:25:20Z

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

Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks_cans.yml

Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml

Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml

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

Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks_cans.yml

Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl

I dont like using the web interface, its also superfluous spaces Signed-off-by: Blitz <[email protected]>

Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl

Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks_cans.yml

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

Signed-off-by: Blitz <[email protected]>

BlitzTheSquishy · 2024-11-23T01:33:32Z

I think thats everything for soder

Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/soda.yml

# Description ## **!!! DO NOT "Squash and commit", ONLY "Create a merge commit" !!!** Merges a lot of PRs from Delta-V, most of these are plain YML changes so they shouldn't cause wizmerge-like issues. - DeltaV-Station/Delta-v#1008 - DeltaV-Station/Delta-v#1077 - DeltaV-Station/Delta-v#1092 - DeltaV-Station/Delta-v#1094 - DeltaV-Station/Delta-v#1143 - Excluded the lobby art with DeltaV branding. - DeltaV-Station/Delta-v#1176 - DeltaV-Station/Delta-v#1209 - DeltaV-Station/Delta-v#1227 - DeltaV-Station/Delta-v#1252 - not directly cherry-picked due to harpy singing now being stored in a different file, but implemented the same thing in df50140 - DeltaV-Station/Delta-v#1261 - DeltaV-Station/Delta-v#1271 - DeltaV-Station/Delta-v#1272 - Also made available to Humans and Tajarans like the other Felinid tails. - DeltaV-Station/Delta-v#1426 - DeltaV-Station/Delta-v#1462 - DeltaV-Station/Delta-v#1542 - DeltaV-Station/Delta-v#1759 - DeltaV-Station/Delta-v#1763 - DeltaV-Station/Delta-v#1765 - DeltaV-Station/Delta-v#1780 - DeltaV-Station/Delta-v#1781 - DeltaV-Station/Delta-v#1804 - DeltaV-Station/Delta-v#1814 - TODO in another pr, vulp sprite for the colorable neck gaiter (PR only adds vulp states to pre-existing black/red neck gaiters) - DeltaV-Station/Delta-v#1828 - Added to Loadouts for Corpsman, costs 2 points. - DeltaV-Station/Delta-v#1838 - DeltaV-Station/Delta-v#1877 - DeltaV-Station/Delta-v#1905 - Added to Loadout Uniforms, costs 1 point. - DeltaV-Station/Delta-v#1910 - DeltaV-Station/Delta-v#1935 - DeltaV-Station/Delta-v#1946 - DeltaV-Station/Delta-v#1994 - DeltaV-Station/Delta-v#1997 - DeltaV-Station/Delta-v#1998 - DeltaV-Station/Delta-v#2031 - DeltaV-Station/Delta-v#2089 - DeltaV-Station/Delta-v#2113 - DeltaV-Station/Delta-v#2213 - DeltaV-Station/Delta-v#2209 - DeltaV-Station/Delta-v#2210 - Prerequisite Wizden PR added: space-wizards/space-station-14#29243 - Prerequisite Wizden PR added: space-wizards/space-station-14#30856 - DeltaV-Station/Delta-v#2233 - DeltaV-Station/Delta-v#2245 - DeltaV-Station/Delta-v#2250 - DeltaV-Station/Delta-v#2266 - DeltaV-Station/Delta-v#2267 - DeltaV-Station/Delta-v#2294 - DeltaV-Station/Delta-v#2307 - DeltaV-Station/Delta-v#2318 - DeltaV-Station/Delta-v#2398 - DeltaV-Station/Delta-v#2410 - DeltaV-Station/Delta-v#2462 - DeltaV-Station/Delta-v#2478 - DeltaV-Station/Delta-v#2501 - DeltaV-Station/Delta-v#2503 - DeltaV-Station/Delta-v#2504 - Prerequisite Wizden PR added: space-wizards/space-station-14#30957 - DeltaV-Station/Delta-v#2524 - DeltaV-Station/Delta-v#2539 - DeltaV-Station/Delta-v#2635 - Prerequisite Wizden PR added: space-wizards/space-station-14#32193 - Prerequisite Wizden PR added: space-wizards/space-station-14#32327 ## Changelog Too much changes to count so some changes are unlisted :cl: Several Contributors - add: Added Lone Digger by Caravan Palace to the jukebox! (by MilonPL) - add: Added Deck The Halls by Kevin Macleod to the jukebox! (by Lyndomen) - tweak: Now medical belts have a slot for medkits. (by Radezolid) - add: Added a way for muskets, flintlocks, and musket cartridges (NOT .60) to be crafted. (by Tryded) - add: Added Vulpkanin-specific sprites to a lot of helmets and masks. (by Adrian16199, TadJohnson00) - add: Security dogs (such as Laika) now have Vulpkanin vocal emotes. Howl! (by Remuchi) - add: Split the Emag into the Cryptographic Sequencer and the Airlock Access Override. (by Warmechanic) - add: Added Corpsman Glasses, no more getting flashed as Corpsman! Also available in Loadouts. (by Unkn0wnGh0st333) - add: Harpies can now mimic harps! (by TheOneWhoIsManyFrame) - tweak: Cats will now play with mouse toys. (by Deltanedas) - add: Added a black turtleneck, available in Loadouts! (by Aikakakah) - add: Added the Binary Translator Key to the uplink costing 1 TC and the listening post operative headset. (by Radezolid) - add: Spesos now have a new pretty look transferred from the Frontier Station. (by whatston3) - add: The home-run bat has been re-added to the traitor uplink. - add: Added the CrystalThistle, mutated from the Galaxythistle that generates Quartzite which when heated produces glass sheets. (by jimmy12or) - add: Added a Ghost Pepper! A friendly looking Pepper that's so Spicy, it hurts! (by jimmy12or) - add: Added a Cosmic Revenant! A spooky mutation of the Ghost pepper that produced Ectoplasm. (by jimmy12or) - add: Added blue and purple tomato soup, made using Blue Tomatoes. (by DisposableCrewmember42) - add: Added new drinks: the double ice cream (by dge21) and Dr. Gibb Blood Red (by BlitzTheSquishy). - add: Some drink reactions now require shaking with the shaker or stirring with a spoon. (by Vermidia) - add: Added "Selene" wing customization option for moths (by boogiebogus) - add: Added the tiger tail sprite for Felinids, Humans and Tajarans. (by Adrian16199) - add: NanoTrasen has established business relations with HydroCo! You can now order powdered milk and juice via your Logistics department. (by DisposableCrewmember42) - tweak: Bar and kitchen shelves no longer restrict the items that can be placed in them. (by Velcroboy) - tweak: Bookshelves can now fit any kind of item, not just books. (by Deltanedas) - add: New magic crayons have appeared in the sector, artists rejoice! (by AvalonProto)

NEW DRINKY!!

f9770af

BlitzTheSquishy requested review from IamVelcroboy and a team as code owners November 21, 2024 04:25

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

Merge branch 'master' of https://github.com/BlitzTheSquishy/Delta-v i…

e247ebb

…nto dr-gibb-blood-red

Merge branch 'master' into dr-gibb-blood-red

0b55ced

github-actions bot removed the S: Merge Conflict Fix your PR! label Nov 21, 2024

flavour is now not broken :)

a91e995

Merge branch 'dr-gibb-blood-red' of https://github.com/BlitzTheSquish…

77fc479

…y/Delta-v into dr-gibb-blood-red

AAAAAAAAAAAAAAAAAAAAAAAAAA

7fbafc7

MilonPL suggested changes Nov 21, 2024

View reviewed changes

BlitzTheSquishy added 2 commits November 21, 2024 21:28

Milons annoyances :blunt:

100df8e

"untouch"

b6d681d

I dont like using the web interface, its also superfluous spaces Signed-off-by: Blitz <[email protected]>

BlitzTheSquishy requested a review from MilonPL November 21, 2024 10:30

MilonPL suggested changes Nov 21, 2024

View reviewed changes

Update drinks_cans.yml

a74adb1

Signed-off-by: Blitz <[email protected]>

BlitzTheSquishy added 2 commits November 22, 2024 07:50

Update flavor-profiles.ftl

a54fef9

Signed-off-by: Blitz <[email protected]>

Merge branch 'master' into dr-gibb-blood-red

34d4172

BlitzTheSquishy requested a review from MilonPL November 21, 2024 21:08

BlitzTheSquishy added 2 commits November 22, 2024 15:39

Update meta.json

bd57468

Signed-off-by: Blitz <[email protected]>

Merge branch 'master' into dr-gibb-blood-red

f3af311

Merge branch 'master' into dr-gibb-blood-red

1fde44b

github-actions bot added the size/M 64-255 lines label Nov 24, 2024

BlitzTheSquishy and others added 3 commits November 25, 2024 11:15

Merge branch 'master' into dr-gibb-blood-red

461bb1c

Merge branch 'master' into dr-gibb-blood-red

2678f92

Merge branch 'master' into dr-gibb-blood-red

f126352

deltanedas requested review from a team as code owners December 17, 2024 04:52

Lyndomen previously approved these changes Dec 17, 2024

View reviewed changes

Merge branch 'master' into dr-gibb-blood-red

9e8a7d9

deltanedas requested changes Dec 17, 2024

View reviewed changes

Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/soda.yml Outdated Show resolved Hide resolved

deltanedas fix

226d057

BlitzTheSquishy dismissed Lyndomen’s stale review via 226d057 December 18, 2024 00:52

BlitzTheSquishy requested a review from deltanedas December 18, 2024 00:52

deltanedas approved these changes Dec 18, 2024

View reviewed changes

deltanedas merged commit 9de9a17 into DeltaV-Station:master Dec 18, 2024
18 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

New Blood Based Soda! #2250

New Blood Based Soda! #2250

BlitzTheSquishy commented Nov 21, 2024 •

edited

Loading

github-actions bot commented Nov 21, 2024

github-actions bot commented Nov 21, 2024 •

edited

Loading

Unkn0wnGh0st333 commented Nov 21, 2024

BlitzTheSquishy commented Nov 21, 2024

Unkn0wnGh0st333 commented Nov 21, 2024 •

edited

Loading

BlitzTheSquishy commented Nov 21, 2024

BlitzTheSquishy commented Nov 21, 2024

BlitzTheSquishy commented Nov 21, 2024

Bonktrauma commented Nov 21, 2024

BlitzTheSquishy commented Nov 21, 2024

BlitzTheSquishy commented Nov 23, 2024

New Blood Based Soda! #2250

New Blood Based Soda! #2250

Conversation

BlitzTheSquishy commented Nov 21, 2024 • edited Loading

About the PR

Why / Balance

Technical details

Media

Requirements

Breaking changes

github-actions bot commented Nov 21, 2024

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

Unkn0wnGh0st333 commented Nov 21, 2024

BlitzTheSquishy commented Nov 21, 2024

Unkn0wnGh0st333 commented Nov 21, 2024 • edited Loading

BlitzTheSquishy commented Nov 21, 2024

BlitzTheSquishy commented Nov 21, 2024

BlitzTheSquishy commented Nov 21, 2024

Bonktrauma commented Nov 21, 2024

BlitzTheSquishy commented Nov 21, 2024

BlitzTheSquishy commented Nov 23, 2024

BlitzTheSquishy commented Nov 21, 2024 •

edited

Loading

github-actions bot commented Nov 21, 2024 •

edited

Loading

Unkn0wnGh0st333 commented Nov 21, 2024 •

edited

Loading