missing icon fix & stop throwing out parts

This commit is contained in:
Letter N
2021-03-05 19:29:52 +08:00
parent 4f8d6c7c11
commit 34697acf74
7 changed files with 28 additions and 30 deletions
+11 -11
View File
@@ -12,7 +12,7 @@
name = "Boss Killer" name = "Boss Killer"
desc = "You've come a long ways from asking how to switch hands." desc = "You've come a long ways from asking how to switch hands."
database_id = "Boss Killer" database_id = "Boss Killer"
icon = "firstboss" // icon = "firstboss"
/datum/award/achievement/boss/blood_miner_kill /datum/award/achievement/boss/blood_miner_kill
name = "Blood-Drunk Miner Killer" name = "Blood-Drunk Miner Killer"
@@ -117,14 +117,14 @@
database_id = BOSS_MEDAL_WENDIGO_CRUSHER database_id = BOSS_MEDAL_WENDIGO_CRUSHER
//should be removed soon //should be removed soon
/datum/award/achievement/boss/king_goat_kill // /datum/award/achievement/boss/king_goat_kill
name = "King Goat Killer" // name = "King Goat Killer"
desc = "The king is dead, long live the king!" // desc = "The king is dead, long live the king!"
database_id = BOSS_MEDAL_KINGGOAT // database_id = BOSS_MEDAL_KINGGOAT
icon = "goatboss" // icon = "goatboss"
/datum/award/achievement/boss/king_goat_crusher // /datum/award/achievement/boss/king_goat_crusher
name = "King Goat Crusher" // name = "King Goat Crusher"
desc = "The king is dead, long live the king!" // desc = "The king is dead, long live the king!"
database_id = BOSS_MEDAL_KINGGOAT_CRUSHER // database_id = BOSS_MEDAL_KINGGOAT_CRUSHER
icon = "goatboss" // icon = "goatboss"
@@ -80,10 +80,10 @@ micro-manipulator, console screen, beaker, Microlaser, matter bin, power cells.
comp_path = def_components[comp_path] comp_path = def_components[comp_path]
if(ispath(comp_path, /obj/item/stack)) 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 else
for(var/i in 1 to comp_amt) for(var/i in 1 to comp_amt)
M.component_parts += new comp_path(M) M.component_parts += new comp_path(null)
M.RefreshParts() M.RefreshParts()
-8
View File
@@ -443,14 +443,6 @@ GLOBAL_PROTECT(admin_verbs_hideable)
// holder.ban_panel() // 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! // 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() /client/proc/game_panel()
set name = "Game Panel" set name = "Game Panel"
set category = "Admin.Game" set category = "Admin.Game"
+1 -1
View File
@@ -24,7 +24,7 @@
/datum/asset_cache_item/New(name, file) /datum/asset_cache_item/New(name, file)
if (!isfile(file)) if (!isfile(file))
file = fcopy_rsc(file) file = fcopy_rsc(file)
hash = md5asfile(file) //icons sent to the rsc sometimes md5 incorrectly hash = md5asfile(file) //icons sent to the rsc sometimes md5 incorrectly
if (!hash) if (!hash)
CRASH("invalid asset sent to asset cache") CRASH("invalid asset sent to asset cache")
+8 -3
View File
@@ -232,6 +232,7 @@
"bbgum" = 'icons/UI_Icons/Achievements/Boss/bbgum.png', "bbgum" = 'icons/UI_Icons/Achievements/Boss/bbgum.png',
"colossus" = 'icons/UI_Icons/Achievements/Boss/colossus.png', "colossus" = 'icons/UI_Icons/Achievements/Boss/colossus.png',
"hierophant" = 'icons/UI_Icons/Achievements/Boss/hierophant.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', "legion" = 'icons/UI_Icons/Achievements/Boss/legion.png',
"miner" = 'icons/UI_Icons/Achievements/Boss/miner.png', "miner" = 'icons/UI_Icons/Achievements/Boss/miner.png',
"swarmer" = 'icons/UI_Icons/Achievements/Boss/swarmer.png', "swarmer" = 'icons/UI_Icons/Achievements/Boss/swarmer.png',
@@ -245,16 +246,20 @@
"clownking" = 'icons/UI_Icons/Achievements/Misc/clownking.png', "clownking" = 'icons/UI_Icons/Achievements/Misc/clownking.png',
"clownthanks" = 'icons/UI_Icons/Achievements/Misc/clownthanks.png', "clownthanks" = 'icons/UI_Icons/Achievements/Misc/clownthanks.png',
"rule8" = 'icons/UI_Icons/Achievements/Misc/rule8.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', "snail" = 'icons/UI_Icons/Achievements/Misc/snail.png',
"ascension" = 'icons/UI_Icons/Achievements/Misc/ascension.png', "ascension" = 'icons/UI_Icons/Achievements/Misc/ascension.png',
"ashascend" = 'icons/UI_Icons/Achievements/Misc/ashascend.png', "ashascend" = 'icons/UI_Icons/Achievements/Misc/ashascend.png',
"fleshascend" = 'icons/UI_Icons/Achievements/Misc/fleshascend.png', "fleshascend" = 'icons/UI_Icons/Achievements/Misc/fleshascend.png',
"rustascend" = 'icons/UI_Icons/Achievements/Misc/rustascend.png', "rustascend" = 'icons/UI_Icons/Achievements/Misc/rustascend.png',
"voidascend" = 'icons/UI_Icons/Achievements/Misc/voidascend.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', "mining" = 'icons/UI_Icons/Achievements/Skills/mining.png',
"changeling" = 'icons/UI_Icons/Achievements/Mafia/mafia.png', "mafia" = 'icons/UI_Icons/Achievements/Mafia/mafia.png',
"chaplain" = 'icons/UI_Icons/Achievements/Mafia/town.png', "town" = 'icons/UI_Icons/Achievements/Mafia/town.png',
"clown" = 'icons/UI_Icons/Achievements/Mafia/neutral.png', "neutral" = 'icons/UI_Icons/Achievements/Mafia/neutral.png',
"hated" = 'icons/UI_Icons/Achievements/Mafia/hated.png',
"basemafia" ='icons/UI_Icons/Achievements/basemafia.png', "basemafia" ='icons/UI_Icons/Achievements/basemafia.png',
"frenching" = 'icons/UI_Icons/Achievements/Misc/frenchingthebubble.png' "frenching" = 'icons/UI_Icons/Achievements/Misc/frenchingthebubble.png'
) )
+5 -3
View File
@@ -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. 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. 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. 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.
@@ -15,8 +15,7 @@ export const Achievements = (props, context) => {
<Window <Window
title="Achievements" title="Achievements"
width={540} width={540}
height={680} height={680}>
resizable>
<Window.Content scrollable> <Window.Content scrollable>
<Tabs> <Tabs>
{categories.map(category => ( {categories.map(category => (