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

Floor Resprite - The Sequel [MDB IGNORE] #10276

Merged
merged 121 commits into from
Jan 15, 2024

Conversation

DrDuckedGoose
Copy link
Contributor

@DrDuckedGoose DrDuckedGoose commented Dec 5, 2023

About The Pull Request

I have come atone for my sins, and in reverence I offer this tribute.

Last year on October 31st, I tried to resprite our floors, unfortunately, I didn't do a very good job. However, 12+ months later paired with more experience, I am trying again to resprite our floors. This attempt features a little more spriting experience, and general 'study' for the task at hand.

Additionally, I have included some other changes to turfs, mostly floors, that complement these changes, such as-

  • Procedural turf dependant damage visuals
  • Area & turf dependant grime and dirt, that can be cleaned
  • Better handling of generating non-slip turfs
  • Better tile variance
  • Mapping helpers for tile breaking

Why It's Good For The Game

Floors currently look bad and make me unenthusiastic to play the game. Improving the floor sprite should motivate myself and others.

Testing Photographs and Procedure

Screenshots&Videos
Beauty Shots

image
image
image
image
image
image
image
image
image
image
image
image
image
image
image
image

Tile Damage

image
image
image
image
image
image
image

Minor Feature Showcase

image
image
image
image

Changelog

🆑
tweak: Resprites the majority of floors.dmi
remove: Removes the majority of floor damage icons
remove: Remove floor anti-slip alternates
add: Add overlays and variables for non-slip floors
add: Adds procedural visual damage to floors
add: Add area & turf dependant 'grime'
tweak: Improve open turf variant system
tweak: Changes all mapping occurrences of old broken tiles
tweak: Change all occurrences of non-slip floor tiles to new system
tweak: Re-maps some areas to better match the new tile appearances
tweak: Resprites decals to match new flooring
/:cl:

Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@itsmeow
Copy link
Member

itsmeow commented Jan 13, 2024


FAIL: /datum/unit_test/smoothing 0.5s
	REASON #1: Did not find the following states in icon_states of icons/turf/floors.dmi, during testing of path /turf/open/floor/grass/fakebasalt: grass-0, grass-1, grass-2, grass-3, grass-4, grass-5, grass-6, grass-7, grass-8, grass-9, grass-10, grass-11, grass-12, grass-13, grass-14, grass-15, grass-21, grass-23, grass-29, grass-31, grass-38, grass-39, grass-46, grass-47, grass-74, grass-75, grass-78, grass-79, grass-137, grass-139, grass-141, grass-143, grass-55, grass-63, grass-95, grass-110, grass-111, grass-157, grass-159, grass-175, grass-203, grass-207, grass-127, grass-191, grass-223, grass-239, grass-255

@itsmeow itsmeow changed the title Floor Resprite - The Sequel Floor Resprite - The Sequel [MDB IGNORE] Jan 13, 2024
@itsmeow
Copy link
Member

itsmeow commented Jan 13, 2024

Noslip mapping helper needs an icon.

Gold has extra dirs.
image

I'm not a huge fan of removing the 'ornate' aspects of gold and silver floors. They are supposed to be pretty/luxurious, not just raw materials in a tile.

Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@itsmeow itsmeow removed the Frozen Frozen until a larger project is finished label Jan 15, 2024
@itsmeow
Copy link
Member

itsmeow commented Jan 15, 2024

meta has merge conflict markers

@PowerfulBacon
Copy link
Member

@PestoVerde322

@DrDuckedGoose
Copy link
Contributor Author

idk what happened, but it's ready

@itsmeow itsmeow added this pull request to the merge queue Jan 15, 2024
Merged via the queue into BeeStation:master with commit f2d6fbd Jan 15, 2024
9 checks passed
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.

7 participants