From 5bce2d79c5c2371034d0d68cdb2e629164a49282 Mon Sep 17 00:00:00 2001 From: Cursor <102828457+theselfish@users.noreply.github.com> Date: Tue, 11 Nov 2025 16:02:44 +0000 Subject: [PATCH] Hopefully fixes the recurring GAGS annoyance. (#4895) ## About The Pull Request Stops the annoying gags bug we get once in a while. Non modular, I woulda submitted it to TG but they don't have any GAGS items that use transformations so it'd be pointless. Code entirely stolen from https://github.com/MrMelbert/MapleStationCode/pull/827 . ## Why It's Good For The Game Things work good. ## Proof Of Testing it work ## Changelog :cl: add: Added a previously unobtainable Parasol to the Clothesmate. code: PRs should hopefully stop chinwagging about map icons now. /:cl: --- code/datums/components/transforming.dm | 5 ++++- .../code/modules/rimpoint_newfeatures/code/umbrella.dm | 5 +++-- modular_zubbers/code/modules/vending/clothesmate.dm | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/code/datums/components/transforming.dm b/code/datums/components/transforming.dm index a8116bd6900..757be5949b0 100644 --- a/code/datums/components/transforming.dm +++ b/code/datums/components/transforming.dm @@ -243,7 +243,10 @@ source.hitsound = initial(source.hitsound) source.update_weight_class(initial(source.w_class)) - source.icon_state = initial(source.icon_state) + if(source.post_init_icon_state) // BUBBER CHANGE START : Bug Fix. + source.icon_state = initial(source.post_init_icon_state) + else + source.icon_state = initial(source.icon_state) // BUBBER CHANGE END source.inhand_icon_state = initial(source.inhand_icon_state) source.update_appearance() source.update_inhand_icon() diff --git a/modular_zubbers/code/modules/rimpoint_newfeatures/code/umbrella.dm b/modular_zubbers/code/modules/rimpoint_newfeatures/code/umbrella.dm index cc225373240..3fc178f6c4c 100644 --- a/modular_zubbers/code/modules/rimpoint_newfeatures/code/umbrella.dm +++ b/modular_zubbers/code/modules/rimpoint_newfeatures/code/umbrella.dm @@ -2,8 +2,8 @@ /obj/item/umbrella name = "umbrella" - icon = 'modular_zubbers/icons/obj/equipment/umbrella.dmi' - icon_state = "umbrella" + icon = 'icons/map_icons/items/_item.dmi' + icon_state = "/obj/item/umbrella" post_init_icon_state = "umbrella" lefthand_file = 'modular_zubbers/icons/obj/equipment/umbrella_inhand_l.dmi' righthand_file = 'modular_zubbers/icons/obj/equipment/umbrella_inhand_r.dmi' @@ -126,6 +126,7 @@ /obj/item/umbrella/parasol name = "parasol" desc = "A black laced parsol, how intricate." + icon = 'modular_zubbers/icons/obj/equipment/umbrella.dmi' icon_state = "parasol" inhand_icon_state = "parasol_closed" on_inhand_icon_state = "parasol_on" diff --git a/modular_zubbers/code/modules/vending/clothesmate.dm b/modular_zubbers/code/modules/vending/clothesmate.dm index 7adea70cc3c..b5f9f7169c0 100644 --- a/modular_zubbers/code/modules/vending/clothesmate.dm +++ b/modular_zubbers/code/modules/vending/clothesmate.dm @@ -226,6 +226,7 @@ /obj/item/riding_saddle/leather = 5, /obj/item/storage/backpack/saddlebags = 5, /obj/item/umbrella = 20, + /obj/item/umbrella/parasol = 20, ) ) )