CrystalThistle! #1462
Merged
CrystalThistle! #1462
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 3b400d9 merging into 1f5f6a2 Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Crystal_Thistle.rsi
|
|
Just in case stating it is needed, this PR is ready for review. |
deltanedas
requested changes
Jul 20, 2024
Resources/Prototypes/DeltaV/Entities/Objects/Specific/Hydroponics/seeds.yml
Outdated
Show resolved
Hide resolved
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml
Outdated
Show resolved
Hide resolved
Resources/Textures/Objects/Specific/Hydroponics/crystal_thistle.rsi/meta.json
Outdated
Show resolved
Hide resolved
deltanedas
approved these changes
Jul 22, 2024
LaryNevesPR
pushed a commit
to LaryNevesPR/Estacao-Andromeda
that referenced
this pull request
Jan 11, 2025
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Port from WWDP. Refactor from [Goob](Goob-Station/Goob-Station#1251) --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>  Night vision goggles:  Zealot's blindfold:  Animal vision:  Thermal vision goggles:  Deathsquad helmet:  Xeno vision:  </p> </details> --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: @Aviu00, Spatison, @PuroSlavKing - add: Added night vision goggle - add: Added thermal vision goggle - add: Deathsquad helmet now grants night and thermal vision. - add: Ninja visor now grants night vision. - tweak: Some animals have gained night vision. - tweak: Xenos have gained night vision. --------- Signed-off-by: Spatison <137375981+Spatison@users.noreply.github.com> Co-authored-by: PuroSlavKing <103608145+puroslavking@users.noreply.github.com>
LaryNevesPR
pushed a commit
to LaryNevesPR/Estacao-Andromeda
that referenced
this pull request
Jan 11, 2025
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
* Brings a glass producing plant to Botany * Linter fix attempt 1 * Adresses adjustments requested by Reviewer --------- Co-authored-by: Alchebun <jimmy.12.or#gmail.com>
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
Brings a glass producing plant to botany!
Why / Balance
For a long time I've wanted to be able to grow glass as a botanist for many projects and departments.
Technical details
Adds a mutated version of Galaxythistle called Crystalthistle that grows with a new reagent called Quartzite. heating up 10u of quartzite produces a sheet of glass.
The plant also grows Ethyloxyephedrine which med can use to treat those with narcolepsy.
Quartzite also acts as a weaker version of razorium when drank (it's basically glass shards. should hurt)
Media
Breaking changes
No breaking changes that I know of.
Changelog