Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "upstream merge 15/11" #2272

Merged
merged 1 commit into from
Nov 24, 2024
Merged

Revert "upstream merge 15/11" #2272

merged 1 commit into from
Nov 24, 2024

Conversation

deltanedas
Copy link
Member

fat finger squashed :trollface:

@deltanedas deltanedas requested review from a team and IamVelcroboy as code owners November 24, 2024 04:37
@github-actions github-actions bot added the size/L 256-1023 lines label Nov 24, 2024
@deltanedas deltanedas enabled auto-merge November 24, 2024 04:38
@deltanedas deltanedas disabled auto-merge November 24, 2024 04:38
@deltanedas deltanedas merged commit 7ccafa8 into master Nov 24, 2024
18 checks passed
@deltanedas deltanedas deleted the revert-2205-upstream-ops branch November 24, 2024 04:38
@github-actions github-actions bot added S: Untriaged This issue or PR needs labelling Changes: YML Changes any yml files Changes: Map Changes: UI Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Documentation Changes any xml or md files Changes: Sprite Changes any png or json in an rsi Changes: Audio Changes any audio files labels Nov 24, 2024
Copy link
Contributor

RSI Diff Bot; head commit 5d5afcb merging into d7a3696
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi

State Old New Status
equipped-INNERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified
prisoner-inhand-left Modified
prisoner-inhand-right Modified
trinkets-equipped-INNERCLOTHING Modified

Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi

State Old New Status
equipped-INNERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified
prisoner-equipped-INNERCLOTHING Modified
prisoner-icon Modified
prisoner-inhand-left Modified
trinkets-equipped-INNERCLOTHING Modified
trinkets-icon Modified
trinkets-inhand-left Modified
trinkets-inhand-right Modified

Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi

State Old New Status
inhand-left Modified
inhand-right Modified
storage Removed

Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi

State Old New Status
inhand-left Modified
inhand-right Modified
storage Removed

Resources/Textures/Structures/Machines/computers.rsi

State Old New Status
broken Modified

Resources/Textures/Interface/Actions/actions_borg.rsi

State Old New Status
select-type Removed

Resources/Textures/Interface/Alerts/walking.rsi

State Old New Status
walking Removed

Resources/Textures/Objects/Consumable/Food/meat.rsi

State Old New Status
anomalymeat-cooked Removed
anomalymeat Removed

Resources/Textures/Objects/Magic/magicactions.rsi

State Old New Status
jaunt Removed

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi

State Old New Status
base Removed
beanbag Removed
flare Removed
incendiary Removed
lethal Removed
mag-1 Removed
mag-2 Removed
mag-3 Removed
mag-4 Removed
mag-alt-1 Removed
mag-alt-2 Removed
mag-alt-3 Removed
mag-alt-4 Removed
practice Removed
slug Removed
tranquilizer Removed
uranium Removed

Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi

State Old New Status
base Removed
bolt-open Removed
equipped-BELT Removed
equipped-SUITSTORAGE Removed
inhand-left Removed
inhand-right Removed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Audio Changes any audio files Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes: Sprite Changes any png or json in an rsi Changes: UI Changes: YML Changes any yml files S: Needs Review S: Untriaged This issue or PR needs labelling size/L 256-1023 lines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant