This repository was archived by the owner on Apr 21, 2026. It is now read-only.
more upstream merges - #72
Merged
Merged
Conversation
* Port WizDen Melee Weapons Animations Upgrade #41425 * Port WizDen Fix Melee Attack Sprite Rotations #43307 * Port WizDen Add Exception Tolerance to SharedDoAfterSystem #43088 * Port WizDen Add Building Animations to TechFabs #42962 * Port WizDen AI Can Now Read Papers & Envelopes #42926 * Port WizDen More Resilient Grenades #34499 * Port WizDen Fixing Issue #42759, Air Grenades Cannot Be Re-triggered #42866 * Port WizDen Add Integration Test for the RCD #40625 * Port WizDen PR #37764, #40485, & #42543 * Port WizDen, uh... PR #42556 * fix various incompatibilities * Port WizDen Allow Protected Grids to be Repaired #36989 * Port WizDen PR #39124 & #40278 * Port WizDen Fix: Spellbooks Can Have Charges #38769 & various compatibility fixes * fix compressed matter queue del error & FH fission generator rsi fail * Port WizDen Rejuvenating Resets Item Charges #41165 & Fix #42560 * Port WizDen PR #35536 & 36378 * Port WizDen Feat: SimpleRadial Menu Support #39223 * fix more incompatibilities * Port WizDen Xenoborg Door Control Module #41546 & PR #42370 * Port WizDen Fix Projectile Deceleration #42320 * Port WizDen Pry Open Critical Borgs #42319 & PR #42460 * fix interaction bug w/ cyborg wire panel & change encryption key removal tool to cutting * Port WizDen PR #38444, #39032, & #42294 * fix spelling inconsistency * Port WizDen Door Remote Fixes 1 & 2 PR #43063 & #43094 * Port WizDen Named Fried Chicken PR #42280 * another compatibility fix * add alt+click interaction for closing resealable containers * Port WizDen PR #42119 & Extinguishable Paper PR #42142 * Port WizDen Increase Shuttle FTL Cooldown PR #42209 & #42283 * fix various ftl fails * Update borg_modules.yml * fix linter fail * fix linter fail (again)
* Cyborg xml and yml First try a the cyborg entry * Update Cyborgs.yml * Path changes and names * File naming fix? * Take 5, action * Update CyborgRights.yml * Update CyborgRights.yml * Update CyborgRights.xml * Update CyborgRights.xml * Update CyborgRights.xml * Update CyborgRights.xml * Revert "Update CyborgRights.xml" This reverts commit dce46a6. * Update CyborgRights.xml * Update CyborgRights.xml * Update CyborgRights.xml * Update CyborgRights.xml * sizing tomfoolery * YML and images * Update meta.json * Update symbols.yml * Update meta.json * Update meta.json * Update symbols.yml * Update CyborgRights.xml * Update CyborgRights.xml * Update CyborgRights.xml * Update CyborgRights.xml * Update CyborgRights.xml * Update CyborgRights.xml * Update CyborgRights.xml * Update CyborgRights.xml * Update CyborgRights.xml * Update CyborgRights.xml * More fixes * Update symbols.yml * Update aiguide.png * MMI * more silly * Update CyborgRights.xml * More image resizing and quad 'the boi' fix * Update CyborgRights.xml
Co-authored-by: ABush <69372251+aabush64@users.noreply.github.com>
* The Drip Must Flow. * oops, duplicate * some of these already exist, whoopsie * Remove extraneous data * fix * god damnit * Final fix for real I think?
github-actions
Bot
added
S: Untriaged
size/L
YML
UI
C#
Sprites
FTL
Docs
and removed
S: Untriaged
size/L
labels
|
RSI Diff Bot; head commit a9f83da merging into 7a47f5a Resources/Textures/Interface/Actions/actions_borg.rsi
Resources/Textures/Structures/Machines/techfab.rsi
Resources/Textures/_CS/Clothes/Head/Hats/belpero.rsi
Resources/Textures/_CS/Clothes/Head/Hats/red_regalia.rsi
Resources/Textures/_CS/Clothes/Neck/Cloaks/ari.rsi
Resources/Textures/_CS/Clothes/Neck/Cloaks/belpero.rsi
Resources/Textures/_CS/Clothes/Neck/Cloaks/red_regalia.rsi
Resources/Textures/_CS/Clothes/Neck/Cloaks/shuba.rsi
Resources/Textures/_CS/Clothes/Shoes/Boots/ari.rsi
Resources/Textures/_CS/Clothes/Shoes/Boots/belpero.rsi
Resources/Textures/_CS/Clothes/Shoes/Boots/highheelshoes.rsi
Resources/Textures/_CS/Clothes/Uniforms/Jumpskirt/alt_purplebartender.rsi
Resources/Textures/_CS/Clothes/Uniforms/Jumpskirt/cap_turtleneck.rsi
Resources/Textures/_CS/Clothes/Uniforms/Jumpskirt/cargoformal.rsi
Resources/Textures/_CS/Clothes/Uniforms/Jumpskirt/centcom_officer.rsi
Resources/Textures/_CS/Clothes/Uniforms/Jumpskirt/centcom_official.rsi
Resources/Textures/_CS/Clothes/Uniforms/Jumpskirt/color_turtle.rsi
Resources/Textures/_CS/Clothes/Uniforms/Jumpskirt/coroner.rsi
Resources/Textures/_CS/Clothes/Uniforms/Jumpskirt/dress_gothic.rsi
Resources/Textures/_CS/Clothes/Uniforms/Jumpskirt/dress_maid.rsi
Resources/Textures/_CS/Clothes/Uniforms/Jumpskirt/dress_red.rsi
Resources/Textures/_CS/Clothes/Uniforms/Jumpskirt/dress_tango.rsi
Resources/Textures/_CS/Clothes/Uniforms/Jumpskirt/dress_victorian_black.rsi
Resources/Textures/_CS/Clothes/Uniforms/Jumpskirt/dress_victorian_red.rsi
Resources/Textures/_CS/Clothes/Uniforms/Jumpskirt/elegantmaid.rsi
Resources/Textures/_CS/Clothes/Uniforms/Jumpskirt/hop_turtleneck.rsi
|
Linter fail removal
more linter fails being removed
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
9 participants
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.
more upstream merges