Undo warp-strings #103
Merged
Undo warp-strings #103
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
* prevent funny meta * Totally didn't forget about drinks * damn chocolate bar * big but less and more or something * while im here fix the empty orange carton Apparently people don't want empty orange cartons??? * juicebox + more random stuff * fix that
|
RSI Diff Bot; head commit 8d0acfc merging into 923eb1c Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi
Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi
Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi
Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi
Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi
|
…ltaV-Station/Delta-v/master
Pspritechologist
added
the
Pull Request Mirror
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
DangerRevolution
approved these changes
Apr 30, 2024
github-actions
bot
added
Changes: Localization
VMSolidus
approved these changes
May 11, 2024
Mnemotechnician
pushed a commit
to Mnemotechnician/Einstein-Engines
that referenced
this pull request
Sep 9, 2024
…-for-a-hug Content.Integration Works Again
zelezniciar1
pushed a commit
to zelezniciar1/Einstein-Engines
that referenced
this pull request
Oct 30, 2024
# Description Completely redone the rules.yml, rules guidebook entries, and rules popup. Also updated default.toml to fit our server settings and likings. Solves issue Simple-Station#103 <!-- 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 --> - [x] Updated Rules.yml - [x] Updated Rules.txt - [x] Made Rules Guidebook entries - [x] Updated Default.toml - [x] Several file/name rebrandings to Grimbly. - [x] Removed unused rules/guidebook entry files. --- # Changelog :cl: - add: Made Rules Guidebook entries - tweak: Updated rules.yml - tweak: Updated rules.txt - tweak: Updated default.toml - tweak: Several file/name rebrandings to Grimbly. - remove: Removed unused rules/guidebook entry files.
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 #1013: Undo warp-strings from
DeltaV-Station/Delta-v
f3048043658cde7a69c831b3c5342d516ed55449PR opened by
IamVelcroboy at 2024-03-27 16:28:25 UTC
web-flow at 2024-03-27 16:40:16 UTC
PR merged by
PR changed 2 files with 34 additions and 34 deletions.
The PR had the following labels:
Original Body