Skip to content

Commit

Permalink
Merge pull request #4485 from out-of-phaze/fix/overlay-args
Browse files Browse the repository at this point in the history
Fix invalid arguments to add_overlay
  • Loading branch information
MistakeNot4892 authored Sep 26, 2024
2 parents 8a5ff01 + 549f781 commit ea5bee1
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion code/modules/hydroponics/seed_packets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
if(is_seeds)
underlays += overlay_image(seed_mask_icon, "seed-mask", seed.get_trait(TRAIT_PLANT_COLOUR), RESET_COLOR)
else
add_overlay(overlay_image(seed_mask_icon, "spore-mask"), null, RESET_COLOR)
add_overlay(overlay_image(seed_mask_icon, "spore-mask", null, RESET_COLOR))
update_strings(is_seeds)

/obj/item/seeds/proc/update_strings(is_seeds)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/integrated_electronics/core/detailer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

/obj/item/integrated_electronics/detailer/on_update_icon()
. = ..()
add_overlay('icons/obj/assemblies/electronic_tools.dmi', "detailer-color", detail_color)
add_overlay(overlay_image('icons/obj/assemblies/electronic_tools.dmi', "detailer-color", detail_color))

/obj/item/integrated_electronics/detailer/attack_self(mob/user)
var/color_choice = input(user, "Select color.", "Assembly Detailer") as null|anything in color_list
Expand Down
12 changes: 6 additions & 6 deletions code/modules/projectiles/guns/magnetic/magnetic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -69,19 +69,19 @@
if(cell)
add_overlay("[icon_state]_cell")
if(capacitor)
add_overlay(icon, "[icon_state]_capacitor")
add_overlay("[icon_state]_capacitor")
if(!cell || !capacitor)
add_overlay(icon, "[icon_state]_red")
add_overlay("[icon_state]_red")
else if(capacitor.charge < power_cost)
add_overlay(icon, "[icon_state]_amber")
add_overlay("[icon_state]_amber")
else
add_overlay(icon, "[icon_state]_green")
add_overlay("[icon_state]_green")
if(loaded)
add_overlay(icon, "[icon_state]_loaded")
add_overlay("[icon_state]_loaded")
var/obj/item/magnetic_ammo/mag = loaded
if(istype(mag))
if(mag.remaining)
add_overlay(icon, "[icon_state]_ammo")
add_overlay("[icon_state]_ammo")

/obj/item/gun/magnetic/proc/show_ammo(var/mob/user)
if(loaded)
Expand Down

0 comments on commit ea5bee1

Please sign in to comment.