mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-27 01:21:30 +00:00
7cb2e37809
* Assorted minor alt-click reskinning fixes, primarily context-based (#83105) ## About The Pull Request This is a collection of tiny alt-click context fixes that I found during testing #82920, but I felt were not right to put in there. Most of the following explanation is for posterity, like they're mostly one-liners, there's only so much explanation to do. First off, the emotion mask would reset `current_skin` for infinite reskinning, while we have the `INFINITE_RESKIN` flag:0c562fd742/code/modules/clothing/masks/costume.dm (L16-L19)We set this to `INFINITE_RESKIN` for sanity's sake. Then, `/obj/item/clothing/under/add_context(...)` would call its parent, but sometimes return `NONE` when its parent returned `CONTEXTUAL_SCREENTIP_SET`:0c562fd742/code/modules/clothing/under/_under.dm (L83)This is bad, because reskinning context is handled on the parent (`/obj/item`), and we have an item inheriting this which can be reskinned, the mech pilot's suit:0c562fd742/code/modules/clothing/under/costume.dm (L224-L240)So we make this return the parent return value rather than `NONE`: ```dm return changed ? CONTEXTUAL_SCREENTIP_SET : . ``` Next up, `/obj/item/clothing/accessory/add_context(...)` would never actually call the parent and thus neither the reskinning context. It also checks for whether you have an item in your active hand when context is added, even though the context it adds actually only applies when the accessory itself is in your active hand.0c562fd742/code/modules/clothing/under/accessories/_accessories.dm (L205-L210)So we instead make it call the parent first, check for whether the accessory itself is in our active hand, and return the parent value if not: ```dm /obj/item/clothing/accessory/add_context(atom/source, list/context, obj/item/held_item, mob/user) . = ..() if(held_item != source) return . (...) ``` This resolves our issue. We're almost there! `/obj/item/reagent_containers/spray/medical/add_context(...)` exists, but is entirely redundant due to this now being handled on the base item, and also misses some of the checks it has.0c562fd742/code/modules/reagents/reagent_containers/spray.dm (L442-L447)So we just remove it. Finally, what is to me the funniest one:9145ecb7e1/code/game/objects/items_reskin.dm (L8-L9)To add reskinning context, we check `item_flags` for `INFINITE_RESKIN`, while it is actually on `obj_flags`. So, instead, we were checking for the equivalent value in `item_flags`, being `IN_STORAGE`.9145ecb7e1/code/__DEFINES/obj_flags.dm (L15)9145ecb7e1/code/__DEFINES/obj_flags.dm (L34)And thus reskinning context for infinitely reskinnables would only show up if they were in storage. For now, we just update this to use `obj_flags` instead. That's everything I found so far, which this should all fix. ## Why It's Good For The Game Having working item usage context tends to be a good thing. ## Changelog 🆑 fix: Emotion masks no longer use a janky workaround for infinite reskinning. fix: Mech pilot suit shows reskinning usage context correctly. fix: Accessories show "wear above/below suit" usage context appropriately. fix: Accessories don't block reskinning usage context when they shouldn't. fix: Showing reskinning usage context cares about the infinite reskinning flag, rather than whether it's in storage or not. del: Removed redundant reskinning usage context code from medical sprays, now shows reskinning usage context like other reskinnables. /🆑 * Assorted minor alt-click reskinning fixes, primarily context-based --------- Co-authored-by: _0Steven <42909981+00-Steven@users.noreply.github.com>