mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-06-05 06:05:58 +01:00
SyncIt21
14411daa11
## About The Pull Request **1. Rolling Pin Icon Fix** The rolling pin icon shows up correctly under the tools section  The problem was with the text `#define TOOL_ROLLINGPIN "rolling pin"` `"rolling pin"` has a space in it's name, so when it's sent to the UI and used as a css class identifier it get's treated as 2 separate classes class1 = rolling class2 = pin Causing undefined results. So i made sure to remove this space when inserting this name as a sprite sheet and also remove the space manually in the Client-Side UI Fixes #75525 **2. Basketball Hoop Icon Fix** The basket ball hoop has the correct icon in the crafting menu  This is not an `32 x 32` icon but an `32 x 64 ` icon so we assumed the icon size wrong hence it got rendered incorrectly. Now in the back end we query the size of the icon using the datum sprite sheet before sending it to the UI, so this should also fix a lot of other broken icon's that are not the standard `32 x 32` that went un noticed ## Changelog 🆑 fix: rolling pin icon show's up correctly under the tools section in the crafting menu i.e. for those recipes that require it fix: basketball hoop icon and other sprites that are not the standard `32 x 32` now show's up correctly in the crafting menu /🆑
75 lines
3.0 KiB
Plaintext
75 lines
3.0 KiB
Plaintext
///Representative icons for the contents of each crafting recipe
|
|
/datum/asset/spritesheet/crafting
|
|
name = "crafting"
|
|
|
|
/datum/asset/spritesheet/crafting/create_spritesheets()
|
|
var/id = 1
|
|
for(var/atom in GLOB.crafting_recipes_atoms)
|
|
add_atom_icon(atom, id++)
|
|
add_tool_icons()
|
|
|
|
/datum/asset/spritesheet/crafting/cooking
|
|
name = "cooking"
|
|
|
|
/datum/asset/spritesheet/crafting/cooking/create_spritesheets()
|
|
var/id = 1
|
|
for(var/atom in GLOB.cooking_recipes_atoms)
|
|
add_atom_icon(atom, id++)
|
|
|
|
/**
|
|
* Adds the ingredient icon to the spritesheet with given ID
|
|
*
|
|
* ingredient_typepath can be an obj typepath OR a reagent typepath
|
|
*
|
|
* If it a reagent, it will use the default container's icon state,
|
|
* OR if it has a glass style associated, it will use that
|
|
*/
|
|
/datum/asset/spritesheet/crafting/proc/add_atom_icon(ingredient_typepath, id)
|
|
var/icon_file
|
|
var/icon_state
|
|
var/obj/preview_item = ingredient_typepath
|
|
if(ispath(ingredient_typepath, /datum/reagent))
|
|
var/datum/reagent/reagent = ingredient_typepath
|
|
preview_item = initial(reagent.default_container)
|
|
var/datum/glass_style/style = GLOB.glass_style_singletons[preview_item]?[reagent]
|
|
if(istype(style))
|
|
icon_file = style.icon
|
|
icon_state = style.icon_state
|
|
|
|
icon_file ||= initial(preview_item.icon_preview) || initial(preview_item.icon)
|
|
icon_state ||= initial(preview_item.icon_state_preview) || initial(preview_item.icon_state)
|
|
|
|
if(PERFORM_ALL_TESTS(focus_only/bad_cooking_crafting_icons))
|
|
if(!icon_exists(icon_file, icon_state, scream = TRUE))
|
|
return
|
|
|
|
Insert("a[id]", icon(icon_file, icon_state, SOUTH))
|
|
|
|
///Adds tool icons to the spritesheet
|
|
/datum/asset/spritesheet/crafting/proc/add_tool_icons()
|
|
var/list/tool_icons = list(
|
|
TOOL_CROWBAR = icon('icons/obj/tools.dmi', "crowbar"),
|
|
TOOL_MULTITOOL = icon('icons/obj/device.dmi', "multitool"),
|
|
TOOL_SCREWDRIVER = icon('icons/obj/tools.dmi', "screwdriver_map"),
|
|
TOOL_WIRECUTTER = icon('icons/obj/tools.dmi', "cutters_map"),
|
|
TOOL_WRENCH = icon('icons/obj/tools.dmi', "wrench"),
|
|
TOOL_WELDER = icon('icons/obj/tools.dmi', "welder"),
|
|
TOOL_ANALYZER = icon('icons/obj/device.dmi', "analyzer"),
|
|
TOOL_MINING = icon('icons/obj/mining.dmi', "minipick"),
|
|
TOOL_SHOVEL = icon('icons/obj/mining.dmi', "spade"),
|
|
TOOL_RETRACTOR = icon('icons/obj/medical/surgery_tools.dmi', "retractor"),
|
|
TOOL_HEMOSTAT = icon('icons/obj/medical/surgery_tools.dmi', "hemostat"),
|
|
TOOL_CAUTERY = icon('icons/obj/medical/surgery_tools.dmi', "cautery"),
|
|
TOOL_DRILL = icon('icons/obj/medical/surgery_tools.dmi', "drill"),
|
|
TOOL_SCALPEL = icon('icons/obj/medical/surgery_tools.dmi', "scalpel"),
|
|
TOOL_SAW = icon('icons/obj/medical/surgery_tools.dmi', "saw"),
|
|
TOOL_BONESET = icon('icons/obj/medical/surgery_tools.dmi', "bonesetter"),
|
|
TOOL_KNIFE = icon('icons/obj/kitchen.dmi', "knife"),
|
|
TOOL_BLOODFILTER = icon('icons/obj/medical/surgery_tools.dmi', "bloodfilter"),
|
|
TOOL_ROLLINGPIN = icon('icons/obj/kitchen.dmi', "rolling_pin"),
|
|
TOOL_RUSTSCRAPER = icon('icons/obj/tools.dmi', "wirebrush"),
|
|
)
|
|
|
|
for(var/tool in tool_icons)
|
|
Insert(replacetext(tool, " ", ""), tool_icons[tool])
|