feat: blue and purple tomato soup #1781
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
Changes: YML
|
RSI Diff Bot; head commit 8dbecc2 merging into 0b20628 Resources/Textures/DeltaV/Objects/Consumable/Food/bluepurpletomatosoup.rsi
|
TadJohnson00
requested changes
Sep 10, 2024
DisposableCrewmember42
force-pushed
the
blue-tomato-soup
branch
from
c4fde6f to
8a1eb36
Compare
DisposableCrewmember42
requested review from
IamVelcroboy and
a team
as code owners
ghost
merged commit
sleepyyapril
added a commit
to Simple-Station/Einstein-Engines
that referenced
this pull request
Feb 4, 2025
# 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)
LaryNevesPR
pushed a commit
to LaryNevesPR/Estacao-Andromeda
that referenced
this pull request
Feb 10, 2025
* feat: blue and purple tomato soup * tweak(bluepurpletomatosoup): incorporate description feedback * style: Add newline at end of soup.yml --------- Co-authored-by: Tad "Taddy" Johnson <[email protected]>
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the PR
This PR adds blue and purple tomato soup.
Why / Balance
You can make blood tomato soup from blood tomatoes, but not blue tomato soup from blue tomatoes (#wcyi-suggestions).
Technical details
Adds the object prototypes FoodSoupTomatoBlue and FoodSoupTomatoPurple, as well their corresponding recipe prototypes RecipeBlueTomatoSoup and RecipePurpleTomatoSoup. The sprites were taken from the regular bowl.rsi and modified.
Media
pr-bluepurplesoup.mp4
Requirements
Breaking changes
None
Changelog
🆑 DisposableCrewmember42