8000 Icon Reorganization port [IDB Ignore] [MDB Ignore] by AlanParkerMasters · Pull Request #1060 · cmss13-devs/cmss13-pve · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Icon Reorganization port [IDB Ignore] [MDB Ignore] #1060

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

Draft
wants to merge 22 commits into
base: master
Choose a base branch
from

Conversation

AlanParkerMasters
Copy link
Contributor
@AlanParkerMasters AlanParkerMasters commented Jun 25, 2025

About the pull request

IMPORTANT: This is a rough draft at the moment, feel free to help out and point anything out that needs to be fixed.

I will work on this and finish it when I have a free day. Very rough state right now.

Ports:
cmss13-devs/cmss13#7021
cmss13-devs/cmss13#7659

Explain why it's good for the game

This will allow for much better organization & make upstream merging significantly easier.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
add: dmi file reorganization
add: new missing icon tests
/:cl:

Drulikar and others added 12 commits June 19, 2025 11:53
This PR is an experimental change to the missing icons unit test where
it now instantiates all items to check their items (meaning they will do
whatever they do to their icon_state in Initialize). This ended up
causing several new hard deletes that I had to fix too. The create and
destroy unit test shares exclusions now with missing icons. I originally
started this because #7021 is likely going to need help sorting out lots
of missing icons at runtime that weren't caught with the old unit test.

~~No actual pixel changes in sprites: Just renames, removals, or
addition of blank states.~~
Added unlocked overlay to `/obj/item/storage/backpack/satchel/lockable`

![image](https://github.com/user-attachments/assets/d4a47ee9-6033-4667-b001-2169a68ec2c6)
Restored the spike overlays to `/obj/item/weapon/gun/launcher/spike`
removed some reason in #7361

![image](https://github.com/user-attachments/assets/4711b856-598d-44f2-8ff3-ff60447254c5)
Tweaked transparency and edges on old alien samples:

![image](https://github.com/user-attachments/assets/ea30a8d0-491a-4b97-8584-247c67176d52)

Currently there are 847 warnings for missing mob icons (could be more if
blanket testing slots that allow equipping the item), but these are only
mentioned in the warnings section (nor annotated currently though I
would like warnings to eventually be annotated once there isn't so much
noise).

More robust testing for hard deletes and missing icons.

<details>
<summary>Screenshots & Videos</summary>

https://youtu.be/uB8Z4yNjfDA

</details>

:cl: Drathek
code: Missing Icons unit test now instantiates items and generally tests
more icon_states
code: Unit tests can now log warnings that appear as a separate
collapsed list but do not fail checks
fix: Fixed various hardrefs and missing icons
fix: Pipes retain their dir when picked up, no longer go invisible when
re-anchored, and reconnect when re-anchored.
fix: Disabled various admin only pistols from being equipped in pistol
belts since they only honk their underlay
refactor: Giant lizards and parent types now use weakrefs
refactor: Removed has_gamemode_skin and renamed NO_SNOW_TYPE to
NO_GAMEMODE_SKIN
refactor: Removed uses_skin_color in favor of the existing flag
HAS_SKIN_COLOR
maptweak: Fixed droppod floors on trijent elevator, lifeboats, corsat,
and bigred
imageadd: Added missing unlocked overlay to lockable satchel
imageadd: Restored the missing overlays to spike launcher
imageadd: Tweaked the old sample jars and samples
admin: Admin spawned predators now have random skin color
/:cl:
Splits and reorganizes tons of heavy dmi files, removes some completely
unused icons.

No changes to existing icons, no new ones are added.

No player facing changes. (Apart from fixes)

- [x] Split majority of heavy files into smaller files with better
structure
- [x] Attach new icon paths based on icon_state (aka object icon)
- [x] Attach new icon paths based on item_state (aka mob icon)
- [x] Add support for camo items render in vendors
- [x] Rework `select_gamemode_skin` into not forcing icon prefixes like
b_ c_ u_ on everything it touches
- [x] Rework helmet garb

We hit icon state cap (512) in certain files, and not to mention the
amount of merge conflicts overloaded files have.

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>

:cl: Blundir, Drathek, ItsVyzo, CzHa, forest2001
refactor: reorganized and cleaned many dmis in icons folder
del: inflatable duck can no longer have ammo
del: removed a huge dozen of extremely outdated legacy bay items
imagedel: removed majority of left unused, duplicate and legacy sprites
from the codebase
imageadd: es7 in belt holstered sprite
imageadd: m39 pmc in belt holstered sprite
imageadd: warden's uniform now has camo variants
imageadd: dcc's jacket now has camo variants
imageadd: type 71, type 71-F and type 71 commando suit storage icons by
CzHa (discord tag .cpol)
fix: mp uniforms not having working onmob camo sprites
fix: mob looking handcuffed while just holding cuffs in hand
fix: rank pins/boards and other accessories not being visible on object
sprite
fix: pdt bracelet looking like a blue tie on the uniform
fix: officer uniform not having working camo sprites
fix: m39 not having custom sprites on belt for camo variants
fix: taser having positions in hands wrong
fix: inhands for shotgun shells not working
fix: emp grenades now use correct (non legacy) icon
/:cl:

---------

Co-authored-by: Vyzo <dj7joke@hotmail.com>
Co-authored-by: forest2001 <ingram.josh@gmail.com>
Co-authored-by: harryob <55142896+harryob@users.noreply.github.com>
Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com>
Co-authored-by: Drulikar <drathek@gmail.com>
@cm13-github
Copy link
Contributor

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

@Drulikar Drulikar changed the title Icon Reorganization port [DNM] Icon Reorganization port [IDB Ignore] Jun 25, 2025
@Drulikar Drulikar changed the title Icon Reorganization port [IDB Ignore] Icon Reorganization port [IDB Ignore] [MDB Ignore] Jun 25, 2025
@Drulikar
Copy link
Contributor

Can lift MDB ignore before merge for final review. No need for it to be spammed in the meantime.

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.

4 participants
0