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

The Resprite: Diagonal Reinforced Wall, Greyscale Decal Cleanup, Secret Doors #1842

Merged
12 commits merged into from
Sep 18, 2024

Conversation

ghost
Copy link

@ghost ghost commented Sep 17, 2024

About the PR

Fixed some wooden tiles (Aikakakah did it, blame them.)
Pulled the diagonal walls from them, and as collateral, got a shit-ton of secret doors. From new-frontiers-14/frontier-station-14#757
Fixed decal offsetting on the new sprites, because there were a bunch of old ones clashing with the normal ones.

Why / Balance

I got annoyed at a bunch of little spriting discrepancies and I've decided that I needed to take Noct's resprite project under my wing so forward things I need to do to me. I have a hefty list.

Technical details

A lot of RSIs, YAML.

Media

295443841-455d93c1-465d-4138-8a12-6200abfc68b2
image
image
image

Requirements

Breaking changes

Changelog
🆑 Adei, ErhardSteinhauer, Aikakakah

  • tweak: Tweaked wooden tiles so they go with the rest of wood chairs / items more.
  • tweak: Decals are now no longer offset by one pixel!
  • add: You can now build more secret doors.

dvir001 and others added 7 commits September 16, 2024 20:57
* Canisters

* Liquid

* Update meta.json

* Update gas_canisters.yml

* Update meta.json

* Fix

* Create gas_canisters.yml

* Update gas_canisters.yml

* Update gas_canisters.yml
* Diagonal walls and window

* added notice board and diagonal window

* diagonal plasma windows

* secret door

* notice boards are craftable

* kegs

* keggers

* added kegs to boozeomat inventory

* Adressing the issues

* Delete Resources/Prototypes/_NF/Recipes/Construction/Graphs/structure…

* Delete Resources/Prototypes/_NF/Recipes/Construction/wallmount_notice…

* Update boozeomat.yml

* window parenting fixes

* Cleanup

* Fixing

* added new entity to use as a parent instead of WallSolidDiagonal (whi…

* Update diagonal_walls.yml

* Merge branch 'new-frontiers-14:master' into Diagonal-Walls&Windows

* moving diagonal windows and grille to separate PR

* Merge remote-tracking branch 'origin/master' into pr/757

* Merge branch 'new-frontiers-14:master' into Diagonal-Walls&Windows
@ghost ghost requested review from IamVelcroboy and a team as code owners September 17, 2024 04:16
@github-actions github-actions bot added Status: Needs Review Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an rsi labels Sep 17, 2024
Copy link
Contributor

github-actions bot commented Sep 17, 2024

RSI Diff Bot; head commit 94ce831 merging into 137eccc
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi

State Old New Status
checkerNESW Added
checkerNWSE Added
diagonal Added
diagonal_checker_a Added
diagonal_checker_b Added
fulltile_overlay Added
halftile_overlay Added
halftile_overlay_180 Added
halftile_overlay_270 Added
halftile_overlay_90 Added
quartertile_overlay Added
quartertile_overlay_180 Added
quartertile_overlay_270 Added
quartertile_overlay_90 Added
threequartertile_overlay Added
threequartertile_overlay_180 Added
threequartertile_overlay_270 Added
threequartertile_overlay_90 Added

Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi

State Old New Status
assembly Added
closed Added
closing Added
open Added
opening Added

Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi

State Old New Status
assembly Added
closed Added
closing Added
open Added
opening Added

Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi

State Old New Status
assembly Added
closed Added
closing Added
open Added
opening Added

Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi

State Old New Status
assembly Added
closed Added
closing Added
open Added
opening Added

Resources/Textures/_NF/Structures/Walls/solid_reinforced_diagonal.rsi

State Old New Status
state0 Added
state1 Added

Resources/Textures/_NF/Structures/Walls/uranium_diagonal.rsi

State Old New Status
state0 Added
state1 Added

Resources/Textures/_NF/Structures/Walls/wood_diagonal.rsi

State Old New Status
state0 Added
state1 Added

Edit: diff updated after 94ce831

@TadJohnson00
Copy link
Contributor

Me personally? I'd love if this could get split into separate PRs

@ghost
Copy link
Author

ghost commented Sep 17, 2024

I'll split the tanks into a seperate PR, and the walls / decals / door assembly can stay here >:)

adeinitas added 2 commits September 17, 2024 03:17
@ghost ghost changed the title The Resprite: Diagonal Reinforced Wall, Greyscale Decal Cleanup, and Frontier Air Canisters The Resprite: Diagonal Reinforced Wall, Greyscale Decal Cleanup, Secret Doors Sep 17, 2024
@ghost
Copy link
Author

ghost commented Sep 17, 2024

I rember 😔

@TadJohnson00
Copy link
Contributor

Wood tiles get Dir. approval
Diagonal walls get Dir. approval
And secret doors, I guess, get Dir. approval - unless there's something secret about those secret doors I ain't seeing

@ghost
Copy link
Author

ghost commented Sep 18, 2024

There is nothing secret about the secret doors TJ.

BUT WHAT ABOUT THE DECALS?!!??!?!?!!!??!?!??!111

@TadJohnson00
Copy link
Contributor

Decals fine x3

Copy link
Contributor

@TadJohnson00 TadJohnson00 left a comment

Choose a reason for hiding this comment

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

YAML seems fine after looking through too. All good to merge?

@ghost
Copy link
Author

ghost commented Sep 18, 2024

Yeah, pretty much. What harm could it do?

@ghost ghost merged commit fb61091 into DeltaV-Station:master Sep 18, 2024
13 checks passed
@dvir001
Copy link
Contributor

dvir001 commented Sep 18, 2024

@adeinitas We actually made more edits to the walls to allow walls to combine with other walls, did you grab the last changes to the files?

new-frontiers-14/frontier-station-14#1603

@ghost ghost deleted the finishing-the-resprite branch September 18, 2024 13:05
@ghost
Copy link
Author

ghost commented Sep 18, 2024

No! I am doing that now, because oh fuck, oh shit!!

This pull request was closed.
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 Status: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants