Update custom drinks #96
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
…ltaV-Station/Delta-v/master
|
RSI Diff Bot; head commit e6f0a08 merging into 4b53cdf Resources/Textures/DeltaV/Objects/Consumable/Drinks/greengrass.rsi
Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemondrop.rsi
Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/atomicpunch.rsi
Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/brainbomb.rsi
Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi
Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/circusjuice.rsi
Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/clownblood.rsi
Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/graveyard.rsi
Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/orangecreamcicle.rsi
Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/pinkdrink.rsi
Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/silverjack.rsi
Resources/Textures/DeltaV/Objects/Consumable/Drinks/dulleavene.rsi
Resources/Textures/DeltaV/Objects/Consumable/Drinks/arsonist.rsi
Resources/Textures/DeltaV/Objects/Consumable/Drinks/daiquiri.rsi
Resources/Textures/DeltaV/Objects/Consumable/Drinks/gunmetal.rsi
Resources/Textures/DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi
Resources/Textures/DeltaV/Objects/Consumable/Drinks/kvass.rsi
Resources/Textures/DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi
Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sakeglass.rsi
Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sapopicante.rsi
Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sojuglass.rsi
|
Pspritechologist
added
the
Pull Request Mirror
DangerRevolution
approved these changes
Apr 30, 2024
github-actions
bot
added
Changes: Localization
VMSolidus
approved these changes
May 12, 2024
Mnemotechnician
pushed a commit
to Mnemotechnician/Einstein-Engines
that referenced
this pull request
Sep 9, 2024
…douts Cosmetic Goggles and Animal Mask Loadout Options
Mnemotechnician
pushed a commit
to Mnemotechnician/Einstein-Engines
that referenced
this pull request
Sep 9, 2024
zelezniciar1
pushed a commit
to zelezniciar1/Einstein-Engines
that referenced
this pull request
Oct 30, 2024
<!-- 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]? --> Because community vote requested to keep Rat Kings as they are, this PR should give neutral and friendly Rat Kings more RP options. - Gives Rat King a PDA and headset slot - Lets Rat King drag objects - Changes Rules and Description to clarify that you are not required to act as an antag. Addresses Simple-Station#93 --- # TODO <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [ ] Task - [x] Completed Task --- <!-- 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>  </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: zelezniciar - tweak: Rat Kings now have PDA and Headset slots, and can drag objects.
zelezniciar1
pushed a commit
to zelezniciar1/Einstein-Engines
that referenced
this pull request
Dec 1, 2024
Update 11/8/2024
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.
Mirror of PR #993: Update custom drinks from
DeltaV-Station/Delta-v
PR opened by
FluffiestFloof at 2024-03-21 21:36:52 UTC PR merged by
FluffiestFloof at 2024-04-04 17:06:01 UTCbe0d84458adc156a7f2bcb6305a7d6dbb5042c10PR changed 0 files with 0 additions and 0 deletions.
The PR had the following labels:
Original Body