Skip to content

Commit

Permalink
Runtime fixes (#1212)
Browse files Browse the repository at this point in the history
  • Loading branch information
BadAtThisGame302 authored Dec 5, 2024
1 parent 1cfbbbc commit 06c7c57
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
12 changes: 8 additions & 4 deletions code/__HELPERS/icons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1106,8 +1106,10 @@ GLOBAL_LIST_INIT(freon_color_matrix, list("#2E5E69", "#60A2A8", "#A1AFB1", rgb(0
if (isfile(thing)) //special snowflake
var/name = sanitize_filename("[generate_asset_name(thing)].png")
register_asset(name, thing)
for (var/thing2 in targets)
send_asset_async(thing2, key)
for (var/mob/thing2 in targets)
if(!istype(thing2) || !thing2.client)
continue
send_asset_async(thing2?.client, key)
return "<img class='icon icon-misc' src=\"[url_encode(name)]\">"
var/atom/A = thing
if (isnull(dir))
Expand All @@ -1130,8 +1132,10 @@ GLOBAL_LIST_INIT(freon_color_matrix, list("#2E5E69", "#60A2A8", "#A1AFB1", rgb(0

key = "[generate_asset_name(I)].png"
register_asset(key, I)
for (var/thing2 in targets)
send_asset_async(thing2, key)
for (var/mob/thing2 in targets)
if(!istype(thing2) || !thing2.client)
continue
send_asset_async(thing2?.client, key)

return "<img class='icon icon-[icon_state]' src=\"[url_encode(key)]\">"

Expand Down
2 changes: 2 additions & 0 deletions code/datums/mind.dm
Original file line number Diff line number Diff line change
Expand Up @@ -832,6 +832,8 @@
// Get a bonus multiplier dependant on age to apply to exp gains. Arg is a skill path.
/datum/mind/proc/get_learning_boon(skill)
var/mob/living/carbon/human/H = current
if(!istype(H))
return 1
var/boon = H.age == AGE_OLD ? 0.8 : 1 // Can't teach an old dog new tricks. Most old jobs start with higher skill too.
boon += get_skill_level(skill) / 10
return boon

0 comments on commit 06c7c57

Please sign in to comment.