upstream merge #1636
Merged
upstream merge #1636
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
remove remaining geras stuff
…(#30918) * Fixes inhand hardsuit cross color from space-wizards/space-station-14#26516 (comment) * Fixed HoS Turtle not covering all butt pixels --------- Co-authored-by: Zachary Yona <[email protected]>
Co-authored-by: plykiya <[email protected]>
* why do I have to change so much just to add drills * diamon
* System & loc strings * pass over syndie contraband * fixes * grand theft pass * contrabandexamine -> contraband * examine text generation update * all composition parents necessary * bring back minor contra so it has a less confusing message * minor * weapon pass * jumpsuit pass * feet pass * AUUUUUUUUUGHHHHHHHHHHHHHHHHHH * head * AUUUUGH * ear * belt * back * fix * bro * rename for more clarity * do da review * add cvar for contraband examine --------- Co-authored-by: EmoGarbage404 <[email protected]> Co-authored-by: Nemanja <[email protected]>
* First pass contra fix * bam * More * Security crates are now marked as security restricted * Syndicate raid suit is contra * damn I forgot gatfruit
* add * lower weight
* Fix DoDrop to DropNextTo in container cases DoDrop is too heavy to calculation. In any other case we should use alternatives, for example DropNextTo helper method * codestyle change
* Fix Reagent Fire Stacks * Comments on code * little nicer wording?
…… (#30954) Lines 88 and 89, updated 'narsie' and 'ratvar' to 'Nar'Sie' and Ratvar, per issue #30719.
* add the mantle * fix a few things * fix merge conflict stuff, remove from winterdrobe and lathe. * Add mantle to loadouts (20 hour requirement)
* init * wtf git
* add base * add fake suffix and flavor fix * address some reviews * parent it * fix test fail * add FoodSequence support and address small review
add the thing i missed
deltanedas
force-pushed
the
upstream-ops
branch
from
d155032 to
f65ddec
Compare
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
notable changes:
upstream has its own delay mechanism so dont need to add anything
excluded:
Why / Balance
grappling hook is essential for spaceborgs and salv ever since space friction was reduced for mobs, and its not nearly as lrp as gravity guns (which are still commented)
no contraband examine since it would need a massive pr to make everything correct, and its doubtful that its even a good thing
Changelog
🆑