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

Miscellaneous Floor Stuff #366

Closed

Conversation

The-Black-Screen
Copy link
Contributor

@The-Black-Screen The-Black-Screen commented Sep 19, 2023

About The Pull Request

This PR makes many of the iron floor designs match and gives some of them extra directions, it also adds a few variants. These changes have also been applied to the RTD.

Why It's Good For The Game

All or most of the iron floors match design wise now and the dark floors aren't duplicates of the smooth floors anymore. There's now also variants for the recharge_floor and goonplaque that match with the other iron floor colors.

chapel floors have finally been fixed, they've also been given a chapel_large variant.

Changelog

🆑
add: Added new floors and also added directions to existing floors. Changes also added to the rtd.
fix: Several iron floor designs and finally the chapel floor designs.
image: Modified floor, floor_edge, floor_half, floor_corner, floor_large, small, diagonal, herringbone, darkfull, dark_edge, dark_half, dark_corner, dark_large, dark_small, dark_diagonal, dark_herringbone, checker, dark, darkcorner, white, white_edge, white_half, white_corner, white_large, white_small, white_diagonal, white_herringbone, cafeteria, whitehall, whitecorner, textured, textured_edge, textured_half, textured_corner, textured_large, textured_dark, textured_dark_edge, textured_dark_half, textured_dark_corner, textured_dark_large, textured_white, textured_white_edge, textured_white_half, textured_white_corner, textured_white_large, plaque, recharge_floor, terracotta, terracotta_small, terracotta_diagonal, terracotta_herringbone, kitchen, kitchen_small, kitchen_diagonal, kitchen_herringbone, sepia, chapel, and pinkblack icons. Added dark_plaque, white_plaque, smooth_plaque, dark_recharge_floor, white_recharge_floor, smooth_recharge_floor, chapel_large icons.
code: Made the appropriate changes to iron_floor.dm, tile_iron.dm, and rtd.dm.
/:cl:

Fixes the dark iron floors being a copy of the smooth iron floors.

Fixes some other floors having the wrong icons.

Adds recharge and plaque variants for the dark, white, and smooth floors.

Adds a large chapel floor variant.

Adds directions to many other floor sprites.

Several floors in the RTD have been given directions as well.
@dwasint
Copy link
Collaborator

dwasint commented Sep 19, 2023

looks good will need to tm though to see in actual rounds

@The-Black-Screen
Copy link
Contributor Author

Alright

simply adds the bitrunning floor icon
@DexeeXI
Copy link
Collaborator

DexeeXI commented Nov 27, 2023

looks to me here if the merge conflict is resolved, we may be able to TM this and see how it looks, like borbop had previously mentioned.

@The-Black-Screen
Copy link
Contributor Author

The merge conflict should've been resolved with the "fix for bitrunner" commit, as it added the missing bitrunning floor icon.
That was the only issue at the time, though since it's been a while I can check again.

@The-Black-Screen
Copy link
Contributor Author

Yeah, it should be good. The only difference I've found in floors.dmi right now is just the position of the sand_damaged icon. It being where it originally was, right next to sand, instead of after tgmc_center.

@DexeeXI
Copy link
Collaborator

DexeeXI commented Dec 15, 2023

Merge conflict is still flagged. Not sure of path of resolution. Will still need to otherwise test merge and see how this looks on live.

@The-Black-Screen
Copy link
Contributor Author

This PR has been up for too long, the branch it's on is 2000+ commits behind.
So I'm just going to close this and redo it after BoxStation has been merged.

@The-Black-Screen The-Black-Screen deleted the sprite-fixes branch February 11, 2024 17:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants