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

[MDB Ignore]Fix every missing icon. Add icons for every worn item. #10869

Merged
merged 99 commits into from
May 11, 2024

Conversation

Tsar-Salat
Copy link
Contributor

@Tsar-Salat Tsar-Salat commented Apr 7, 2024

About The Pull Request

Ports:

closes #10956

Fix all missing icons

Adds a unit test to yell at you if you input an improper icon_state entry.

Yes, now I have to resolve every missing icon in the game.

image

If you want to see my progress, just look

Sorting clothing folders

I am sorting the clothing folders based on category/department

Why It's Good For The Game

Yes. Missing Icons bad. We hold the little coders responsible for when they LEAVE OUT their icons in their PRs!!!!

Looking at YOU @kit-katz #8458 and YOU @MarkusLarsson421 #10548

Testing Photographs and Procedure

Screenshots&Videos

You know its working when the unit test stops yelling at me.

E-guns

dreamseeker_G34cM6keco.mp4

Clothing icon & spritesheet test

GfamDg1YlN.mp4

Changelog

🆑 rkz(organized & repathed every clothing sprite), MrMelbert, ShizCalev, ArcaneMusic(code contribution), maxymax13, TaG2e, LordVollkorn, Twaticus(sprite contribution)
add: A hell of a lot of new belt/back sprites for items
tweak: Lawyer's aristocratic coats are now under premium in vendor
fix: All missing sprite icon_states in the game are now accounted for.
fix: All missing sprite worn_states in the game are now accounted for.
code: all offending coders have been taken out back and cried at
code: Implements full missing icon unit test
code: Organizes obj/clothing & mob/clothing by category & typepath
code: hooded cult robes now use hooded typepath instead of being hardsuit subtypes (all stats preserved)
code: hooded carp suit now use hooded typepath instead of being hardsuit subtypes (all stats preserved)
code: adjusts several body_parts_covered flags on different clothes articles to fix worn_icon issues
/:cl:

@github-actions github-actions bot added the Mapping DMM Change label Apr 8, 2024
@@ -220,9 +220,6 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
meteor_effect()
qdel(src)

/obj/effect/meteor/ex_act()
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Instead of 10 snowflake ex_act handlings for every child of /effect/, we simply do it all on effect.

Incredible.

@@ -476,7 +476,7 @@
/obj/item/bodypart/chest
name = BODY_ZONE_CHEST
desc = "It's impolite to stare at a person's chest."
icon_state = "default_human_chest"
//icon_state = "default_human_chest"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I preserve this in a comment because its a really bad way to have it. This NEEDS to be fixed in a proper kapulimbs port.

However bodyparts default to their main dmi file, greyscaled parts, which isnt what these icon_states are trying to point at, nor can I just put the proper icons in the greyscale folder (it would fuck it up).

Fun stuff, really.

Copy link

github-actions bot commented May 8, 2024

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

Copy link

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

body_parts_covered = CHEST|GROIN|LEGS|FEET
flags_inv = HIDEJUMPSUIT|HIDESHOES

/obj/item/clothing/suit/hooded/carp_costume
Copy link
Contributor Author

Choose a reason for hiding this comment

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

1st "hardsuit" converted into a hooded suit and given spaceproof. This is because under this pr, typepaths direct towards specific .dmi now

body_parts_covered = CHEST|GROIN|LEGS|ARMS
allowed = list(/obj/item/tome, /obj/item/melee/cultblade)
armor = list(MELEE = 50, BULLET = 30, LASER = 50, ENERGY = 20, BOMB = 25, BIO = 10, RAD = 0, FIRE = 10, ACID = 10, STAMINA = 50)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT

/obj/item/clothing/head/helmet/space/hardsuit/cult
/obj/item/clothing/suit/hooded/cultrobes/hardened
Copy link
Contributor Author

Choose a reason for hiding this comment

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

2nd "hardsuit" converted into a hooded suit and given spaceproof. This is because under this pr, typepaths direct towards specific .dmi now.

Also made no sense being a hardsuit

@Tsar-Salat Tsar-Salat marked this pull request as ready for review May 10, 2024 13:40
@Tsar-Salat Tsar-Salat requested a review from a team as a code owner May 10, 2024 13:40
@Tsar-Salat
Copy link
Contributor Author

testing evidence added , no more unit test errors, see no issues on energy guns.

We're ready to roll 😎

@PowerfulBacon PowerfulBacon added this pull request to the merge queue May 11, 2024
Merged via the queue into BeeStation:master with commit 9106b1d May 11, 2024
29 checks passed
@@ -62,6 +63,7 @@
name = "doctor's bag"
icon_state = "firstaid-surgeryalt"
item_state = "firstaid-surgeryalt"
worn_icon_state = "baguette"
Copy link
Contributor

Choose a reason for hiding this comment

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

You turned my bag into a baguette.
I'll pay you double of what the French paid you to release my bag from the carbohydrate-prison.
(belt slot)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@lowwy I didn't turn it into anything, rather doctors bags are supposed to have a worn state, but do not.

I chose to use baguettes for several of these cases as they both have a valid back and waist sprite.

Whoever made doctors use "Doctor's Bags" at roundstart neglected their due diligence, it needs an actual worn sprite like the medkit doctors used before.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah no worries, just some banter, I though it would be something like that. just making sure!

Copy link
Contributor

@lowwy lowwy left a comment

Choose a reason for hiding this comment

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

5 items ended up with a worn_icon_state = "baguette", not sure if intentional as they are not baguette-like

Was intentional, all good!

BarteG44 added a commit to BarteG44/BeeStation-Hornet that referenced this pull request Oct 6, 2024
BeeStation#10869 broke the alt jumpsuit by renaming the base state and not changing anything else. This updates both the alt name and the sprite itself
github-merge-queue bot pushed a commit that referenced this pull request Oct 13, 2024
#10869 broke the alt jumpsuit by renaming the base state and not changing anything else. This updates both the alt name and the sprite itself
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.

[Bug]: Revenant dust form has invisible sprite.
4 participants