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

Merge #33141

Closed
wants to merge 235 commits into from
Closed

Merge #33141

wants to merge 235 commits into from

Conversation

GroggleG
Copy link

@GroggleG GroggleG commented Nov 3, 2024

About the PR

Merges upstream, DONT YELL AT ME SKIPS!

Why / Balance

Technical details

Media

Requirements

Breaking changes

Changelog

@github-actions github-actions bot added Status: Needs Review This PR requires new reviews before it can be merged. Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping. Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. labels Nov 3, 2024
Copy link
Contributor

github-actions bot commented Nov 3, 2024

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

Resources/Textures/Mobs/Pets/weasel.rsi

State Old New Status
weasel Added
weasel_dead Added

Resources/Textures/_Weaselstation/Clothing/Head/Hats/headofchuckles.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Weaselstation/Clothing/Mask/headofchuckles.rsi

State Old New Status
equipped-MASK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Weaselstation/Clothing/Neck/Cloaks/headofchuckles.rsi

State Old New Status
equipped-NECK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Weaselstation/Objects/Consumable/Drinks/weh_max.rsi

State Old New Status
icon Added
icon_open Added
inhand-left Added
inhand-right Added

Resources/Textures/_Weaselstation/Objects/Fun/toys.rsi

State Old New Status
Bewitched_being Added
Panda Added

Resources/Textures/_Weaselstation/Structures/Doors/Airlocks/Abductor/abductor.rsi

State Old New Status
assembly Added
bolted_unlit Added
closed Added
closed_unlit Added
closing Added
closing_unlit Added
emergency_unlit Added
open Added
opening Added
opening_unlit Added
panel_closed Added
panel_closing Added
panel_open Added
panel_opening Added
welded Added

Resources/Textures/_Weaselstation/Structures/Walls/abductor.rsi

State Old New Status
full Added
state0 Added
state1 Added
state2 Added
state3 Added
state4 Added
state5 Added
state6 Added
state7 Added

Resources/Textures/_Weaselstation/Structures/Walls/abductor_diagonal.rsi

State Old New Status
state0 Added
state1 Added

Resources/Textures/_Weaselstation/Structures/Walls/abductor_hw.rsi

State Old New Status
state0 Added
state1 Added

Resources/Textures/_Weaselstation/Structures/Walls/abductor_hwcorner.rsi

State Old New Status
state0 Added
state1 Added

Resources/Textures/_Weaselstation/Structures/Walls/abductor_hwcornerflip.rsi

State Old New Status
state0 Added
state1 Added

Resources/Textures/_Weaselstation/Structures/Walls/abductor_jaggeddiagonal.rsi

State Old New Status
state0 Added
state1 Added

Resources/Textures/_Weaselstation/Structures/Walls/abductor_jaggeddiagonalflip.rsi

State Old New Status
state0 Added
state1 Added

Resources/Textures/_Weaselstation/Structures/Walls/abductor_jaggedfull.rsi

State Old New Status
state0 Added
state1 Added

Resources/Textures/_Weaselstation/Tiles/abductorpod.rsi

State Old New Status
Pod1 Added
Pod2 Added
Pod3 Added
Pod4 Added
Pod5 Added
Pod6 Added
Pod7 Added
Pod8 Added
Pod9 Added

@GroggleG GroggleG closed this Nov 3, 2024
@GroggleG
Copy link
Author

GroggleG commented Nov 3, 2024

Ugh, happened again.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping. Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. Status: Needs Review This PR requires new reviews before it can be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants