cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 07:08:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes certain broken icons in the outfit editor, stripping menu and multiple others (#93319)

Browse Source 
## About The Pull Request

``icon2base64`` does not like animated icons and will display an atlas
in TGUI when one is passed into it

<img width="239" height="220" alt="JKneqDL9NH"
src="https://github.com/user-attachments/assets/47e0ffdf-c155-4c84-94ce-c23203281012"
/>

Additionally added some padding between the icon and the slot name in
the outfit editor because it annoyed me

## Changelog
🆑
fix: Fixed certain broken icons in the outfit editor, stripping menu and
multiple others
/🆑
This commit is contained in:
SmArtKar
2025-10-07 18:42:17 +02:00
committed by GitHub
parent 6206945cea
commit 975d3d47ae
9 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/outfit_editor.dm
+4 -2
View File
@@ -55,7 +55,7 @@
"name" = initial(item.name),
"desc" = initial(item.desc),
// at this point initializing the item is probably faster tbh
"sprite" = icon2base64(icon(initial(item.icon), initial(item.icon_state))),
"sprite" = icon2base64(icon(initial(item.icon), initial(item.icon_state), frame = 1)),
)
return data
@@ -78,7 +78,9 @@
var/icon/dummysprite = get_flat_human_icon(null,
dummy_key = dummy_key,
showDirs = list(SOUTH),
outfit_override = drip)
outfit_override = drip,
no_anim = TRUE,
)
data["dummy64"] = icon2base64(dummysprite)
return data
code/modules/admin/verbs/selectequipment.dm
+3 -1
View File
@@ -107,7 +107,9 @@ ADMIN_VERB_ONLY_CONTEXT_MENU(select_equipment, R_FUN, "Select Equipment", mob/ta
var/icon/dummysprite = get_flat_human_icon(null,
dummy_key = dummy_key,
outfit_override = selected_outfit)
outfit_override = selected_outfit,
no_anim = TRUE,
)
data["icon64"] = icon2base64(dummysprite)
data["name"] = target_mob
code/modules/fishing/fishing_rod.dm
+3 -3
View File
@@ -543,13 +543,13 @@
var/list/data = list()
data["bait_name"] = format_text(bait?.name)
data["bait_icon"] = bait != null ? icon2base64(icon(bait.icon, bait.icon_state)) : null
data["bait_icon"] = bait != null ? icon2base64(icon(bait.icon, bait.icon_state, frame = 1)) : null
data["line_name"] = format_text(line?.name)
data["line_icon"] = line != null ? icon2base64(icon(line.icon, line.icon_state)) : null
data["line_icon"] = line != null ? icon2base64(icon(line.icon, line.icon_state, frame = 1)) : null
data["hook_name"] = format_text(hook?.name)
data["hook_icon"] = hook != null ? icon2base64(icon(hook.icon, hook.icon_state)) : null
data["hook_icon"] = hook != null ? icon2base64(icon(hook.icon, hook.icon_state, frame = 1)) : null
data["busy"] = fishing_line
code/modules/mob/living/basic/lavaland/raptor/raptor_dex.dm
+2 -2
View File
@@ -21,7 +21,7 @@
var/list/data = list()
var/mob/living/basic/raptor/my_raptor = raptor.resolve()
data["raptor_image"] = icon2base64(getFlatIcon(image(icon = my_raptor.icon, icon_state = my_raptor.icon_state)))
data["raptor_image"] = icon2base64(icon(icon = my_raptor.icon, icon_state = my_raptor.icon_state, frame = 1))
data["raptor_attack"] = my_raptor.melee_damage_lower
data["raptor_health"] = my_raptor.maxHealth
data["raptor_speed"] = my_raptor.speed
@@ -33,7 +33,7 @@
var/obj/effect/overlay/happiness_overlay/display = new
display.set_hearts(happiness_percentage)
display.pixel_y = ICON_SIZE_Y * 0.5
data["raptor_happiness"] = icon2base64(getFlatIcon(display))
data["raptor_happiness"] = icon2base64(getFlatIcon(display, no_anim = TRUE))
qdel(display)
var/datum/raptor_inheritance/inherit = my_raptor.inherited_stats
code/modules/mob/living/basic/minebots/minebot.dm
+1 -1
View File
@@ -165,7 +165,7 @@
/mob/living/basic/mining_drone/ui_static_data(mob/user)
var/list/data = list()
data["bot_icon"] = icon2base64(getFlatIcon(src))
data["bot_icon"] = icon2base64(getFlatIcon(src, no_anim = TRUE))
data["possible_colors"] = list()
for(var/color in possible_colors)
data["possible_colors"] += list(list(
code/modules/mob/living/basic/pets/pet_designer.dm
+1 -1
View File
@@ -81,7 +81,7 @@ GLOBAL_LIST_INIT(pet_options, list(
for(var/color in possible_colors)
demo_carrier.set_greyscale(possible_colors[color])
list_to_return[color] = icon2base64(getFlatIcon(demo_carrier))
list_to_return[color] = icon2base64(getFlatIcon(demo_carrier, no_anim = TRUE))
qdel(demo_carrier)
return list_to_return