Skip to content

Windows And Tables Resprites!#958

Merged
VMSolidus merged 6 commits intoSimple-Station:masterfrom
ShadesMars:window-table-sprite
Oct 4, 2024
Merged

Windows And Tables Resprites!#958
VMSolidus merged 6 commits intoSimple-Station:masterfrom
ShadesMars:window-table-sprite

Conversation

@ShadesMars
Copy link
Copy Markdown
Contributor

Description

Changes Windows, Tables Sprites, and fixes the state for the airalarm.

Directional windows needed to be updated as we updated the previous ones, tables looked ugly and needed an update, its was provided.

Airalarm has its danger state set to warning, and the other inverted, this fixes it too.


TODO

  • AirAlarm State Fix
  • Window/Windoor Sprite
  • Tables

Media

image


Changelog

🆑

  • tweak: Directional Windows and Tables has gotten new sprites!
  • fix: AirAlarm Inverted Alert States has been fixed!

@ShadesMars ShadesMars added Size: 4-Small For small issues/PRs Priority: 3-Medium Needs to be resolved at some point labels Sep 24, 2024
@ShadesMars ShadesMars requested a review from a team September 24, 2024 22:49
@ShadesMars ShadesMars self-assigned this Sep 24, 2024
@ShadesMars ShadesMars requested review from DEATHB4DEFEAT, OldDanceJacket, Peptide90, Pspritechologist and VMSolidus and removed request for a team September 24, 2024 22:49
@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Sep 24, 2024
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Sep 24, 2024

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

Resources/Textures/Structures/Doors/Windoors/windoor.rsi

State Old New Status
assembly Modified
closed Modified
closing Modified
opening Modified

Resources/Textures/Structures/Furniture/Tables/carpet.rsi

State Old New Status
full Modified
state_0 Modified
state_1 Modified
state_2 Modified
state_3 Modified
state_4 Modified
state_5 Modified
state_6 Modified
state_7 Modified

Resources/Textures/Structures/Furniture/Tables/frame.rsi

State Old New Status
full Modified
state_0 Modified
state_1 Modified
state_2 Modified
state_3 Modified
state_4 Modified
state_5 Modified
state_6 Modified

Resources/Textures/Structures/Furniture/Tables/generic.rsi

State Old New Status
full Modified
state_0 Modified
state_1 Modified
state_2 Modified
state_3 Modified
state_4 Modified
state_5 Modified
state_6 Modified
state_7 Modified

Resources/Textures/Structures/Furniture/Tables/glass.rsi

State Old New Status
full Modified
state_0 Modified
state_1 Modified
state_2 Modified
state_3 Modified
state_4 Modified
state_5 Modified
state_6 Modified
state_7 Modified

Resources/Textures/Structures/Furniture/Tables/plasma.rsi

State Old New Status
full Modified
state_0 Modified
state_1 Modified
state_2 Modified
state_3 Modified
state_4 Modified
state_5 Modified
state_6 Modified
state_7 Modified

Resources/Textures/Structures/Furniture/Tables/r_glass.rsi

State Old New Status
full Modified
state_0 Modified
state_1 Modified
state_2 Modified
state_3 Modified
state_4 Modified
state_5 Modified
state_6 Modified
state_7 Modified

Resources/Textures/Structures/Furniture/Tables/reinforced.rsi

State Old New Status
full Modified
state_0 Modified
state_1 Modified
state_2 Modified
state_3 Modified
state_4 Modified
state_5 Modified
state_6 Modified
state_7 Modified

Resources/Textures/Structures/Furniture/Tables/wood.rsi

State Old New Status
full Modified
state_0 Modified
state_1 Modified
state_2 Modified
state_3 Modified
state_4 Modified
state_5 Modified
state_6 Modified
state_7 Modified

Resources/Textures/Structures/Wallmounts/air_monitors.rsi

State Old New Status
alarm1 Modified
alarm2 Modified

Resources/Textures/Structures/Windows/directional.rsi

State Old New Status
frosted_window Modified
plasma_reinforced_window Modified
plasma_window Modified
reinforced_window Modified
tinted_window Modified
window Modified

Edit: diff updated after e8fe4e4

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Me when i touch the "Format Document" button.

Copy link
Copy Markdown
Member

@VMSolidus VMSolidus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh those look really nice!

Copy link
Copy Markdown
Member

@DEATHB4DEFEAT DEATHB4DEFEAT left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove single-frame delays from metas and put the delays on one line per direction

@ShadesMars
Copy link
Copy Markdown
Contributor Author

Really...

Meta File Formatting, you dying that?
Format File.

@DEATHB4DEFEAT
Copy link
Copy Markdown
Member

ooh right I can make my edited changes in VSCode into review comments

@DEATHB4DEFEAT
Copy link
Copy Markdown
Member

image
guh

@ShadesMars
Copy link
Copy Markdown
Contributor Author

image

Just for file format this is pain, gosh.
What Format File VSCode Setting are you using so you dont trouble me with this ever again?

@ShadesMars ShadesMars added the Status: Awaiting Changes Do not merge due to requested changes label Oct 1, 2024
@ShadesMars ShadesMars removed the Status: Awaiting Changes Do not merge due to requested changes label Oct 3, 2024
@VMSolidus VMSolidus merged commit ef59cbb into Simple-Station:master Oct 4, 2024
SimpleStation14 added a commit that referenced this pull request Oct 4, 2024
zelezniciar1 added a commit to zelezniciar1/Einstein-Engines that referenced this pull request Oct 30, 2024
zelezniciar1 added a commit to zelezniciar1/Einstein-Engines that referenced this pull request Oct 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Priority: 3-Medium Needs to be resolved at some point Size: 4-Small For small issues/PRs Status: Needs Review Someone please review this

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants