From 34697acf741feff6edef0fd074a9d151bf28febe Mon Sep 17 00:00:00 2001 From: Letter N <24603524+LetterN@users.noreply.github.com> Date: Fri, 5 Mar 2021 19:29:52 +0800 Subject: [PATCH] missing icon fix & stop throwing out parts --- code/datums/achievements/boss_achievements.dm | 22 +++++++++---------- .../items/circuitboards/circuitboard.dm | 4 ++-- code/modules/admin/admin_verbs.dm | 8 ------- code/modules/asset_cache/asset_cache_item.dm | 2 +- code/modules/asset_cache/asset_list_items.dm | 11 +++++++--- code/modules/asset_cache/readme.md | 8 ++++--- tgui/packages/tgui/interfaces/Achievements.js | 3 +-- 7 files changed, 28 insertions(+), 30 deletions(-) diff --git a/code/datums/achievements/boss_achievements.dm b/code/datums/achievements/boss_achievements.dm index 6625bbb439..104a369405 100644 --- a/code/datums/achievements/boss_achievements.dm +++ b/code/datums/achievements/boss_achievements.dm @@ -12,7 +12,7 @@ name = "Boss Killer" desc = "You've come a long ways from asking how to switch hands." database_id = "Boss Killer" - icon = "firstboss" + // icon = "firstboss" /datum/award/achievement/boss/blood_miner_kill name = "Blood-Drunk Miner Killer" @@ -117,14 +117,14 @@ database_id = BOSS_MEDAL_WENDIGO_CRUSHER //should be removed soon -/datum/award/achievement/boss/king_goat_kill - name = "King Goat Killer" - desc = "The king is dead, long live the king!" - database_id = BOSS_MEDAL_KINGGOAT - icon = "goatboss" +// /datum/award/achievement/boss/king_goat_kill +// name = "King Goat Killer" +// desc = "The king is dead, long live the king!" +// database_id = BOSS_MEDAL_KINGGOAT +// icon = "goatboss" -/datum/award/achievement/boss/king_goat_crusher - name = "King Goat Crusher" - desc = "The king is dead, long live the king!" - database_id = BOSS_MEDAL_KINGGOAT_CRUSHER - icon = "goatboss" +// /datum/award/achievement/boss/king_goat_crusher +// name = "King Goat Crusher" +// desc = "The king is dead, long live the king!" +// database_id = BOSS_MEDAL_KINGGOAT_CRUSHER +// icon = "goatboss" diff --git a/code/game/objects/items/circuitboards/circuitboard.dm b/code/game/objects/items/circuitboards/circuitboard.dm index 6dcc344037..a0ce6e749a 100644 --- a/code/game/objects/items/circuitboards/circuitboard.dm +++ b/code/game/objects/items/circuitboards/circuitboard.dm @@ -80,10 +80,10 @@ micro-manipulator, console screen, beaker, Microlaser, matter bin, power cells. comp_path = def_components[comp_path] if(ispath(comp_path, /obj/item/stack)) - M.component_parts += new comp_path(M, comp_amt) + M.component_parts += new comp_path(null, comp_amt) else for(var/i in 1 to comp_amt) - M.component_parts += new comp_path(M) + M.component_parts += new comp_path(null) M.RefreshParts() diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 5b28ad0ca9..6157aa1207 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -443,14 +443,6 @@ GLOBAL_PROTECT(admin_verbs_hideable) // holder.ban_panel() // SSblackbox.record_feedback("tally", "admin_verb", 1, "Banning Panel") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -// /client/proc/unban_panel() -// set name = "Unbanning Panel" -// set category = "Admin" -// if(!check_rights(R_BAN)) -// return -// holder.unban_panel() -// SSblackbox.record_feedback("tally", "admin_verb", 1, "Unbanning Panel") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - /client/proc/game_panel() set name = "Game Panel" set category = "Admin.Game" diff --git a/code/modules/asset_cache/asset_cache_item.dm b/code/modules/asset_cache/asset_cache_item.dm index 72d976bf11..059ebaebca 100644 --- a/code/modules/asset_cache/asset_cache_item.dm +++ b/code/modules/asset_cache/asset_cache_item.dm @@ -24,7 +24,7 @@ /datum/asset_cache_item/New(name, file) if (!isfile(file)) file = fcopy_rsc(file) - + hash = md5asfile(file) //icons sent to the rsc sometimes md5 incorrectly if (!hash) CRASH("invalid asset sent to asset cache") diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index 353328b934..e32fcee639 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -232,6 +232,7 @@ "bbgum" = 'icons/UI_Icons/Achievements/Boss/bbgum.png', "colossus" = 'icons/UI_Icons/Achievements/Boss/colossus.png', "hierophant" = 'icons/UI_Icons/Achievements/Boss/hierophant.png', + "drake" = 'icons/UI_Icons/Achievements/Boss/drake.png', "legion" = 'icons/UI_Icons/Achievements/Boss/legion.png', "miner" = 'icons/UI_Icons/Achievements/Boss/miner.png', "swarmer" = 'icons/UI_Icons/Achievements/Boss/swarmer.png', @@ -245,16 +246,20 @@ "clownking" = 'icons/UI_Icons/Achievements/Misc/clownking.png', "clownthanks" = 'icons/UI_Icons/Achievements/Misc/clownthanks.png', "rule8" = 'icons/UI_Icons/Achievements/Misc/rule8.png', + "longshift" = 'icons/UI_Icons/Achievements/Misc/longshift.png', "snail" = 'icons/UI_Icons/Achievements/Misc/snail.png', "ascension" = 'icons/UI_Icons/Achievements/Misc/ascension.png', "ashascend" = 'icons/UI_Icons/Achievements/Misc/ashascend.png', "fleshascend" = 'icons/UI_Icons/Achievements/Misc/fleshascend.png', "rustascend" = 'icons/UI_Icons/Achievements/Misc/rustascend.png', "voidascend" = 'icons/UI_Icons/Achievements/Misc/voidascend.png', + "toolbox_soul" = 'icons/UI_Icons/Achievements/Misc/toolbox_soul.png', + "chem_tut" = 'icons/UI_Icons/Achievements/Misc/chem_tut.png', "mining" = 'icons/UI_Icons/Achievements/Skills/mining.png', - "changeling" = 'icons/UI_Icons/Achievements/Mafia/mafia.png', - "chaplain" = 'icons/UI_Icons/Achievements/Mafia/town.png', - "clown" = 'icons/UI_Icons/Achievements/Mafia/neutral.png', + "mafia" = 'icons/UI_Icons/Achievements/Mafia/mafia.png', + "town" = 'icons/UI_Icons/Achievements/Mafia/town.png', + "neutral" = 'icons/UI_Icons/Achievements/Mafia/neutral.png', + "hated" = 'icons/UI_Icons/Achievements/Mafia/hated.png', "basemafia" ='icons/UI_Icons/Achievements/basemafia.png', "frenching" = 'icons/UI_Icons/Achievements/Misc/frenchingthebubble.png' ) diff --git a/code/modules/asset_cache/readme.md b/code/modules/asset_cache/readme.md index ce90563d6e..82e6bea896 100644 --- a/code/modules/asset_cache/readme.md +++ b/code/modules/asset_cache/readme.md @@ -24,12 +24,14 @@ Call .get_url_mappings() to get an associated list with the urls your assets can See the documentation for `/datum/asset_transport` for the backend api the asset datums utilize. -The global variable `SSassets.transport` contains the currently configured transport. +The global variable `SSassets.transport` contains the currently configured transport. -### Notes + + +### Notes: Because byond browse() calls use non-blocking queues, if your code uses output() (which bypasses all of these queues) to invoke javascript functions you will need to first have the javascript announce to the server it has loaded before trying to invoke js functions. -To make your code work with any CDNs configured by the server, you must make sure assets are referenced from the url returned by `get_url_mappings()` or by asset_transport's `get_asset_url()`. (TGUI also has helpers for this.) If this can not be easily done, you can bypass the cdn using legacy assets, see the simple asset datum for details. +To make your code work with any CDNs configured by the server, you must make sure assets are referenced from the url returned by `get_url_mappings()` or by asset_transport's `get_asset_url()`. (TGUI also has helpers for this.) If this can not be easily done, you can bypass the cdn using legacy assets, see the simple asset datum for details. CSS files that use url() can be made to use the CDN without needing to rewrite all url() calls in code by using the namespaced helper datum. See the documentation for `/datum/asset/simple/namespaced` for details. diff --git a/tgui/packages/tgui/interfaces/Achievements.js b/tgui/packages/tgui/interfaces/Achievements.js index 512c39fb59..a4ac21b657 100644 --- a/tgui/packages/tgui/interfaces/Achievements.js +++ b/tgui/packages/tgui/interfaces/Achievements.js @@ -15,8 +15,7 @@ export const Achievements = (props, context) => { + height={680}> {categories.map(category => (