Telecommunications Key
The station core linkage password is '[C.link_password]'.
Should this paper be misplaced or destroyed, fear not, as the password is visible under the core linkage section. Should you wish to modify this password, it can be modified from the core." info_links = info - update_icon() + update_icon(UPDATE_ICON_STATE) // Save time, even though there should only be one STATION-CORE in the world break return ..() diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 5957e133004..2d5e524a3eb 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -155,7 +155,7 @@ power_station.engaged = FALSE if(power_station.teleporter_hub.accurate < 3) power_station.teleporter_hub.calibrated = FALSE - power_station.teleporter_hub.update_icon() + power_station.teleporter_hub.update_icon(UPDATE_ICON_STATE) /** * Calibrates the hub. Helper function of ui_act @@ -288,7 +288,7 @@ trg.stat &= ~NOPOWER if(trg.teleporter_hub) trg.teleporter_hub.stat &= ~NOPOWER - trg.teleporter_hub.update_icon() + trg.teleporter_hub.update_icon(UPDATE_ICON_STATE) if(trg.teleporter_console) trg.teleporter_console.stat &= ~NOPOWER trg.teleporter_console.update_icon() @@ -405,7 +405,7 @@ if(accurate < 3) calibrated = FALSE -/obj/machinery/teleport/hub/update_icon() +/obj/machinery/teleport/hub/update_icon_state() if(panel_open) icon_state = "tele-o" else if(power_station && power_station.engaged) @@ -432,7 +432,7 @@ for(var/obj/item/stock_parts/matter_bin/M in component_parts) A -= M.rating * 10 tele_delay = max(A, 0) - update_icon() + update_icon(UPDATE_ICON_STATE) /** Internal helper function @@ -464,18 +464,18 @@ use_power(5000) if(tele_delay) recalibrating = TRUE - update_icon() + update_icon(UPDATE_ICON_STATE) addtimer(CALLBACK(src, .proc/BumpedCallback), tele_delay) /obj/machinery/teleport/perma/proc/BumpedCallback() recalibrating = FALSE - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/machinery/teleport/perma/power_change() ..() - update_icon() + update_icon(UPDATE_ICON_STATE) -/obj/machinery/teleport/perma/update_icon() +/obj/machinery/teleport/perma/update_icon_state() if(panel_open) icon_state = "tele-o" else if(target && !recalibrating && !(stat & (BROKEN|NOPOWER))) @@ -543,7 +543,7 @@ /obj/machinery/teleport/station/Destroy() if(teleporter_hub) teleporter_hub.power_station = null - teleporter_hub.update_icon() + teleporter_hub.update_icon(UPDATE_ICON_STATE) teleporter_hub = null if(teleporter_console) teleporter_console.power_station = null @@ -584,7 +584,7 @@ /obj/machinery/teleport/station/screwdriver_act(mob/user, obj/item/I) if(default_deconstruction_screwdriver(user, "controller-o", "controller", I)) - update_icon() + update_icon(UPDATE_ICON_STATE) return TRUE /obj/machinery/teleport/station/wirecutter_act(mob/user, obj/item/I) @@ -618,17 +618,17 @@ else visible_message("No target detected.") engaged = FALSE - teleporter_hub.update_icon() + teleporter_hub.update_icon(UPDATE_ICON_STATE) if(istype(user)) add_fingerprint(user) /obj/machinery/teleport/station/power_change() ..() - update_icon() + update_icon(UPDATE_ICON_STATE) if(teleporter_hub) - teleporter_hub.update_icon() + teleporter_hub.update_icon(UPDATE_ICON_STATE) -/obj/machinery/teleport/station/update_icon() +/obj/machinery/teleport/station/update_icon_state() if(panel_open) icon_state = "controller-o" else if(stat & NOPOWER) diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm index 846c39917b3..910410727c1 100644 --- a/code/game/machinery/transformer.dm +++ b/code/game/machinery/transformer.dm @@ -48,10 +48,9 @@ /obj/machinery/transformer/power_change() ..() - update_icon() + update_icon(UPDATE_ICON_STATE) -/obj/machinery/transformer/update_icon() - ..() +/obj/machinery/transformer/update_icon_state() if(is_on_cooldown || stat & (BROKEN|NOPOWER)) icon_state = "separator-AO0" else @@ -66,7 +65,7 @@ /// Resets `is_on_cooldown` to `FALSE` and updates our icon. Used in a callback after the transformer does a transformation. /obj/machinery/transformer/proc/reset_cooldown() is_on_cooldown = FALSE - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/machinery/transformer/Bumped(atom/movable/AM) // They have to be human to be transformed. @@ -94,7 +93,7 @@ // Activate the cooldown is_on_cooldown = TRUE - update_icon() + update_icon(UPDATE_ICON_STATE) addtimer(CALLBACK(src, .proc/reset_cooldown), cooldown_duration) addtimer(CALLBACK(null, .proc/playsound, loc, 'sound/machines/ping.ogg', 50, 0), 3 SECONDS) @@ -141,7 +140,7 @@ // Activate the cooldown is_on_cooldown = TRUE - update_icon() + update_icon(UPDATE_ICON_STATE) addtimer(CALLBACK(src, .proc/reset_cooldown), cooldown_duration) /obj/machinery/transformer/xray @@ -167,10 +166,9 @@ /obj/machinery/transformer/xray/power_change() ..() - update_icon() + update_icon(UPDATE_ICON_STATE) -/obj/machinery/transformer/xray/update_icon() - ..() +/obj/machinery/transformer/xray/update_icon_state() if(stat & (BROKEN|NOPOWER)) icon_state = "separator-AO0" else diff --git a/code/game/machinery/turret_control.dm b/code/game/machinery/turret_control.dm index a341de01742..888da17489b 100644 --- a/code/game/machinery/turret_control.dm +++ b/code/game/machinery/turret_control.dm @@ -215,15 +215,14 @@ if(faction == aTurret.faction) aTurret.setState(TC) - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/machinery/turretid/power_change() ..() updateTurrets() - update_icon() + update_icon(UPDATE_ICON_STATE) -/obj/machinery/turretid/update_icon() - ..() +/obj/machinery/turretid/update_icon_state() if(stat & NOPOWER) icon_state = "control_off" set_light(0) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 5c8fab85c49..df9e4bdaeb8 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -164,17 +164,17 @@ for(var/obj/item/vending_refill/VR in component_parts) restock(VR) -/obj/machinery/vending/update_icon() - cut_overlays() +/obj/machinery/vending/update_overlays() + . = ..() underlays.Cut() if(panel_open) - add_overlay("[icon_panel ? "[icon_panel]_panel" : "[icon_state]_panel"]") + . += "[icon_panel ? "[icon_panel]_panel" : "[icon_state]_panel"]" if(icon_addon) - add_overlay("[icon_addon]") + . += "[icon_addon]" if((stat & (BROKEN|NOPOWER)) || force_no_power_icon_state) - add_overlay("[icon_off ? "[icon_off]_off" : "[icon_state]_off"]") + . += "[icon_off ? "[icon_off]_off" : "[icon_state]_off"]" if(stat & BROKEN) - add_overlay("[icon_broken ? "[icon_broken]_broken" : "[icon_state]_broken"]") + . += "[icon_broken ? "[icon_broken]_broken" : "[icon_state]_broken"]" return if(light) underlays += emissive_appearance(icon, "[icon_lightmask ? "[icon_lightmask]_lightmask" : "[icon_state]_off"]") @@ -203,14 +203,14 @@ for(var/i in 1 to amount) force_no_power_icon_state = TRUE set_light(0) - update_icon() + update_icon(UPDATE_OVERLAYS) sleep(rand(1, 3)) force_no_power_icon_state = FALSE set_light(light_range_on, light_power_on) - update_icon() + update_icon(UPDATE_OVERLAYS) sleep(rand(1, 10)) - update_icon() + update_icon(UPDATE_OVERLAYS) flickering = FALSE /** @@ -363,7 +363,7 @@ if(anchored) panel_open = !panel_open panel_open ? SCREWDRIVER_OPEN_PANEL_MESSAGE : SCREWDRIVER_CLOSE_PANEL_MESSAGE - update_icon() + update_icon(UPDATE_OVERLAYS) SStgui.update_uis(src) /obj/machinery/vending/wirecutter_act(mob/user, obj/item/I) @@ -840,13 +840,13 @@ set_light(0) else set_light(light_range_on, light_power_on) - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/machinery/vending/obj_break(damage_flag) if(!(stat & BROKEN)) stat |= BROKEN set_light(0) - update_icon() + update_icon(UPDATE_OVERLAYS) var/dump_amount = 0 var/found_anything = TRUE diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index 5123417bf4d..4ed63a63d1d 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -37,7 +37,7 @@ state = 8 else state = 5 - update_icon() + update_icon(UPDATE_ICON_STATE) sleep(200) for(var/atom/A in contents) A.clean_blood() @@ -188,7 +188,7 @@ gibs_ready = 1 else state = 4 - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/machinery/washing_machine/verb/climb_out() set name = "Climb out" @@ -200,7 +200,7 @@ usr.loc = src.loc -/obj/machinery/washing_machine/update_icon() +/obj/machinery/washing_machine/update_icon_state() icon_state = "wm_[state][panel]" /obj/machinery/washing_machine/attackby(obj/item/W as obj, mob/user as mob, params) @@ -216,7 +216,7 @@ user.drop_item() crayon = W crayon.loc = src - update_icon() + update_icon(UPDATE_ICON_STATE) else return ..() else @@ -228,7 +228,7 @@ G.affecting.loc = src qdel(G) state = 3 - update_icon() + update_icon(UPDATE_ICON_STATE) else return ..() else if(istype(W,/obj/item/stack/sheet/hairlesshide) || \ @@ -296,7 +296,7 @@ to_chat(user, "You can't put the item in right now.") else to_chat(user, "The washing machine is full.") - update_icon() + update_icon(UPDATE_ICON_STATE) else return ..() @@ -332,7 +332,7 @@ state = 1 - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/machinery/washing_machine/deconstruct(disassembled = TRUE) new /obj/item/stack/sheet/metal(drop_location(), 2) diff --git a/code/game/mecha/equipment/tools/work_tools.dm b/code/game/mecha/equipment/tools/work_tools.dm index ef8ca2f09eb..771bfca5a36 100644 --- a/code/game/mecha/equipment/tools/work_tools.dm +++ b/code/game/mecha/equipment/tools/work_tools.dm @@ -438,13 +438,13 @@ NC.cable_color("red") NC.d1 = 0 NC.d2 = fdirn - NC.updateicon() + NC.update_icon() var/datum/powernet/PN if(last_piece && last_piece.d2 != Dir) last_piece.d1 = min(last_piece.d2, Dir) last_piece.d2 = max(last_piece.d2, Dir) - last_piece.updateicon() + last_piece.update_icon() PN = last_piece.powernet if(!PN) diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm index ceb24de45c8..9ad12133cf3 100644 --- a/code/game/mecha/mech_bay.dm +++ b/code/game/mecha/mech_bay.dm @@ -122,7 +122,7 @@ var/obj/machinery/mech_bay_recharge_port/recharge_port -/obj/machinery/computer/mech_bay_power_console/update_icon() +/obj/machinery/computer/mech_bay_power_console/update_overlays() if(!recharge_port || !recharge_port.recharging_mecha || !recharge_port.recharging_mecha.cell || !(recharge_port.recharging_mecha.cell.charge < recharge_port.recharging_mecha.cell.maxcharge) || stat & (NOPOWER|BROKEN)) icon_screen = "recharge_comp" else diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index 34934baea86..413d2a51be9 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -42,24 +42,34 @@ /obj/mecha/working/ripley/go_out() ..() - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/mecha/working/ripley/moved_inside(mob/living/carbon/human/H) ..() - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/mecha/working/ripley/mmi_moved_inside(obj/item/mmi/mmi_as_oc, mob/user) ..() - update_icon() + update_icon(UPDATE_OVERLAYS) -/obj/mecha/working/ripley/update_icon() - ..() - if(hides) - cut_overlays() - if(hides < 3) - add_overlay(occupant ? "ripley-g" : "ripley-g-open") - else - add_overlay(occupant ? "ripley-g-full" : "ripley-g-full-open") +/obj/mecha/working/ripley/update_desc() + . = ..() + if(!hides) // Just in case if hides are somehow removed + desc = initial(desc) + return + if(hides == 3) + desc = "Autonomous Power Loader Unit. It's wearing a fearsome carapace entirely composed of goliath hide plates - its pilot must be an experienced monster hunter." + else + desc = "Autonomous Power Loader Unit. Its armour is enhanced with some goliath hide plates." + +/obj/mecha/working/ripley/update_overlays() + . = ..() + if(!hides) + return + if(hides == 3) + . += occupant ? "ripley-g-full" : "ripley-g-full-open" + else + . += occupant ? "ripley-g" : "ripley-g-open" /obj/mecha/working/ripley/firefighter desc = "A standard APLU chassis that was refitted with additional thermal protection and a cistern." diff --git a/code/game/objects/effects/decals/Cleanable/aliens.dm b/code/game/objects/effects/decals/Cleanable/aliens.dm index c33969d1f40..4e9041f98a6 100644 --- a/code/game/objects/effects/decals/Cleanable/aliens.dm +++ b/code/game/objects/effects/decals/Cleanable/aliens.dm @@ -19,6 +19,7 @@ /obj/effect/decal/cleanable/blood/gibs/xeno/update_icon() color = "#FFFFFF" + . = ..() /obj/effect/decal/cleanable/blood/gibs/xeno/up random_icon_states = list("xgib1", "xgib2", "xgib3", "xgib4", "xgib5", "xgib6", "xgibup1", "xgibup1", "xgibup1") diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index fc3d74a678e..d6c8cb58af8 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -50,6 +50,7 @@ GLOBAL_LIST_EMPTY(splatter_cache) if(basecolor == "rainbow") basecolor = "#[pick(list("FF0000","FF7F00","FFFF00","00FF00","0000FF","4B0082","8F00FF"))]" color = basecolor + ..() /obj/effect/decal/cleanable/blood/proc/dry() name = dryname @@ -142,21 +143,26 @@ GLOBAL_LIST_EMPTY(splatter_cache) random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6") no_clear = TRUE mergeable_decal = FALSE - + var/image/giblets var/fleshcolor = "#FFFFFF" +/obj/effect/decal/cleanable/blood/gibs/Destroy() + giblets = null + return ..() + /obj/effect/decal/cleanable/blood/gibs/update_icon() - var/image/giblets = new(base_icon, "[icon_state]_flesh", dir) + giblets = new(base_icon, "[icon_state]_flesh", dir) if(!fleshcolor || fleshcolor == "rainbow") fleshcolor = "#[pick(list("FF0000","FF7F00","FFFF00","00FF00","0000FF","4B0082","8F00FF"))]" giblets.color = fleshcolor var/icon/blood = new(base_icon,"[icon_state]",dir) - icon = blood - overlays.Cut() - overlays += giblets . = ..() +/obj/effect/decal/cleanable/blood/gibs/update_overlays() + . = ..() + . += giblets + /obj/effect/decal/cleanable/blood/gibs/ex_act(severity) return diff --git a/code/game/objects/effects/decals/Cleanable/robots.dm b/code/game/objects/effects/decals/Cleanable/robots.dm index b3519902a6e..ed14d7c55b9 100644 --- a/code/game/objects/effects/decals/Cleanable/robots.dm +++ b/code/game/objects/effects/decals/Cleanable/robots.dm @@ -13,6 +13,7 @@ /obj/effect/decal/cleanable/blood/gibs/robot/update_icon() color = "#FFFFFF" + . = ..() /obj/effect/decal/cleanable/blood/gibs/robot/dry() //pieces of robots do not dry up like return diff --git a/code/game/objects/effects/decals/Cleanable/tracks.dm b/code/game/objects/effects/decals/Cleanable/tracks.dm index 464d3e5a010..b50635e67a3 100644 --- a/code/game/objects/effects/decals/Cleanable/tracks.dm +++ b/code/game/objects/effects/decals/Cleanable/tracks.dm @@ -87,8 +87,8 @@ GLOBAL_LIST_EMPTY(fluidtrack_cache) update_icon() -/obj/effect/decal/cleanable/blood/footprints/update_icon() - overlays.Cut() +/obj/effect/decal/cleanable/blood/footprints/update_overlays() + . = ..() for(var/Ddir in GLOB.cardinal) if(entered_dirs & Ddir) @@ -100,7 +100,7 @@ GLOBAL_LIST_EMPTY(fluidtrack_cache) GLOB.fluidtrack_cache["entered-[blood_state]-[Ddir]"] = I if(I) I.color = basecolor - overlays += I + . += I if(exited_dirs & Ddir) var/image/I if(GLOB.fluidtrack_cache["exited-[blood_state]-[Ddir]"]) @@ -110,7 +110,7 @@ GLOBAL_LIST_EMPTY(fluidtrack_cache) GLOB.fluidtrack_cache["exited-[blood_state]-[Ddir]"] = I if(I) I.color = basecolor - overlays += I + . += I alpha = base_alpha + bloodiness diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm index 72919ba1fc4..35bfd04b14f 100644 --- a/code/game/objects/effects/decals/contraband.dm +++ b/code/game/objects/effects/decals/contraband.dm @@ -62,9 +62,9 @@ var/poster_item_icon_state = "rolled_poster" /obj/structure/sign/poster/Initialize(mapload) - . = ..() if(random_basetype) randomise(random_basetype) + . = ..() if(!ruined) original_name = name name = "poster - [name]" diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm index d3350fb5afe..9268b006c45 100644 --- a/code/game/objects/effects/effect_system/effects_foam.dm +++ b/code/game/objects/effects/effect_system/effects_foam.dm @@ -36,7 +36,7 @@ var/obj/structure/foamedmetal/M = new(src.loc) M.metal = metal - M.updateicon() + M.update_state() flick("[icon_state]-disolve", src) sleep(5) @@ -193,15 +193,20 @@ /obj/structure/foamedmetal/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) playsound(src.loc, 'sound/weapons/tap.ogg', 100, TRUE) -/obj/structure/foamedmetal/proc/updateicon() +/obj/structure/foamedmetal/proc/update_state() if(metal == MFOAM_ALUMINUM) - icon_state = "metalfoam" max_integrity = 20 obj_integrity = max_integrity else - icon_state = "ironfoam" max_integrity = 50 obj_integrity = max_integrity + update_icon(UPDATE_ICON_STATE) + +/obj/structure/foamedmetal/update_icon_state() + if(metal == MFOAM_ALUMINUM) + icon_state = "metalfoam" + else + icon_state = "ironfoam" /obj/structure/foamedmetal/attack_hand(mob/user) user.changeNext_move(CLICK_CD_MELEE) diff --git a/code/game/objects/items/ashtray.dm b/code/game/objects/items/ashtray.dm index 40f988e40d2..0b46012b35f 100644 --- a/code/game/objects/items/ashtray.dm +++ b/code/game/objects/items/ashtray.dm @@ -30,19 +30,25 @@ visible_message("[user] places [I] in [src].") add_fingerprint(user) - update_icon() + update_appearance(UPDATE_DESC|UPDATE_ICON_STATE) else return ..() -/obj/item/ashtray/update_icon() +/obj/item/ashtray/update_icon_state() if(contents.len == max_butts) icon_state = icon_full - desc = initial(desc) + " It's stuffed full." else if(contents.len > max_butts * 0.5) icon_state = icon_half - desc = initial(desc) + " It's half-filled." else icon_state = initial(icon_state) + +/obj/item/ashtray/update_desc() + . = ..() + if(contents.len == max_butts) + desc = initial(desc) + " It's stuffed full." + else if(contents.len > max_butts * 0.5) + desc = initial(desc) + " It's half-filled." + else desc = initial(desc) /obj/item/ashtray/deconstruct() @@ -52,7 +58,7 @@ /obj/item/ashtray/proc/empty_tray() for(var/obj/item/I in contents) I.forceMove(loc) - update_icon() + update_appearance(UPDATE_DESC|UPDATE_ICON_STATE) /obj/item/ashtray/throw_impact(atom/hit_atom) if(contents.len) diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 6b32e1420a4..48d36d9ceac 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -56,7 +56,7 @@ /obj/structure/closet/body_bag/update_overlays() ..() if(name != initial(name)) - add_overlay("bodybag_label") + . += "bodybag_label" /obj/structure/closet/body_bag/MouseDrop(over_object, src_location, over_location) . = ..() diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm index 366e64ade1e..ce18fe47a01 100644 --- a/code/game/objects/items/candle.dm +++ b/code/game/objects/items/candle.dm @@ -22,7 +22,7 @@ STOP_PROCESSING(SSobj, src) return ..() -/obj/item/candle/update_icon() +/obj/item/candle/update_icon_state() if(flickering) icon_state = "candle[get_icon_index()]_flicker" else @@ -58,7 +58,7 @@ usr.visible_message(show_message) set_light(CANDLE_LUM) START_PROCESSING(SSobj, src) - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/candle/proc/get_icon_index() if(wax > 150) @@ -70,12 +70,12 @@ /obj/item/candle/proc/start_flickering() flickering = TRUE - update_icon() + update_icon(UPDATE_ICON_STATE) addtimer(CALLBACK(src, .proc/stop_flickering), 4 SECONDS, TIMER_UNIQUE) /obj/item/candle/proc/stop_flickering() flickering = FALSE - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/candle/process() if(!lit) @@ -88,7 +88,7 @@ var/mob/M = src.loc M.unEquip(src, 1) //src is being deleted anyway qdel(src) - update_icon() + update_icon(UPDATE_ICON_STATE) if(isturf(loc)) //start a fire if possible var/turf/T = loc T.hotspot_expose(700, 5) @@ -98,7 +98,7 @@ if(lit) user.visible_message("[user] snuffs out [src].") lit = FALSE - update_icon() + update_icon(UPDATE_ICON_STATE) set_light(0) /obj/item/candle/eternal diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 929e09592e3..ba336a52aa8 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -269,13 +269,12 @@ if("Toggle Cap") to_chat(user, "You [capped ? "remove" : "replace"] the cap of [src].") capped = !capped - icon_state = "spraycan[capped ? "_cap" : ""]" - update_icon() + update_icon(UPDATE_ICON_STATE) if("Change Drawing") ..() if("Change Color") colour = input(user,"Choose Color") as color - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/item/toy/crayon/spraycan/afterattack(atom/target, mob/user as mob, proximity) if(!proximity) @@ -300,8 +299,11 @@ playsound(user.loc, 'sound/effects/spray.ogg', 5, 1, 5) ..() -/obj/item/toy/crayon/spraycan/update_icon() - overlays.Cut() +/obj/item/toy/crayon/spraycan/update_icon_state() + icon_state = "spraycan[capped ? "_cap" : ""]" + +/obj/item/toy/crayon/spraycan/update_overlays() + . = ..() var/image/I = image('icons/obj/crayons.dmi',icon_state = "[capped ? "spraycan_cap_colors" : "spraycan_colors"]") I.color = colour - overlays += I + . += I diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 9e96d111a11..5744418df9c 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -15,34 +15,32 @@ /obj/item/flashlight/Initialize() . = ..() - if(on) - icon_state = "[initial(icon_state)]-on" - set_light(brightness_on) - else - icon_state = initial(icon_state) - set_light(0) + update_brightness() -/obj/item/flashlight/proc/update_brightness(mob/user = null) +/obj/item/flashlight/update_icon_state() if(on) icon_state = "[initial(icon_state)]-on" + else + icon_state = "[initial(icon_state)]" + +/obj/item/flashlight/proc/update_brightness() + if(on) set_light(brightness_on) else - icon_state = initial(icon_state) set_light(0) + update_icon() /obj/item/flashlight/attack_self(mob/user) if(!isturf(user.loc)) to_chat(user, "You cannot turn the light on while in this [user.loc].")//To prevent some lighting anomalities. - - return 0 + return FALSE on = !on playsound(user, togglesound, 100, 1) - update_brightness(user) + update_brightness() for(var/X in actions) var/datum/action/A = X A.UpdateButtonIcon() - return 1 - + return TRUE /obj/item/flashlight/attack(mob/living/M as mob, mob/living/user as mob) add_fingerprint(user) @@ -129,15 +127,12 @@ materials = list() on = TRUE - // green-shaded desk lamp /obj/item/flashlight/lamp/green desc = "A classic green-shaded desk lamp." icon_state = "lampgreen" item_state = "lampgreen" - - /obj/item/flashlight/lamp/verb/toggle_light() set name = "Toggle light" set category = "Object" @@ -153,7 +148,6 @@ icon_state = "bananalamp" item_state = "bananalamp" - // FLARES /obj/item/flashlight/flare @@ -174,6 +168,12 @@ fuel = rand(fuel_lower, fuel_upp) ..() +/obj/item/flashlight/flare/update_icon_state() + if(!fuel) + icon_state = "[initial(icon_state)]-empty" + return + ..() + /obj/item/flashlight/flare/process() var/turf/pos = get_turf(src) if(pos && produce_heat) @@ -181,8 +181,6 @@ fuel = max(fuel - 1, 0) if(!fuel || !on) turn_off() - if(!fuel) - icon_state = "[initial(icon_state)]-empty" STOP_PROCESSING(SSobj, src) /obj/item/flashlight/flare/Destroy() @@ -193,21 +191,9 @@ on = FALSE force = initial(force) damtype = initial(damtype) - if(ismob(loc)) - var/mob/U = loc - update_brightness(U) - else - update_brightness(null) - -/obj/item/flashlight/flare/update_brightness(mob/user = null) - ..() - if(on) - item_state = "[initial(item_state)]-on" - else - item_state = "[initial(item_state)]" + update_brightness() /obj/item/flashlight/flare/attack_self(mob/user) - // Usual checks if(!fuel) to_chat(user, "[src] is out of fuel.") @@ -220,8 +206,9 @@ // All good, turn it on. if(.) user.visible_message("[user] activates [src].", "You activate [src].") - force = on_damage - damtype = "fire" + if(produce_heat) + force = on_damage + damtype = "fire" START_PROCESSING(SSobj, src) // GLOWSTICKS @@ -234,30 +221,25 @@ icon_state = "glowstick" item_state = "glowstick" togglesound = 'sound/effects/bone_break_1.ogg' - produce_heat = 0 + produce_heat = FALSE fuel_lower = 1600 fuel_upp = 2000 + blocks_emissive = FALSE /obj/item/flashlight/flare/glowstick/Initialize() light_color = color ..() -/obj/item/flashlight/flare/glowstick/update_icon() - item_state = "glowstick" - cut_overlays() +/obj/item/flashlight/flare/glowstick/update_icon_state() if(!fuel) icon_state = "glowstick-empty" - cut_overlays() - update_brightness(0) - else if(on) + +/obj/item/flashlight/flare/glowstick/update_overlays() + . = ..() + if(on) var/mutable_appearance/glowstick_overlay = mutable_appearance(icon, "glowstick-glow") glowstick_overlay.color = color - add_overlay(glowstick_overlay) - item_state = "glowstick-on" - update_brightness(brightness_on) - else - icon_state = "glowstick" - cut_overlays() + . += glowstick_overlay /obj/item/flashlight/flare/glowstick/red name = "red glowstick" diff --git a/code/game/objects/items/devices/geiger_counter.dm b/code/game/objects/items/devices/geiger_counter.dm index c24d92e7a96..70b3f251d96 100644 --- a/code/game/objects/items/devices/geiger_counter.dm +++ b/code/game/objects/items/devices/geiger_counter.dm @@ -53,7 +53,7 @@ current_tick_amount = 0 - update_icon() + update_icon(UPDATE_ICON_STATE) update_sound() /obj/item/geiger_counter/examine(mob/user) @@ -80,7 +80,7 @@ . += "The last radiation amount detected was [last_tick_amount]" -/obj/item/geiger_counter/update_icon() +/obj/item/geiger_counter/update_icon_state() if(!scanning) icon_state = "geiger_off" else if(emagged) @@ -113,11 +113,11 @@ if(amount <= RAD_BACKGROUND_RADIATION || !scanning) return current_tick_amount += amount - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/geiger_counter/attack_self(mob/user) scanning = !scanning - update_icon() + update_icon(UPDATE_ICON_STATE) to_chat(user, "[bicon(src)] You switch [scanning ? "on" : "off"] [src].") /obj/item/geiger_counter/afterattack(atom/target, mob/user) @@ -158,7 +158,7 @@ user.visible_message("[user] refastens [src]'s maintenance panel!", "You reset [src] to its factory settings!") emagged = FALSE radiation_count = 0 - update_icon() + update_icon(UPDATE_ICON_STATE) return TRUE else return ..() @@ -171,7 +171,7 @@ return radiation_count = 0 to_chat(user, "You flush [src]'s radiation counts, resetting it to normal.") - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/geiger_counter/emag_act(mob/user) if(emagged) diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index f032341c6f6..71585752d8f 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -147,14 +147,23 @@ /obj/item/lightreplacer/emag_act(user as mob) if(!emagged) - Emag() + emagged = !emagged + playsound(loc, "sparks", 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + update_appearance(UPDATE_NAME|UPDATE_ICON_STATE) /obj/item/lightreplacer/attack_self(mob/user) for(var/obj/machinery/light/target in user.loc) ReplaceLight(target, user) to_chat(user, status_string()) -/obj/item/lightreplacer/update_icon() +/obj/item/lightreplacer/update_name() + . = ..() + if(emagged) + name = "shortcircuited [initial(name)]" + else + name = initial(name) + +/obj/item/lightreplacer/update_icon_state() icon_state = "lightreplacer[emagged]" /obj/item/lightreplacer/proc/status_string() @@ -214,15 +223,6 @@ to_chat(U, "There is a working [target.fitting] already inserted!") return -/obj/item/lightreplacer/proc/Emag() - emagged = !emagged - playsound(loc, "sparks", 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - if(emagged) - name = "shortcircuited [initial(name)]" - else - name = initial(name) - update_icon() - /obj/item/lightreplacer/proc/CanUse(mob/living/user) add_fingerprint(user) if(uses > 0) @@ -249,9 +249,8 @@ to_chat(U, "[src]'s refill light blinks red.") /obj/item/lightreplacer/proc/janicart_insert(mob/user, obj/structure/janitorialcart/J) - J.put_in_cart(src, user) J.myreplacer = src - J.update_icon() + J.put_in_cart(src, user) /obj/item/lightreplacer/cyborg/janicart_insert(mob/user, obj/structure/janitorialcart/J) return diff --git a/code/game/objects/items/devices/painter/airlock_painter.dm b/code/game/objects/items/devices/painter/airlock_painter.dm index 28d3863553e..a0634da1842 100644 --- a/code/game/objects/items/devices/painter/airlock_painter.dm +++ b/code/game/objects/items/devices/painter/airlock_painter.dm @@ -58,5 +58,5 @@ A.icon = initial(airlock.icon) A.overlays_file = initial(airlock.overlays_file) A.assemblytype = initial(airlock.assemblytype) - A.update_icon() + A.update_appearance() return TRUE diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index 7206a4ea24f..5e94b9e02fe 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -30,7 +30,7 @@ attached = null return ..() -/obj/item/powersink/update_icon() +/obj/item/powersink/update_icon_state() icon_state = "powersink[mode == OPERATING]" /obj/item/powersink/proc/set_mode(value) @@ -60,7 +60,7 @@ density = TRUE mode = value - update_icon() + update_icon(UPDATE_ICON_STATE) set_light(0) /obj/item/powersink/screwdriver_act(mob/user, obj/item/I) diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 41e2af3f999..2c82e3e2812 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -61,10 +61,10 @@ if(direction) setDir(direction) set_pixel_offsets_from_dir(28, -28, 28, -28) - b_stat=1 + b_stat = TRUE on = FALSE GLOB.global_intercoms.Add(src) - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/radio/intercom/Initialize() . = ..() @@ -184,12 +184,12 @@ return if(!I.use_tool(src, user, 10, volume = I.tool_volume) || buildstage != 2) return - update_icon() + update_icon(UPDATE_ICON_STATE) on = TRUE - b_stat = 0 + b_stat = FALSE buildstage = 3 to_chat(user, "You secure the electronics!") - update_icon() + update_icon(UPDATE_ICON_STATE) update_operating_status() for(var/i, i<= 5, i++) wires.on_cut(i, 1) @@ -203,9 +203,9 @@ WIRECUTTER_SNIP_MESSAGE new /obj/item/stack/cable_coil(get_turf(src),5) on = FALSE - b_stat = 1 + b_stat = TRUE buildstage = 1 - update_icon() + update_icon(UPDATE_ICON_STATE) update_operating_status(FALSE) /obj/item/radio/intercom/welder_act(mob/user, obj/item/I) @@ -220,11 +220,11 @@ new /obj/item/mounted/frame/intercom(get_turf(src)) qdel(src) -/obj/item/radio/intercom/update_icon() +/obj/item/radio/intercom/update_icon_state() if(!circuitry_installed) icon_state="intercom-frame" - return - icon_state = "intercom[!on?"-p":""][b_stat ? "-open":""]" + else + icon_state = "intercom[!on?"-p":""][b_stat ? "-open":""]" /obj/item/radio/intercom/proc/update_operating_status(on = TRUE) var/area/current_area = get_area(src) @@ -249,7 +249,7 @@ on = FALSE else on = current_area.powered(EQUIP) // set "on" to the equipment power status of our area. - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/intercom_electronics name = "intercom electronics" diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 7acc14f1dc3..92253145eeb 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -596,6 +596,7 @@ REAGENT SCANNER var/obj/item/stock_parts/cell/cell var/cell_type = /obj/item/stock_parts/cell/upgraded var/ready = TRUE // Ready to scan + var/printing = FALSE var/time_to_use = 0 // How much time remaining before next scan is available. var/usecharge = 750 var/scan_time = 10 SECONDS //how long does it take to scan @@ -626,20 +627,22 @@ REAGENT SCANNER playsound(src, 'sound/machines/defib_saftyon.ogg', 50, 0) update_icon() -/obj/item/bodyanalyzer/update_icon(printing = FALSE) - overlays.Cut() - var/percent = cell.percent() +/obj/item/bodyanalyzer/update_icon_state() + if(!cell) + icon_state = "bodyanalyzer_0" + return if(ready) icon_state = "bodyanalyzer_1" else icon_state = "bodyanalyzer_2" +/obj/item/bodyanalyzer/update_overlays() + . = ..() + var/percent = cell.percent() var/overlayid = round(percent / 10) - overlayid = "bodyanalyzer_charge[overlayid]" - overlays += icon(icon, overlayid) - + . += "bodyanalyzer_charge[overlayid]" if(printing) - overlays += icon(icon, "bodyanalyzer_printing") + . += "bodyanalyzer_printing" /obj/item/bodyanalyzer/attack(mob/living/M, mob/living/carbon/human/user) if(user.incapacitated() || !user.Adjacent(M)) @@ -686,14 +689,16 @@ REAGENT SCANNER else cell.use(usecharge) ready = FALSE - update_icon(TRUE) + printing = TRUE + update_icon() addtimer(CALLBACK(src, /obj/item/bodyanalyzer/.proc/setReady), scan_cd) - addtimer(CALLBACK(src, /obj/item/bodyanalyzer/.proc/update_icon), 20) - + addtimer(VARSET_CALLBACK(src, printing, FALSE), 1.4 SECONDS) + addtimer(CALLBACK(src, /atom/.proc/update_icon, UPDATE_OVERLAYS), 1.5 SECONDS) else if(iscorgi(M) && M.stat == DEAD) to_chat(user, "You wonder if [M.p_they()] was a good dog. [src] tells you they were the best...") // :'( playsound(loc, 'sound/machines/ping.ogg', 50, 0) ready = FALSE + update_icon(UPDATE_ICON_STATE) addtimer(CALLBACK(src, /obj/item/bodyanalyzer/.proc/setReady), scan_cd) time_to_use = world.time + scan_cd else diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 22e92f603d5..f39dcceeaaf 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -26,7 +26,7 @@ ..() if(starts_with_tape) mytape = new /obj/item/tape/random(src) - update_icon() + update_icon(UPDATE_ICON_STATE) soundloop = new(list(src)) /obj/item/taperecorder/Destroy() @@ -53,7 +53,7 @@ mytape = I to_chat(user, "You insert [I] into [src].") playsound(src, 'sound/items/taperecorder/taperecorder_close.ogg', 50, FALSE) - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/taperecorder/proc/eject(mob/user) if(mytape) @@ -62,7 +62,7 @@ stop() user.put_in_hands(mytape) mytape = null - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/taperecorder/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE) @@ -92,7 +92,7 @@ eject(usr) -/obj/item/taperecorder/update_icon() +/obj/item/taperecorder/update_icon_state() if(!mytape) icon_state = "taperecorder_empty" else if(recording) @@ -102,7 +102,6 @@ else icon_state = "taperecorder_idle" - /obj/item/taperecorder/hear_talk(mob/living/M as mob, list/message_pieces) var/msg = multilingual_to_message(message_pieces) if(mytape && recording) @@ -146,7 +145,7 @@ recording = TRUE atom_say("Recording started.") update_sound() - update_icon() + update_icon(UPDATE_ICON_STATE) mytape.timestamp += mytape.used_capacity mytape.storedinfo += "\[[time2text(mytape.used_capacity * 10,"mm:ss")]\] Recording started." var/used = mytape.used_capacity //to stop runtimes when you eject the tape @@ -180,7 +179,7 @@ playsound(src, 'sound/items/taperecorder/taperecorder_stop.ogg', 50, FALSE) atom_say("Playback stopped.") playing = FALSE - update_icon() + update_icon(UPDATE_ICON_STATE) update_sound() @@ -198,7 +197,7 @@ return playing = TRUE - update_icon() + update_icon(UPDATE_ICON_STATE) update_sound() atom_say("Playback started.") playsound(src, 'sound/items/taperecorder/taperecorder_play.ogg', 50, FALSE) @@ -285,7 +284,7 @@ var/used_capacity = 0 var/list/storedinfo = list() var/list/timestamp = list() - var/ruined = 0 + var/ruined = FALSE /obj/item/tape/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE) ..() @@ -308,22 +307,23 @@ to_chat(usr, "You erase the data from [src].") clear() +/obj/item/tape/update_overlays() + . = ..() + if(ruined) + . += "ribbonoverlay" + /obj/item/tape/proc/clear() used_capacity = 0 storedinfo.Cut() timestamp.Cut() /obj/item/tape/proc/ruin() - if(!ruined) - overlays += "ribbonoverlay" - ruined = 1 - - + ruined = TRUE + update_icon(UPDATE_OVERLAYS) /obj/item/tape/proc/fix() - overlays -= "ribbonoverlay" - ruined = 0 - + ruined = FALSE + update_icon(UPDATE_OVERLAYS) /obj/item/tape/attackby(obj/item/I, mob/user) if(ruined && istype(I, /obj/item/screwdriver)) diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 61f2b016a68..e2cfcaf5474 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -152,23 +152,25 @@ spawn(50) // To stop a signal being spammed from a proxy sensor constantly going off or whatever toggle = TRUE -/obj/item/transfer_valve/update_icon() - overlays.Cut() - underlays = null - +/obj/item/transfer_valve/update_icon_state() if(!tank_one && !tank_two && !attached_device) icon_state = "valve_1" + else + icon_state = "valve" + +/obj/item/transfer_valve/update_overlays() + . = ..() + underlays.Cut() + if(!tank_one && !tank_two && !attached_device) return - icon_state = "valve" - if(tank_one) - overlays += "[tank_one.icon_state]" + . += "[tank_one.icon_state]" if(tank_two) var/icon/J = new(icon, icon_state = "[tank_two.icon_state]") J.Shift(WEST, 13) underlays += J if(attached_device) - overlays += "device" + . += "device" /obj/item/transfer_valve/proc/merge_gases() tank_two.air_contents.volume += tank_one.air_contents.volume diff --git a/code/game/objects/items/flag.dm b/code/game/objects/items/flag.dm index 49931fe1cfa..2b75caed3b4 100644 --- a/code/game/objects/items/flag.dm +++ b/code/game/objects/items/flag.dm @@ -8,6 +8,7 @@ w_class = WEIGHT_CLASS_BULKY max_integrity = 40 resistance_flags = FLAMMABLE + custom_fire_overlay = "fire" var/rolled = FALSE /obj/item/flag/attackby(obj/item/W, mob/user, params) @@ -29,18 +30,16 @@ ..() update_icon() -/obj/item/flag/update_icon() - overlays.Cut() +/obj/item/flag/update_icon_state() updateFlagIcon() item_state = icon_state if(rolled) icon_state = "[icon_state]_rolled" + custom_fire_overlay = "fire_rolled" + else + custom_fire_overlay = initial(custom_fire_overlay) if(resistance_flags & ON_FIRE) item_state = "[item_state]_fire" - if((resistance_flags & ON_FIRE) && rolled) - overlays += image('icons/obj/flag.dmi', src , "fire_rolled") - else if((resistance_flags & ON_FIRE) && !rolled) - overlays += image('icons/obj/flag.dmi', src , "fire") if(ismob(loc)) var/mob/M = loc M.update_inv_r_hand() diff --git a/code/game/objects/items/his_grace.dm b/code/game/objects/items/his_grace.dm index 1f11a40df33..9c8d79dd60c 100644 --- a/code/game/objects/items/his_grace.dm +++ b/code/game/objects/items/his_grace.dm @@ -41,16 +41,18 @@ GLOB.poi_list -= src return ..() -/obj/item/his_grace/update_icon() +/obj/item/his_grace/update_icon_state() icon_state = ascended ? "gold" : "green" item_state = ascended ? "toolbox_gold" : "artistic_toolbox" - cut_overlays() + +/obj/item/his_grace/update_overlays() + . = ..() if(ascended) - add_overlay("triple_latch") + . += "triple_latch" else if(awakened) - add_overlay("single_latch_open") + . += "single_latch_open" else - add_overlay("single_latch") + . += "single_latch" /obj/item/his_grace/attack_self(mob/living/user) if(!awakened) diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 1ad616cba8d..eb4ba9457e6 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -102,7 +102,7 @@ /obj/item/robot_parts/robot_suit/New() ..() - updateicon() + update_icon(UPDATE_OVERLAYS) /obj/item/robot_parts/robot_suit/Destroy() QDEL_NULL(l_arm) @@ -117,20 +117,20 @@ /obj/item/robot_parts/robot_suit/attack_self(mob/user) return -/obj/item/robot_parts/robot_suit/proc/updateicon() - overlays.Cut() +/obj/item/robot_parts/robot_suit/update_overlays() + . = ..() if(l_arm) - overlays += "l_arm+o" + . += "l_arm+o" if(r_arm) - overlays += "r_arm+o" + . += "r_arm+o" if(chest) - overlays += "chest+o" + . += "chest+o" if(l_leg) - overlays += "l_leg+o" + . += "l_leg+o" if(r_leg) - overlays += "r_leg+o" + . += "r_leg+o" if(head) - overlays += "head+o" + . += "head+o" /obj/item/robot_parts/robot_suit/proc/check_completion() if(l_arm && r_arm) @@ -158,7 +158,7 @@ user.drop_item() W.forceMove(src) l_leg = W - updateicon() + update_icon(UPDATE_OVERLAYS) if(istype(W, /obj/item/robot_parts/r_leg)) if(r_leg) @@ -166,7 +166,7 @@ user.drop_item() W.forceMove(src) r_leg = W - updateicon() + update_icon(UPDATE_OVERLAYS) if(istype(W, /obj/item/robot_parts/l_arm)) if(l_arm) @@ -174,7 +174,7 @@ user.drop_item() W.forceMove(src) l_arm = W - updateicon() + update_icon(UPDATE_OVERLAYS) if(istype(W, /obj/item/robot_parts/r_arm)) if(r_arm) @@ -182,7 +182,7 @@ user.drop_item() W.forceMove(src) r_arm = W - updateicon() + update_icon(UPDATE_OVERLAYS) if(istype(W, /obj/item/robot_parts/chest)) var/obj/item/robot_parts/chest/CH = W @@ -192,7 +192,7 @@ user.drop_item() W.forceMove(src) chest = W - updateicon() + update_icon(UPDATE_OVERLAYS) else if(!CH.wired) to_chat(user, "You need to attach wires to it first!") else @@ -206,7 +206,7 @@ user.drop_item() W.forceMove(src) head = W - updateicon() + update_icon(UPDATE_OVERLAYS) else to_chat(user, "You need to attach a flash to it first!") diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 40aef78bc3d..7377c6b98a7 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -39,11 +39,11 @@ /obj/item/borg/upgrade/proc/pre_install_checks(mob/living/silicon/robot/R) if(R.stat == DEAD) to_chat(usr, "[src] will not function on a deceased cyborg.") - return FALSE + return if(module_type && !istype(R.module, module_type)) to_chat(R, "Upgrade mounting error! No suitable hardpoint detected!") to_chat(usr, "There's no mounting point for the module!") - return FALSE + return return TRUE /** @@ -99,7 +99,7 @@ /obj/item/borg/upgrade/rename/do_install(mob/living/silicon/robot/R) if(!R.allow_rename) to_chat(R, "Internal diagnostic error: incompatible upgrade module detected.") - return 0 + return R.notify_ai(3, R.name, heldname) R.name = heldname R.custom_name = heldname @@ -116,7 +116,7 @@ /obj/item/borg/upgrade/restart/do_install(mob/living/silicon/robot/R) if(R.health < 0) to_chat(usr, "You have to repair the cyborg before using this module!") - return 0 + return if(!R.key) for(var/mob/dead/observer/ghost in GLOB.player_list) @@ -286,7 +286,7 @@ var/obj/item/borg/upgrade/selfrepair/U = locate() in R if(U) to_chat(usr, "This unit is already equipped with a self-repair module.") - return 0 + return cyborg = R icon_state = "selfrepair_off" @@ -308,9 +308,9 @@ else to_chat(cyborg, "You deactivate the self-repair module.") STOP_PROCESSING(SSobj, src) - update_icon() + update_icon(UPDATE_ICON_STATE) -/obj/item/borg/upgrade/selfrepair/update_icon() +/obj/item/borg/upgrade/selfrepair/update_icon_state() if(cyborg) icon_state = "selfrepair_[on ? "on" : "off"]" for(var/X in actions) @@ -322,7 +322,7 @@ /obj/item/borg/upgrade/selfrepair/proc/deactivate() STOP_PROCESSING(SSobj, src) on = FALSE - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/borg/upgrade/selfrepair/process() if(!repair_tick) diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 262c6b53734..2d9a644f3f7 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -43,7 +43,7 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \ is_cyborg = TRUE materials = list() -/obj/item/stack/rods/cyborg/update_icon() +/obj/item/stack/rods/cyborg/update_icon_state() return // icon_state should always be a full stack of rods. /obj/item/stack/rods/ten @@ -58,9 +58,9 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \ /obj/item/stack/rods/New(loc, amount=null) ..() recipes = GLOB.rod_recipes - update_icon() + update_icon(UPDATE_ICON_STATE) -/obj/item/stack/rods/update_icon() +/obj/item/stack/rods/update_icon_state() var/amount = get_amount() if((amount <= 5) && (amount > 0)) icon_state = "rods-[amount]" diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 38cf37fbc3b..502c0f8d632 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -199,11 +199,7 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \ D.armor = D.armor.setRating(bullet_value = min(D.armor.getRating(BULLET) + 5, 50)) D.armor = D.armor.setRating(laser_value = min(D.armor.getRating(LASER) + 5, 50)) to_chat(user, "You strengthen [target], improving its resistance against melee attacks.") - D.update_icon() - if(D.hides == 3) - D.desc = "Autonomous Power Loader Unit. It's wearing a fearsome carapace entirely composed of goliath hide plates - its pilot must be an experienced monster hunter." - else - D.desc = "Autonomous Power Loader Unit. Its armour is enhanced with some goliath hide plates." + D.update_appearance(UPDATE_DESC|UPDATE_OVERLAYS) use(1) else to_chat(user, "You can't improve [D] any further!") diff --git a/code/game/objects/items/tools/welder.dm b/code/game/objects/items/tools/welder.dm index aab2826e46d..d8786596fb0 100644 --- a/code/game/objects/items/tools/welder.dm +++ b/code/game/objects/items/tools/welder.dm @@ -170,15 +170,7 @@ else to_chat(user, "There's not enough fuel in [A] to refuel [src]!") -/obj/item/weldingtool/proc/update_torch() - overlays.Cut() - if(tool_enabled) - overlays += "[initial(icon_state)]-on" - item_state = "[initial(item_state)]1" - else - item_state = "[initial(item_state)]" - -/obj/item/weldingtool/update_icon() +/obj/item/weldingtool/update_icon_state() if(low_fuel_changes_icon) var/ratio = GET_FUEL / maximum_fuel ratio = CEILING(ratio*4, 1) * 25 @@ -186,8 +178,15 @@ icon_state = initial(icon_state) else icon_state = "[initial(icon_state)][ratio]" - update_torch() - ..() + if(tool_enabled) + item_state = "[initial(item_state)]1" + else + item_state = "[initial(item_state)]" + +/obj/item/weldingtool/update_overlays() + . = ..() + if(tool_enabled) + . += "[initial(icon_state)]-on" /obj/item/weldingtool/cyborg_recharge(coeff, emagged) if(reagents.check_and_add("fuel", maximum_fuel, 2 * coeff)) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 2a8bd868a93..223a064f525 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -96,7 +96,7 @@ qdel(src) return -/obj/item/toy/balloon/update_icon() +/obj/item/toy/balloon/update_icon_state() if(src.reagents.total_volume >= 1) icon_state = "waterballoon" item_state = "waterballoon" @@ -772,21 +772,20 @@ /obj/item/toy/windup_toolbox/Initialize(mapload) . = ..() - update_icon() + update_icon(UPDATE_OVERLAYS) -/obj/item/toy/windup_toolbox/update_icon() - ..() - cut_overlays() +/obj/item/toy/windup_toolbox/update_overlays() + . = ..() if(active) - add_overlay("single_latch_open") + . += "single_latch_open" else - add_overlay("single_latch") + . += "single_latch" /obj/item/toy/windup_toolbox/attack_self(mob/user) if(!active) to_chat(user, "You wind up [src], it begins to rumble.") active = TRUE - update_icon() + update_icon(UPDATE_OVERLAYS) playsound(src, 'sound/effects/pope_entry.ogg', 100) animate_rumble(src) addtimer(CALLBACK(src, .proc/stopRumble), 60 SECONDS) @@ -795,7 +794,7 @@ /obj/item/toy/windup_toolbox/proc/stopRumble() active = FALSE - update_icon() + update_icon(UPDATE_OVERLAYS) visible_message("[src] slowly stops rattling and falls still, its latch snapping shut.") //subtle difference playsound(loc, 'sound/weapons/batonextend.ogg', 100, TRUE) animate(src, transform = matrix()) @@ -1113,7 +1112,7 @@ wieldsound = 'sound/weapons/chainsawstart.ogg' attack_verb = list("sawed", "cut", "hacked", "carved", "cleaved", "butchered", "felled", "timbered") -/obj/item/twohanded/toy/chainsaw/update_icon() +/obj/item/twohanded/toy/chainsaw/update_icon_state() if(wielded) icon_state = "chainsaw[wielded]" else diff --git a/code/game/objects/items/weapons/RCL.dm b/code/game/objects/items/weapons/RCL.dm index 73fbc9eb337..0309a28a0c7 100644 --- a/code/game/objects/items/weapons/RCL.dm +++ b/code/game/objects/items/weapons/RCL.dm @@ -34,7 +34,7 @@ loaded.amount = amount else return - update_icon() + update_icon(UPDATE_ICON_STATE) to_chat(user, "You add the cables to [src]. It now contains [loaded.amount].") else ..() @@ -58,7 +58,7 @@ loaded.forceMove(user.loc) user.put_in_hands(loaded) loaded = null - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/twohanded/rcl/examine(mob/user) . = ..() @@ -71,7 +71,7 @@ active = FALSE return ..() -/obj/item/twohanded/rcl/update_icon() +/obj/item/twohanded/rcl/update_icon_state() if(!loaded) icon_state = "rcl-0" item_state = "rcl-0" @@ -89,10 +89,9 @@ else icon_state = "rcl-0" item_state = "rcl-0" - ..() /obj/item/twohanded/rcl/proc/is_empty(mob/user, loud = 1) - update_icon() + update_icon(UPDATE_ICON_STATE) if(!loaded || !loaded.amount) if(loud) to_chat(user, "The last of the cables unreel from [src].") @@ -151,4 +150,4 @@ loaded = new() loaded.max_amount = max_amount loaded.amount = max_amount - update_icon() + update_icon(UPDATE_ICON_STATE) diff --git a/code/game/objects/items/weapons/cash.dm b/code/game/objects/items/weapons/cash.dm index 23aaeb27cbc..8e6e34d8622 100644 --- a/code/game/objects/items/weapons/cash.dm +++ b/code/game/objects/items/weapons/cash.dm @@ -16,10 +16,9 @@ /obj/item/stack/spacecash/New(loc, amt = null) ..() - update_icon() + update_icon(UPDATE_ICON_STATE) -/obj/item/stack/spacecash/update_icon() - ..() +/obj/item/stack/spacecash/update_icon_state() name = "[amount == max_amount ? "1000000" : amount] Credit[amount > 1 ? "s" : ""]" if(amount >= 1 && amount < 10) icon_state = "cashgreen" diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm index c5847f68944..6c2b1b91409 100644 --- a/code/game/objects/items/weapons/chrono_eraser.dm +++ b/code/game/objects/items/weapons/chrono_eraser.dm @@ -63,8 +63,8 @@ TED = new(src.loc) qdel(src) -/obj/item/gun/energy/chrono_gun/update_icon() - return +/obj/item/gun/energy/chrono_gun/update_overlays() + return list() /obj/item/gun/energy/chrono_gun/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params, zone_override, bonus_spread = 0) if(field) @@ -177,7 +177,7 @@ cached_icon.Insert(mob_icon, "frame[i]") mob_underlay = mutable_appearance(cached_icon, "frame1") - update_icon() + update_icon(UPDATE_ICON_STATE) desc = initial(desc) + "
It appears to contain [target.name]." START_PROCESSING(SSobj, src) @@ -188,7 +188,7 @@ gun.field_disconnect(src) return ..() -/obj/structure/chrono_field/update_icon() +/obj/structure/chrono_field/update_icon_state() var/ttk_frame = 1 - (tickstokill / initial(tickstokill)) ttk_frame = clamp(CEILING(ttk_frame * CHRONO_FRAME_COUNT, 1), 1, CHRONO_FRAME_COUNT) if(ttk_frame != RPpos) @@ -217,7 +217,7 @@ captured.Paralyse(8 SECONDS) if(captured.loc != src) captured.forceMove(src) - update_icon() + update_icon(UPDATE_ICON_STATE) if(gun) if(gun.field_check(src)) tickstokill-- diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index f581cd50ecd..3d0930b1dc0 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -33,17 +33,16 @@ /obj/item/defibrillator/Initialize(mapload) //starts without a cell for rnd . = ..() paddles = new paddle_type(src) - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/item/defibrillator/loaded/Initialize(mapload) //starts with hicap . = ..() cell = new(src) - update_icon() + update_icon(UPDATE_OVERLAYS) -/obj/item/defibrillator/update_icon() +/obj/item/defibrillator/update_icon(updates=ALL) update_power() - update_overlays() - update_charge() + ..() /obj/item/defibrillator/examine(mob/user) . = ..() @@ -58,28 +57,25 @@ else powered = FALSE -/obj/item/defibrillator/proc/update_overlays() - overlays.Cut() +/obj/item/defibrillator/update_overlays() + . = ..() if(paddles_on_defib) - overlays += "[icon_state]-paddles" - if(powered) - overlays += "[icon_state]-powered" - if(!cell) - overlays += "[icon_state]-nocell" + . += "[icon_state]-paddles" if(!safety) - overlays += "[icon_state]-emagged" - -/obj/item/defibrillator/proc/update_charge() - if(powered) //so it doesn't show charge if it's unpowered - if(cell) - var/ratio = cell.charge / cell.maxcharge - ratio = CEILING(ratio*4, 1) * 25 - overlays += "[icon_state]-charge[ratio]" + . += "[icon_state]-emagged" + if(powered) + . += "[icon_state]-powered" + if(powered && cell) + var/ratio = cell.charge / cell.maxcharge + ratio = CEILING(ratio*4, 1) * 25 + . += "[icon_state]-charge[ratio]" + if(!cell) + . += "[icon_state]-nocell" /obj/item/defibrillator/CheckParts(list/parts_list) ..() cell = locate(/obj/item/stock_parts/cell) in contents - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/item/defibrillator/ui_action_click() toggle_paddles() @@ -109,7 +105,7 @@ cell = null to_chat(user, "You remove the cell from [src].") - update_icon() + update_icon(UPDATE_OVERLAYS) return /obj/item/defibrillator/emag_act(user as mob) @@ -131,7 +127,7 @@ safety = TRUE visible_message("[src] beeps: Safety protocols enabled!") playsound(get_turf(src), 'sound/machines/defib_saftyon.ogg', 50, 0) - update_icon() + update_icon(UPDATE_OVERLAYS) ..() /obj/item/defibrillator/verb/toggle_paddles() @@ -146,7 +142,7 @@ if(!usr.put_in_hands(paddles)) to_chat(user, "You need a free hand to hold the paddles!") - update_icon() + update_icon(UPDATE_OVERLAYS) return paddles.loc = user paddles_on_defib = FALSE @@ -154,7 +150,7 @@ //Remove from their hands and back onto the defib unit remove_paddles(user) - update_icon() + update_icon(UPDATE_OVERLAYS) for(var/X in actions) var/datum/action/A = X A.UpdateButtonIcon() @@ -163,7 +159,7 @@ ..() if(slot != slot_back) remove_paddles(user) - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/item/defibrillator/item_action_slot_check(slot, mob/user) if(slot == slot_back) @@ -174,7 +170,7 @@ if(paddles in get_both_hands(M)) M.unEquip(paddles) paddles_on_defib = TRUE - update_icon() + update_icon(UPDATE_OVERLAYS) return /obj/item/defibrillator/Destroy() @@ -189,12 +185,12 @@ if(cell) if(cell.charge < (paddles.revivecost+chrgdeductamt)) powered = FALSE - update_icon() + update_icon(UPDATE_OVERLAYS) if(cell.use(chrgdeductamt)) - update_icon() + update_icon(UPDATE_OVERLAYS) return TRUE else - update_icon() + update_icon(UPDATE_OVERLAYS) return FALSE /obj/item/defibrillator/proc/cooldowncheck(mob/user) @@ -207,8 +203,8 @@ user.visible_message("[src] beeps: Charge depleted.") playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) paddles.cooldown = FALSE - paddles.update_icon() - update_icon() + paddles.update_icon(UPDATE_ICON_STATE) + update_icon(UPDATE_OVERLAYS) /obj/item/defibrillator/compact name = "compact defibrillator" @@ -223,7 +219,7 @@ /obj/item/defibrillator/compact/loaded/Initialize(mapload) . = ..() cell = new(src) - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/item/defibrillator/compact/item_action_slot_check(slot, mob/user) if(slot == slot_belt) @@ -242,7 +238,7 @@ /obj/item/defibrillator/compact/combat/loaded/Initialize(mapload) . = ..() cell = new(src) - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/item/defibrillator/compact/advanced name = "advanced compact defibrillator" @@ -260,12 +256,12 @@ if(W == paddles) paddles.unwield() toggle_paddles() - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/item/defibrillator/compact/advanced/loaded/Initialize(mapload) . = ..() cell = new /obj/item/stock_parts/cell/bluespace/charging(src) - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/item/defibrillator/compact/advanced/emp_act(severity) if(world.time > next_emp_message) @@ -277,7 +273,7 @@ if(W == paddles) paddles.unwield() toggle_paddles() - update_icon() + update_icon(UPDATE_OVERLAYS) return //paddles @@ -306,10 +302,10 @@ defib = mainunit loc = defib busy = FALSE - update_icon() + update_icon(UPDATE_ICON_STATE) return -/obj/item/twohanded/shockpaddles/update_icon() +/obj/item/twohanded/shockpaddles/update_icon_state() icon_state = "[base_icon_state][wielded]" item_state = "[base_icon_state][wielded]" if(cooldown) @@ -330,8 +326,8 @@ to_chat(user, "The paddles snap back into the main unit.") defib.paddles_on_defib = TRUE loc = defib - defib.update_icon() - update_icon() + defib.update_icon(UPDATE_OVERLAYS) + update_icon(UPDATE_ICON_STATE) unwield(user) /obj/item/twohanded/shockpaddles/on_mob_move(dir, mob/user) @@ -384,12 +380,12 @@ defib.deductcharge(revivecost) cooldown = TRUE busy = FALSE - update_icon() + update_icon(UPDATE_ICON_STATE) defib.cooldowncheck(user) return user.visible_message("[user] begins to place [src] on [M.name]'s chest.", "You begin to place [src] on [M.name]'s chest.") busy = TRUE - update_icon() + update_icon(UPDATE_ICON_STATE) var/mob/dead/observer/ghost = H.get_ghost(TRUE) if(ghost && ghost.can_reenter_corpse) to_chat(ghost, "Your heart is being defibrillated. Return to your body if you want to be revived! (Verbs -> Ghost -> Re-enter corpse)") @@ -415,14 +411,14 @@ user.visible_message("[defib] buzzes: Patient's chest is obscured. Operation aborted.") playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) busy = FALSE - update_icon() + update_icon(UPDATE_ICON_STATE) return if(H.undergoing_cardiac_arrest()) if(!H.get_int_organ(/obj/item/organ/internal/heart) && !H.get_int_organ(/obj/item/organ/internal/brain/slime)) //prevents defibing someone still alive suffering from a heart attack attack if they lack a heart user.visible_message("[defib] buzzes: Resuscitation failed - Failed to pick up any heart electrical activity.") playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) busy = FALSE - update_icon() + update_icon(UPDATE_ICON_STATE) return else var/obj/item/organ/internal/heart/heart = H.get_int_organ(/obj/item/organ/internal/heart) @@ -430,7 +426,7 @@ user.visible_message("[defib] buzzes: Resuscitation failed - Heart necrosis detected.") playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) busy = FALSE - update_icon() + update_icon(UPDATE_ICON_STATE) return H.set_heartattack(FALSE) SEND_SIGNAL(H, COMSIG_LIVING_MINOR_SHOCK, 100) @@ -442,7 +438,7 @@ defib.deductcharge(revivecost) busy = FALSE cooldown = TRUE - update_icon() + update_icon(UPDATE_ICON_STATE) defib.cooldowncheck(user) return if(H.stat == DEAD) @@ -497,14 +493,14 @@ user.visible_message("[defib] buzzes: Resuscitation failed.") playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) defib.deductcharge(revivecost) - update_icon() cooldown = TRUE + update_icon(UPDATE_ICON_STATE) defib.cooldowncheck(user) else user.visible_message("[defib] buzzes: Patient is not in a valid state. Operation aborted.") playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) busy = FALSE - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/borg_defib name = "defibrillator paddles" @@ -551,10 +547,10 @@ R.cell.use(revivecost) cooldown = TRUE busy = FALSE - update_icon() + update_icon(UPDATE_ICON_STATE) spawn(50) cooldown = FALSE - update_icon() + update_icon(UPDATE_ICON_STATE) return user.visible_message("[user] begins to place [src] on [M.name]'s chest.", "You begin to place [src] on [M.name]'s chest.") busy = TRUE @@ -619,16 +615,16 @@ if(isrobot(user)) var/mob/living/silicon/robot/R = user R.cell.use(revivecost) - update_icon() cooldown = TRUE + update_icon(UPDATE_ICON_STATE) spawn(50) cooldown = FALSE - update_icon() + update_icon(UPDATE_ICON_STATE) else user.visible_message("[user] buzzes: Patient is not in a valid state. Operation aborted.") playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) busy = FALSE - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/twohanded/shockpaddles/syndicate name = "combat defibrillator paddles" diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm index 13a347d2c79..0b60332e700 100644 --- a/code/game/objects/items/weapons/dice.dm +++ b/code/game/objects/items/weapons/dice.dm @@ -304,8 +304,8 @@ icon_state = "d100" sides = 100 -/obj/item/dice/d100/update_icon() - return +/obj/item/dice/d100/update_overlays() + return list() /obj/item/dice/d20/e20 var/triggered = FALSE @@ -333,7 +333,7 @@ comment = "NAT 20!" else if(sides == 20 && result == 1) comment = "Ouch, bad luck." - update_icon() + update_icon(UPDATE_OVERLAYS) if(initial(icon_state) == "d00") result = (result - 1) * 10 if(length(special_faces) == sides) @@ -375,9 +375,9 @@ log_game("E20 detonated at [A.name] ([epicenter.x],[epicenter.y],[epicenter.z]) with a roll of [actual_result]. Triggered by: [key_name(user)]") add_attack_logs(user, src, "detonated with a roll of [actual_result]", ATKLOG_FEW) -/obj/item/dice/update_icon() - overlays.Cut() - overlays += "[icon_state][result]" +/obj/item/dice/update_overlays() + . = ..() + . += "[icon_state][result]" /obj/item/storage/box/dice name = "Box of dice" diff --git a/code/game/objects/items/weapons/dnascrambler.dm b/code/game/objects/items/weapons/dnascrambler.dm index 78da396e30e..c726f40e10c 100644 --- a/code/game/objects/items/weapons/dnascrambler.dm +++ b/code/game/objects/items/weapons/dnascrambler.dm @@ -6,7 +6,7 @@ icon_state = "lepopen" var/used = FALSE -/obj/item/dnascrambler/update_icon() +/obj/item/dnascrambler/update_icon_state() if(used) icon_state = "lepopen0" else @@ -52,5 +52,5 @@ add_attack_logs(user, target, "injected with [src]") used = TRUE - update_icon() + update_icon(UPDATE_ICON_STATE) name = "used " + name diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index 8913b38b262..aea420a3804 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -33,14 +33,14 @@ assemblyattacher = user.ckey to_chat(user, "You add [A] to [src].") playsound(src, 'sound/weapons/tap.ogg', 20, 1) - update_icon() + update_icon(UPDATE_ICON_STATE) return if(nadeassembly && istype(I, /obj/item/wirecutters)) playsound(src, I.usesound, 20, 1) nadeassembly.loc = get_turf(src) nadeassembly.master = null nadeassembly = null - update_icon() + update_icon(UPDATE_ICON_STATE) return ..() @@ -80,16 +80,16 @@ if(do_after(user, 50 * toolspeed, target = AM)) if(!user.unEquip(src)) return - src.target = AM + target = AM loc = null message_admins("[key_name_admin(user)]([ADMIN_QUE(user,"?")]) ([ADMIN_FLW(user,"FLW")]) planted [src.name] on [target.name] at ([target.x],[target.y],[target.z] - JMP) with [det_time] second fuse",0,1) log_game("[key_name(user)] planted [name] on [target.name] at ([target.x],[target.y],[target.z]) with [det_time] second fuse") - target.overlays += image_overlay + AddComponent(/datum/component/persistent_overlay, image_overlay, target) if(!nadeassembly) to_chat(user, "You plant the bomb. Timer counting down from [det_time].") - addtimer(CALLBACK(src, .proc/prime), det_time*10) + addtimer(CALLBACK(src, .proc/prime), det_time SECONDS) /obj/item/grenade/plastic/suicide_act(mob/user) message_admins("[key_name_admin(user)]([ADMIN_QUE(user,"?")]) ([ADMIN_FLW(user,"FLW")]) suicided with [src.name] at ([user.x],[user.y],[user.z] - JMP)",0,1) @@ -120,7 +120,7 @@ user.gib() return OBLITERATION -/obj/item/grenade/plastic/update_icon() +/obj/item/grenade/plastic/update_icon_state() if(nadeassembly) icon_state = "[item_state]1" else @@ -153,7 +153,6 @@ if(target) if(!QDELETED(target)) location = get_turf(target) - target.overlays -= image_overlay if(!ex_breach && istype(target, /turf/simulated/wall)) //Walls get dismantled instead of destroyed to avoid making unwanted holes to space. var/turf/simulated/wall/W = target W.dismantle_wall(TRUE, TRUE) @@ -219,7 +218,6 @@ if(target) if(!QDELETED(target)) location = get_turf(target) - target.overlays -= image_overlay else location = get_turf(src) if(location) diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index b28988adc8d..2d6a3da4c6b 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -48,14 +48,8 @@ igniter.flamethrower_process(location) -/obj/item/flamethrower/update_icon() - cut_overlays() - if(igniter) - add_overlay("+igniter[status]") - if(ptank) - add_overlay("+ptank") +/obj/item/flamethrower/update_icon_state() if(lit) - add_overlay("+lit") item_state = "flamethrower_1" else item_state = "flamethrower_0" @@ -64,6 +58,15 @@ M.update_inv_l_hand() M.update_inv_r_hand() +/obj/item/flamethrower/update_overlays() + . = ..() + if(igniter) + . += "+igniter[status]" + if(ptank) + . += "+ptank" + if(lit) + . += "+lit" + /obj/item/flamethrower/can_enter_storage(obj/item/storage/S, mob/user) if(lit) to_chat(user, "[S] can't hold [src] while it's lit!") diff --git a/code/game/objects/items/weapons/garrote.dm b/code/game/objects/items/weapons/garrote.dm index dc9ffcd2bf2..8787c888b38 100644 --- a/code/game/objects/items/weapons/garrote.dm +++ b/code/game/objects/items/weapons/garrote.dm @@ -10,32 +10,24 @@ icon_state = "garrot_wrap" w_class = WEIGHT_CLASS_TINY var/mob/living/carbon/human/strangling - var/improvised = 0 + var/improvised = FALSE var/garrote_time /obj/item/twohanded/garrote/Destroy() strangling = null return ..() -/obj/item/twohanded/garrote/update_icon() +/obj/item/twohanded/garrote/update_icon_state() if(strangling) // If we're strangling someone we want our icon to stay wielded - icon_state = "garrot_unwrap" - return - - icon_state = "garrot_[wielded ? "un" : ""]wrap" + icon_state = "garrot_[improvised ? "I_" : ""]unwrap" + else + icon_state = "garrot_[improvised ? "I_" : ""][wielded ? "un" : ""]wrap" /obj/item/twohanded/garrote/improvised // Made via tablecrafting name = "garrote" desc = "A length of cable with a shoddily-carved wooden handle tied to either end.
You suspect you'd have to be behind the target to use this weapon effectively." icon_state = "garrot_I_wrap" - improvised = 1 - -/obj/item/twohanded/garrote/improvised/update_icon() - if(strangling) - icon_state = "garrot_I_unwrap" - return - - icon_state = "garrot_I_[wielded ? "un" : ""]wrap" + improvised = TRUE /obj/item/twohanded/garrote/wield(mob/living/carbon/user) if(strangling) @@ -43,7 +35,7 @@ "You remove [src] from [strangling]'s neck.") strangling = null - update_icon() + update_icon(UPDATE_ICON_STATE) STOP_PROCESSING(SSobj, src) else @@ -99,7 +91,7 @@ garrote_time = world.time + 10 START_PROCESSING(SSobj, src) strangling = M - update_icon() + update_icon(UPDATE_ICON_STATE) playsound(src.loc, 'sound/weapons/cablecuff.ogg', 15, 1, -1) @@ -112,14 +104,14 @@ /obj/item/twohanded/garrote/process() if(!strangling) // Our mark got gibbed or similar - update_icon() + update_icon(UPDATE_ICON_STATE) STOP_PROCESSING(SSobj, src) return if(!istype(loc, /mob/living/carbon/human)) strangling = null - update_icon() + update_icon(UPDATE_ICON_STATE) STOP_PROCESSING(SSobj, src) return @@ -137,7 +129,7 @@ "You lose your grip on [strangling]'s neck.") strangling = null - update_icon() + update_icon(UPDATE_ICON_STATE) STOP_PROCESSING(SSobj, src) return @@ -147,7 +139,7 @@ "You lose your grip on [strangling]'s neck.") strangling = null - update_icon() + update_icon(UPDATE_ICON_STATE) STOP_PROCESSING(SSobj, src) return diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 88a0c8d0954..566372d52db 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -50,22 +50,10 @@ return O return null - -/obj/item/grenade/chem_grenade/proc/update_overlays() - underlays = list() - if(nadeassembly) - underlays += "[nadeassembly.a_left.icon_state]_left" - for(var/O in nadeassembly.a_left.attached_overlays) - underlays += "[O]_l" - underlays += "[nadeassembly.a_right.icon_state]_right" - for(var/O in nadeassembly.a_right.attached_overlays) - underlays += "[O]_r" - -/obj/item/grenade/chem_grenade/update_icon() +/obj/item/grenade/chem_grenade/update_icon_state() if(nadeassembly) icon = 'icons/obj/assemblies/new_assemblies.dmi' icon_state = bomb_state - update_overlays() var/obj/item/assembly/A = get_trigger() if(stage != READY) name = "bomb casing[label]" @@ -90,6 +78,15 @@ else icon_state += "_locked" name = payload_name + "grenade" + label + + underlays.Cut() + if(nadeassembly) + underlays += "[nadeassembly.a_left.icon_state]_left" + for(var/O in nadeassembly.a_left.attached_overlays) + underlays += "[O]_l" + underlays += "[nadeassembly.a_right.icon_state]_right" + for(var/O in nadeassembly.a_right.attached_overlays) + underlays += "[O]_r" /obj/item/grenade/chem_grenade/attack_self(mob/user) @@ -98,7 +95,7 @@ var/area/A = get_area(bombturf) if(nadeassembly) nadeassembly.attack_self(user) - update_icon() + update_icon(UPDATE_ICON_STATE) else if(clown_check(user)) // This used to go before the assembly check, but that has absolutely zero to do with priming the damn thing. You could spam the admins with it. log_game("[key_name(usr)] has primed a [name] for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]) [contained].") @@ -133,7 +130,7 @@ else if(label) label = null - update_icon() + update_icon(UPDATE_ICON_STATE) to_chat(user, "You remove the label from [src].") return 1 if(istype(I, /obj/item/screwdriver)) @@ -142,7 +139,7 @@ to_chat(user, "You lock the assembly.") playsound(loc, prime_sound, 25, -3) stage = READY - update_icon() + update_icon(UPDATE_ICON_STATE) contained = "" cores = "" // clear them out so no recursive logging by accidentally for(var/obj/O in beakers) @@ -195,7 +192,7 @@ assemblyattacher = user.ckey stage = WIRED to_chat(user, "You add [A] to [src]!") - update_icon() + update_icon(UPDATE_ICON_STATE) else if(stage == EMPTY && istype(I, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = I @@ -203,12 +200,12 @@ stage = WIRED to_chat(user, "You rig [src].") - update_icon() + update_icon(UPDATE_ICON_STATE) else if(stage == READY && istype(I, /obj/item/wirecutters)) to_chat(user, "You unlock the assembly.") stage = WIRED - update_icon() + update_icon(UPDATE_ICON_STATE) else if(stage == WIRED && istype(I, /obj/item/wrench)) to_chat(user, "You open the grenade and remove the contents.") @@ -223,7 +220,7 @@ for(var/obj/O in beakers) O.forceMove(get_turf(src)) beakers = list() - update_icon() + update_icon(UPDATE_ICON_STATE) //assembly stuff @@ -286,7 +283,7 @@ O.forceMove(get_turf(src)) beakers = list() stage = EMPTY - update_icon() + update_icon(UPDATE_ICON_STATE) return if(nadeassembly) @@ -448,7 +445,7 @@ beakers += B1 beakers += B2 - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/grenade/chem_grenade/firefighting @@ -466,7 +463,7 @@ beakers += B1 beakers += B2 - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/grenade/chem_grenade/incendiary payload_name = "incendiary" @@ -485,7 +482,7 @@ beakers += B1 beakers += B2 - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/grenade/chem_grenade/antiweed @@ -506,7 +503,7 @@ beakers += B1 beakers += B2 - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/grenade/chem_grenade/cleaner @@ -526,7 +523,7 @@ beakers += B1 beakers += B2 - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/grenade/chem_grenade/teargas @@ -546,7 +543,7 @@ beakers += B1 beakers += B2 - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/grenade/chem_grenade/facid payload_name = "acid smoke" @@ -566,7 +563,7 @@ beakers += B1 beakers += B2 - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/grenade/chem_grenade/saringas payload_name = "sarin gas" @@ -585,7 +582,7 @@ beakers += B1 beakers += B2 - update_icon() + update_icon(UPDATE_ICON_STATE) #undef EMPTY #undef WIRED diff --git a/code/game/objects/items/weapons/implants/implant_mindshield.dm b/code/game/objects/items/weapons/implants/implant_mindshield.dm index 97b02c2546d..9404dd9e275 100644 --- a/code/game/objects/items/weapons/implants/implant_mindshield.dm +++ b/code/game/objects/items/weapons/implants/implant_mindshield.dm @@ -42,8 +42,6 @@ /obj/item/implanter/mindshield/New() imp = new /obj/item/implant/mindshield(src) ..() - update_icon() - /obj/item/implantcase/mindshield name = "implant case - 'mindshield'" diff --git a/code/game/objects/items/weapons/implants/implantcase.dm b/code/game/objects/items/weapons/implants/implantcase.dm index 6f331f2be53..365c73cefaa 100644 --- a/code/game/objects/items/weapons/implants/implantcase.dm +++ b/code/game/objects/items/weapons/implants/implantcase.dm @@ -12,18 +12,22 @@ materials = list(MAT_GLASS=500) var/obj/item/implant/imp = null - -/obj/item/implantcase/update_icon() +/obj/item/implantcase/proc/update_state() if(imp) - icon_state = "implantcase-[imp.item_color]" origin_tech = imp.origin_tech flags = imp.flags & ~DROPDEL reagents = imp.reagents else - icon_state = "implantcase-0" origin_tech = initial(origin_tech) flags = initial(flags) reagents = null + update_icon(UPDATE_ICON_STATE) + +/obj/item/implantcase/update_icon_state() + if(imp) + icon_state = "implantcase-[imp.item_color]" + else + icon_state = "implantcase-0" /obj/item/implantcase/attackby(obj/item/W, mob/user, params) @@ -38,8 +42,8 @@ I.imp.loc = src imp = I.imp I.imp = null - update_icon() - I.update_icon() + update_state() + I.update_icon(UPDATE_ICON_STATE) else if(imp) if(I.imp) @@ -47,8 +51,8 @@ imp.loc = I I.imp = imp imp = null - update_icon() - I.update_icon() + update_state() + I.update_icon(UPDATE_ICON_STATE) /*else if(istype(W, /obj/item/ammo_casing/shotgun/implanter)) var/obj/item/ammo_casing/shotgun/implanter/I = W @@ -57,7 +61,7 @@ /obj/item/implantcase/New() ..() - update_icon() + update_state() /obj/item/implantcase/tracking diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index 5fd031c2b2f..ef9a60f5b66 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -13,7 +13,7 @@ var/obj/item/implant/imp = null -/obj/item/implanter/update_icon() +/obj/item/implanter/update_icon_state() if(imp) icon_state = "implanter1" origin_tech = imp.origin_tech @@ -38,7 +38,7 @@ else M.visible_message("[user] has implanted [M].", "[user] implants you.") imp = null - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/implanter/attackby(obj/item/W, mob/user, params) ..() @@ -48,7 +48,7 @@ /obj/item/implanter/New() ..() spawn(1) - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/implanter/adrenalin diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/implants/implantpad.dm index 5f1cf0ae103..f80f1d1cda3 100644 --- a/code/game/objects/items/weapons/implants/implantpad.dm +++ b/code/game/objects/items/weapons/implants/implantpad.dm @@ -14,12 +14,11 @@ dropcase() return ..() -/obj/item/implantpad/update_icon() +/obj/item/implantpad/update_icon_state() if(case) - src.icon_state = "implantpad-1" + icon_state = "implantpad-1" else - src.icon_state = "implantpad-0" - return + icon_state = "implantpad-0" /obj/item/implantpad/proc/addcase(mob/user as mob, obj/item/implantcase/C as obj) if(!user || !C) @@ -30,7 +29,7 @@ user.unEquip(C) C.forceMove(src) case = C - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/implantpad/proc/dropcase(mob/user as mob) if(!case) @@ -41,12 +40,12 @@ add_fingerprint(user) case.add_fingerprint(user) case = null - update_icon() + update_icon(UPDATE_ICON_STATE) return case.forceMove(get_turf(src)) case = null - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/implantpad/verb/remove_implant() set category = "Object" diff --git a/code/game/objects/items/weapons/legcuffs.dm b/code/game/objects/items/weapons/legcuffs.dm index 2201ee986e6..2b8d54b973a 100644 --- a/code/game/objects/items/weapons/legcuffs.dm +++ b/code/game/objects/items/weapons/legcuffs.dm @@ -26,7 +26,7 @@ /obj/item/restraints/legcuffs/beartrap/New() ..() -/obj/item/restraints/legcuffs/beartrap/update_icon() +/obj/item/restraints/legcuffs/beartrap/update_icon_state() icon_state = "beartrap[armed]" /obj/item/restraints/legcuffs/beartrap/Destroy() @@ -43,7 +43,7 @@ ..() if(ishuman(user) && !user.stat && !user.restrained()) armed = !armed - update_icon() + update_icon(UPDATE_ICON_STATE) to_chat(user, "[src] is now [armed ? "armed" : "disarmed"]") /obj/item/restraints/legcuffs/beartrap/attackby(obj/item/I, mob/user) //Let's get explosive. diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm index a833f591972..b25e31d3794 100644 --- a/code/game/objects/items/weapons/mop.dm +++ b/code/game/objects/items/weapons/mop.dm @@ -70,9 +70,8 @@ return ..() /obj/item/mop/proc/janicart_insert(mob/user, obj/structure/janitorialcart/J) + J.mymop = src J.put_in_cart(src, user) - J.mymop=src - J.update_icon() /obj/item/mop/wash(mob/user, atom/source) reagents.add_reagent("water", 5) diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm index 1b333078354..f0378fe0316 100644 --- a/code/game/objects/items/weapons/paint.dm +++ b/code/game/objects/items/weapons/paint.dm @@ -14,6 +14,7 @@ possible_transfer_amounts = list(5,10,20,30,50,70) volume = 70 container_type = OPENCONTAINER + blocks_emissive = EMISSIVE_BLOCK_GENERIC /obj/item/reagent_containers/glass/paint/afterattack(turf/simulated/target, mob/user, proximity) if(!proximity) diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 38639080270..16989a09521 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -45,7 +45,7 @@ playsound(loc, 'sound/items/eatfood.ogg', 50, 1, -1) return TOXLOSS -/obj/item/storage/bag/trash/update_icon() +/obj/item/storage/bag/trash/update_icon_state() switch(contents.len) if(21 to INFINITY) icon_state = "[initial(icon_state)]3" @@ -59,14 +59,12 @@ var/mob/living/carbon/human/H = loc H.update_inv_l_hand() H.update_inv_r_hand() - ..() /obj/item/storage/bag/trash/cyborg /obj/item/storage/bag/trash/proc/janicart_insert(mob/user, obj/structure/janitorialcart/J) + J.mybag = src J.put_in_cart(src, user) - J.mybag=src - J.update_icon() /obj/item/storage/bag/trash/cyborg/janicart_insert(mob/user, obj/structure/janitorialcart/J) return @@ -405,58 +403,51 @@ if(prob(10)) M.Weaken(4 SECONDS) -/obj/item/storage/bag/tray/proc/rebuild_overlays() - overlays.Cut() +/obj/item/storage/bag/tray/update_icon_state() + return + +/obj/item/storage/bag/tray/update_overlays() + . = ..() for(var/obj/item/I in contents) - overlays += image("icon" = I.icon, "icon_state" = I.icon_state, "layer" = -1) - -/obj/item/storage/bag/tray/remove_from_storage(obj/item/W as obj, atom/new_location) - ..() - rebuild_overlays() - -/obj/item/storage/bag/tray/handle_item_insertion(obj/item/I, prevent_warning = 0) - overlays += image("icon" = I.icon, "icon_state" = I.icon_state, "layer" = -1) - ..() + . += image(icon = I.icon, icon_state = I.icon_state, layer = -1) /obj/item/storage/bag/tray/cyborg /obj/item/storage/bag/tray/cyborg/afterattack(atom/target, mob/user as mob) if( isturf(target) || istype(target,/obj/structure/table) ) - var/foundtable = istype(target,/obj/structure/table/) - if( !foundtable ) //it must be a turf! + var/found_table = istype(target,/obj/structure/table/) + if(!found_table) //it must be a turf! for(var/obj/structure/table/T in target) - foundtable = 1 + found_table = TRUE break var/turf/dropspot - if( !foundtable ) // don't unload things onto walls or other silly places. + if(!found_table) // don't unload things onto walls or other silly places. dropspot = user.loc else if( isturf(target) ) // they clicked on a turf with a table in it dropspot = target else // they clicked on a table dropspot = target.loc - overlays = null - - var/droppedSomething = 0 + var/dropped_something = FALSE for(var/obj/item/I in contents) I.loc = dropspot contents.Remove(I) - droppedSomething = 1 - if(!foundtable && isturf(dropspot)) + dropped_something = TRUE + if(!found_table && isturf(dropspot)) // if no table, presume that the person just shittily dropped the tray on the ground and made a mess everywhere! spawn() for(var/i = 1, i <= rand(1,2), i++) if(I) step(I, pick(NORTH,SOUTH,EAST,WEST)) sleep(rand(2,4)) - if( droppedSomething ) - if( foundtable ) + if(dropped_something) + if(found_table) user.visible_message("[user] unloads [user.p_their()] service tray.") else user.visible_message("[user] drops all the items on [user.p_their()] tray.") - + update_icon(UPDATE_OVERLAYS) return ..() @@ -466,8 +457,8 @@ /obj/item/storage/bag/tray/cookies_tray/populate_contents() // By Azule Utama, thank you a lot! for(var/i in 1 to 6) var/obj/item/C = new cookie(src) - handle_item_insertion(C) // Done this way so the tray actually has the cookies visible when spawned - rebuild_overlays() + C.in_inventory = TRUE + update_icon(UPDATE_OVERLAYS) /obj/item/storage/bag/tray/cookies_tray/sugarcookie cookie = /obj/item/reagent_containers/food/snacks/sugarcookie diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index cd791b73751..9e3f30a73e0 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -13,14 +13,13 @@ /// Do we have overlays for items held inside the belt? var/use_item_overlays = FALSE -/obj/item/storage/belt/update_icon() +/obj/item/storage/belt/update_overlays() + . = ..() if(use_item_overlays) - cut_overlays() for(var/obj/item/I in contents) var/image/belt_image = image(icon, I.belt_icon) belt_image.color = I.color - add_overlay(belt_image) - ..() + . += belt_image /obj/item/storage/belt/proc/can_use() return is_equipped() @@ -433,8 +432,7 @@ . = ..() update_icon() -/obj/item/storage/belt/lazarus/update_icon() - ..() +/obj/item/storage/belt/lazarus/update_icon_state() icon_state = "[initial(icon_state)]_[length(contents)]" /obj/item/storage/belt/lazarus/attackby(obj/item/I, mob/user) @@ -465,8 +463,7 @@ for(var/I in 1 to 8) new /obj/item/ammo_casing/shotgun/beanbag(src) -/obj/item/storage/belt/bandolier/update_icon() - ..() +/obj/item/storage/belt/bandolier/update_icon_state() icon_state = "[initial(icon_state)]_[length(contents)]" /obj/item/storage/belt/bandolier/attackby(obj/item/I, mob/user) @@ -611,13 +608,13 @@ return playsound(src, 'sound/weapons/blade_unsheath.ogg', 20) -/obj/item/storage/belt/rapier/update_icon() - . = ..() - icon_state = initial(icon_state) - item_state = initial(item_state) +/obj/item/storage/belt/rapier/update_icon_state() if(length(contents)) icon_state = "[icon_state]-rapier" item_state = "[item_state]-rapier" + else + icon_state = initial(icon_state) + item_state = initial(item_state) if(isliving(loc)) var/mob/living/L = loc L.update_inv_belt() diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 79136b78137..54c511fae82 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -724,10 +724,26 @@ foldable = null var/design = NODESIGN -/obj/item/storage/box/papersack/update_icon() - if(!contents.len) +/obj/item/storage/box/papersack/update_desc() + . = ..() + switch(design) + if(NODESIGN) + desc = "A sack neatly crafted out of paper." + if(NANOTRASEN) + desc = "A standard Nanotrasen paper lunch sack for loyal employees on the go." + if(SYNDI) + desc = "The design on this paper sack is a remnant of the notorious 'SyndieSnacks' program." + if(HEART) + desc = "A paper sack with a heart etched onto the side." + if(SMILE) + desc = "A paper sack with a crude smile etched onto the side." + +/obj/item/storage/box/papersack/update_icon_state() + item_state = "paperbag_[design]" + if(!length(contents)) icon_state = "[item_state]" - else icon_state = "[item_state]_closed" + else + icon_state = "[item_state]_closed" /obj/item/storage/box/papersack/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/pen)) @@ -746,19 +762,7 @@ return to_chat(usr, "You make some modifications to [src] using your pen.") design = switchDesign - icon_state = "paperbag_[design]" - item_state = "paperbag_[design]" - switch(design) - if(NODESIGN) - desc = "A sack neatly crafted out of paper." - if(NANOTRASEN) - desc = "A standard Nanotrasen paper lunch sack for loyal employees on the go." - if(SYNDI) - desc = "The design on this paper sack is a remnant of the notorious 'SyndieSnacks' program." - if(HEART) - desc = "A paper sack with a heart etched onto the side." - if(SMILE) - desc = "A paper sack with a crude smile etched onto the side." + update_appearance(UPDATE_DESC|UPDATE_ICON_STATE) return else if(is_sharp(W)) if(!contents.len) diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 044287be2ef..0125f77711c 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -18,10 +18,8 @@ resistance_flags = FLAMMABLE var/icon_type -/obj/item/storage/fancy/update_icon(itemremoved = 0) - var/total_contents = length(contents) - itemremoved - icon_state = "[icon_type]box[total_contents]" - return +/obj/item/storage/fancy/update_icon_state() + icon_state = "[icon_type]box[length(contents)]" /obj/item/storage/fancy/examine(mob/user) . = ..() @@ -48,23 +46,23 @@ foldable = /obj/item/stack/sheet/cardboard foldable_amt = 1 -/obj/item/storage/fancy/donut_box/update_icon() - overlays.Cut() - +/obj/item/storage/fancy/donut_box/update_overlays() + . = ..() for(var/I = 1 to length(contents)) var/obj/item/reagent_containers/food/snacks/donut/donut = contents[I] var/icon/new_donut_icon = icon('icons/obj/food/containers.dmi', "donut_[donut.donut_sprite_type]") new_donut_icon.Shift(EAST, 3 * (I-1)) - overlays += new_donut_icon + . += new_donut_icon - overlays += icon('icons/obj/food/containers.dmi', "donutbox_front") + . += "donutbox_front" /obj/item/storage/fancy/donut_box/populate_contents() for(var/I in 1 to storage_slots) new /obj/item/reagent_containers/food/snacks/donut(src) - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/item/storage/fancy/donut_box/empty/populate_contents() + update_icon(UPDATE_OVERLAYS) return /* @@ -138,11 +136,11 @@ new /obj/item/toy/crayon/black(src) update_icon() -/obj/item/storage/fancy/crayons/update_icon() - overlays = list() //resets list - overlays += image('icons/obj/crayons.dmi',"crayonbox") +/obj/item/storage/fancy/crayons/update_overlays() + . = ..() + . += image('icons/obj/crayons.dmi',"crayonbox") for(var/obj/item/toy/crayon/crayon in contents) - overlays += image('icons/obj/crayons.dmi',crayon.colourName) + . += image('icons/obj/crayons.dmi',crayon.colourName) /obj/item/storage/fancy/crayons/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/toy/crayon)) @@ -184,7 +182,7 @@ for(var/I in 1 to storage_slots) new cigarette_type(src) -/obj/item/storage/fancy/cigarettes/update_icon() +/obj/item/storage/fancy/cigarettes/update_icon_state() icon_state = "[initial(icon_state)][contents.len]" /obj/item/storage/fancy/cigarettes/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) @@ -325,10 +323,10 @@ for(var/I in 1 to storage_slots) new /obj/item/rollingpaper(src) -/obj/item/storage/fancy/rollingpapers/update_icon() - overlays.Cut() +/obj/item/storage/fancy/rollingpapers/update_overlays() + . = ..() if(!contents.len) - overlays += "[icon_state]_empty" + . += "[icon_state]_empty" /* * Vial Box @@ -364,15 +362,18 @@ . = ..() update_icon() -/obj/item/storage/lockbox/vials/update_icon() +/obj/item/storage/lockbox/vials/update_icon_state() icon_state = "vialbox[length(contents)]" cut_overlays() + +/obj/item/storage/lockbox/vials/update_overlays() + . = ..() if(!broken) - overlays += image(icon, src, "led[locked]") + . += "led[locked]" if(locked) - overlays += image(icon, src, "cover") + . += "cover" else - overlays += image(icon, src, "ledb") + . += "ledb" /obj/item/storage/lockbox/vials/attackby(obj/item/I, mob/user, params) ..() diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index 6a5301ef461..2fa5a0180c0 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -460,7 +460,7 @@ if(istype(src, /obj/item/storage/fancy)) var/obj/item/storage/fancy/F = src - F.update_icon(TRUE) + F.update_icon() for(var/_M in mobs_viewing) var/mob/M = _M diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index 6e52acb93df..f159d136a02 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -24,16 +24,16 @@ . = ..() if(has_latches) if(prob(10)) - latches = "double_latch" if(prob(1)) latches = "triple_latch" - update_icon() + else + latches = "double_latch" + update_icon(UPDATE_OVERLAYS) -/obj/item/storage/toolbox/update_icon() - ..() - cut_overlays() +/obj/item/storage/toolbox/update_overlays() + . = ..() if(has_latches) - add_overlay(latches) + . += latches /obj/item/storage/toolbox/emergency name = "emergency toolbox" diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index a2f52ff243b..6e9f1173b76 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -36,17 +36,16 @@ if(.) if(W == front_id) front_id = null - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/storage/wallet/handle_item_insertion(obj/item/W as obj, prevent_warning = 0) . = ..(W, prevent_warning) if(.) if(!front_id && istype(W, /obj/item/card/id)) front_id = W - update_icon() - -/obj/item/storage/wallet/update_icon() + update_icon(UPDATE_ICON_STATE) +/obj/item/storage/wallet/update_icon_state() if(front_id) switch(front_id.icon_state) if("silver") @@ -112,7 +111,7 @@ desc = "A cheap, [item_color] wallet from the arcade." icon_state = "[item_color]_wallet" -/obj/item/storage/wallet/color/update_icon() +/obj/item/storage/wallet/color/update_icon_state() if(front_id) switch(front_id.icon_state) if("silver") diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index e7ce48833f0..327941dc04b 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -59,7 +59,7 @@ user.visible_message("[user] is putting the live [name] in [user.p_their()] mouth! It looks like [user.p_theyre()] trying to commit suicide.") return FIRELOSS -/obj/item/melee/baton/update_icon() +/obj/item/melee/baton/update_icon_state() if(turned_on) icon_state = "[base_icon]_active" else if(!cell) @@ -97,7 +97,7 @@ if(cell.rigged) cell = null turned_on = FALSE - update_icon() + update_icon(UPDATE_ICON_STATE) if(cell.charge < (hitcost)) // If after the deduction the baton doesn't have enough charge for a stun hit it turns off. turned_on = FALSE update_icon() @@ -117,7 +117,7 @@ I.forceMove(src) cell = I to_chat(user, "You install [I] into [src].") - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/melee/baton/screwdriver_act(mob/living/user, obj/item/I) if(!cell) @@ -131,7 +131,7 @@ cell.update_icon() cell = null turned_on = FALSE - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/melee/baton/attack_self(mob/user) if(cell?.charge >= hitcost) diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index 62bd83dd263..a5a11491c32 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -61,7 +61,7 @@ if(!silent) to_chat(C, "You are not wearing a suitable mask or helmet.") return FALSE - if(M.mask_adjusted) // If the mask is equipped but pushed down + if(M.up) // If the mask is equipped but pushed away M.adjustmask(C) // Adjust it back if(!silent) diff --git a/code/game/objects/items/weapons/tape.dm b/code/game/objects/items/weapons/tape.dm index ccc1a9ddbbd..3a20fd356d7 100644 --- a/code/game/objects/items/weapons/tape.dm +++ b/code/game/objects/items/weapons/tape.dm @@ -10,8 +10,7 @@ /obj/item/stack/tape_roll/New(loc, amount=null) ..() - - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/stack/tape_roll/attack(mob/living/carbon/human/M, mob/living/user) if(!istype(M)) //What good is a duct tape mask if you are unable to speak? @@ -42,7 +41,7 @@ M.equip_to_slot(G, slot_wear_mask) G.add_fingerprint(user) -/obj/item/stack/tape_roll/update_icon() +/obj/item/stack/tape_roll/update_icon_state() var/amount = get_amount() if((amount <= 2) && (amount > 0)) icon_state = "taperoll" @@ -54,4 +53,3 @@ icon_state = "taperoll-4" else icon_state = "taperoll-4" - ..() diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index c137568ddad..fa19fd50124 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -202,9 +202,8 @@ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 30) resistance_flags = FIRE_PROOF -/obj/item/twohanded/fireaxe/update_icon() //Currently only here to fuck with the on-mob icons. +/obj/item/twohanded/fireaxe/update_icon_state() //Currently only here to fuck with the on-mob icons. icon_state = "fireaxe[wielded]" - ..() /obj/item/twohanded/fireaxe/afterattack(atom/A, mob/user, proximity) if(!proximity) @@ -221,7 +220,7 @@ force_wielded = 23 needs_permit = TRUE -/obj/item/twohanded/fireaxe/boneaxe/update_icon() +/obj/item/twohanded/fireaxe/boneaxe/update_icon_state() icon_state = "bone_axe[wielded]" /obj/item/twohanded/fireaxe/energized @@ -231,7 +230,7 @@ var/charge = 30 var/max_charge = 30 -/obj/item/twohanded/fireaxe/energized/update_icon() +/obj/item/twohanded/fireaxe/energized/update_icon_state() if(wielded) icon_state = "fireaxe2" else @@ -298,14 +297,13 @@ if(!blade_color) blade_color = pick("red", "blue", "green", "purple") -/obj/item/twohanded/dualsaber/update_icon() +/obj/item/twohanded/dualsaber/update_icon_state() if(wielded) icon_state = "dualsaber[blade_color][wielded]" set_light(brightness_on, l_color=colormap[blade_color]) else icon_state = "dualsaber0" set_light(0) - ..() /obj/item/twohanded/dualsaber/attack(mob/target, mob/living/user) if(HAS_TRAIT(user, TRAIT_HULK)) @@ -406,7 +404,7 @@ needs_permit = TRUE var/icon_prefix = "spearglass" -/obj/item/twohanded/spear/update_icon() +/obj/item/twohanded/spear/update_icon_state() icon_state = "[icon_prefix][wielded]" /obj/item/twohanded/spear/CheckParts(list/parts_list) @@ -609,12 +607,11 @@ attack_verb = list("sawed", "cut", "hacked", "carved", "cleaved", "butchered", "felled", "timbered") sharp = TRUE -/obj/item/twohanded/chainsaw/update_icon() +/obj/item/twohanded/chainsaw/update_icon_state() if(wielded) icon_state = "chainsaw[wielded]" else icon_state = "chainsaw0" - ..() /obj/item/twohanded/chainsaw/attack(mob/living/target, mob/living/user) if(wielded) @@ -685,9 +682,8 @@ if(charged < 2) charged++ -/obj/item/twohanded/singularityhammer/update_icon() //Currently only here to fuck with the on-mob icons. +/obj/item/twohanded/singularityhammer/update_icon_state() //Currently only here to fuck with the on-mob icons. icon_state = "singulohammer[wielded]" - ..() /obj/item/twohanded/singularityhammer/proc/vortex(turf/pull, mob/wielder) for(var/atom/movable/X in orange(5, pull)) @@ -762,9 +758,8 @@ L.Stun(6 SECONDS) shock(L) -/obj/item/twohanded/mjollnir/update_icon() //Currently only here to fuck with the on-mob icons. +/obj/item/twohanded/mjollnir/update_icon_state() //Currently only here to fuck with the on-mob icons. icon_state = "mjollnir[wielded]" - ..() /obj/item/twohanded/knighthammer name = "singuloth knight's hammer" @@ -793,9 +788,8 @@ if(charged < 5) charged++ -/obj/item/twohanded/knighthammer/update_icon() //Currently only here to fuck with the on-mob icons. +/obj/item/twohanded/knighthammer/update_icon_state() //Currently only here to fuck with the on-mob icons. icon_state = "knighthammer[wielded]" - ..() /obj/item/twohanded/knighthammer/afterattack(atom/A, mob/user, proximity) if(!proximity) diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm index a61e302ddc5..a18ba5038d3 100644 --- a/code/game/objects/obj_defense.dm +++ b/code/game/objects/obj_defense.dm @@ -209,8 +209,8 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e if(!(resistance_flags & ON_FIRE) && (resistance_flags & FLAMMABLE) && !(resistance_flags & FIRE_PROOF)) resistance_flags |= ON_FIRE SSfires.processing[src] = src - add_overlay(GLOB.fire_overlay, TRUE) - return 1 + add_overlay(custom_fire_overlay ? custom_fire_overlay : GLOB.fire_overlay) + return TRUE ///called when the obj is destroyed by fire /obj/proc/burn() @@ -222,7 +222,7 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e /obj/proc/extinguish() if(resistance_flags & ON_FIRE) resistance_flags &= ~ON_FIRE - cut_overlay(GLOB.fire_overlay, TRUE) + cut_overlay(custom_fire_overlay ? custom_fire_overlay : GLOB.fire_overlay, TRUE) SSfires.processing -= src ///Called when the obj is hit by a tesla bolt. diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 88e712ebddd..38d1eb303ed 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -18,6 +18,7 @@ var/damage_deflection = 0 var/resistance_flags = NONE // INDESTRUCTIBLE + var/custom_fire_overlay // Update_fire_overlay will check if a different icon state should be used var/acid_level = 0 //how much acid is on that obj @@ -168,9 +169,6 @@ /obj/proc/interact(mob/user) return -/obj/proc/update_icon() - SEND_SIGNAL(src, COMSIG_OBJ_UPDATE_ICON) - /mob/proc/unset_machine() if(machine) UnregisterSignal(machine, COMSIG_PARENT_QDELETING) diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 4f51f7bf41c..43fb525e1f7 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -284,7 +284,7 @@ LINEN BINS . += "There are [amount] bed sheets in the bin." -/obj/structure/bedsheetbin/update_icon() +/obj/structure/bedsheetbin/update_icon_state() switch(amount) if(0) icon_state = "linenbin-empty" @@ -313,6 +313,7 @@ LINEN BINS I.forceMove(src) sheets.Add(I) amount++ + update_icon(UPDATE_ICON_STATE) to_chat(user, "You put [I] in [src].") else if(amount && !hidden && I.w_class < WEIGHT_CLASS_BULKY) //make sure there's sheets to hide it among, make sure nothing else is hidden in there. if(I.flags & ABSTRACT) @@ -346,7 +347,7 @@ LINEN BINS hidden.loc = user.loc to_chat(user, "[hidden] falls out of [B]!") hidden = null - + update_icon(UPDATE_ICON_STATE) add_fingerprint(user) @@ -365,7 +366,7 @@ LINEN BINS B.loc = loc to_chat(user, "You telekinetically remove [B] from [src].") - update_icon() + update_icon(UPDATE_ICON_STATE) if(hidden) hidden.loc = loc diff --git a/code/game/objects/structures/coathanger.dm b/code/game/objects/structures/coathanger.dm index 59bd99a7e15..21fef42091d 100644 --- a/code/game/objects/structures/coathanger.dm +++ b/code/game/objects/structures/coathanger.dm @@ -9,44 +9,42 @@ /obj/structure/coatrack/attack_hand(mob/user as mob) user.visible_message("[user] takes [coat] off \the [src].", "You take [coat] off the \the [src]") if(!user.put_in_active_hand(coat)) - coat.loc = get_turf(user) + coat.forceMove(get_turf(user)) coat = null - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/structure/coatrack/attackby(obj/item/W as obj, mob/user as mob, params) - var/can_hang = 0 + var/can_hang = FALSE for(var/T in allowed) if(istype(W,T)) - can_hang = 1 + can_hang = TRUE if(can_hang && !coat) user.visible_message("[user] hangs [W] on \the [src].", "You hang [W] on the \the [src]") coat = W user.drop_item(src) - coat.loc = src - update_icon() - else - return ..() + coat.forceMove(src) + update_icon(UPDATE_OVERLAYS) + return + return ..() /obj/structure/coatrack/CanPass(atom/movable/mover, turf/target, height=0) - var/can_hang = 0 + var/can_hang = FALSE for(var/T in allowed) if(istype(mover,T)) - can_hang = 1 - + can_hang = TRUE if(can_hang && !coat) - src.visible_message("[mover] lands on \the [src].") + visible_message("[mover] lands on \the [src].") coat = mover - coat.loc = src - update_icon() - return 0 - else - return 1 + coat.forceMove(src) + update_icon(UPDATE_OVERLAYS) + return + return ..() -/obj/structure/coatrack/update_icon() - overlays.Cut() +/obj/structure/coatrack/update_overlays() + . = ..() if(istype(coat, /obj/item/clothing/suit/storage/labcoat)) - overlays += image(icon, icon_state = "coat_lab") + . += "coat_lab" if(istype(coat, /obj/item/clothing/suit/storage/labcoat/cmo)) - overlays += image(icon, icon_state = "coat_cmo") + . += "coat_cmo" if(istype(coat, /obj/item/clothing/suit/storage/det_suit)) - overlays += image(icon, icon_state = "coat_det") + . += "coat_det" diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 6ee9d43978c..1a6773524b5 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -24,6 +24,7 @@ var/storage_capacity = 30 //This is so that someone can't pack hundreds of items in a locker/crate then open it in a populated area to crash clients. var/material_drop = /obj/item/stack/sheet/metal var/material_drop_amount = 2 + var/transparent // Please dont override this unless you absolutely have to /obj/structure/closet/Initialize(mapload) @@ -298,23 +299,22 @@ return to_chat(usr, "This mob type can't use this verb.") -/obj/structure/closet/update_icon()//Putting the welded stuff in updateicon() so it's easy to overwrite for special cases (Fridges, cabinets, and whatnot) +/obj/structure/closet/update_icon_state() if(!opened) - icon_state = icon_closed + icon_state = "[icon_closed][transparent ? "_trans" : ""]" else - icon_state = icon_opened - update_overlays() + icon_state = "[icon_opened][transparent ? "_trans" : ""]" -/obj/structure/closet/proc/update_overlays(transparent = FALSE) - cut_overlays() +/obj/structure/closet/update_overlays() + . = ..() if(transparent && opened) - add_overlay("[open_door_sprite]_trans") + . += "[open_door_sprite]_trans" return if(opened) - add_overlay(open_door_sprite) + . += open_door_sprite return if(welded) - add_overlay("welded") + . += "welded" // Objects that try to exit a locker by stepping were doing so successfully, // and due to an oversight in turf/Enter() were going through walls. That @@ -399,20 +399,17 @@ return TRUE /obj/structure/closet/bluespace/proc/UpdateTransparency(atom/movable/AM, atom/location) - var/transparent = FALSE + transparent = FALSE for(var/atom/A in location) if(A.density && A != src && A != AM) transparent = TRUE break - icon_opened = transparent ? "bluespace_open_trans" : "bluespace_open" - icon_closed = transparent ? "bluespace_trans" : "bluespace" - icon_state = opened ? icon_opened : icon_closed - update_overlays(transparent) + update_icon() /obj/structure/closet/bluespace/Crossed(atom/movable/AM, oldloc) if(AM.density) - icon_state = opened ? "bluespace_open_trans" : "bluespace_trans" - update_overlays(TRUE) + transparent = TRUE + update_icon() /obj/structure/closet/bluespace/Move(NewLoc, direct) // Allows for "phasing" throug objects but doesn't allow you to stuff your EOC homebois in one of these and push them through walls. var/turf/T = get_turf(NewLoc) diff --git a/code/game/objects/structures/crates_lockers/closets/coffin.dm b/code/game/objects/structures/crates_lockers/closets/coffin.dm index f0e319ae5c1..bfd0bb4e0bd 100644 --- a/code/game/objects/structures/crates_lockers/closets/coffin.dm +++ b/code/game/objects/structures/crates_lockers/closets/coffin.dm @@ -11,12 +11,15 @@ open_sound_volume = 25 close_sound_volume = 50 -/obj/structure/closet/coffin/update_icon() +/obj/structure/closet/coffin/update_icon_state() if(!opened) icon_state = icon_closed else icon_state = icon_opened +/obj/structure/closet/coffin/update_overlays() + return list() + /obj/structure/closet/coffin/sarcophagus name = "sarcophagus" icon_state = "sarc" diff --git a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm index f7985d9636c..8f93ccfe7da 100644 --- a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm +++ b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm @@ -20,7 +20,7 @@ /obj/structure/closet/fireaxecabinet/populate_contents() fireaxe = new/obj/item/twohanded/fireaxe(src) has_axe = "full" - update_icon() // So its initial icon doesn't show it without the fireaxe + update_icon(UPDATE_ICON_STATE) // So its initial icon doesn't show it without the fireaxe /obj/structure/closet/fireaxecabinet/examine(mob/user) . = ..() @@ -37,7 +37,7 @@ if(do_after(user, 20 * O.toolspeed, target = src)) locked = FALSE to_chat(user, " You disable the locking modules.") - update_icon() + update_icon(UPDATE_ICON_STATE) return else if(istype(O, /obj/item)) user.changeNext_move(CLICK_CD_MELEE) @@ -58,7 +58,7 @@ smashed = TRUE locked = FALSE localopened = TRUE - update_icon() + update_icon(UPDATE_ICON_STATE) return if(istype(O, /obj/item/twohanded/fireaxe) && localopened) if(!fireaxe) @@ -73,7 +73,7 @@ has_axe = "full" contents += F to_chat(user, "You place \the [F] back in the [name].") - update_icon() + update_icon(UPDATE_ICON_STATE) else if(smashed) return @@ -107,7 +107,7 @@ fireaxe = null add_fingerprint(user) - update_icon() + update_icon(UPDATE_ICON_STATE) return if(smashed) return @@ -119,7 +119,7 @@ to_chat(user, "You telekinetically remove \the [fireaxe].") has_axe = "empty" fireaxe = null - update_icon() + update_icon(UPDATE_ICON_STATE) return attack_hand(user) @@ -153,7 +153,7 @@ to_chat(usr, "[src] is empty.") else to_chat(usr, "[src] is closed.") - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/closet/fireaxecabinet/attack_ai(mob/user as mob) if(smashed) @@ -180,14 +180,17 @@ else flick("fireaxe_[has_axe]_opening", src) sleep(10) - update_icon() + update_icon(UPDATE_ICON_STATE) -/obj/structure/closet/fireaxecabinet/update_icon() +/obj/structure/closet/fireaxecabinet/update_icon_state() if(localopened && !smashed) icon_state = "fireaxe_[has_axe]_open" - return - icon_state = "fireaxe_[has_axe]_[hitstaken]hits" + else + icon_state = "fireaxe_[has_axe]_[hitstaken]hits" + +/obj/structure/closet/fireaxecabinet/update_overlays() + return list() /obj/structure/closet/fireaxecabinet/open() return diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm index c7d992c8c13..f9df8a47b96 100644 --- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm +++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm @@ -10,12 +10,15 @@ close_sound_volume = 50 max_integrity = 70 -/obj/structure/closet/cabinet/update_icon() +/obj/structure/closet/cabinet/update_icon_state() if(!opened) icon_state = icon_closed else icon_state = icon_opened +/obj/structure/closet/cabinet/update_overlays() + return list() + /obj/structure/closet/acloset name = "strange closet" desc = "It looks alien!" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm index a3141815a2b..ab0ba13a026 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm @@ -21,7 +21,7 @@ update_icon() /obj/structure/closet/secure_closet/guncabinet/update_overlays() - cut_overlays() + . = list() if(!opened) var/lasers = 0 var/ballistics = 0 @@ -43,10 +43,10 @@ gun.icon_state = "projectile" gun.pixel_x = i*4 - add_overlay(gun) + . += gun - add_overlay("door") + . += "door" if(broken) - add_overlay("off") + . += "off" else if(locked) - add_overlay("locked") + . += "locked" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index 55ad93a743d..d6cb82c095b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -73,7 +73,7 @@ locked = FALSE add_overlay("sparking") to_chat(user, "You break the lock on [src].") - addtimer(CALLBACK(src, .proc/update_icon), 1 SECONDS) + addtimer(CALLBACK(src, /atom/.proc/update_icon), 1 SECONDS) /obj/structure/closet/secure_closet/attack_hand(mob/user) add_fingerprint(user) diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm index dff70c677cc..a18dd3c2842 100644 --- a/code/game/objects/structures/crates_lockers/closets/statue.dm +++ b/code/game/objects/structures/crates_lockers/closets/statue.dm @@ -105,9 +105,12 @@ /obj/structure/closet/statue/verb_toggleopen() return -/obj/structure/closet/statue/update_icon() +/obj/structure/closet/statue/update_icon_state() return +/obj/structure/closet/statue/update_overlays() + return list() + /obj/structure/closet/statue/proc/shatter(mob/user) if(user) user.dust() diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 30ac9743a3a..0b05438aa51 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -15,11 +15,10 @@ // A list of beacon names that the crate will announce the arrival of, when delivered. var/list/announce_beacons = list() -/obj/structure/closet/crate/update_icon() - ..() - cut_overlays() +/obj/structure/closet/crate/update_overlays() + . = ..() if(manifest) - add_overlay("manifest") + . += "manifest" /obj/structure/closet/crate/can_open() return TRUE @@ -175,15 +174,15 @@ locked = TRUE can_be_emaged = TRUE -/obj/structure/closet/crate/secure/update_icon() - ..() +/obj/structure/closet/crate/secure/update_overlays() + . = ..() if(broken) - add_overlay(emag) + . += emag return if(locked) - add_overlay(redlight) + . += redlight else - add_overlay(greenlight) + . += greenlight /obj/structure/closet/crate/secure/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1) if(prob(tamperproof) && damage_amount >= DAMAGE_PRECISION) diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index ca2f8f762ad..8b97aefeb3a 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -10,11 +10,10 @@ . = ..() update_icon() -/obj/structure/largecrate/update_icon() - ..() - overlays.Cut() +/obj/structure/largecrate/update_overlays() + . = ..() if(manifest) - overlays += "manifest" + . += "manifest" /obj/structure/largecrate/attack_hand(mob/user as mob) if(manifest) diff --git a/code/game/objects/structures/depot.dm b/code/game/objects/structures/depot.dm index 919d8c2ea70..b64bcbc2c98 100644 --- a/code/game/objects/structures/depot.dm +++ b/code/game/objects/structures/depot.dm @@ -86,7 +86,7 @@ if(istype(depotarea)) if(!depotarea.used_self_destruct) depotarea.used_self_destruct = TRUE // Silences all further alerts from this point onwards. - depotarea.updateicon() + depotarea.update_state() depotarea.shields_down() else log_debug("[src] at [x],[y],[z] failed depotarea istype check during Initialize()! Either it was spawned outside the depot area (bad idea), or a bug is happening.") @@ -103,7 +103,7 @@ depotarea = get_area(src) if(istype(depotarea)) depotarea.destroyed = TRUE - depotarea.updateicon() + depotarea.update_state() for(var/obj/structure/closet/L in range(30, T)) for(var/obj/O in L) diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index f9771f51d67..63b8da19f48 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -28,7 +28,7 @@ trophy_message = showpiece_entry["trophy_message"] if(start_showpiece_type) showpiece = new start_showpiece_type (src) - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/structure/displaycase/Destroy() QDEL_NULL(electronics) @@ -81,7 +81,7 @@ open = TRUE new /obj/item/shard(drop_location()) playsound(src, "shatter", 70, TRUE) - update_icon() + update_icon(UPDATE_OVERLAYS) trigger_alarm() /obj/structure/displaycase/proc/trigger_alarm() @@ -95,17 +95,17 @@ playsound(src, 'sound/machines/burglar_alarm.ogg', 50, 0) sleep(74) // 7.4 seconds long -/obj/structure/displaycase/update_icon() - cut_overlays() +/obj/structure/displaycase/update_overlays() + . = ..() if(broken) - add_overlay("glassbox_broken") + . += "glassbox_broken" if(showpiece) var/mutable_appearance/showpiece_overlay = mutable_appearance(showpiece.icon, showpiece.icon_state) showpiece_overlay.copy_overlays(showpiece) showpiece_overlay.transform *= 0.6 - add_overlay(showpiece_overlay) + . += showpiece_overlay if(!open && !broken) - add_overlay("glassbox_closed") + . += "glassbox_closed" /obj/structure/displaycase/attackby(obj/item/I, mob/user, params) if(I.GetID() && !broken && openable) @@ -131,7 +131,7 @@ broken = FALSE open = FALSE obj_integrity = max_integrity - update_icon() + update_icon(UPDATE_OVERLAYS) else return ..() @@ -174,7 +174,7 @@ /obj/structure/displaycase/proc/toggle_lock() open = !open - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/structure/displaycase/attack_hand(mob/user) user.changeNext_move(CLICK_CD_MELEE) @@ -182,7 +182,7 @@ to_chat(user, "You deactivate the hover field built into the case.") dump() add_fingerprint(user) - update_icon() + update_icon(UPDATE_OVERLAYS) return else //prevents remote "kicks" with TK diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 0ba1faa2033..c63db29ec37 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -22,7 +22,7 @@ /obj/structure/door_assembly/Initialize(mapload) . = ..() - update_icon() + update_icon(UPDATE_OVERLAYS) update_name() /obj/structure/door_assembly/Destroy() @@ -131,7 +131,7 @@ else return ..() update_name() - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/structure/door_assembly/crowbar_act(mob/user, obj/item/I) if(state != AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER ) @@ -152,7 +152,7 @@ ae = electronics electronics = null ae.forceMove(loc) - update_icon() + update_icon(UPDATE_OVERLAYS) update_name() /obj/structure/door_assembly/screwdriver_act(mob/user, obj/item/I) @@ -189,7 +189,7 @@ electronics.forceMove(door) electronics = null qdel(src) - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/structure/door_assembly/wirecutter_act(mob/user, obj/item/I) if(state != AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS) @@ -203,7 +203,7 @@ to_chat(user, "You cut the wires from the airlock assembly.") new/obj/item/stack/cable_coil(get_turf(user), 1) state = AIRLOCK_ASSEMBLY_NEEDS_WIRES - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/structure/door_assembly/wrench_act(mob/user, obj/item/I) if(state != AIRLOCK_ASSEMBLY_NEEDS_WIRES) @@ -256,17 +256,18 @@ return to_chat(user, "You disassemble the airlock assembly.") deconstruct(TRUE) - update_icon() + update_icon(UPDATE_OVERLAYS) -/obj/structure/door_assembly/update_icon() - overlays.Cut() +/obj/structure/door_assembly/update_overlays() + . = ..() if(!glass) - overlays += get_airlock_overlay("fill_construction", icon) + . += get_airlock_overlay("fill_construction", icon) else if(glass) - overlays += get_airlock_overlay("glass_construction", overlays_file) - overlays += get_airlock_overlay("panel_c[state+1]", overlays_file) + . += get_airlock_overlay("glass_construction", overlays_file) + . += get_airlock_overlay("panel_c[state+1]", overlays_file) -/obj/structure/door_assembly/proc/update_name() +/obj/structure/door_assembly/update_name() + . = ..() name = "" switch(state) if(AIRLOCK_ASSEMBLY_NEEDS_WIRES) @@ -289,7 +290,7 @@ if(electronics) target.electronics = source.electronics source.electronics.forceMove(target) - target.update_icon() + target.update_icon(UPDATE_OVERLAYS) target.update_name() qdel(source) diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm index c83d06f6550..27e1e2670bb 100644 --- a/code/game/objects/structures/electricchair.dm +++ b/code/game/objects/structures/electricchair.dm @@ -6,10 +6,11 @@ var/obj/item/assembly/shock_kit/part = null var/last_time = 1.0 var/delay_time = 50 + var/shocking = FALSE /obj/structure/chair/e_chair/Initialize(mapload, obj/item/assembly/shock_kit/sk) . = ..() - overlays += image('icons/obj/chairs.dmi', src, "echair_over", MOB_LAYER + 1, dir) + update_icon(UPDATE_OVERLAYS) if(sk) part = sk @@ -50,17 +51,25 @@ /obj/structure/chair/e_chair/rotate() ..() - overlays.Cut() - overlays += image('icons/obj/chairs.dmi', src, "echair_over", MOB_LAYER + 1, dir) //there's probably a better way of handling this, but eh. -Pete + update_icon(UPDATE_OVERLAYS) + +/obj/structure/chair/e_chair/update_icon_state() + icon_state = "echair[shocking]" + +/obj/structure/chair/e_chair/update_overlays() + . = ..() + . += image('icons/obj/chairs.dmi', src, "echair_over", MOB_LAYER + 1, dir) /obj/structure/chair/e_chair/proc/shock() if(last_time + delay_time > world.time) return last_time = world.time - icon_state = "echair1" + shocking = TRUE + update_icon(UPDATE_ICON_STATE) spawn(delay_time) - icon_state = "echair0" + shocking = FALSE + update_icon(UPDATE_ICON_STATE) // special power handling var/area/A = get_area(src) @@ -70,7 +79,7 @@ return A.use_power(5000, EQUIP) var/light = A.power_light - A.updateicon() + A.update_icon(UPDATE_ICON_STATE) flick("echair_shock", src) do_sparks(12, 1, src) @@ -83,4 +92,4 @@ spawn(1) buckled_mob.electrocute_act(110, src, 1) A.power_light = light - A.updateicon() + A.update_icon(UPDATE_ICON_STATE) diff --git a/code/game/objects/structures/engicart.dm b/code/game/objects/structures/engicart.dm index 1ed5c86fa83..f36e8da0aa1 100644 --- a/code/game/objects/structures/engicart.dm +++ b/code/game/objects/structures/engicart.dm @@ -37,49 +37,49 @@ if(!myglass) put_in_cart(I, user) myglass=I - update_icon() + update_icon(UPDATE_OVERLAYS) else to_chat(user, fail_msg) else if(istype(I, /obj/item/stack/sheet/metal)) if(!mymetal) put_in_cart(I, user) mymetal=I - update_icon() + update_icon(UPDATE_OVERLAYS) else to_chat(user, fail_msg) else if(istype(I, /obj/item/stack/sheet/plasteel)) if(!myplasteel) put_in_cart(I, user) myplasteel=I - update_icon() + update_icon(UPDATE_OVERLAYS) else to_chat(user, fail_msg) else if(istype(I, /obj/item/flashlight)) if(!myflashlight) put_in_cart(I, user) myflashlight=I - update_icon() + update_icon(UPDATE_OVERLAYS) else to_chat(user, fail_msg) else if(istype(I, /obj/item/storage/toolbox/mechanical)) if(!mybluetoolbox) put_in_cart(I, user) mybluetoolbox=I - update_icon() + update_icon(UPDATE_OVERLAYS) else to_chat(user, fail_msg) else if(istype(I, /obj/item/storage/toolbox/electrical)) if(!myyellowtoolbox) put_in_cart(I, user) myyellowtoolbox=I - update_icon() + update_icon(UPDATE_OVERLAYS) else to_chat(user, fail_msg) else if(istype(I, /obj/item/storage/toolbox)) if(!myredtoolbox) put_in_cart(I, user) myredtoolbox=I - update_icon() + update_icon(UPDATE_OVERLAYS) else to_chat(user, fail_msg) else if(istype(I, /obj/item/wrench)) @@ -120,6 +120,7 @@ var/datum/browser/popup = new(user, "engicart", name, 240, 160) popup.set_content(dat) popup.open() + /obj/structure/engineeringcart/Topic(href, href_list) if(!in_range(src, usr)) return @@ -162,22 +163,22 @@ to_chat(user, "You take [myyellowtoolbox] from [src].") myyellowtoolbox = null - update_icon() + update_icon(UPDATE_OVERLAYS) updateUsrDialog() -/obj/structure/engineeringcart/update_icon() - overlays.Cut() +/obj/structure/engineeringcart/update_overlays() + . = ..() if(myglass) - overlays += "cart_glass" + . += "cart_glass" if(mymetal) - overlays += "cart_metal" + . += "cart_metal" if(myplasteel) - overlays += "cart_plasteel" + . += "cart_plasteel" if(myflashlight) - overlays += "cart_flashlight" + . += "cart_flashlight" if(mybluetoolbox) - overlays += "cart_bluetoolbox" + . += "cart_bluetoolbox" if(myredtoolbox) - overlays += "cart_redtoolbox" + . += "cart_redtoolbox" if(myyellowtoolbox) - overlays += "cart_yellowtoolbox" + . += "cart_yellowtoolbox" diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index 360342384a3..5231d659687 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -45,7 +45,7 @@ return playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3) opened = !opened - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/extinguisher_cabinet/Destroy() QDEL_NULL(has_extinguisher) @@ -59,7 +59,7 @@ /obj/structure/extinguisher_cabinet/handle_atom_del(atom/A) if(A == has_extinguisher) has_extinguisher = null - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/extinguisher_cabinet/attackby(obj/item/O, mob/user, params) if(isrobot(user) || isalien(user)) @@ -71,17 +71,17 @@ user.drop_item(O) contents += O has_extinguisher = O - update_icon() + update_icon(UPDATE_ICON_STATE) to_chat(user, "You place [O] in [src].") return TRUE else playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3) opened = !opened - update_icon() + update_icon(UPDATE_ICON_STATE) else if(user.a_intent != INTENT_HARM) playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3) opened = !opened - update_icon() + update_icon(UPDATE_ICON_STATE) else return ..() @@ -122,7 +122,7 @@ else playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3) opened = !opened - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/extinguisher_cabinet/attack_tk(mob/user) if(has_extinguisher) @@ -135,7 +135,7 @@ else playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3) opened = !opened - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/extinguisher_cabinet/obj_break(damage_flag) if(!broken && !(flags & NODECONSTRUCT)) @@ -144,7 +144,7 @@ if(has_extinguisher) has_extinguisher.forceMove(loc) has_extinguisher = null - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/extinguisher_cabinet/deconstruct(disassembled = TRUE) if(!(flags & NODECONSTRUCT)) @@ -154,7 +154,7 @@ has_extinguisher = null qdel(src) -/obj/structure/extinguisher_cabinet/update_icon() +/obj/structure/extinguisher_cabinet/update_icon_state() if(!opened) icon_state = "extinguisher_closed" return diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index 853a1bf3310..091e8cfdd6b 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -84,7 +84,7 @@ opening = FALSE update_icon() -/obj/structure/falsewall/update_icon() +/obj/structure/falsewall/update_icon_state() if(opening) smoothing_flags = NONE clear_smooth_overlays() diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 172f92c9bf9..a2bb074fd75 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -50,9 +50,9 @@ /obj/structure/grille/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) . = ..() - update_icon() + update_icon(UPDATE_ICON_STATE) -/obj/structure/grille/update_icon() +/obj/structure/grille/update_icon_state() if(QDELETED(src) || broken) return diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm index bbbedfec433..9dc455fa8dc 100644 --- a/code/game/objects/structures/inflatable.dm +++ b/code/game/objects/structures/inflatable.dm @@ -41,7 +41,7 @@ T.air_update_turf(TRUE) /obj/structure/inflatable/CanPass(atom/movable/mover, turf/target, height=0) - return 0 + return /obj/structure/inflatable/CanAtmosPass(turf/T) return !density @@ -105,14 +105,12 @@ /obj/structure/inflatable/door //Based on mineral door code name = "inflatable door" - - icon = 'icons/obj/inflatable.dmi' icon_state = "door_closed" torn = /obj/item/inflatable/door/torn intact = /obj/item/inflatable/door var/state_open = FALSE - var/isSwitchingStates = FALSE + var/is_operating = FALSE /obj/structure/inflatable/door/detailed_examine() return "Click the door to open or close it. It only stops air while closed.
\ @@ -123,10 +121,10 @@ return else if(isrobot(user)) //but cyborgs can if(get_dist(user,src) <= 1) //not remotely though - return TryToSwitchState(user) + return try_to_operate(user) /obj/structure/inflatable/door/attack_hand(mob/user as mob) - return TryToSwitchState(user) + return try_to_operate(user) /obj/structure/inflatable/door/CanPass(atom/movable/mover, turf/target, height=0) if(istype(mover, /obj/effect/beam)) @@ -136,8 +134,8 @@ /obj/structure/inflatable/door/CanAtmosPass(turf/T) return !density -/obj/structure/inflatable/door/proc/TryToSwitchState(atom/user) - if(isSwitchingStates) +/obj/structure/inflatable/door/proc/try_to_operate(atom/user) + if(is_operating) return if(ismob(user)) var/mob/M = user @@ -147,42 +145,28 @@ if(iscarbon(M)) var/mob/living/carbon/C = M if(!C.handcuffed) - SwitchState() + operate() else - SwitchState() + operate() else if(istype(user, /obj/mecha)) - SwitchState() + operate() -/obj/structure/inflatable/door/proc/SwitchState() - if(state_open) - Close() +/obj/structure/inflatable/door/proc/operate() + is_operating = TRUE + //playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 100, 1) + if(!state_open) + flick("door_opening",src) else - Open() + flick("door_closing",src) + sleep(10) + density = !density + opacity = !opacity + state_open = !state_open + update_icon(UPDATE_ICON_STATE) + is_operating = FALSE air_update_turf(1) -/obj/structure/inflatable/door/proc/Open() - isSwitchingStates = TRUE - //playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 100, 1) - flick("door_opening",src) - sleep(10) - density = FALSE - opacity = FALSE - state_open = TRUE - update_icon() - isSwitchingStates = FALSE - -/obj/structure/inflatable/door/proc/Close() - isSwitchingStates = TRUE - //playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 100, 1) - flick("door_closing",src) - sleep(10) - density = TRUE - opacity = FALSE - state_open = FALSE - update_icon() - isSwitchingStates = FALSE - -/obj/structure/inflatable/door/update_icon() +/obj/structure/inflatable/door/update_icon_state() if(state_open) icon_state = "door_open" else diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index bfae20cf65c..0c0ce95a705 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -40,7 +40,7 @@ return /obj/structure/janitorialcart/on_reagent_change() - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/structure/janitorialcart/attackby(obj/item/I, mob/user, params) var/fail_msg = "There is already one of those in [src]." @@ -66,7 +66,7 @@ if(!myspray) put_in_cart(I, user) myspray=I - update_icon() + update_icon(UPDATE_OVERLAYS) else to_chat(user, fail_msg) else if(istype(I, /obj/item/lightreplacer)) @@ -79,7 +79,7 @@ if(signs < max_signs) put_in_cart(I, user) signs++ - update_icon() + update_icon(UPDATE_OVERLAYS) else to_chat(user, "[src] can't hold any more signs.") else if(istype(I, /obj/item/crowbar)) @@ -163,22 +163,22 @@ WARNING("Signs ([signs]) didn't match contents") signs = 0 - update_icon() + update_icon(UPDATE_OVERLAYS) updateUsrDialog() -/obj/structure/janitorialcart/update_icon() - overlays = null +/obj/structure/janitorialcart/update_overlays() + . = ..() if(mybag) - overlays += "cart_garbage" + . += "cart_garbage" if(mymop) - overlays += "cart_mop" + . += "cart_mop" if(myspray) - overlays += "cart_spray" + . += "cart_spray" if(myreplacer) - overlays += "cart_replacer" + . += "cart_replacer" if(signs) - overlays += "cart_sign[signs]" + . += "cart_sign[signs]" if(reagents.total_volume > 0) var/image/reagentsImage = image(icon,src,"cart_reagents0") reagentsImage.alpha = 150 @@ -192,4 +192,4 @@ if(76 to 100) reagentsImage.icon_state = "cart_reagents4" reagentsImage.icon += mix_color_from_reagents(reagents.reagent_list) - add_overlay(reagentsImage) + . += reagentsImage diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm index cb093c9521a..bcc7a7e0515 100644 --- a/code/game/objects/structures/ladders.dm +++ b/code/game/objects/structures/ladders.dm @@ -55,7 +55,7 @@ down.update_icon() up = down = null -/obj/structure/ladder/update_icon() +/obj/structure/ladder/update_icon_state() if(up && down) icon_state = "ladder11" @@ -198,5 +198,5 @@ . = ..() set_light(light_range, light_power) //magical glowing anchor -/obj/structure/ladder/unbreakable/dive_point/update_icon() +/obj/structure/ladder/unbreakable/dive_point/update_icon_state() return diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index 41f568e6a54..1a8ad73211c 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -13,7 +13,7 @@ rad_insulation = RAD_MEDIUM_INSULATION var/initial_state var/state_open = FALSE - var/isSwitchingStates = FALSE + var/is_operating = FALSE var/close_delay = -1 //-1 if does not auto close. var/hardness = 1 @@ -41,20 +41,20 @@ /obj/structure/mineral_door/Bumped(atom/user) ..() if(!state_open) - return TryToSwitchState(user) + return try_to_operate(user) /obj/structure/mineral_door/attack_ai(mob/user) //those aren't machinery, they're just big fucking slabs of a mineral if(isAI(user)) //so the AI can't open it return else if(isrobot(user) && Adjacent(user)) //but cyborgs can, but not remotely - return TryToSwitchState(user) + return try_to_operate(user) /obj/structure/mineral_door/attack_hand(mob/user) - return TryToSwitchState(user) + return try_to_operate(user) /obj/structure/mineral_door/attack_ghost(mob/user) if(user.can_advanced_admin_interact()) - SwitchState() + operate() /obj/structure/mineral_door/CanPass(atom/movable/mover, turf/target, height = 0) if(istype(mover, /obj/effect/beam)) @@ -64,8 +64,8 @@ /obj/structure/mineral_door/CanAtmosPass(turf/T) return !density -/obj/structure/mineral_door/proc/TryToSwitchState(atom/user) - if(isSwitchingStates) +/obj/structure/mineral_door/proc/try_to_operate(atom/user) + if(is_operating) return if(isliving(user)) var/mob/living/M = user @@ -75,52 +75,35 @@ if(iscarbon(M)) var/mob/living/carbon/C = M if(!C.handcuffed) - SwitchState() + operate() else - SwitchState() + operate() else if(istype(user, /obj/mecha)) - SwitchState() + operate() -/obj/structure/mineral_door/proc/SwitchState() - if(state_open) - Close() +/obj/structure/mineral_door/proc/operate() + is_operating = TRUE + if(!state_open) + playsound(loc, openSound, 100, 1) + flick("[initial_state]opening",src) else - Open() - -/obj/structure/mineral_door/proc/Open() - isSwitchingStates = TRUE - playsound(loc, openSound, 100, 1) - flick("[initial_state]opening",src) + var/turf/T = get_turf(src) + for(var/mob/living/L in T) + return + playsound(loc, closeSound, 100, 1) + flick("[initial_state]closing",src) sleep(10) - density = FALSE - opacity = FALSE - state_open = TRUE + density = !density + opacity = !opacity + state_open = !state_open air_update_turf(1) - update_icon() - isSwitchingStates = FALSE + update_icon(UPDATE_ICON_STATE) + is_operating = FALSE - if(close_delay != -1) - spawn(close_delay) - Close() + if(state_open && close_delay != -1) + addtimer(CALLBACK(src, .proc/operate), close_delay) -/obj/structure/mineral_door/proc/Close() - if(isSwitchingStates || !state_open) - return - var/turf/T = get_turf(src) - for(var/mob/living/L in T) - return - isSwitchingStates = TRUE - playsound(loc, closeSound, 100, 1) - flick("[initial_state]closing",src) - sleep(10) - density = TRUE - opacity = TRUE - state_open = FALSE - air_update_turf(1) - update_icon() - isSwitchingStates = FALSE - -/obj/structure/mineral_door/update_icon() +/obj/structure/mineral_door/update_icon_state() if(state_open) icon_state = "[initial_state]open" else @@ -180,7 +163,7 @@ opacity = FALSE rad_insulation = RAD_VERY_LIGHT_INSULATION -/obj/structure/mineral_door/transparent/Close() +/obj/structure/mineral_door/transparent/operate() ..() set_opacity(0) @@ -235,6 +218,6 @@ damageSound = 'sound/effects/attackblob.ogg' sheetType = null -/obj/structure/mineral_door/resin/TryToSwitchState(atom/user) +/obj/structure/mineral_door/resin/try_to_operate(atom/user) if(isalien(user)) return ..() diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm index a1bc67571ae..326d8380dd5 100644 --- a/code/game/objects/structures/mop_bucket.dm +++ b/code/game/objects/structures/mop_bucket.dm @@ -6,7 +6,7 @@ density = TRUE container_type = OPENCONTAINER face_while_pulling = FALSE - var/obj/item/mop/mymop = null + var/obj/item/mop/stored_mop = null var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite /obj/structure/mopbucket/Initialize(mapload) @@ -29,12 +29,12 @@ /obj/structure/mopbucket/attackby(obj/item/W as obj, mob/user as mob, params) if(istype(W, /obj/item/mop)) - var/obj/item/mop/m = W - if(m.reagents.total_volume < m.reagents.maximum_volume) - m.wet_mop(src, user) + var/obj/item/mop/M = W + if(M.reagents.total_volume < M.reagents.maximum_volume) + M.wet_mop(src, user) return - if(!mymop) - m.janicart_insert(user, src) + if(!stored_mop) + M.janicart_insert(user, src) return to_chat(user, "Theres already a mop in the mopbucket.") return @@ -47,12 +47,12 @@ return /obj/structure/mopbucket/on_reagent_change() - update_icon() + update_icon(UPDATE_OVERLAYS) -/obj/structure/mopbucket/update_icon() - overlays.Cut() - if(mymop) - overlays += image(icon,"mopbucket_mop") +/obj/structure/mopbucket/update_overlays() + . = ..() + if(stored_mop) + . += "mopbucket_mop" if(reagents.total_volume > 0) var/image/reagentsImage = image(icon, src, "mopbucket_reagents0") reagentsImage.alpha = 150 @@ -66,15 +66,15 @@ if(76 to 100) reagentsImage.icon_state = "mopbucket_reagents4" reagentsImage.icon += mix_color_from_reagents(reagents.reagent_list) - add_overlay(reagentsImage) + . += reagentsImage /obj/structure/mopbucket/attack_hand(mob/living/user) . = ..() - if(mymop) - user.put_in_hands(mymop) - to_chat(user, "You take [mymop] from [src].") - mymop = null - update_icon() + if(stored_mop) + user.put_in_hands(stored_mop) + to_chat(user, "You take [stored_mop] from [src].") + stored_mop = null + update_icon(UPDATE_OVERLAYS) return diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 5b1df6272fe..869c19e5448 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -40,36 +40,39 @@ /obj/structure/morgue/Initialize() . = ..() - update() + update_icon(update_state()) -/obj/structure/morgue/proc/update() - cut_overlays() - if(!connected) - if(contents.len) - var/mob/living/M = locate() in contents - var/obj/structure/closet/body_bag/B = locate() in contents - if(M==null) M = locate() in B - - if(M) - var/mob/dead/observer/G = M.get_ghost() - if(M.mind && !M.mind.suicided) - if(M.client) - status = REVIVABLE - else if(G && G.client) //There is a ghost and it is connected to the server - status = GHOST_CONNECTED - else - status = UNREVIVABLE - else - status = UNREVIVABLE - else - status = NOT_BODY - else - status = EMPTY_MORGUE - add_overlay("morgue_[status]") - else +/obj/structure/morgue/proc/update_state() + . = UPDATE_OVERLAYS + if(connected) status = EXTENDED_TRAY + return + if(!length(contents)) + status = EMPTY_MORGUE + return + var/mob/living/M = locate() in contents + var/obj/structure/closet/body_bag/B = locate() in contents + if(!M) + M = locate() in B + if(!M) + status = NOT_BODY + return + var/mob/dead/observer/G = M.get_ghost() + if(M.mind && !M.mind.suicided) + if(M.client) + status = REVIVABLE + return + if(G && G.client) //There is a ghost and it is connected to the server + status = GHOST_CONNECTED + return + status = UNREVIVABLE + +/obj/structure/morgue/update_overlays() + . = ..() + if(!connected) + . += "morgue_[status]" if(name != initial(name)) - add_overlay("morgue_label") + . += "morgue_label" /obj/structure/morgue/examine(mob/user) . = ..() @@ -110,7 +113,7 @@ playsound(loc, open_sound, 50, 1) connect() add_fingerprint(user) - update() + update_icon(update_state()) return /obj/structure/morgue/attackby(P as obj, mob/user as mob, params) @@ -118,7 +121,7 @@ var/t = rename_interactive(user, P) if(isnull(t)) return - update() + update_icon(UPDATE_OVERLAYS) add_fingerprint(user) return return ..() @@ -127,7 +130,7 @@ if(name != initial(name)) to_chat(user, "You cut the tag off the morgue.") name = initial(name) - update() + update_icon(UPDATE_OVERLAYS) return TRUE /obj/structure/morgue/relaymove(mob/user as mob) @@ -196,7 +199,7 @@ if(!( A.anchored )) A.forceMove(connected) connected.connected = null - connected.update() + connected.update_icon(UPDATE_OVERLAYS) add_fingerprint(user) qdel(src) return @@ -256,17 +259,18 @@ /obj/structure/crematorium/Initialize(mapload) . = ..() - update() + update_icon(UPDATE_OVERLAYS) -/obj/structure/crematorium/proc/update() - cut_overlays() - if(!connected) - add_overlay("crema_closed") - if(cremating) - add_overlay("crema_active") - return - if(contents.len) - add_overlay("crema_full") +/obj/structure/crematorium/update_overlays() + . = ..() + if(connected) + return + . += "crema_closed" + if(cremating) + . += "crema_active" + return + if(length(contents)) + . += "crema_full" /obj/structure/crematorium/ex_act(severity) switch(severity) @@ -306,7 +310,7 @@ playsound(loc, open_sound, 50, 1) connect() add_fingerprint(user) - update() + update_icon(UPDATE_OVERLAYS) /obj/structure/crematorium/attackby(P as obj, mob/user as mob, params) if(istype(P, /obj/item/pen)) @@ -327,7 +331,7 @@ var/turf/T = get_step(src, SOUTH) if(T.contents.Find(connected)) connected.connected = src - update() + update_icon(UPDATE_OVERLAYS) for(var/atom/movable/A in src) A.forceMove(connected.loc) connected.icon_state = "crema_tray" @@ -349,7 +353,7 @@ cremating = TRUE locked = TRUE - update() + update_icon(UPDATE_OVERLAYS) for(var/mob/living/M in search_contents_for(/mob/living)) if(QDELETED(M)) @@ -371,7 +375,7 @@ sleep(30) cremating = FALSE locked = FALSE - update() + update_icon(UPDATE_OVERLAYS) playsound(loc, 'sound/machines/ding.ogg', 50, 1) return @@ -419,7 +423,7 @@ A.forceMove(connected) //Foreach goto(26) connected.connected = null - connected.update() + connected.update_icon(UPDATE_OVERLAYS) add_fingerprint(user) qdel(src) return @@ -488,7 +492,7 @@ if(istype(C)) //We found our corpse, is it inside a morgue? morgue = get(C.loc, /obj/structure/morgue) if(morgue) - morgue.update() + morgue.update_icon(UPDATE_OVERLAYS) #undef EXTENDED_TRAY #undef EMPTY_MORGUE diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index 36f33388f50..737894bd880 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -112,7 +112,7 @@ GLOBAL_LIST_EMPTY(safes) /obj/structure/safe/examine_status(mob/user) return -/obj/structure/safe/update_icon() +/obj/structure/safe/update_icon_state() if(open) if(broken) icon_state = "[initial(icon_state)]-open-broken" @@ -124,17 +124,13 @@ GLOBAL_LIST_EMPTY(safes) else icon_state = initial(icon_state) - var/list/overlays_to_cut = list(drill_overlay) - if(!drill_timer) - overlays_to_cut += progress_bar - - cut_overlay(overlays_to_cut) - +/obj/structure/safe/update_overlays() + . = ..() if(istype(drill, /obj/item/thermal_drill)) var/drill_icon = istype(drill, /obj/item/thermal_drill/diamond_drill) ? "d" : "h" var/state = "[initial(icon_state)]_[drill_icon]-drill-[drill_timer ? "on" : "off"]" drill_overlay = image(icon = 'icons/effects/drill.dmi', icon_state = state, pixel_x = drill_x_offset, pixel_y = drill_y_offset) - add_overlay(drill_overlay) + . += drill_overlay /obj/structure/safe/attack_ghost(mob/user) if(..() || drill) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index a861fec8d4a..712bc602826 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -49,15 +49,15 @@ /obj/structure/table/proc/deconstruction_hints(mob/user) return "The top is screwed on, but the main bolts are also visible." -/obj/structure/table/update_icon() +/obj/structure/table/update_icon(updates=ALL) + . = ..() + update_smoothing() + +/obj/structure/table/update_icon_state() if((smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK)) && !flipped) icon_state = "" - QUEUE_SMOOTH(src) - QUEUE_SMOOTH_NEIGHBORS(src) if(flipped) - clear_smooth_overlays() - var/type = 0 var/subtype = null for(var/direction in list(turn(dir,90), turn(dir,-90)) ) @@ -80,7 +80,13 @@ icon_state = "[base]flip[type][type == 1 ? subtype : ""]" - return 1 +/obj/structure/table/proc/update_smoothing() + if((smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK)) && !flipped) + QUEUE_SMOOTH(src) + QUEUE_SMOOTH_NEIGHBORS(src) + + if(flipped) + clear_smooth_overlays() /obj/structure/table/narsie_act() new /obj/structure/table/wood(loc) diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index 3413f97a732..20cf24e52ac 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -21,7 +21,7 @@ /obj/structure/dispenser/Initialize(mapload) . = ..() initialize_tanks() - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/structure/dispenser/Destroy() QDEL_LIST(stored_plasma_tanks) @@ -37,21 +37,21 @@ var/obj/item/tank/internals/oxygen/O = new(src) stored_oxygen_tanks.Add(O) -/obj/structure/dispenser/update_icon() - cut_overlays() +/obj/structure/dispenser/update_overlays() + . = ..() var/oxy_tank_amount = LAZYLEN(stored_oxygen_tanks) switch(oxy_tank_amount) if(1 to 3) - overlays += "oxygen-[oxy_tank_amount]" + . += "oxygen-[oxy_tank_amount]" if(4 to INFINITY) - overlays += "oxygen-4" + . += "oxygen-4" var/pla_tank_amount = LAZYLEN(stored_plasma_tanks) switch(pla_tank_amount) if(1 to 4) - overlays += "plasma-[pla_tank_amount]" + . += "plasma-[pla_tank_amount]" if(5 to INFINITY) - overlays += "plasma-5" + . += "plasma-5" /obj/structure/dispenser/attack_hand(mob/user) if(..()) @@ -119,7 +119,7 @@ T.forceMove(loc) // If the user's hands are full, place it on the tile of the dispenser. to_chat(user, "You take [T] out of [src].") - update_icon() + update_icon(UPDATE_OVERLAYS) /// Called when the user clicks on the dispenser with a tank. Tries to insert the tank into the dispenser, and updates the UI if successful. /obj/structure/dispenser/proc/try_insert_tank(mob/living/user, list/tank_list, obj/item/tank/T) @@ -133,7 +133,7 @@ T.forceMove(src) tank_list.Add(T) - update_icon() + update_icon(UPDATE_OVERLAYS) to_chat(user, "You put [T] in [src].") SStgui.update_uis(src) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index d82862fd8d1..71139809b96 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -47,7 +47,7 @@ open = !open update_icon() -/obj/structure/toilet/update_icon() +/obj/structure/toilet/update_icon_state() icon_state = "toilet[open][cistern]" if(!anchored) pixel_x = 0 @@ -340,11 +340,11 @@ transfer_prints_to(S, TRUE) qdel(src) -/obj/machinery/shower/update_icon() - cut_overlays() +/obj/machinery/shower/update_overlays() + . = ..() if(on) var/mutable_appearance/water_falling = mutable_appearance('icons/obj/watercloset.dmi', "water", ABOVE_MOB_LAYER) - add_overlay(water_falling) + . += water_falling /obj/machinery/shower/proc/handle_mist() // If there is no mist, and the shower was turned on (on a non-freezing temp): make mist in 5 seconds @@ -565,8 +565,7 @@ dir = dir_choices[selected] update_icon() //is this necessary? probably not -/obj/structure/sink/update_icon() - ..() +/obj/structure/sink/update_icon_state() layer = OBJ_LAYER if(!anchored) pixel_x = 0 diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index 46cb419af2f..a7d176e6060 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -50,7 +50,7 @@ setDir(ini_dir) move_update_air(T) -/obj/structure/windoor_assembly/update_icon() +/obj/structure/windoor_assembly/update_icon_state() icon_state = "[facing]_[secure ? "secure_" : ""]windoor_assembly[state]" /obj/structure/windoor_assembly/CanPass(atom/movable/mover, turf/target, height=0) @@ -156,7 +156,7 @@ return ..() //Update to reflect changes(if applicable) - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/windoor_assembly/crowbar_act(mob/user, obj/item/I) //Crowbar to complete the assembly, Step 7 complete. if(state != "02") @@ -244,7 +244,7 @@ name = "secure anchored windoor assembly" else name = "anchored windoor assembly" - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/windoor_assembly/wrench_act(mob/user, obj/item/I) if(state != "01") @@ -282,7 +282,7 @@ name = "secure windoor assembly" else name = "windoor assembly" - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/windoor_assembly/welder_act(mob/user, obj/item/I) if(state != "01") @@ -320,7 +320,7 @@ setDir(target_dir) ini_dir = dir - update_icon() + update_icon(UPDATE_ICON_STATE) return TRUE /obj/structure/windoor_assembly/AltClick(mob/user) @@ -348,5 +348,5 @@ facing = "l" to_chat(usr, "The windoor will now slide to the left.") - update_icon() + update_icon(UPDATE_ICON_STATE) return diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 2b56830ef29..1408f79c218 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -454,7 +454,8 @@ if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK)) QUEUE_SMOOTH_NEIGHBORS(src) -/obj/structure/window/update_icon() +/obj/structure/window/update_overlays() + . = ..() if(!QDELETED(src)) if(!fulltile) return @@ -464,11 +465,10 @@ if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK)) QUEUE_SMOOTH(src) - cut_overlay(crack_overlay) if(ratio > 75) return crack_overlay = mutable_appearance('icons/obj/structures.dmi', "damage[ratio]", -(layer+0.1)) - add_overlay(crack_overlay) + . += crack_overlay /obj/structure/window/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) ..() @@ -569,7 +569,7 @@ if(active && !powered(power_channel)) toggle_tint() -/obj/machinery/button/windowtint/update_icon() +/obj/machinery/button/windowtint/update_icon_state() icon_state = "light[active]" /obj/structure/window/plasmabasic diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index fd8c106d369..b71c5542802 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -106,12 +106,11 @@ GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","dama /turf/simulated/floor/blob_act(obj/structure/blob/B) return -/turf/simulated/floor/proc/update_icon() +/turf/simulated/floor/update_overlays() + . = ..() update_visuals() - overlays -= current_overlay if(current_overlay) - overlays.Add(current_overlay) - return 1 + . += current_overlay /turf/simulated/floor/proc/break_tile_to_plating() var/turf/simulated/floor/plating/T = make_plating() diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm index d2128887f04..7b71867ff4c 100644 --- a/code/game/turfs/simulated/floor/fancy_floor.dm +++ b/code/game/turfs/simulated/floor/fancy_floor.dm @@ -110,9 +110,7 @@ . = ..() update_icon() -/turf/simulated/floor/carpet/update_icon() - if(!..()) - return 0 +/turf/simulated/floor/carpet/update_icon_state() if(!broken && !burnt) if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK)) QUEUE_SMOOTH(src) diff --git a/code/game/turfs/simulated/floor/light_floor.dm b/code/game/turfs/simulated/floor/light_floor.dm index 4c4e3e44a15..9bbb817459f 100644 --- a/code/game/turfs/simulated/floor/light_floor.dm +++ b/code/game/turfs/simulated/floor/light_floor.dm @@ -15,8 +15,7 @@ . = ..() update_icon() -/turf/simulated/floor/light/update_icon() - ..() +/turf/simulated/floor/light/update_icon_state() if(on) icon_state = "light_on" set_light(5, null, color) diff --git a/code/game/turfs/simulated/floor/mineral.dm b/code/game/turfs/simulated/floor/mineral.dm index 6a3a7e5902d..20d87446a5e 100644 --- a/code/game/turfs/simulated/floor/mineral.dm +++ b/code/game/turfs/simulated/floor/mineral.dm @@ -18,9 +18,7 @@ . = ..() broken_states = list("[initial(icon_state)]_dam") -/turf/simulated/floor/mineral/update_icon() - if(!..()) - return 0 +/turf/simulated/floor/mineral/update_icon_state() if(!broken && !burnt) if(!(icon_state in icons)) icon_state = initial(icon_state) diff --git a/code/game/turfs/simulated/floor/plasteel_floor.dm b/code/game/turfs/simulated/floor/plasteel_floor.dm index 59701bb7738..8c937b64fca 100644 --- a/code/game/turfs/simulated/floor/plasteel_floor.dm +++ b/code/game/turfs/simulated/floor/plasteel_floor.dm @@ -4,9 +4,7 @@ broken_states = list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5") burnt_states = list("floorscorched1", "floorscorched2") -/turf/simulated/floor/plasteel/update_icon() - if(!..()) - return 0 +/turf/simulated/floor/plasteel/update_icon_state() if(!broken && !burnt) icon_state = icon_regular_floor diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index 453d051e374..c486a3b589f 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -26,9 +26,7 @@ . = ..() burn_tile() -/turf/simulated/floor/plating/update_icon() - if(!..()) - return +/turf/simulated/floor/plating/update_icon_state() if(!broken && !burnt) icon_state = icon_plating //Because asteroids are 'platings' too. @@ -321,7 +319,7 @@ icon_state = "ironfoam" metal = MFOAM_IRON -/turf/simulated/floor/plating/metalfoam/update_icon() +/turf/simulated/floor/plating/metalfoam/update_icon_state() switch(metal) if(MFOAM_ALUMINUM) icon_state = "metalfoam" diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 307995a57e7..5fe8c077ec8 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -17,7 +17,6 @@ var/damage = 0 var/damage_cap = 100 //Wall will break down to girders if damage reaches this point - var/damage_overlay var/global/damage_overlays[8] opacity = TRUE @@ -90,35 +89,36 @@ /turf/simulated/wall/proc/rust() if(rusted) return - name = "rusted [name]" rusted = TRUE - update_icon() + update_appearance(UPDATE_NAME|UPDATE_OVERLAYS) -/turf/simulated/wall/proc/update_icon() +/turf/simulated/wall/update_name() + . = ..() + name = "[rusted ? "rusted " : ""][name]" + +/turf/simulated/wall/update_overlays() + . = ..() if(!damage_overlays[1]) //list hasn't been populated generate_overlays() QUEUE_SMOOTH(src) if(rusted && !rusted_overlay) rusted_overlay = icon('icons/turf/overlays.dmi', pick("rust", "rust2"), pick(NORTH, SOUTH, EAST, WEST)) - add_overlay(rusted_overlay) + . += rusted_overlay if(!damage) - if(damage_overlay) - overlays -= damage_overlays[damage_overlay] - damage_overlay = null + . += dent_decals return var/overlay = round(damage / damage_cap * damage_overlays.len) + 1 if(overlay > damage_overlays.len) overlay = damage_overlays.len - if(damage_overlay && overlay == damage_overlay) //No need to update. - return - if(damage_overlay) - overlays -= damage_overlays[damage_overlay] - overlays += damage_overlays[overlay] - damage_overlay = overlay + if(length(dent_decals)) + . += dent_decals + + . += damage_overlays[overlay] + . += dent_decals /turf/simulated/wall/proc/generate_overlays() var/alpha_inc = 256 / damage_overlays.len @@ -386,8 +386,8 @@ if(I.use_tool(src, user, time, volume = I.tool_volume)) if(repairing) WELDER_REPAIR_SUCCESS_MESSAGE - cut_overlay(dent_decals) dent_decals?.Cut() // I feel like this isn't needed but it can't hurt to keep it in anyway + update_icon() take_damage(-damage) else WELDER_SLICING_SUCCESS_MESSAGE @@ -516,11 +516,10 @@ decal.pixel_y = y if(LAZYLEN(dent_decals)) - cut_overlay(dent_decals) dent_decals += decal else dent_decals = list(decal) - add_overlay(dent_decals) + update_icon() #undef MAX_DENT_DECALS diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm index 94f5350ba34..6f59080ef50 100644 --- a/code/game/turfs/simulated/walls_reinforced.dm +++ b/code/game/turfs/simulated/walls_reinforced.dm @@ -210,9 +210,7 @@ if(prob(30)) dismantle_wall() -/turf/simulated/wall/r_wall/update_icon() - . = ..() - +/turf/simulated/wall/r_wall/update_icon_state() if(d_state) icon_state = "r_wall-[d_state]" smoothing_flags = NONE diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm index b8110cf2b54..eca15970870 100644 --- a/code/game/turfs/space/transit.dm +++ b/code/game/turfs/space/transit.dm @@ -152,9 +152,9 @@ /turf/space/transit/Initialize(mapload) . = ..() - update_icon() + update_icon(UPDATE_ICON_STATE) -/turf/space/transit/proc/update_icon() +/turf/space/transit/update_icon_state() var/p = 9 var/angle = 0 var/state = 1 diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index b12cb1cf83b..0edc3c3aba5 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1863,7 +1863,7 @@ if(!P.ico) P.ico = new P.ico += "paper_stamp-[stampvalue]" - P.overlays += stampoverlay + P.stamp_overlays += stampoverlay P.stamps += "
"
P.update_icon()
P.faxmachineid = fax.UID()
@@ -2233,7 +2233,7 @@
if(!P.ico)
P.ico = new
P.ico += "paper_stamp-[stampvalue]"
- P.overlays += stampoverlay
+ P.stamp_overlays += stampoverlay
P.stamps += ""
P.update_icon()
fax.receivefax(P)
@@ -2445,14 +2445,14 @@
if(!P.stamped)
P.stamped = new
P.stamped += /obj/item/stamp/centcom
- P.overlays += stampoverlay
+ P.stamp_overlays += stampoverlay
P.stamps += ""
else if(stamptype == "text")
if(!P.stamped)
P.stamped = new
P.stamped += /obj/item/stamp
- P.overlays += stampoverlay
+ P.stamp_overlays += stampoverlay
P.stamps += "[stampvalue]" if(destination != "All Departments") diff --git a/code/modules/antagonists/vampire/vampire_powers/umbrae_powers.dm b/code/modules/antagonists/vampire/vampire_powers/umbrae_powers.dm index c0f49838b95..b1df1a74551 100644 --- a/code/modules/antagonists/vampire/vampire_powers/umbrae_powers.dm +++ b/code/modules/antagonists/vampire/vampire_powers/umbrae_powers.dm @@ -9,7 +9,8 @@ ..() update_name() -/obj/effect/proc_holder/spell/vampire/self/cloak/proc/update_name() +/obj/effect/proc_holder/spell/vampire/self/cloak/update_name() + . = ..() var/mob/living/user = loc if(!ishuman(user) || !user.mind) return diff --git a/code/modules/arcade/arcade_base.dm b/code/modules/arcade/arcade_base.dm index 1d1cdcc4641..fb7b891f3be 100644 --- a/code/modules/arcade/arcade_base.dm +++ b/code/modules/arcade/arcade_base.dm @@ -88,9 +88,6 @@ default_deconstruction_crowbar(user, I) return TRUE -/obj/machinery/arcade/update_icon() - return - /obj/machinery/arcade/proc/pay_with_cash(obj/item/stack/spacecash/cashmoney, mob/user) if(cashmoney.amount < token_price) to_chat(user, "[bicon(cashmoney)] That is not enough money.") diff --git a/code/modules/arcade/arcade_prize.dm b/code/modules/arcade/arcade_prize.dm index 18d149b39e9..85d2b657852 100644 --- a/code/modules/arcade/arcade_prize.dm +++ b/code/modules/arcade/arcade_prize.dm @@ -71,12 +71,12 @@ /obj/item/stack/tickets/New(loc, amount=null) ..() - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/stack/tickets/attack_self(mob/user as mob) return -/obj/item/stack/tickets/update_icon() +/obj/item/stack/tickets/update_icon_state() switch(get_amount()) if(1 to 3) icon_state = "tickets_1" // One ticket diff --git a/code/modules/arcade/claw_game.dm b/code/modules/arcade/claw_game.dm index f9bc2da5b5e..a0429c7cdbc 100644 --- a/code/modules/arcade/claw_game.dm +++ b/code/modules/arcade/claw_game.dm @@ -20,7 +20,7 @@ GLOBAL_VAR(claw_game_html) /obj/machinery/arcade/claw/Initialize(mapload) . = ..() machine_image = pick("_1", "_2") - update_icon() + update_icon(UPDATE_ICON_STATE) component_parts = list() component_parts += new /obj/item/circuitboard/clawgame(null) @@ -39,7 +39,7 @@ GLOBAL_VAR(claw_game_html) bin_upgrades = B.rating bonus_prize_chance = bin_upgrades * 5 //equals +5% chance per matter bin rating level (+20% with rating 4) -/obj/machinery/arcade/claw/update_icon() +/obj/machinery/arcade/claw/update_icon_state() if(stat & BROKEN) icon_state = "clawmachine[machine_image]_broken" else if(panel_open) @@ -58,7 +58,7 @@ GLOBAL_VAR(claw_game_html) atom_say("WINNER!") new /obj/item/toy/prizeball(get_turf(src)) playsound(loc, 'sound/arcade/win.ogg', 50, TRUE) - addtimer(CALLBACK(src, .proc/update_icon), 10) + addtimer(CALLBACK(src, /atom/.proc/update_icon, UPDATE_ICON_STATE), 10) /obj/machinery/arcade/claw/start_play(mob/user as mob) ..() diff --git a/code/modules/arcade/mob_hunt/battle_computer.dm b/code/modules/arcade/mob_hunt/battle_computer.dm index 8155eb50d7e..75221766619 100644 --- a/code/modules/arcade/mob_hunt/battle_computer.dm +++ b/code/modules/arcade/mob_hunt/battle_computer.dm @@ -32,12 +32,11 @@ ..() check_connection() -/obj/machinery/computer/mob_battle_terminal/update_icon() +/obj/machinery/computer/mob_battle_terminal/update_icon_state() if(card) icon_state = "mob_battle_loaded" else icon_state = "mob_battle_empty" - ..() /obj/machinery/computer/mob_battle_terminal/Destroy() eject_card(1) diff --git a/code/modules/arcade/prize_counter.dm b/code/modules/arcade/prize_counter.dm index ece858500e1..0a561c7bd64 100644 --- a/code/modules/arcade/prize_counter.dm +++ b/code/modules/arcade/prize_counter.dm @@ -20,7 +20,7 @@ component_parts += new /obj/item/stack/sheet/glass(null) RefreshParts() -/obj/machinery/prize_counter/update_icon() +/obj/machinery/prize_counter/update_icon_state() if(stat & BROKEN) icon_state = "prize_counter-broken" else if(panel_open) @@ -29,7 +29,6 @@ icon_state = "prize_counter-off" else icon_state = "prize_counter-on" - return /obj/machinery/prize_counter/attackby(obj/item/O as obj, mob/user as mob, params) if(istype(O, /obj/item/stack/tickets)) @@ -44,7 +43,7 @@ playsound(src.loc, O.usesound, 50, 1) panel_open = !panel_open to_chat(user, "You [panel_open ? "open" : "close"] the maintenance panel.") - update_icon() + update_icon(UPDATE_ICON_STATE) return if(panel_open) if(istype(O, /obj/item/wrench)) diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm index 6da7af91d36..b1161d8b247 100644 --- a/code/modules/assembly/bomb.dm +++ b/code/modules/assembly/bomb.dm @@ -16,13 +16,16 @@ . = ..() . += bombtank.examine(user) -/obj/item/onetankbomb/update_icon() +/obj/item/onetankbomb/update_icon_state() if(bombtank) icon_state = bombtank.icon_state + +/obj/item/onetankbomb/update_overlays() + . = ..() if(bombassembly) - overlays += bombassembly.icon_state - overlays += bombassembly.overlays - overlays += "bomb_assembly" + . += bombassembly.icon_state + . += bombassembly.overlays + . += "bomb_assembly" /obj/item/onetankbomb/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/analyzer)) diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index 895d74f25b4..fa4efa9f02b 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -51,7 +51,7 @@ a_left = A1 a_right = A2 name = "[A1.name]-[A2.name] assembly" - update_icon() + update_icon(UPDATE_OVERLAYS) return TRUE /obj/item/assembly_holder/proc/has_prox_sensors() @@ -59,16 +59,16 @@ return TRUE return FALSE -/obj/item/assembly_holder/update_icon() - overlays.Cut() +/obj/item/assembly_holder/update_overlays() + . = ..() if(a_left) - overlays += "[a_left.icon_state]_left" + . += "[a_left.icon_state]_left" for(var/O in a_left.attached_overlays) - overlays += "[O]_l" + . += "[O]_l" if(a_right) - overlays += "[a_right.icon_state]_right" + . += "[a_right.icon_state]_right" for(var/O in a_right.attached_overlays) - overlays += "[O]_r" + . += "[O]_r" if(master) master.update_icon() diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index 267d054f9f0..694ca59f6ce 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -61,13 +61,12 @@ toggle_secure() on = TRUE -/obj/item/assembly/infra/update_icon() - overlays.Cut() +/obj/item/assembly/infra/update_overlays() + . = ..() attached_overlays = list() if(on) - overlays += "infrared_on" + . += "infrared_on" attached_overlays += "infrared_on" - if(holder) holder.update_icon() @@ -228,7 +227,7 @@ if(next) next.vis_spread(v) -/obj/effect/beam/i_beam/update_icon() +/obj/effect/beam/i_beam/update_icon_state() transform = turn(matrix(), dir2angle(dir)) /obj/effect/beam/i_beam/process() diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index 758b4b48468..e6168b3b3ae 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -29,7 +29,7 @@ /obj/item/assembly/mousetrap/describe() return "The pressure switch is [armed ? "primed" : "safe"]." -/obj/item/assembly/mousetrap/update_icon() +/obj/item/assembly/mousetrap/update_icon_state() if(armed) icon_state = "mousetraparmed" else diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index 7784b81e127..c8213dbab8f 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -76,14 +76,14 @@ scanning = !scanning update_icon() -/obj/item/assembly/prox_sensor/update_icon() - overlays.Cut() +/obj/item/assembly/prox_sensor/update_overlays() + . = ..() attached_overlays = list() if(timing) - overlays += "prox_timing" + . += "prox_timing" attached_overlays += "prox_timing" if(scanning) - overlays += "prox_scanning" + . += "prox_scanning" attached_overlays += "prox_scanning" if(holder) holder.update_icon() diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 0521f95951f..8530ff1fe3c 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -46,10 +46,9 @@ signal() return TRUE -/obj/item/assembly/signaler/update_icon() +/obj/item/assembly/signaler/update_icon_state() if(holder) holder.update_icon() - return /obj/item/assembly/signaler/interact(mob/user, flag1) var/t1 = "-------" diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index 11907e84d78..187423190ae 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -53,11 +53,11 @@ timer_end() time = set_time -/obj/item/assembly/timer/update_icon() - overlays.Cut() +/obj/item/assembly/timer/update_overlays() + . = ..() attached_overlays = list() if(timing) - overlays += "timer_timing" + . += "timer_timing" attached_overlays += "timer_timing" if(holder) holder.update_icon() diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index fd8a4646df5..e3f483b881e 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -376,7 +376,7 @@ environment.merge(gas) -/obj/machinery/alarm/update_icon() +/obj/machinery/alarm/update_icon_state() if(wiresexposed) icon_state = "alarmx" return @@ -555,7 +555,7 @@ if(alarm_area.atmosalert(new_area_danger_level, src)) //if area was in normal state or if area was in alert state post_alert(new_area_danger_level) - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/machinery/alarm/proc/post_alert(alert_level) if(!report_danger_level) @@ -914,13 +914,13 @@ if(alarm_area.atmosalert(ATMOS_ALARM_DANGER, src)) post_alert(ATMOS_ALARM_DANGER) alarmActivated = TRUE - update_icon() + update_icon(UPDATE_ICON_STATE) if("atmos_reset") if(alarm_area.atmosalert(ATMOS_ALARM_NONE, src, TRUE)) post_alert(ATMOS_ALARM_NONE) alarmActivated = FALSE - update_icon() + update_icon(UPDATE_ICON_STATE) if("mode") if(!is_authenticated(usr, active_ui)) @@ -994,7 +994,7 @@ coil.use(5) buildstage = 2 - update_icon() + update_icon(UPDATE_ICON_STATE) first_run() return if(0) @@ -1003,7 +1003,7 @@ playsound(get_turf(src), I.usesound, 50, 1) qdel(I) buildstage = 1 - update_icon() + update_icon(UPDATE_ICON_STATE) return return ..() @@ -1021,7 +1021,7 @@ to_chat(user, "You pry out the circuit!") new /obj/item/airalarm_electronics(user.drop_location()) buildstage = AIR_ALARM_FRAME - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/machinery/alarm/multitool_act(mob/user, obj/item/I) if(buildstage != AIR_ALARM_READY) @@ -1039,7 +1039,7 @@ if(!I.use_tool(src, user, 0, volume = I.tool_volume)) return wiresexposed = !wiresexposed - update_icon() + update_icon(UPDATE_ICON_STATE) if(wiresexposed) SCREWDRIVER_OPEN_PANEL_MESSAGE else @@ -1055,7 +1055,7 @@ var/obj/item/stack/cable_coil/new_coil = new /obj/item/stack/cable_coil(user.drop_location()) new_coil.amount = 5 buildstage = AIR_ALARM_BUILDING - update_icon() + update_icon(UPDATE_ICON_STATE) if(wiresexposed) wires.Interact(user) @@ -1074,11 +1074,11 @@ stat &= ~NOPOWER else stat |= NOPOWER - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/machinery/alarm/obj_break(damage_flag) ..() - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/machinery/alarm/deconstruct(disassembled = TRUE) if(!(flags & NODECONSTRUCT)) @@ -1099,7 +1099,7 @@ /obj/machinery/alarm/proc/unshort_callback() if(shorted) shorted = FALSE - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/machinery/alarm/proc/enable_ai_control_callback() if(aidisabled) diff --git a/code/modules/atmospherics/machinery/atmospherics.dm b/code/modules/atmospherics/machinery/atmospherics.dm index 7bfa0644458..f0c6e57f55d 100644 --- a/code/modules/atmospherics/machinery/atmospherics.dm +++ b/code/modules/atmospherics/machinery/atmospherics.dm @@ -70,6 +70,12 @@ Pipelines + Other Objects -> Pipe network // Icons/overlays/underlays /obj/machinery/atmospherics/update_icon() + if(check_icon_cache()) + ..(ALL) + else + ..(UPDATE_ICON_STATE) + +/obj/machinery/atmospherics/update_icon_state() var/turf/T = get_turf(loc) if(T && T.transparent_floor) plane = FLOOR_PLANE @@ -112,10 +118,7 @@ Pipelines + Other Objects -> Pipe network underlays += SSair.icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "exposed" + icon_connect_type) /obj/machinery/atmospherics/proc/update_underlays() - if(check_icon_cache()) - return 1 - else - return 0 + return check_icon_cache() // Connect types /obj/machinery/atmospherics/proc/check_connect_types(obj/machinery/atmospherics/atmos1, obj/machinery/atmospherics/atmos2) diff --git a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm index 7111d4ef4e5..f67836341bb 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm @@ -106,39 +106,47 @@ return side_inverted = !side_inverted to_chat(user, "You reverse the circulator's valve settings. The inlet of the circulator is now on the [get_inlet_side(dir)] side.") + update_appearance(UPDATE_DESC|UPDATE_ICON) + +/obj/machinery/atmospherics/binary/circulator/update_desc() + . = ..() desc = "A gas circulator pump and heat exchanger. Its input port is on the [get_inlet_side(dir)] side, and its output port is on the [get_outlet_side(dir)] side." -/obj/machinery/atmospherics/binary/circulator/update_icon() //this gets called everytime atmos is updated in the circulator (alot) - ..() - underlays.Cut() - cut_overlays() - +/obj/machinery/atmospherics/binary/circulator/update_icon_state() //this gets called everytime atmos is updated in the circulator (alot) if(stat & (BROKEN|NOPOWER)) icon_state = "circ[side]-p" - else if(last_pressure_delta > 0) + return + if(last_pressure_delta > 0) if(last_pressure_delta > ONE_ATMOSPHERE) icon_state = "circ[side]-run" - underlays += emissive_appearance(icon,"emit[side]-run") else icon_state = "circ[side]-slow" - underlays += emissive_appearance(icon,"emit[side]-slow") else icon_state = "circ[side]-off" - underlays += emissive_appearance(icon,"emit[side]-off") +/obj/machinery/atmospherics/binary/circulator/update_overlays() + . = ..() if(!side_inverted) - add_overlay(mutable_appearance(icon,"in_up")) + . += "in_up" else - add_overlay(mutable_appearance(icon,"in_down")) + . += "in_down" if(node2) var/image/new_pipe_overlay = image(icon, "connected") new_pipe_overlay.color = node2.pipe_color - add_overlay(new_pipe_overlay) + . += new_pipe_overlay else - add_overlay(mutable_appearance(icon, "disconnected")) + . += "disconnected" - return 1 + if(stat & (BROKEN|NOPOWER) && !light) + return + if(last_pressure_delta > 0) + if(last_pressure_delta > ONE_ATMOSPHERE) + . += emissive_appearance(icon,"emit[side]-run") + else + . += emissive_appearance(icon,"emit[side]-slow") + else + . += emissive_appearance(icon,"emit[side]-off") /obj/machinery/atmospherics/binary/circulator/power_change() . = ..() diff --git a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm index 1a8e1a9c5fc..28da8931a3d 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm @@ -70,13 +70,8 @@ add_underlay(T, node1, turn(dir, -180)) add_underlay(T, node2, dir) -/obj/machinery/atmospherics/binary/dp_vent_pump/update_icon(safety = 0) - ..() - - if(!check_icon_cache()) - return - - overlays.Cut() +/obj/machinery/atmospherics/binary/dp_vent_pump/update_overlays() + . = ..() var/vent_icon = "vent" @@ -89,7 +84,7 @@ else vent_icon += "[on ? "[releasing ? "out" : "in"]" : "off"]" - overlays += SSair.icon_manager.get_atmos_icon("device", , , vent_icon) + . += SSair.icon_manager.get_atmos_icon("device", , , vent_icon) /obj/machinery/atmospherics/binary/dp_vent_pump/update_underlays() if(..()) diff --git a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm index ad13f06dbe2..ff228a46cb2 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm @@ -27,8 +27,7 @@ radio_connection = null return ..() -/obj/machinery/atmospherics/binary/passive_gate/update_icon() - ..() +/obj/machinery/atmospherics/binary/passive_gate/update_icon_state() icon_state = "[on ? "on" : "off"]" /obj/machinery/atmospherics/binary/passive_gate/update_underlays() diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm index 2b8ccb022aa..a7632626783 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm @@ -57,9 +57,7 @@ Thus, the two variables affect pump operation are set in New(): icon_state = "map_on" on = TRUE -/obj/machinery/atmospherics/binary/pump/update_icon() - ..() - +/obj/machinery/atmospherics/binary/pump/update_icon_state() if(!powered()) icon_state = "off" else diff --git a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm index 283aca14f91..91d9ced59ba 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm @@ -8,6 +8,7 @@ can_unwrench = TRUE var/open = FALSE + var/animating = FALSE req_one_access_txt = "24;10" @@ -22,11 +23,9 @@ open = TRUE icon_state = "map_valve1" -/obj/machinery/atmospherics/binary/valve/update_icon(animation) - ..() - - if(animation) - flick("valve[src.open][!src.open]",src) +/obj/machinery/atmospherics/binary/valve/update_icon_state() + if(animating) + flick("valve[open][!open]",src) else icon_state = "valve[open]" @@ -41,7 +40,7 @@ /obj/machinery/atmospherics/binary/valve/proc/open() open = TRUE - update_icon() + update_icon(UPDATE_ICON_STATE) parent1.update = 0 parent2.update = 0 parent1.reconcile_air() @@ -50,7 +49,7 @@ /obj/machinery/atmospherics/binary/valve/proc/close() open = FALSE - update_icon() + update_icon(UPDATE_ICON_STATE) investigate_log("was closed by [usr ? key_name(usr) : "a remote signal"]", "atmos") return @@ -63,8 +62,10 @@ /obj/machinery/atmospherics/binary/valve/attack_hand(mob/user) add_fingerprint(usr) - update_icon(1) + animating = TRUE + update_icon(UPDATE_ICON_STATE) sleep(10) + animating = FALSE if(open) close() else @@ -105,12 +106,13 @@ var/old_stat = stat ..() if(old_stat != stat) - update_icon() + update_icon(UPDATE_ICON_STATE) -/obj/machinery/atmospherics/binary/valve/digital/update_icon() - ..() +/obj/machinery/atmospherics/binary/valve/digital/update_icon_state() if(!powered()) icon_state = "valve[open]nopower" + return + ..() /obj/machinery/atmospherics/binary/valve/digital/atmos_init() ..() diff --git a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm index 5929225ea16..54416c051e8 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm @@ -58,9 +58,7 @@ Thus, the two variables affect pump operation are set in New(): ..() set_frequency(frequency) -/obj/machinery/atmospherics/binary/volume_pump/update_icon() - ..() - +/obj/machinery/atmospherics/binary/volume_pump/update_icon_state() if(!powered()) icon_state = "off" else diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm index f27d01c8969..d73d71eb6ec 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm @@ -60,9 +60,7 @@ icon_state = "mmap" flipped = TRUE -/obj/machinery/atmospherics/trinary/filter/update_icon() - ..() - +/obj/machinery/atmospherics/trinary/filter/update_icon_state() if(flipped) icon_state = "m" else diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm index f1568410eb9..d5a5bab08ea 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm @@ -35,9 +35,7 @@ icon_state = "mmap" flipped = TRUE -/obj/machinery/atmospherics/trinary/mixer/update_icon(safety = 0) - ..() - +/obj/machinery/atmospherics/trinary/mixer/update_icon_state() if(flipped) icon_state = "m" else diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/tvalve.dm b/code/modules/atmospherics/machinery/components/trinary_devices/tvalve.dm index d59a206d000..12452b53db8 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/tvalve.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/tvalve.dm @@ -36,6 +36,7 @@ flick("tvalve[flipstate][state][!state]",src) else icon_state = "tvalve[flipstate][state]" + ..() /obj/machinery/atmospherics/trinary/tvalve/update_underlays() if(..()) @@ -134,9 +135,7 @@ if(old_stat != stat) update_icon() -/obj/machinery/atmospherics/trinary/tvalve/digital/update_icon() - ..() - +/obj/machinery/atmospherics/trinary/tvalve/digital/update_icon_state() if(!powered()) icon_state = "tvalvenopower" diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm index a00fa5296a2..d58a72e4937 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm @@ -1,6 +1,8 @@ #define AUTO_EJECT_DEAD (1<<0) #define AUTO_EJECT_HEALTHY (1<<1) - +#define HIGH 24 +#define MID 23 +#define LOW 22 /obj/machinery/atmospherics/unary/cryo_cell name = "cryo cell" desc = "Lowers the body temperature so certain medications may take effect." @@ -340,52 +342,50 @@ if(default_deconstruction_screwdriver(user, "pod0-o", "pod0", I)) return TRUE -/obj/machinery/atmospherics/unary/cryo_cell/update_icon() - handle_update_icon() - -/obj/machinery/atmospherics/unary/cryo_cell/proc/handle_update_icon() //making another proc to avoid spam in update_icon - overlays.Cut() //empty the overlay proc, just in case +/obj/machinery/atmospherics/unary/cryo_cell/update_icon_state() icon_state = "pod[on]" //set the icon properly every time - if(!src.occupant) - overlays += "lid[on]" //if no occupant, just put the lid overlay on, and ignore the rest +/obj/machinery/atmospherics/unary/cryo_cell/update_overlays() + . = ..() + if(!occupant) + . += "lid[on]" //if no occupant, just put the lid overlay on, and ignore the rest return if(occupant) var/mutable_appearance/pickle = mutable_appearance(occupant.icon, occupant.icon_state) pickle.overlays = occupant.overlays - pickle.pixel_y = 22 + pickle.pixel_y = LOW - overlays += pickle - overlays += "lid[on]" - if(src.on && !running_bob_animation) //no bobbing if off - var/up = 0 //used to see if we are going up or down, 1 is down, 2 is up + . += pickle + . += "lid[on]" + if(on && !running_bob_animation) //no bobbing if off + var/bobbing = NONE //used to see if we are going up or down spawn(0) // Without this, the icon update will block. The new thread will die once the occupant leaves. running_bob_animation = TRUE - while(occupant) - overlays -= "lid[on]" //have to remove the overlays first, to force an update- remove cloning pod overlay - overlays -= pickle //remove mob overlay + while(occupant && on) + cut_overlay("lid[on]") //have to remove the overlays first, to force an update- remove cloning pod overlay + cut_overlay(pickle) //remove mob overlay switch(pickle.pixel_y) //this looks messy as fuck but it works, switch won't call itself twice - if(23) //inbetween state, for smoothness - switch(up) //this is set later in the switch, to keep track of where the mob is supposed to go - if(2) //2 is up - pickle.pixel_y = 24 //set to highest + if(MID) //inbetween state, for smoothness + switch(bobbing) //this is set later in the switch, to keep track of where the mob is supposed to go + if(UP) + pickle.pixel_y = HIGH //set to highest - if(1) //1 is down - pickle.pixel_y = 22 //set to lowest + if(DOWN) + pickle.pixel_y = LOW //set to lowest - if(22) //mob is at it's lowest - pickle.pixel_y = 23 //set to inbetween - up = 2 //have to go up + if(LOW) //mob is at it's lowest + pickle.pixel_y = MID //set to inbetween + bobbing = UP //have to go up - if(24) //mob is at it's highest - pickle.pixel_y = 23 //set to inbetween - up = 1 //have to go down + if(HIGH) //mob is at it's highest + pickle.pixel_y = MID //set to inbetween + bobbing = DOWN //have to go down - overlays += pickle //re-add the mob to the icon - overlays += "lid[on]" //re-add the overlay of the pod, they are inside it, not floating + add_overlay(pickle) //re-add the mob to the icon + add_overlay("lid[on]") //re-add the overlay of the pod, they are inside it, not floating sleep(7) //don't want to jiggle violently, just slowly bob running_bob_animation = FALSE @@ -434,7 +434,7 @@ if(occupant.bodytemperature < 261 && occupant.bodytemperature >= 70) //Patch by Aranclanos to stop people from taking burn damage after being ejected occupant.bodytemperature = 261 occupant = null - update_icon() + update_icon(UPDATE_OVERLAYS) // eject trash the occupant dropped for(var/atom/movable/A in contents - component_parts - list(beaker)) A.forceMove(get_step(loc, SOUTH)) @@ -473,9 +473,9 @@ occupant = M // M.metabslow = 1 add_fingerprint(usr) - update_icon() + update_icon(UPDATE_OVERLAYS) M.ExtinguishMob() - return 1 + return TRUE /obj/machinery/atmospherics/unary/cryo_cell/verb/move_eject() set name = "Eject occupant" @@ -549,3 +549,6 @@ #undef AUTO_EJECT_HEALTHY #undef AUTO_EJECT_DEAD +#undef HIGH +#undef MID +#undef LOW diff --git a/code/modules/atmospherics/machinery/components/unary_devices/generator_input.dm b/code/modules/atmospherics/machinery/components/unary_devices/generator_input.dm index ae4cb9d270b..74bd027998e 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/generator_input.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/generator_input.dm @@ -8,9 +8,7 @@ var/update_cycle -/obj/machinery/atmospherics/unary/generator_input/update_icon() - ..() - +/obj/machinery/atmospherics/unary/generator_input/update_icon_state() if(node) icon_state = "intact" else diff --git a/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm b/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm index 45167b81bbd..15ef6b5437c 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm @@ -10,9 +10,7 @@ var/obj/machinery/atmospherics/unary/heat_exchanger/partner = null var/update_cycle -/obj/machinery/atmospherics/unary/heat_exchanger/update_icon() - ..() - +/obj/machinery/atmospherics/unary/heat_exchanger/update_icon_state() if(node) icon_state = "intact" else diff --git a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm index 80d4f7bc4ca..df7c8752832 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm @@ -39,9 +39,7 @@ radio_connection = null return ..() -/obj/machinery/atmospherics/unary/outlet_injector/update_icon() - ..() - +/obj/machinery/atmospherics/unary/outlet_injector/update_icon_state() if(!powered()) icon_state = "off" else diff --git a/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm b/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm index ac223678e69..c043e75ff00 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm @@ -11,9 +11,7 @@ var/oxygen_content = 10 -/obj/machinery/atmospherics/unary/oxygen_generator/update_icon() - ..() - +/obj/machinery/atmospherics/unary/oxygen_generator/update_icon_state() if(node) icon_state = "intact_[on?("on"):("off")]" else diff --git a/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm b/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm index 5f032649e40..f55de1ee8c8 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm @@ -15,8 +15,7 @@ connected_device.disconnect() return ..() -/obj/machinery/atmospherics/unary/portables_connector/update_icon() - ..() +/obj/machinery/atmospherics/unary/portables_connector/update_icon_state() icon_state = "connector" /obj/machinery/atmospherics/unary/portables_connector/update_underlays() diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermal_plate.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermal_plate.dm index e27754d25c9..a9667859d62 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/thermal_plate.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/thermal_plate.dm @@ -10,9 +10,7 @@ name = "thermal tansfer plate" desc = "Transfers heat to and from an area" -/obj/machinery/atmospherics/unary/thermal_plate/update_icon() - ..() - +/obj/machinery/atmospherics/unary/thermal_plate/update_icon_state() var/prefix = "" //var/suffix="_idle" // Also available: _heat, _cool if(level == 1 && istype(loc, /turf/simulated)) diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm index b5aa0382327..c5353ab1e92 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm @@ -74,7 +74,7 @@ calculated_laser_rating += laser.rating max_temperature = T20C + (base_heating * calculated_laser_rating) //573.15K with T1 stock parts -/obj/machinery/atmospherics/unary/thermomachine/update_icon() +/obj/machinery/atmospherics/unary/thermomachine/update_icon_state() if(panel_open) icon_state = icon_state_open else if(on) diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm index 57dde255b5a..42cb39ceec0 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm @@ -78,16 +78,9 @@ ..() air_contents.volume = 1000 -/obj/machinery/atmospherics/unary/vent_pump/update_icon(safety = 0) - ..() - +/obj/machinery/atmospherics/unary/vent_pump/update_overlays() + . = ..() plane = FLOOR_PLANE - - if(!check_icon_cache()) - return - - overlays.Cut() - var/vent_icon = "vent" var/turf/T = get_turf(src) @@ -101,7 +94,7 @@ else vent_icon += "[on ? "[releasing ? "out" : "in"]" : "off"]" - overlays += SSair.icon_manager.get_atmos_icon("device", state = vent_icon) + . += SSair.icon_manager.get_atmos_icon("device", state = vent_icon) update_pipe_image() diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm index c82e9ff3710..bac3f2e4f01 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm @@ -96,16 +96,9 @@ use_power(amount, power_channel) return 1 -/obj/machinery/atmospherics/unary/vent_scrubber/update_icon(safety = 0) - ..() - +/obj/machinery/atmospherics/unary/vent_scrubber/update_overlays() + . = ..() plane = FLOOR_PLANE - - if(!check_icon_cache()) - return - - overlays.Cut() - var/scrubber_icon = "scrubber" var/turf/T = get_turf(src) @@ -122,7 +115,7 @@ if(welded) scrubber_icon = "scrubberweld" - overlays += SSair.icon_manager.get_atmos_icon("device", state = scrubber_icon) + . += SSair.icon_manager.get_atmos_icon("device", state = scrubber_icon) update_pipe_image() /obj/machinery/atmospherics/unary/vent_scrubber/update_underlays() diff --git a/code/modules/atmospherics/machinery/other/meter.dm b/code/modules/atmospherics/machinery/other/meter.dm index acd46cc8e13..a3efee164c2 100644 --- a/code/modules/atmospherics/machinery/other/meter.dm +++ b/code/modules/atmospherics/machinery/other/meter.dm @@ -43,34 +43,17 @@ return "Measures the volume and temperature of the pipe under the meter." /obj/machinery/meter/process_atmos() - if(!target) - icon_state = "meterX" - return 0 - - if(stat & (BROKEN|NOPOWER)) - icon_state = "meter0" - return 0 + if(!target || (stat & (BROKEN|NOPOWER))) + update_icon(UPDATE_ICON_STATE) + return var/datum/gas_mixture/environment = target.return_air() if(!environment) - icon_state = "meterX" - return 0 + update_icon(UPDATE_ICON_STATE) + return + update_icon(UPDATE_ICON_STATE) var/env_pressure = environment.return_pressure() - if(env_pressure <= 0.15*ONE_ATMOSPHERE) - icon_state = "meter0" - else if(env_pressure <= 1.8*ONE_ATMOSPHERE) - var/val = round(env_pressure/(ONE_ATMOSPHERE*0.3) + 0.5) - icon_state = "meter1_[val]" - else if(env_pressure <= 30*ONE_ATMOSPHERE) - var/val = round(env_pressure/(ONE_ATMOSPHERE*5)-0.35) + 1 - icon_state = "meter2_[val]" - else if(env_pressure <= 59*ONE_ATMOSPHERE) - var/val = round(env_pressure/(ONE_ATMOSPHERE*5) - 6) + 1 - icon_state = "meter3_[val]" - else - icon_state = "meter4" - if(frequency) var/datum/radio_frequency/radio_connection = SSradio.return_frequency(frequency) @@ -86,6 +69,36 @@ "sigtype" = "status" ) radio_connection.post_signal(src, signal) + + +/obj/machinery/meter/update_icon_state() + if(!target) + icon_state = "meterX" + return + + if(stat & (BROKEN|NOPOWER)) + icon_state = "meter0" + return + + var/datum/gas_mixture/environment = target.return_air() + if(!environment) + icon_state = "meterX" + return + + var/env_pressure = environment.return_pressure() + if(env_pressure <= 0.15*ONE_ATMOSPHERE) + icon_state = "meter0" + else if(env_pressure <= 1.8*ONE_ATMOSPHERE) + var/val = round(env_pressure/(ONE_ATMOSPHERE*0.3) + 0.5) + icon_state = "meter1_[val]" + else if(env_pressure <= 30*ONE_ATMOSPHERE) + var/val = round(env_pressure/(ONE_ATMOSPHERE*5)-0.35) + 1 + icon_state = "meter2_[val]" + else if(env_pressure <= 59*ONE_ATMOSPHERE) + var/val = round(env_pressure/(ONE_ATMOSPHERE*5) - 6) + 1 + icon_state = "meter3_[val]" + else + icon_state = "meter4" /obj/machinery/meter/proc/status() var/t = "" diff --git a/code/modules/atmospherics/machinery/pipes/cap.dm b/code/modules/atmospherics/machinery/pipes/cap.dm index 4cfa2efb450..67e9ed9a9a5 100644 --- a/code/modules/atmospherics/machinery/pipes/cap.dm +++ b/code/modules/atmospherics/machinery/pipes/cap.dm @@ -56,16 +56,10 @@ if(node) node.update_underlays() -/obj/machinery/atmospherics/pipe/cap/update_icon(safety = 0) - ..() - - if(!check_icon_cache()) - return - +/obj/machinery/atmospherics/pipe/cap/update_overlays() + . = ..() alpha = 255 - - overlays.Cut() - overlays += SSair.icon_manager.get_atmos_icon("pipe", , pipe_color, "cap" + icon_connect_type) + . += SSair.icon_manager.get_atmos_icon("pipe", , pipe_color, "cap" + icon_connect_type) /obj/machinery/atmospherics/pipe/cap/atmos_init() ..() diff --git a/code/modules/atmospherics/machinery/pipes/manifold.dm b/code/modules/atmospherics/machinery/pipes/manifold.dm index 20dd2990888..8459b7dea3e 100644 --- a/code/modules/atmospherics/machinery/pipes/manifold.dm +++ b/code/modules/atmospherics/machinery/pipes/manifold.dm @@ -118,17 +118,14 @@ if(node3) node3.update_underlays() -/obj/machinery/atmospherics/pipe/manifold/update_icon(safety = 0) - ..() - - if(!check_icon_cache()) - return - +/obj/machinery/atmospherics/pipe/manifold/update_overlays() + . = ..() alpha = 255 + . += SSair.icon_manager.get_atmos_icon("manifold", , pipe_color, "core" + icon_connect_type) + . += SSair.icon_manager.get_atmos_icon("manifold", , , "clamps" + icon_connect_type) + update_underlays() - overlays.Cut() - overlays += SSair.icon_manager.get_atmos_icon("manifold", , pipe_color, "core" + icon_connect_type) - overlays += SSair.icon_manager.get_atmos_icon("manifold", , , "clamps" + icon_connect_type) +/obj/machinery/atmospherics/pipe/manifold/update_underlays() underlays.Cut() var/turf/T = get_turf(src) @@ -147,10 +144,6 @@ for(var/D in directions) add_underlay(T,,D,icon_connect_type) -/obj/machinery/atmospherics/pipe/manifold/update_underlays() - ..() - update_icon() - // A check to make sure both nodes exist - self-delete if they aren't present /obj/machinery/atmospherics/pipe/manifold/check_nodes_exist() if(!node1 && !node2 && !node3) diff --git a/code/modules/atmospherics/machinery/pipes/manifold4w.dm b/code/modules/atmospherics/machinery/pipes/manifold4w.dm index 5cefc6f723c..e75d4f4b842 100644 --- a/code/modules/atmospherics/machinery/pipes/manifold4w.dm +++ b/code/modules/atmospherics/machinery/pipes/manifold4w.dm @@ -91,16 +91,14 @@ if(node4) node4.update_underlays() -/obj/machinery/atmospherics/pipe/manifold4w/update_icon(safety = 0) - ..() - - if(!check_icon_cache()) - return - +/obj/machinery/atmospherics/pipe/manifold4w/update_overlays() + . = ..() alpha = 255 - overlays.Cut() - overlays += SSair.icon_manager.get_atmos_icon("manifold", , pipe_color, "4way" + icon_connect_type) - overlays += SSair.icon_manager.get_atmos_icon("manifold", , , "clamps_4way" + icon_connect_type) + . += SSair.icon_manager.get_atmos_icon("manifold", , pipe_color, "4way" + icon_connect_type) + . += SSair.icon_manager.get_atmos_icon("manifold", , , "clamps_4way" + icon_connect_type) + update_underlays() + +/obj/machinery/atmospherics/pipe/manifold4w/update_underlays() underlays.Cut() var/turf/T = get_turf(src) @@ -121,11 +119,6 @@ for(var/D in directions) add_underlay(T,,D,icon_connect_type) -/obj/machinery/atmospherics/pipe/manifold4w/update_underlays() - ..() - update_icon() - - // A check to make sure both nodes exist - self-delete if they aren't present /obj/machinery/atmospherics/pipe/manifold4w/check_nodes_exist() if(!node1 && !node2 && !node3 && !node4) diff --git a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple.dm b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple.dm index deec621d34c..340dd2ff880 100644 --- a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple.dm +++ b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple.dm @@ -137,20 +137,13 @@ if(node2) node2.update_underlays() -/obj/machinery/atmospherics/pipe/simple/update_icon(safety = 0) - ..() - - if(!check_icon_cache()) - return - +/obj/machinery/atmospherics/pipe/simple/update_overlays() + . = ..() alpha = 255 - - overlays.Cut() - if(node1 && node2) - overlays += SSair.icon_manager.get_atmos_icon("pipe", , pipe_color, pipe_icon + "intact" + icon_connect_type) + . += SSair.icon_manager.get_atmos_icon("pipe", , pipe_color, pipe_icon + "intact" + icon_connect_type) else - overlays += SSair.icon_manager.get_atmos_icon("pipe", , pipe_color, pipe_icon + "exposed[node1?1:0][node2?1:0]" + icon_connect_type) + . += SSair.icon_manager.get_atmos_icon("pipe", , pipe_color, pipe_icon + "exposed[node1?1:0][node2?1:0]" + icon_connect_type) // A check to make sure both nodes exist - self-delete if they aren't present /obj/machinery/atmospherics/pipe/simple/check_nodes_exist() diff --git a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_hidden.dm b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_hidden.dm index d3fafe950c0..a020519dd8f 100644 --- a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_hidden.dm +++ b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_hidden.dm @@ -38,16 +38,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/universal/detailed_examine() return "This allows you to connect 'normal' pipes, red 'scrubber' pipes, and blue 'supply' pipes." -/obj/machinery/atmospherics/pipe/simple/hidden/universal/update_icon(safety = 0) - ..() - - if(!check_icon_cache()) - return - +/obj/machinery/atmospherics/pipe/simple/hidden/universal/update_overlays() + . = list() alpha = 255 + . += SSair.icon_manager.get_atmos_icon("pipe", , pipe_color, "universal") + update_underlays() - overlays.Cut() - overlays += SSair.icon_manager.get_atmos_icon("pipe", , pipe_color, "universal") +/obj/machinery/atmospherics/pipe/simple/hidden/universal/update_underlays() underlays.Cut() if(node1) @@ -65,10 +62,6 @@ universal_underlays(,dir) universal_underlays(,turn(dir, -180)) -/obj/machinery/atmospherics/pipe/simple/hidden/universal/update_underlays() - ..() - update_icon() - /obj/machinery/atmospherics/pipe/simple/hidden/yellow color = PIPE_COLOR_YELLOW diff --git a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_visible.dm b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_visible.dm index 348453e758f..0706d592d63 100644 --- a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_visible.dm +++ b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_visible.dm @@ -55,16 +55,13 @@ /obj/machinery/atmospherics/pipe/simple/visible/universal/detailed_examine() return "This allows you to connect 'normal' pipes, red 'scrubber' pipes, and blue 'supply' pipes." -/obj/machinery/atmospherics/pipe/simple/visible/universal/update_icon(safety = 0) - ..() - - if(!check_icon_cache()) - return - +/obj/machinery/atmospherics/pipe/simple/visible/universal/update_overlays() + . = list() alpha = 255 + . += SSair.icon_manager.get_atmos_icon("pipe", , pipe_color, "universal") + update_underlays() - overlays.Cut() - overlays += SSair.icon_manager.get_atmos_icon("pipe", , pipe_color, "universal") +/obj/machinery/atmospherics/pipe/simple/visible/universal/update_underlays() underlays.Cut() if(node1) @@ -79,7 +76,3 @@ else universal_underlays(,dir) universal_underlays(,turn(dir, -180)) - -/obj/machinery/atmospherics/pipe/simple/visible/universal/update_underlays() - ..() - update_icon() diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index 4bf43e7f369..177be11324b 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -39,6 +39,15 @@ ) GLOBAL_DATUM_INIT(canister_icon_container, /datum/canister_icons, new()) +#define HOLDING_TANK 1 +#define CONNECTED_PORT 2 +#define LOW_PRESSURE 4 +#define NORMAL_PRESSURE 8 +#define HIGH_PRESSURE 16 +#define EXTREME_PRESSURE 32 +#define NEW_COLOR 64 +#define RESET 68 + /obj/machinery/portable_atmospherics/canister name = "canister" icon = 'icons/obj/atmos.dmi' @@ -56,7 +65,7 @@ GLOBAL_DATUM_INIT(canister_icon_container, /datum/canister_icons, new()) var/list/color_index // list which stores tgui color indexes for the recoloring options, to enable previously-set colors to show up right //lists for check_change() - var/list/oldcolor + var/list/old_color //passed to the ui to render the color lists var/list/colorcontainer @@ -69,7 +78,7 @@ GLOBAL_DATUM_INIT(canister_icon_container, /datum/canister_icons, new()) use_power = NO_POWER_USE interact_offline = TRUE var/release_log = "" - var/update_flag = 0 + var/update_flag = NONE /obj/machinery/portable_atmospherics/canister/New() ..() @@ -79,7 +88,7 @@ GLOBAL_DATUM_INIT(canister_icon_container, /datum/canister_icons, new()) "ter" = "none", "quart" = "none" ) - oldcolor = new /list() + old_color = new /list() colorcontainer = list( "prim" = list( "options" = GLOB.canister_icon_container.possiblemaincolor, @@ -111,78 +120,71 @@ GLOBAL_DATUM_INIT(canister_icon_container, /datum/canister_icons, new()) /obj/machinery/portable_atmospherics/canister/proc/check_change() var/old_flag = update_flag - update_flag = 0 - if(holding) - update_flag |= 1 + update_flag = NONE + if(holding_tank) + update_flag |= HOLDING_TANK if(connected_port) - update_flag |= 2 + update_flag |= CONNECTED_PORT var/tank_pressure = air_contents.return_pressure() if(tank_pressure < 10) - update_flag |= 4 + update_flag |= LOW_PRESSURE else if(tank_pressure < ONE_ATMOSPHERE) - update_flag |= 8 + update_flag |= NORMAL_PRESSURE else if(tank_pressure < 15*ONE_ATMOSPHERE) - update_flag |= 16 + update_flag |= HIGH_PRESSURE else - update_flag |= 32 + update_flag |= EXTREME_PRESSURE - if(list2params(oldcolor) != list2params(canister_color)) - update_flag |= 64 - oldcolor = canister_color.Copy() + if(list2params(old_color) != list2params(canister_color)) + update_flag |= NEW_COLOR + old_color = canister_color.Copy() if(update_flag == old_flag) - return 1 - else - return 0 + return FALSE + return TRUE -/obj/machinery/portable_atmospherics/canister/update_icon() +/obj/machinery/portable_atmospherics/canister/update_icon_state() /* -update_flag -1 = holding -2 = connected_port -4 = tank_pressure < 10 -8 = tank_pressure < ONE_ATMOS -16 = tank_pressure < 15*ONE_ATMOS -32 = tank_pressure go boom. -64 = colors (note: colors has to be applied every icon update) */ if(stat & BROKEN) - cut_overlays() icon_state = text("[]-1", canister_color["prim"])//yes, I KNOW the colours don't reflect when the can's borked, whatever. return if(icon_state != canister_color["prim"]) icon_state = canister_color["prim"] - if(check_change()) //Returns 1 if no change needed to icons. + if(!check_change()) //Returns FALSE if no change needed to icons. return - cut_overlays() +/obj/machinery/portable_atmospherics/canister/update_overlays() + . = ..() + if(stat & BROKEN) + return for(var/C in canister_color) if(C == "prim") continue if(canister_color[C] == "none") continue - add_overlay(canister_color[C]) + . += canister_color[C] - if(update_flag & 1) - add_overlay("can-open") - if(update_flag & 2) - add_overlay("can-connector") - if(update_flag & 4) - add_overlay("can-o0") - if(update_flag & 8) - add_overlay("can-o1") - else if(update_flag & 16) - add_overlay("can-o2") - else if(update_flag & 32) - add_overlay("can-o3") + if(update_flag & HOLDING_TANK) + . += "can-open" + if(update_flag & CONNECTED_PORT) + . += "can-connector" + if(update_flag & LOW_PRESSURE) + . += "can-o0" + if(update_flag & NORMAL_PRESSURE) + . += "can-o1" + else if(update_flag & HIGH_PRESSURE) + . += "can-o2" + else if(update_flag & EXTREME_PRESSURE) + . += "can-o3" - update_flag &= ~68 //the flag 64 represents change, not states. As such, we have to reset them to be able to detect a change on the next go. + update_flag &= ~RESET //the flag NEW_COLOR represents change, not states. As such, we have to reset them to be able to detect a change on the next go. return /obj/machinery/portable_atmospherics/canister/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) @@ -217,9 +219,9 @@ update_flag playsound(loc, 'sound/effects/spray.ogg', 10, TRUE, -3) update_icon() - if(holding) - holding.forceMove(T) - holding = null + if(holding_tank) + holding_tank.forceMove(T) + holding_tank = null /obj/machinery/portable_atmospherics/canister/process_atmos() if(stat & BROKEN) @@ -229,8 +231,8 @@ update_flag if(valve_open) var/datum/gas_mixture/environment - if(holding) - environment = holding.air_contents + if(holding_tank) + environment = holding_tank.air_contents else environment = loc.return_air() @@ -245,7 +247,7 @@ update_flag //Actually transfer the gas var/datum/gas_mixture/removed = air_contents.remove(transfer_moles) - if(holding) + if(holding_tank) environment.merge(removed) else loc.assume_air(removed) @@ -266,13 +268,13 @@ update_flag var/datum/gas_mixture/GM = return_air() if(GM && GM.volume>0) return GM.temperature - return 0 + return /obj/machinery/portable_atmospherics/canister/proc/return_pressure() var/datum/gas_mixture/GM = return_air() if(GM && GM.volume>0) return GM.return_pressure() - return 0 + return /obj/machinery/portable_atmospherics/canister/replace_tank(mob/living/user, close_valve) . = ..() @@ -281,8 +283,8 @@ update_flag valve_open = FALSE update_icon() investigate_log("Valve was closed by [key_name(user)].
", "atmos") - else if(valve_open && holding) - investigate_log("[key_name(user)] started a transfer into [holding].
", "atmos") + else if(valve_open && holding_tank) + investigate_log("[key_name(user)] started a transfer into [holding_tank].
", "atmos") /obj/machinery/portable_atmospherics/canister/attack_ai(mob/user) add_hiddenprint(user) @@ -302,20 +304,20 @@ update_flag /obj/machinery/portable_atmospherics/canister/ui_data() var/data = list() - data["portConnected"] = connected_port ? 1 : 0 + data["portConnected"] = connected_port ? TRUE : FALSE data["tankPressure"] = round(air_contents.return_pressure() ? air_contents.return_pressure() : 0) data["releasePressure"] = round(release_pressure ? release_pressure : 0) data["defaultReleasePressure"] = ONE_ATMOSPHERE data["minReleasePressure"] = round(ONE_ATMOSPHERE / 10) data["maxReleasePressure"] = round(ONE_ATMOSPHERE * 10) - data["valveOpen"] = valve_open ? 1 : 0 + data["valveOpen"] = valve_open ? TRUE : FALSE data["name"] = name - data["canLabel"] = can_label ? 1 : 0 + data["canLabel"] = can_label ? TRUE : FALSE data["colorContainer"] = colorcontainer.Copy() data["color_index"] = color_index - data["hasHoldingTank"] = holding ? 1 : 0 - if(holding) - data["holdingTank"] = list("name" = holding.name, "tankPressure" = round(holding.air_contents.return_pressure())) + data["hasHoldingTank"] = holding_tank ? TRUE : FALSE + if(holding_tank) + data["holdingTank"] = list("name" = holding_tank.name, "tankPressure" = round(holding_tank.air_contents.return_pressure())) return data /obj/machinery/portable_atmospherics/canister/ui_act(action, params) @@ -357,8 +359,8 @@ update_flag var/logmsg valve_open = !valve_open if(valve_open) - logmsg = "Valve was opened by [key_name(usr)], starting a transfer into the [holding || "air"].
" - if(!holding) + logmsg = "Valve was opened by [key_name(usr)], starting a transfer into the [holding_tank || "air"].
" + if(!holding_tank) logmsg = "Valve was opened by [key_name(usr)], starting a transfer into the air.
" if(air_contents.toxins > 0) message_admins("[key_name_admin(usr)] opened a canister that contains plasma in [get_area(src)]! (JMP)") @@ -367,14 +369,14 @@ update_flag message_admins("[key_name_admin(usr)] opened a canister that contains N2O in [get_area(src)]! (JMP)") log_admin("[key_name(usr)] opened a canister that contains N2O at [get_area(src)]: [x], [y], [z]") else - logmsg = "Valve was closed by [key_name(usr)], stopping the transfer into the [holding || "air"].
" + logmsg = "Valve was closed by [key_name(usr)], stopping the transfer into the [holding_tank || "air"].
" investigate_log(logmsg, "atmos") release_log += logmsg if("eject") - if(holding) + if(holding_tank) if(valve_open) valve_open = FALSE - release_log += "Valve was closed by [key_name(usr)], stopping the transfer into the [holding]
" + release_log += "Valve was closed by [key_name(usr)], stopping the transfer into the [holding_tank]
" replace_tank(usr, FALSE) if("recolor") if(can_label) @@ -420,7 +422,6 @@ update_flag icon_state = "whiters" //See New() can_label = FALSE - /obj/machinery/portable_atmospherics/canister/toxins/New() ..() @@ -428,7 +429,7 @@ update_flag air_contents.toxins = (maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature) update_icon() - return 1 + return TRUE /obj/machinery/portable_atmospherics/canister/oxygen/New() ..() @@ -437,7 +438,7 @@ update_flag air_contents.oxygen = (maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature) update_icon() - return 1 + return TRUE /obj/machinery/portable_atmospherics/canister/sleeping_agent/New() ..() @@ -446,7 +447,7 @@ update_flag air_contents.sleeping_agent = (maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature) update_icon() - return 1 + return TRUE /obj/machinery/portable_atmospherics/canister/nitrogen/New() ..() @@ -455,7 +456,7 @@ update_flag air_contents.nitrogen = (maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature) update_icon() - return 1 + return TRUE /obj/machinery/portable_atmospherics/canister/carbon_dioxide/New() ..() @@ -464,8 +465,7 @@ update_flag air_contents.carbon_dioxide = (maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature) update_icon() - return 1 - + return TRUE /obj/machinery/portable_atmospherics/canister/air/New() ..() @@ -475,14 +475,14 @@ update_flag air_contents.nitrogen = (N2STANDARD * maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature) update_icon() - return 1 + return TRUE /obj/machinery/portable_atmospherics/canister/custom_mix/New() ..() canister_color["prim"] = "whiters" update_icon() // Otherwise new canisters do not have their icon updated with the pressure light, likely want to add this to the canister class constructor, avoiding at current time to refrain from screwing up code for other canisters. --DZD - return 1 + return TRUE /obj/machinery/portable_atmospherics/canister/welder_act(mob/user, obj/item/I) if(!(stat & BROKEN)) @@ -495,3 +495,12 @@ update_flag to_chat(user, "You salvage whats left of [src]!") new /obj/item/stack/sheet/metal(drop_location(), 3) qdel(src) + +#undef HOLDING_TANK +#undef CONNECTED_PORT +#undef LOW_PRESSURE +#undef NORMAL_PRESSURE +#undef HIGH_PRESSURE +#undef EXTREME_PRESSURE +#undef NEW_COLOR +#undef RESET diff --git a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm index 6e8f23f7f98..04a14229d5b 100644 --- a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm +++ b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm @@ -6,7 +6,7 @@ var/datum/gas_mixture/air_contents = new var/obj/machinery/atmospherics/unary/portables_connector/connected_port - var/obj/item/tank/holding + var/obj/item/tank/holding_tank var/volume = 0 @@ -19,7 +19,7 @@ air_contents.volume = volume air_contents.temperature = T20C - return 1 + return TRUE /obj/machinery/portable_atmospherics/Initialize() . = ..() @@ -40,20 +40,17 @@ SSair.atmos_machinery -= src disconnect() QDEL_NULL(air_contents) - QDEL_NULL(holding) + QDEL_NULL(holding_tank) return ..() -/obj/machinery/portable_atmospherics/update_icon() - return null - /obj/machinery/portable_atmospherics/proc/connect(obj/machinery/atmospherics/unary/portables_connector/new_port) //Make sure not already connected to something else if(connected_port || !new_port || new_port.connected_device) - return 0 + return //Make sure are close enough for a valid connection if(new_port.loc != loc) - return 0 + return //Perform the connection connected_port = new_port @@ -66,18 +63,18 @@ anchored = TRUE //Prevent movement - return 1 + return TRUE /obj/machinery/portable_atmospherics/proc/disconnect() if(!connected_port) - return 0 + return anchored = FALSE connected_port.connected_device = null connected_port = null - return 1 + return TRUE /obj/machinery/portable_atmospherics/portableConnectorReturnAir() return air_contents @@ -90,24 +87,24 @@ return if(!ishuman(usr) && !issilicon(usr)) return - if(holding) - to_chat(user, "You remove [holding] from [src].") + if(holding_tank) + to_chat(user, "You remove [holding_tank] from [src].") replace_tank(user, TRUE) /obj/machinery/portable_atmospherics/examine(mob/user) . = ..() - if(holding) - . += "\The [src] contains [holding]. Alt-click [src] to remove it." + if(holding_tank) + . += "\The [src] contains [holding_tank]. Alt-click [src] to remove it." /obj/machinery/portable_atmospherics/proc/replace_tank(mob/living/user, close_valve, obj/item/tank/new_tank) - if(holding) - holding.forceMove(drop_location()) + if(holding_tank) + holding_tank.forceMove(drop_location()) if(Adjacent(user) && !issilicon(user)) - user.put_in_hands(holding) + user.put_in_hands(holding_tank) if(new_tank) - holding = new_tank + holding_tank = new_tank else - holding = null + holding_tank = null update_icon() return TRUE @@ -118,11 +115,11 @@ return var/obj/item/tank/T = W user.drop_item() - if(src.holding) - to_chat(user, "[holding ? "In one smooth motion you pop [holding] out of [src]'s connector and replace it with [T]" : "You insert [T] into [src]"].") + if(holding_tank) + to_chat(user, "[holding_tank ? "In one smooth motion you pop [holding_tank] out of [src]'s connector and replace it with [T]" : "You insert [T] into [src]"].") replace_tank(user, FALSE) T.loc = src - src.holding = T + holding_tank = T update_icon() return if((istype(W, /obj/item/analyzer)) && get_dist(user, src) <= 1) diff --git a/code/modules/atmospherics/machinery/portable/pump.dm b/code/modules/atmospherics/machinery/portable/pump.dm index 49383c09bea..4fd3c2a3805 100644 --- a/code/modules/atmospherics/machinery/portable/pump.dm +++ b/code/modules/atmospherics/machinery/portable/pump.dm @@ -24,21 +24,15 @@ connecting it to a connector port. The pump can pump the air in (sucking) or out (blowing), at a specific target pressure. The powercell inside can be \ replaced by using a screwdriver, and then adding a new cell. A tank of gas can also be attached to the air pump." -/obj/machinery/portable_atmospherics/pump/update_icon() - overlays = 0 - - if(on) - icon_state = "psiphon:1" - else - icon_state = "psiphon:0" - - if(holding) - overlays += "siphon-open" +/obj/machinery/portable_atmospherics/pump/update_icon_state() + icon_state = "psiphon:[on]" +/obj/machinery/portable_atmospherics/pump/update_overlays() + . = ..() + if(holding_tank) + . += "siphon-open" if(connected_port) - overlays += "siphon-connector" - - return + . += "siphon-connector" /obj/machinery/portable_atmospherics/pump/emp_act(severity) if(stat & (BROKEN|NOPOWER)) @@ -60,8 +54,8 @@ ..() if(on) var/datum/gas_mixture/environment - if(holding) - environment = holding.air_contents + if(holding_tank) + environment = holding_tank.air_contents else environment = loc.return_air() if(direction == DIRECTION_OUT) @@ -75,7 +69,7 @@ //Actually transfer the gas var/datum/gas_mixture/removed = air_contents.remove(transfer_moles) - if(holding) + if(holding_tank) environment.merge(removed) else loc.assume_air(removed) @@ -90,7 +84,7 @@ //Actually transfer the gas var/datum/gas_mixture/removed - if(holding) + if(holding_tank) removed = environment.remove(transfer_moles) else removed = loc.remove_air(transfer_moles) @@ -110,8 +104,8 @@ if(on) on = FALSE update_icon() - else if(on && holding && direction == DIRECTION_OUT) - investigate_log("[key_name(user)] started a transfer into [holding].
", "atmos") + else if(on && holding_tank && direction == DIRECTION_OUT) + investigate_log("[key_name(user)] started a transfer into [holding_tank].
", "atmos") /obj/machinery/portable_atmospherics/pump/attack_ai(mob/user) add_hiddenprint(user) @@ -138,9 +132,9 @@ "target_pressure" = round(target_pressure, 0.001), "tank_pressure" = air_contents.return_pressure() > 0 ? round(air_contents.return_pressure(), 0.001) : 0 ) - if(holding) + if(holding_tank) data["has_holding_tank"] = TRUE - data["holding_tank"] = list("name" = holding.name, "tank_pressure" = holding.air_contents.return_pressure() > 0 ? round(holding.air_contents.return_pressure(), 0.001) : 0) + data["holding_tank"] = list("name" = holding_tank.name, "tank_pressure" = holding_tank.air_contents.return_pressure() > 0 ? round(holding_tank.air_contents.return_pressure(), 0.001) : 0) else data["has_holding_tank"] = FALSE @@ -154,7 +148,7 @@ if("power") on = !on if(on && direction == DIRECTION_OUT) - investigate_log("[key_name(usr)] started a transfer into [holding].
", "atmos") + investigate_log("[key_name(usr)] started a transfer into [holding_tank].
", "atmos") update_icon() return TRUE @@ -163,15 +157,15 @@ direction = DIRECTION_IN else direction = DIRECTION_OUT - if(on && holding) - investigate_log("[key_name(usr)] started a transfer into [holding].
", "atmos") + if(on && holding_tank) + investigate_log("[key_name(usr)] started a transfer into [holding_tank].
", "atmos") return TRUE if("remove_tank") - if(holding) + if(holding_tank) on = FALSE - holding.forceMove(get_turf(src)) - holding = null + holding_tank.forceMove(get_turf(src)) + holding_tank = null update_icon() return TRUE diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm index 0904fd72a55..012a7e70444 100644 --- a/code/modules/atmospherics/machinery/portable/scrubber.dm +++ b/code/modules/atmospherics/machinery/portable/scrubber.dm @@ -30,21 +30,18 @@ ..(severity) -/obj/machinery/portable_atmospherics/scrubber/update_icon() - overlays = 0 - +/obj/machinery/portable_atmospherics/scrubber/update_icon_state() if(on) icon_state = "pscrubber:1" else icon_state = "pscrubber:0" - if(holding) - overlays += "scrubber-open" - +/obj/machinery/portable_atmospherics/scrubber/update_overlays() + . = ..() + if(holding_tank) + . += "scrubber-open" if(connected_port) - overlays += "scrubber-connector" - - return + . += "scrubber-connector" /obj/machinery/portable_atmospherics/scrubber/process_atmos() ..() @@ -60,15 +57,15 @@ /obj/machinery/portable_atmospherics/scrubber/proc/scrub(turf/simulated/tile) var/datum/gas_mixture/environment - if(holding) - environment = holding.air_contents + if(holding_tank) + environment = holding_tank.air_contents else environment = tile.return_air() var/transfer_moles = min(1,volume_rate/environment.volume)*environment.total_moles() //Take a gas sample var/datum/gas_mixture/removed - if(holding) + if(holding_tank) removed = environment.remove(transfer_moles) else removed = loc.remove_air(transfer_moles) @@ -95,7 +92,7 @@ //Remix the resulting gases air_contents.merge(filtered_out) - if(holding) + if(holding_tank) environment.merge(removed) else tile.assume_air(removed) @@ -130,9 +127,9 @@ "rate" = round(volume_rate, 0.001), "tank_pressure" = air_contents.return_pressure() > 0 ? round(air_contents.return_pressure(), 0.001) : 0 ) - if(holding) + if(holding_tank) data["has_holding_tank"] = TRUE - data["holding_tank"] = list("name" = holding.name, "tank_pressure" = holding.air_contents.return_pressure() > 0 ? round(holding.air_contents.return_pressure(), 0.001) : 0) + data["holding_tank"] = list("name" = holding_tank.name, "tank_pressure" = holding_tank.air_contents.return_pressure() > 0 ? round(holding_tank.air_contents.return_pressure(), 0.001) : 0) else data["has_holding_tank"] = FALSE @@ -149,9 +146,9 @@ return TRUE if("remove_tank") - if(holding) - holding.forceMove(get_turf(src)) - holding = null + if(holding_tank) + holding_tank.forceMove(get_turf(src)) + holding_tank = null update_icon() return TRUE @@ -183,13 +180,8 @@ /obj/machinery/portable_atmospherics/scrubber/huge/attack_hand(mob/user) to_chat(usr, "You can't directly interact with this machine. Use the area atmos computer.") -/obj/machinery/portable_atmospherics/scrubber/huge/update_icon() - overlays = 0 - - if(on) - icon_state = "scrubber:1" - else - icon_state = "scrubber:0" +/obj/machinery/portable_atmospherics/scrubber/huge/update_icon_state() + icon_state = "scrubber:[on]" /obj/machinery/portable_atmospherics/scrubber/huge/attackby(obj/item/W, mob/user, params) if((istype(W, /obj/item/analyzer)) && get_dist(user, src) <= 1) diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index 01444cd6c57..8a4db58ddb4 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -12,20 +12,15 @@ GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null) /obj/machinery/gateway/Initialize() ..() - update_icon() + update_icon(UPDATE_ICON_STATE) update_density_from_dir() /obj/machinery/gateway/proc/update_density_from_dir() if(dir == 2) density = FALSE - -/obj/machinery/gateway/update_icon() - if(active) - icon_state = "on" - return - icon_state = "off" - +/obj/machinery/gateway/update_icon_state() + icon_state = active ? "on" : "off" //this is da important part wot makes things go @@ -45,7 +40,7 @@ GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null) if(!GLOB.the_gateway) GLOB.the_gateway = src - update_icon() + update_icon(UPDATE_ICON_STATE) wait = world.time + GLOB.configuration.gateway.away_mission_delay return INITIALIZE_HINT_LATELOAD @@ -60,12 +55,8 @@ GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null) GLOB.the_gateway = null return ..() -/obj/machinery/gateway/centerstation/update_icon() - if(active) - icon_state = "oncenter" - return - icon_state = "offcenter" - +/obj/machinery/gateway/centerstation/update_icon_state() + icon_state = active ? "oncenter" : "offcenter" /obj/machinery/gateway/centerstation/process() @@ -115,17 +106,17 @@ GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null) for(var/obj/machinery/gateway/G in linked) G.active = TRUE - G.update_icon() + G.update_icon(UPDATE_ICON_STATE) active = TRUE - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/machinery/gateway/centerstation/proc/toggleoff() for(var/obj/machinery/gateway/G in linked) G.active = FALSE - G.update_icon() + G.update_icon(UPDATE_ICON_STATE) active = FALSE - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/machinery/gateway/centerstation/attack_hand(mob/user as mob) @@ -181,18 +172,15 @@ GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null) /obj/machinery/gateway/centeraway/Initialize() ..() - update_icon() + update_icon(UPDATE_ICON_STATE) stationgate = locate(/obj/machinery/gateway/centerstation) in GLOB.machines /obj/machinery/gateway/centeraway/update_density_from_dir() return -/obj/machinery/gateway/centeraway/update_icon() - if(active) - icon_state = "oncenter" - return - icon_state = "offcenter" +/obj/machinery/gateway/centeraway/update_icon_state() + icon_state = active ? "oncenter" : "offcenter" /obj/machinery/gateway/centeraway/proc/detect() @@ -228,17 +216,17 @@ GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null) for(var/obj/machinery/gateway/G in linked) G.active = TRUE - G.update_icon() + G.update_icon(UPDATE_ICON_STATE) active = TRUE - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/machinery/gateway/centeraway/proc/toggleoff() for(var/obj/machinery/gateway/G in linked) G.active = FALSE - G.update_icon() + G.update_icon(UPDATE_ICON_STATE) active = FALSE - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/machinery/gateway/centeraway/attack_hand(mob/user as mob) diff --git a/code/modules/awaymissions/mission_code/ruins/oldstation.dm b/code/modules/awaymissions/mission_code/ruins/oldstation.dm index 6165d75d1d5..6addd22877a 100644 --- a/code/modules/awaymissions/mission_code/ruins/oldstation.dm +++ b/code/modules/awaymissions/mission_code/ruins/oldstation.dm @@ -66,7 +66,7 @@ /obj/item/clothing/head/helmet/old name = "degrading helmet" desc = "Standard issue security helmet. Due to degradation the helmet's visor obstructs the users ability to see long distances." - tint = 2 + tint = FLASH_PROTECTION_WELDER /obj/item/clothing/suit/armor/vest/old name = "degrading armor vest" diff --git a/code/modules/awaymissions/pamphlet.dm b/code/modules/awaymissions/pamphlet.dm index ffbb188ada2..77e3f053ef1 100644 --- a/code/modules/awaymissions/pamphlet.dm +++ b/code/modules/awaymissions/pamphlet.dm @@ -34,5 +34,5 @@ environs." //we don't want the silly text overlay! -/obj/item/paper/pamphlet/update_icon() +/obj/item/paper/pamphlet/update_icon_state() return diff --git a/code/modules/buildmode/buttons.dm b/code/modules/buildmode/buttons.dm index 9f74ac9aeff..7c18de6be90 100644 --- a/code/modules/buildmode/buttons.dm +++ b/code/modules/buildmode/buttons.dm @@ -26,7 +26,7 @@ update_icon() return TRUE -/obj/screen/buildmode/mode/update_icon() +/obj/screen/buildmode/mode/update_icon_state() icon_state = bd.mode.get_button_iconstate() /obj/screen/buildmode/help @@ -43,8 +43,9 @@ screen_loc = "NORTH,WEST+2" name = "Change Dir" -/obj/screen/buildmode/bdir/update_icon() +/obj/screen/buildmode/bdir/update_icon(updates=UPDATE_ICON_STATE) dir = bd.build_dir + ..() /obj/screen/buildmode/bdir/Click() bd.toggle_dirswitch() diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 3f071e22665..381a993ac5c 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -165,6 +165,7 @@ var/obj/item/clothing/CL = I var/obj/item/clothing/PCL = picked_item CL.flags_cover = initial(PCL.flags_cover) + I.update_appearance() target.icon = initial(picked_item.icon) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 17525d0f52d..fe2a9ffaa53 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -17,13 +17,14 @@ righthand_file = 'icons/mob/inhands/clothing_righthand.dmi' var/alt_desc = null var/flash_protect = FLASH_PROTECTION_NONE //What level of bright light protection item has. 1 = Flashers, Flashes, & Flashbangs | 2 = Welding | -1 = OH GOD WELDING BURNT OUT MY RETINAS - var/tint = 0 //Sets the item's level of visual impairment tint, normally set to the same as flash_protect + var/tint = FLASH_PROTECTION_NONE //Sets the item's level of visual impairment tint, normally set to the same as flash_protect var/up = FALSE //but seperated to allow items to protect but not impair vision, like space helmets - var/visor_flags = 0 //flags that are added/removed when an item is adjusted up/down - var/visor_flags_inv = 0 //same as visor_flags, but for flags_inv + var/visor_flags = NONE //flags that are added/removed when an item is adjusted up/down + var/visor_flags_inv = NONE //same as visor_flags, but for flags_inv var/visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT | VISOR_VISIONFLAGS | VISOR_DARKNESSVIEW | VISOR_INVISVIEW //what to toggle when toggled with weldingvisortoggle() + var/can_toggle = FALSE var/toggle_message = null var/alt_toggle_message = null var/active_sound = null @@ -35,6 +36,13 @@ var/dyeable = FALSE w_class = WEIGHT_CLASS_SMALL +/obj/item/clothing/update_icon_state() + if(!can_toggle) + return + /// Done as such to not break chameleon gear since you can't rely on initial states + icon_state = "[replacetext("[icon_state]", "_up", "")][up ? "_up" : ""]" + return TRUE + /obj/item/clothing/proc/weldingvisortoggle(mob/user) //proc to toggle welding visors on helmets, masks, goggles, etc. if(!can_use(user)) return FALSE @@ -56,11 +64,11 @@ flags ^= visor_flags flags_inv ^= visor_flags_inv flags_cover ^= initial(flags_cover) - icon_state = "[initial(icon_state)][up ? "up" : ""]" if(visor_vars_to_toggle & VISOR_FLASHPROTECT) flash_protect ^= initial(flash_protect) if(visor_vars_to_toggle & VISOR_TINT) tint ^= initial(tint) + update_icon(UPDATE_ICON_STATE) /obj/item/clothing/proc/can_use(mob/user) if(user && ismob(user)) @@ -269,14 +277,14 @@ BLIND // can't see anything // Called just before an attack_hand(), in mob/UnarmedAttack() /obj/item/clothing/gloves/proc/Touch(atom/A, proximity) - return 0 // return 1 to cancel attack_hand() + return // return TRUE to cancel attack_hand() /obj/item/clothing/gloves/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/wirecutters)) if(!clipped) playsound(src.loc, W.usesound, 100, 1) user.visible_message("[user] snips the fingertips off [src].","You snip the fingertips off [src].") - clipped = 1 + clipped = TRUE name = "mangled [name]" desc = "[desc] They have had the fingertips cut off of them." update_icon() @@ -290,7 +298,7 @@ BLIND // can't see anything * Tries to turn the sensors off. Returns TRUE if it succeeds */ /obj/item/clothing/under/proc/turn_sensors_off() - if(has_sensor != 1) + if(has_sensor != SUIT_SENSOR_BINARY) return FALSE sensor_mode = SUIT_SENSOR_OFF return TRUE @@ -300,10 +308,10 @@ BLIND // can't see anything return if(has_sensor >= 2) to_chat(user, "The controls are locked.") - return 0 - if(has_sensor <= 0) + return + if(has_sensor <= SUIT_SENSOR_OFF) to_chat(user, "This suit does not have any sensors.") - return 0 + return var/list/modes = list("Off", "Binary sensors", "Vitals tracker", "Tracking beacon") var/switchMode = input("Select a sensor mode:", "Suit Sensor Mode", modes[sensor_mode + 1]) in modes @@ -374,7 +382,9 @@ BLIND // can't see anything var/see_in_dark = 0 var/lighting_alpha - var/can_toggle = null +/obj/item/clothing/head/update_icon_state() + if(..()) + item_state = "[replacetext("[item_state]", "_up", "")][up ? "_up" : ""]" //Mask /obj/item/clothing/mask @@ -382,7 +392,6 @@ BLIND // can't see anything icon = 'icons/obj/clothing/masks.dmi' body_parts_covered = HEAD slot_flags = SLOT_MASK - var/mask_adjusted = 0 var/adjusted_flags = null strip_delay = 40 put_on_delay = 40 @@ -392,12 +401,14 @@ BLIND // can't see anything var/mob/living/carbon/human/H = usr //Used to check if the mask is on the head, to check if the hands are full, and to turn off internals if they were on when the mask was pushed out of the way. if(user.incapacitated()) //This check allows you to adjust your masks while you're buckled into chairs or beds. return - if(mask_adjusted) - icon_state = initial(icon_state) + + up = !up + update_icon(UPDATE_ICON_STATE) + + if(!up) gas_transfer_coefficient = initial(gas_transfer_coefficient) permeability_coefficient = initial(permeability_coefficient) to_chat(user, "You push \the [src] back into place.") - mask_adjusted = 0 slot_flags = initial(slot_flags) if(flags_inv != initial(flags_inv)) if(initial(flags_inv) & HIDEFACE) //If the mask is one that hides the face and can be adjusted yet lost that trait when it was adjusted, make it hide the face again. @@ -415,11 +426,9 @@ BLIND // can't see anything user.unEquip(src) user.put_in_hands(src) else - icon_state += "_up" to_chat(user, "You push \the [src] out of the way.") gas_transfer_coefficient = null permeability_coefficient = null - mask_adjusted = 1 if(adjusted_flags) slot_flags = adjusted_flags if(ishuman(user) && H.internal && !H.get_organ_slot("breathing_tube") && user.wear_mask == src) /*If the user was wearing the mask providing internals on their face at the time it was adjusted, turn off internals. @@ -439,7 +448,7 @@ BLIND // can't see anything else //Otherwise, put it in an available hand, the active one preferentially. user.unEquip(src) user.put_in_hands(src) - H.wear_mask_update(src, toggle_off = mask_adjusted) + H.wear_mask_update(src, toggle_off = up) usr.update_inv_wear_mask() usr.update_inv_head() for(var/X in actions) @@ -448,7 +457,7 @@ BLIND // can't see anything // Changes the speech verb when wearing a mask if a value is returned /obj/item/clothing/mask/proc/change_speech_verb() - return + return //Shoes /obj/item/clothing/shoes @@ -456,9 +465,9 @@ BLIND // can't see anything icon = 'icons/obj/clothing/shoes.dmi' desc = "Comfortable-looking shoes." gender = PLURAL //Carn: for grammatically correct text-parsing - var/chained = 0 - var/can_cut_open = 0 - var/cut_open = 0 + var/chained = FALSE + var/can_cut_open = FALSE + var/cut_open = FALSE body_parts_covered = FEET slot_flags = SLOT_FEET @@ -491,20 +500,34 @@ BLIND // can't see anything if(!cut_open) playsound(src.loc, I.usesound, 100, 1) user.visible_message("[user] cuts open the toes of [src].","You cut open the toes of [src].") - cut_open = 1 - icon_state = "[icon_state]_opentoe" - item_state = "[item_state]_opentoe" - name = "mangled [name]" - desc = "[desc] They have had their toes opened up." - update_icon() + cut_open = TRUE + update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_ICON_STATE) else to_chat(user, "[src] have already had [p_their()] toes cut open!") return else return ..() +/obj/item/clothing/shoes/update_name() + . = ..() + if(!cut_open) + return + name = "mangled [initial(name)]" + +/obj/item/clothing/shoes/update_desc() + . = ..() + if(!cut_open) + return + desc = "[initial(desc)] They have had their toes opened up." + +/obj/item/clothing/shoes/update_icon_state() + if(!cut_open) + return + icon_state = "[icon_state]_opentoe" + item_state = "[item_state]_opentoe" + /obj/item/proc/negates_gravity() - return 0 + return //Suit /obj/item/clothing/suit @@ -517,60 +540,63 @@ BLIND // can't see anything pickup_sound = 'sound/items/handling/cloth_pickup.ogg' slot_flags = SLOT_OCLOTHING var/blood_overlay_type = "suit" - var/suittoggled = FALSE - var/suit_adjusted = 0 - var/ignore_suitadjust = 1 + var/suit_toggled = FALSE + var/suit_adjusted = FALSE + var/ignore_suitadjust = TRUE var/adjust_flavour = null var/list/hide_tail_by_species = null //Proc that opens and closes jackets. /obj/item/clothing/suit/proc/adjustsuit(mob/user) - if(!ignore_suitadjust) - if(!user.incapacitated()) - if(!HAS_TRAIT(user, TRAIT_HULK)) - if(suit_adjusted) - var/flavour = "close" - icon_state = copytext(icon_state, 1, findtext(icon_state, "_open")) /*Trims the '_open' off the end of the icon state, thus avoiding a case where jackets that start open will - end up with a suffix of _open_open if adjusted twice, since their initial state is _open. */ - item_state = copytext(item_state, 1, findtext(item_state, "_open")) - if(adjust_flavour) - flavour = "[copytext(adjust_flavour, 3, length(adjust_flavour) + 1)] up" //Trims off the 'un' at the beginning of the word. unzip -> zip, unbutton->button. - to_chat(user, "You [flavour] \the [src].") - suit_adjusted = 0 //Suit is no longer adjusted. - for(var/X in actions) - var/datum/action/A = X - A.UpdateButtonIcon() - else - var/flavour = "open" - icon_state += "_open" - item_state += "_open" - if(adjust_flavour) - flavour = "[adjust_flavour]" - to_chat(user, "You [flavour] \the [src].") - suit_adjusted = 1 //Suit's adjusted. - for(var/X in actions) - var/datum/action/A = X - A.UpdateButtonIcon() - else - if(user.canUnEquip(src)) //Checks to see if the item can be unequipped. If so, lets shred. Otherwise, struggle and fail. - if(contents) //If the suit's got any storage capability... - for(var/obj/item/O in contents) //AVOIDING ITEM LOSS. Check through everything that's stored in the jacket and see if one of the items is a pocket. - if(istype(O, /obj/item/storage/internal)) //If it's a pocket... - if(O.contents) //Check to see if the pocket's got anything in it. - for(var/obj/item/I in O.contents) //Dump the pocket out onto the floor below the user. - user.unEquip(I,1) - - user.visible_message("[user] bellows, [pick("shredding", "ripping open", "tearing off")] [user.p_their()] jacket in a fit of rage!","You accidentally [pick("shred", "rend", "tear apart")] [src] with your [pick("excessive", "extreme", "insane", "monstrous", "ridiculous", "unreal", "stupendous")] [pick("power", "strength")]!") - user.unEquip(src) - qdel(src) //Now that the pockets have been emptied, we can safely destroy the jacket. - user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!")) - else - to_chat(user, "You yank and pull at \the [src] with your [pick("excessive", "extreme", "insane", "monstrous", "ridiculous", "unreal", "stupendous")] [pick("power", "strength")], however you are unable to change its state!")//Yep, that's all they get. Avoids having to snowflake in a cooldown. - - return - user.update_inv_wear_suit() - else + if(ignore_suitadjust) to_chat(user, "You attempt to button up the velcro on \the [src], before promptly realising how foolish you are.") + return + if(user.incapacitated()) + return + + if(HAS_TRAIT(user, TRAIT_HULK)) + if(user.canUnEquip(src)) //Checks to see if the item can be unequipped. If so, lets shred. Otherwise, struggle and fail. + if(contents) //If the suit's got any storage capability... + for(var/obj/item/O in contents) //AVOIDING ITEM LOSS. Check through everything that's stored in the jacket and see if one of the items is a pocket. + if(istype(O, /obj/item/storage/internal)) //If it's a pocket... + if(O.contents) //Check to see if the pocket's got anything in it. + for(var/obj/item/I in O.contents) //Dump the pocket out onto the floor below the user. + user.unEquip(I,1) + + user.visible_message("[user] bellows, [pick("shredding", "ripping open", "tearing off")] [user.p_their()] jacket in a fit of rage!","You accidentally [pick("shred", "rend", "tear apart")] [src] with your [pick("excessive", "extreme", "insane", "monstrous", "ridiculous", "unreal", "stupendous")] [pick("power", "strength")]!") + user.unEquip(src) + qdel(src) //Now that the pockets have been emptied, we can safely destroy the jacket. + user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!")) + user.update_inv_wear_suit() + return + else + to_chat(user, "You yank and pull at \the [src] with your [pick("excessive", "extreme", "insane", "monstrous", "ridiculous", "unreal", "stupendous")] [pick("power", "strength")], however you are unable to change its state!")//Yep, that's all they get. Avoids having to snowflake in a cooldown. + return + + if(suit_adjusted) + var/flavour = "close" + icon_state = copytext(icon_state, 1, findtext(icon_state, "_open")) /*Trims the '_open' off the end of the icon state, thus avoiding a case where jackets that start open will end up with a suffix of _open_open if adjusted twice, since their initial state is _open. */ + item_state = copytext(item_state, 1, findtext(item_state, "_open")) + if(adjust_flavour) + flavour = "[copytext(adjust_flavour, 3, length(adjust_flavour) + 1)] up" //Trims off the 'un' at the beginning of the word. unzip -> zip, unbutton->button. + to_chat(user, "You [flavour] \the [src].") + for(var/X in actions) + var/datum/action/A = X + A.UpdateButtonIcon() + else + var/flavour = "open" + icon_state += "_open" + item_state += "_open" + if(adjust_flavour) + flavour = "[adjust_flavour]" + to_chat(user, "You [flavour] \the [src].") + for(var/X in actions) + var/datum/action/A = X + A.UpdateButtonIcon() + + suit_adjusted = !suit_adjusted + update_icon(UPDATE_ICON_STATE) + user.update_inv_wear_suit() /obj/item/clothing/suit/equipped(mob/living/carbon/human/user, slot) //Handle tail-hiding on a by-species basis. ..() @@ -672,7 +698,7 @@ BLIND // can't see anything 3 = Report location */ var/list/accessories = list() - var/displays_id = 1 + var/displays_id = TRUE var/rolled_down = FALSE var/basecolor diff --git a/code/modules/clothing/glasses/engine_goggles.dm b/code/modules/clothing/glasses/engine_goggles.dm index a17cd7a897b..2d9db5d9d1a 100644 --- a/code/modules/clothing/glasses/engine_goggles.dm +++ b/code/modules/clothing/glasses/engine_goggles.dm @@ -22,7 +22,7 @@ /obj/item/clothing/glasses/meson/engine/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/clothing/glasses/meson/engine/Destroy() STOP_PROCESSING(SSobj, src) @@ -46,7 +46,7 @@ if(H.glasses == src) H.update_sight() - update_icon() + update_icon(UPDATE_ICON_STATE) for(var/X in actions) var/datum/action/A = X A.UpdateButtonIcon() @@ -71,7 +71,7 @@ var/mob/living/carbon/human/user = loc user.show_rads(range * 5) // Rads are easier to see than wires under the floor -/obj/item/clothing/glasses/meson/engine/update_icon() +/obj/item/clothing/glasses/meson/engine/update_icon_state() icon_state = "trayson-[mode]" update_mob() diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index ee031f9f622..54d0e0193b4 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -32,6 +32,10 @@ H.update_nearsighted_effects() +/obj/item/clothing/glasses/update_icon_state() + if(..()) + item_state = "[replacetext("[item_state]", "_up", "")][up ? "_up" : ""]" + /obj/item/clothing/glasses/visor_toggling() ..() if(visor_vars_to_toggle & VISOR_VISIONFLAGS) @@ -272,7 +276,7 @@ item_state = "sunglasses" see_in_dark = 1 flash_protect = FLASH_PROTECTION_FLASH - tint = 1 + tint = FLASH_PROTECTION_FLASH prescription_upgradable = TRUE dog_fashion = /datum/dog_fashion/head sprite_sheets = list( @@ -288,7 +292,7 @@ item_state = "sunglasses" see_in_dark = 0 flash_protect = FLASH_PROTECTION_NONE - tint = 0 + tint = FLASH_PROTECTION_NONE sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', @@ -341,7 +345,7 @@ item_state = "sunglasses" see_in_dark = 1 flash_protect = FLASH_PROTECTION_FLASH - tint = 1 + tint = FLASH_PROTECTION_FLASH sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', @@ -367,7 +371,8 @@ item_state = "welding-g" actions_types = list(/datum/action/item_action/toggle) flash_protect = FLASH_PROTECTION_WELDER - tint = 2 + tint = FLASH_PROTECTION_WELDER + can_toggle = TRUE visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', @@ -384,7 +389,7 @@ icon_state = "rwelding-g" item_state = "rwelding-g" flash_protect = FLASH_PROTECTION_WELDER - tint = 0 + tint = FLASH_PROTECTION_NONE /obj/item/clothing/glasses/sunglasses/blindfold name = "blindfold" @@ -399,7 +404,7 @@ name = "tattered blindfold" desc = "A see-through blindfold perfect for cheating at games like pin the stunbaton on the clown." flash_protect = FLASH_PROTECTION_NONE - tint = 0 + tint = FLASH_PROTECTION_NONE /obj/item/clothing/glasses/sunglasses/prescription prescription = 1 @@ -496,7 +501,7 @@ flags_cover = GLASSESCOVERSEYES actions_types = list(/datum/action/item_action/toggle) up = FALSE - tint = 0 + tint = FLASH_PROTECTION_NONE sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', @@ -525,15 +530,12 @@ /obj/item/clothing/glasses/proc/toggle_veil() if(HAS_TRAIT(usr, TRAIT_HANDS_BLOCKED) || usr.incapacitated()) return - + up = !up if(up) - up = !up - tint = initial(tint) - to_chat(usr, "You activate [src], allowing you to see.") - else - up = !up tint = 3 - to_chat(usr, "You deactivate [src], obscuring your vision.") + else + tint = initial(tint) + to_chat(usr, up ? "You deactivate [src], obscuring your vision." : "You activate [src], allowing you to see.") var/mob/living/carbon/user = usr user.update_tint() user.update_inv_glasses() diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index b6ad033fb45..adae31e51b7 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -57,7 +57,7 @@ icon_state = "sunhudmed" see_in_dark = 1 flash_protect = FLASH_PROTECTION_FLASH - tint = 1 + tint = FLASH_PROTECTION_FLASH /obj/item/clothing/glasses/hud/diagnostic name = "diagnostic HUD" @@ -88,7 +88,7 @@ icon_state = "sunhuddiag" item_state = "glasses" flash_protect = FLASH_PROTECTION_FLASH - tint = 1 + tint = FLASH_PROTECTION_FLASH /obj/item/clothing/glasses/hud/security name = "security HUD" @@ -133,7 +133,7 @@ origin_tech = "magnets=3;combat=3;engineering=3" see_in_dark = 1 flash_protect = FLASH_PROTECTION_FLASH - tint = 1 + tint = FLASH_PROTECTION_FLASH prescription_upgradable = TRUE sprite_sheets = list( @@ -220,7 +220,7 @@ icon_state = "sunhudskill" see_in_dark = 1 // None of these three can be converted to booleans. Do not try it. flash_protect = FLASH_PROTECTION_FLASH - tint = 1 + tint = FLASH_PROTECTION_FLASH prescription_upgradable = TRUE sprite_sheets = list( "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index afd2bea4d7e..62fdb63a927 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -9,7 +9,7 @@ min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT strip_delay = 40 put_on_delay = 20 - clipped = 1 + clipped = TRUE /obj/item/clothing/gloves/cyborg name = "cyborg gloves" @@ -93,7 +93,7 @@ /obj/item/clothing/gloves/color/yellow/stun/New() ..() - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/item/clothing/gloves/color/yellow/stun/Destroy() QDEL_NULL(cell) @@ -123,12 +123,11 @@ return TRUE return FALSE -/obj/item/clothing/gloves/color/yellow/stun/update_icon() - ..() - overlays.Cut() - overlays += "gloves_wire" +/obj/item/clothing/gloves/color/yellow/stun/update_overlays() + . = ..() + . += "gloves_wire" if(cell) - overlays += "gloves_cell" + . += "gloves_cell" /obj/item/clothing/gloves/color/yellow/stun/attackby(obj/item/W, mob/living/user, params) if(istype(W, /obj/item/stock_parts/cell)) @@ -139,7 +138,7 @@ W.forceMove(src) cell = W to_chat(user, "You attach [W] to [src].") - update_icon() + update_icon(UPDATE_OVERLAYS) else to_chat(user, "[src] already has a cell.") else @@ -153,7 +152,7 @@ to_chat(user, "You cut [cell] away from [src].") cell.forceMove(get_turf(loc)) cell = null - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/item/clothing/gloves/color/yellow/fake/examine(mob/user) . = ..() diff --git a/code/modules/clothing/gloves/rings.dm b/code/modules/clothing/gloves/rings.dm index acae9edbea9..1a608b31af7 100644 --- a/code/modules/clothing/gloves/rings.dm +++ b/code/modules/clothing/gloves/rings.dm @@ -13,9 +13,9 @@ /obj/item/clothing/gloves/ring/New() ..() - update_icon() + update_icon(UPDATE_ICON_STATE) -/obj/item/clothing/gloves/ring/update_icon() +/obj/item/clothing/gloves/ring/update_icon_state() icon_state = "[stud ? "d_" : ""][ring_color]ring" /obj/item/clothing/gloves/ring/examine(mob/user) @@ -33,8 +33,8 @@ else if(D.amount >= 1) D.use(1) - stud = 1 - update_icon() + stud = TRUE + update_icon(UPDATE_ICON_STATE) to_chat(usr, "You socket the diamond into [src].") // s'pensive diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 5462a209a53..5e50da79b76 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -25,9 +25,9 @@ turn_on(user) else turn_off(user) - update_icon() + update_icon(UPDATE_ICON_STATE) -/obj/item/clothing/head/hardhat/update_icon() +/obj/item/clothing/head/hardhat/update_icon_state() icon_state = "hardhat[on]_[item_color]" item_state = "hardhat[on]_[item_color]" if(ishuman(loc)) @@ -36,7 +36,6 @@ for(var/X in actions) var/datum/action/A = X A.UpdateButtonIcon() - ..() /obj/item/clothing/head/hardhat/proc/turn_on(mob/user) set_light(brightness_on) @@ -48,7 +47,7 @@ if(on) on = FALSE turn_off(user) - update_icon() + update_icon(UPDATE_ICON_STATE) visible_message("[src]'s light fades and turns off.") /obj/item/clothing/head/hardhat/orange diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 936fe1f0b0f..6facbd827be 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -27,9 +27,8 @@ up = !up flags ^= visor_flags flags_inv ^= visor_flags_inv - icon_state = "[initial(icon_state)][up ? "up" : ""]" to_chat(user, "[up ? alt_toggle_message : toggle_message] \the [src]") - + update_icon(UPDATE_ICON_STATE) user.update_inv_head() if(active_sound) @@ -39,7 +38,6 @@ if(toggle_sound) playsound(src.loc, "[toggle_sound]", 100, 0, 4) - /obj/item/clothing/head/helmet/visor name = "visor helmet" desc = "A helmet with a built-in visor. It doesn't seem to do anything, but it sure looks cool!" diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 061da93fe9e..5c09f1b5584 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -20,7 +20,8 @@ item_state = "welding" materials = list(MAT_METAL=1750, MAT_GLASS=400) flash_protect = FLASH_PROTECTION_WELDER - tint = 2 + tint = FLASH_PROTECTION_WELDER + can_toggle = TRUE armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 60) flags_inv = (HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE) actions_types = list(/datum/action/item_action/toggle) @@ -35,6 +36,9 @@ "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi' ) +/obj/item/clothing/head/welding/attack_self(mob/user) + weldingvisortoggle(user) + /obj/item/clothing/head/welding/flamedecal name = "flame decal welding helmet" desc = "A welding helmet adorned with flame decals, and several cryptic slogans of varying degrees of legibility." @@ -50,38 +54,6 @@ desc = "A white welding helmet with a character written across it." icon_state = "welding_white" -/obj/item/clothing/head/welding/attack_self() - toggle() - -/obj/item/clothing/head/welding/proc/toggle() - if(up) - up = !up - flags_cover |= (HEADCOVERSEYES | HEADCOVERSMOUTH) - flags_inv |= (HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE) - icon_state = initial(icon_state) - to_chat(usr, "You flip [src] down to protect your eyes.") - flash_protect = FLASH_PROTECTION_WELDER - tint = 2 - else - up = !up - flags_cover &= ~(HEADCOVERSEYES | HEADCOVERSMOUTH) - flags_inv &= ~(HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE) - icon_state = "[initial(icon_state)]up" - to_chat(usr, "You push [src] up out of your face.") - flash_protect = FLASH_PROTECTION_NONE - tint = 0 - var/mob/living/carbon/user = usr - user.update_tint() - //so our mob-overlays update - user.update_inv_wear_mask() - user.update_inv_head() - - for(var/X in actions) - var/datum/action/A = X - A.UpdateButtonIcon() - - - /* * Cakehat */ @@ -194,14 +166,16 @@ var/icon/mob dog_fashion = /datum/dog_fashion/head/kitty -/obj/item/clothing/head/kitty/update_icon(mob/living/carbon/human/user) - if(!istype(user)) return +/obj/item/clothing/head/kitty/update_icon(updates=ALL, mob/living/carbon/human/user) + ..() + if(!istype(user)) + return var/obj/item/organ/external/head/head_organ = user.get_organ("head") - mob = new/icon("icon" = 'icons/mob/clothing/head.dmi', "icon_state" = "kitty") + mob = new/icon("icon" = 'icons/mob/clothing/head.dmi', "icon_state" = icon_state) mob.Blend(head_organ.hair_colour, ICON_ADD) - var/icon/earbit = new/icon("icon" = 'icons/mob/clothing/head.dmi', "icon_state" = "kittyinner") + var/icon/earbit = new/icon("icon" = 'icons/mob/clothing/head.dmi', "icon_state" = "[icon_state]inner") mob.Blend(earbit, ICON_OVERLAY) icon_override = mob @@ -209,25 +183,13 @@ /obj/item/clothing/head/kitty/equipped(mob/M, slot) . = ..() if(ishuman(M) && slot == slot_head) - update_icon(M) - + update_icon(NONE, M) /obj/item/clothing/head/kitty/mouse name = "mouse ears" desc = "A pair of mouse ears. Squeak!" icon_state = "mousey" -/obj/item/clothing/head/kitty/mouse/update_icon(mob/living/carbon/human/user) - if(!istype(user)) return - var/obj/item/organ/external/head/head_organ = user.get_organ("head") - mob = new/icon("icon" = 'icons/mob/clothing/head.dmi', "icon_state" = "mousey") - mob.Blend(head_organ.hair_colour, ICON_ADD) - - var/icon/earbit = new/icon("icon" = 'icons/mob/clothing/head.dmi', "icon_state" = "mouseyinner") - mob.Blend(earbit, ICON_OVERLAY) - - icon_override = mob - /obj/item/clothing/head/cardborg name = "cardborg helmet" desc = "A helmet made out of a box." diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index 895b0214f71..44bf65214db 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -5,6 +5,7 @@ item_state = "breath" flags = AIRTIGHT flags_cover = MASKCOVERSMOUTH + can_toggle = TRUE w_class = WEIGHT_CLASS_SMALL gas_transfer_coefficient = 0.10 permeability_coefficient = 0.50 diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 0410fe45e81..f0163d8753b 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -29,12 +29,13 @@ item_state = "weldingmask" materials = list(MAT_METAL=4000, MAT_GLASS=2000) flash_protect = FLASH_PROTECTION_WELDER - tint = 2 + tint = FLASH_PROTECTION_WELDER armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 55) origin_tech = "materials=2;engineering=3" actions_types = list(/datum/action/item_action/toggle) flags_inv = HIDEEARS|HIDEEYES|HIDEFACE flags_cover = MASKCOVERSEYES + can_toggle = TRUE visor_flags_inv = HIDEEYES resistance_flags = FIRE_PROOF @@ -48,6 +49,7 @@ actions_types = list(/datum/action/item_action/adjust) armor = list(MELEE = 10, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 0, BIO = 50, RAD = 0, FIRE = 20, ACID = 40) resistance_flags = FIRE_PROOF + can_toggle = TRUE sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/mask.dmi', @@ -66,7 +68,7 @@ /obj/item/clothing/mask/gas/explorer/adjustmask(user) ..() - w_class = mask_adjusted ? WEIGHT_CLASS_SMALL : WEIGHT_CLASS_NORMAL + w_class = up ? WEIGHT_CLASS_SMALL : WEIGHT_CLASS_NORMAL /obj/item/clothing/mask/gas/explorer/folded/Initialize() . = ..() @@ -214,6 +216,7 @@ var/phrase = 1 var/aggressiveness = 1 var/safety = 1 + can_toggle = TRUE actions_types = list(/datum/action/item_action/halt, /datum/action/item_action/adjust, /datum/action/item_action/selectphrase) var/phrase_list = list( @@ -240,6 +243,7 @@ name = "head of security's SWAT mask" desc = "A close-fitting tactical mask with an especially aggressive Compli-o-nator 3000. It has a tan stripe." icon_state = "hosmask" + can_toggle = FALSE aggressiveness = 3 phrase = 12 actions_types = list(/datum/action/item_action/halt, /datum/action/item_action/selectphrase) @@ -248,6 +252,7 @@ name = "warden's SWAT mask" desc = "A close-fitting tactical mask with an especially aggressive Compli-o-nator 3000. It has a blue stripe." icon_state = "wardenmask" + can_toggle = FALSE aggressiveness = 3 phrase = 12 actions_types = list(/datum/action/item_action/halt, /datum/action/item_action/selectphrase) diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index b1ef8680a4f..3b7823de94f 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -208,6 +208,7 @@ permeability_coefficient = 0.01 armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 25, RAD = 0, FIRE = 0, ACID = 0) actions_types = list(/datum/action/item_action/adjust) + can_toggle = TRUE sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/mask.dmi', @@ -424,6 +425,7 @@ adjusted_flags = SLOT_HEAD icon_state = "bandbotany" dyeable = TRUE + can_toggle = TRUE sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/mask.dmi', @@ -434,7 +436,7 @@ "Drask" = 'icons/mob/clothing/species/drask/mask.dmi' ) actions_types = list(/datum/action/item_action/adjust) - + can_toggle = TRUE /obj/item/clothing/mask/bandana/attack_self(mob/user) adjustmask(user) diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm index 5cab13e9447..9297fa2d12c 100644 --- a/code/modules/clothing/spacesuits/alien.dm +++ b/code/modules/clothing/spacesuits/alien.dm @@ -147,7 +147,7 @@ desc = "An almost organic looking nonhuman pressure suit." /obj/item/clothing/under/vox - has_sensor = 0 + has_sensor = FALSE icon = 'icons/obj/clothing/species/vox/uniforms.dmi' species_restricted = list("Vox") sprite_sheets = list( diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index de2f2263b98..4030d17e10a 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -341,7 +341,7 @@ visor_flags_inv = HIDEMASK|HIDEEYES|HIDEFACE|HIDETAIL visor_flags = STOPSPRESSUREDMAGE -/obj/item/clothing/head/helmet/space/hardsuit/syndi/update_icon() +/obj/item/clothing/head/helmet/space/hardsuit/syndi/update_icon_state() icon_state = "hardsuit[on]-[item_color]" /obj/item/clothing/head/helmet/space/hardsuit/syndi/New() @@ -417,7 +417,7 @@ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi jetpack = /obj/item/tank/jetpack/suit -/obj/item/clothing/suit/space/hardsuit/syndi/update_icon() +/obj/item/clothing/suit/space/hardsuit/syndi/update_icon_state() icon_state = "hardsuit[on]-[item_color]" //Elite Syndie suit @@ -462,7 +462,7 @@ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/freedom sprite_sheets = null -/obj/item/clothing/suit/space/hardsuit/syndi/freedom/update_icon() +/obj/item/clothing/suit/space/hardsuit/syndi/freedom/update_icon_state() return /obj/item/clothing/head/helmet/space/hardsuit/syndi/freedom @@ -472,7 +472,7 @@ item_state = "griffinhat" sprite_sheets = null -/obj/item/clothing/head/helmet/space/hardsuit/syndi/freedom/update_icon() +/obj/item/clothing/head/helmet/space/hardsuit/syndi/freedom/update_icon_state() return //Medical hardsuit diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index debdb7e5ffe..a871eb5171a 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -6,7 +6,7 @@ item_state = "plasmaman-helm" strip_delay = 80 flash_protect = FLASH_PROTECTION_WELDER - tint = 2 + tint = FLASH_PROTECTION_WELDER armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 100, RAD = 0, FIRE = 100, ACID = 75) resistance_flags = FIRE_PROOF var/brightness_on = 4 //luminosity when the light is on @@ -28,7 +28,6 @@ ..() visor_toggling() update_icon() - cut_overlays() /obj/item/clothing/head/helmet/space/plasmaman/AltClick(mob/user) if(!user.incapacitated() && Adjacent(user)) @@ -57,20 +56,21 @@ playsound(src, 'sound/mecha/mechmove03.ogg', 50, 1) //Visors don't just come from nothing update_icon() -/obj/item/clothing/head/helmet/space/plasmaman/update_icon() - cut_overlays() - add_overlay(visor_icon) - ..() +/obj/item/clothing/head/helmet/space/plasmaman/update_icon_state() + icon_state = "[initial(icon_state)][on ? "-light":""]" + item_state = icon_state actions_types = list(/datum/action/item_action/toggle_helmet_light) +/obj/item/clothing/head/helmet/space/plasmaman/update_overlays() + . = ..() + . += visor_icon + /obj/item/clothing/head/helmet/space/plasmaman/attack_self(mob/user) toggle_light(user) /obj/item/clothing/head/helmet/space/plasmaman/proc/toggle_light(mob/user) if(up) on = !on - icon_state = "[initial(icon_state)][on ? "-light":""]" - item_state = icon_state if(isnull(user)) user = loc var/mob/living/carbon/human/H = user @@ -89,6 +89,7 @@ for(var/X in actions) var/datum/action/A = X A.UpdateButtonIcon() + update_icon() /obj/item/clothing/head/helmet/space/plasmaman/extinguish_light() if(on) diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm index 7e1a993fca4..398ea9d959b 100644 --- a/code/modules/clothing/suits/toggles.dm +++ b/code/modules/clothing/suits/toggles.dm @@ -37,7 +37,7 @@ /obj/item/clothing/suit/space/hardsuit/proc/RemoveHelmet() if(!helmet) return - suittoggled = FALSE + suit_toggled = FALSE if(ishuman(helmet.loc)) var/mob/living/carbon/H = helmet.loc if(helmet.on) @@ -60,7 +60,7 @@ return if(!helmet) return - if(!suittoggled) + if(!suit_toggled) if(ishuman(src.loc)) if(H.wear_suit != src) to_chat(H, "You must be wearing [src] to engage the helmet!") @@ -70,7 +70,7 @@ return else if(H.equip_to_slot_if_possible(helmet, slot_head, FALSE, FALSE)) to_chat(H, "You engage the helmet on the hardsuit.") - suittoggled = TRUE + suit_toggled = TRUE H.update_inv_wear_suit() playsound(src.loc, 'sound/mecha/mechmove03.ogg', 50, 1) else diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index 16c0940b479..1d2cf1b2da9 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -56,7 +56,7 @@ /obj/item/clothing/under/color/grey/glorf/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) owner.forcesay(GLOB.hit_appends) - return 0 + return /obj/item/clothing/under/color/orange name = "orange jumpsuit" @@ -72,7 +72,7 @@ item_state = "prisoner" item_color = "prisoner" has_sensor = 2 - sensor_mode = 3 + sensor_mode = SENSOR_COORDS /obj/item/clothing/under/color/pink name = "pink jumpsuit" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 3ce1d20ff3e..877e44f00ba 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -67,7 +67,7 @@ item_state = "ro_suit" item_color = "solgov" armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 30, ACID = 30) - displays_id = 0 + displays_id = FALSE /obj/item/clothing/under/solgov/elite name = "\improper Trans-Solar Federation Specops marine uniform" desc = "A comfortable and durable combat uniform worn by Trans-Solar Federation Specops Marine Forces." @@ -127,7 +127,7 @@ item_state = "navy_gold" item_color = "navy_gold" armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 30, ACID = 30) - displays_id = 0 + displays_id = FALSE /obj/item/clothing/under/rank/centcom/captain name = "\improper Nanotrasen naval captain's uniform" @@ -136,7 +136,7 @@ item_state = "navy_gold" item_color = "navy_gold" armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 30, ACID = 30) - displays_id = 0 + displays_id = FALSE /obj/item/clothing/under/rank/centcom/captain/solgov name = "\improper Trans-Solar Federation commander's uniform" @@ -149,7 +149,7 @@ item_state = "g_suit" item_color = "officer" armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 30, ACID = 30) - displays_id = 0 + displays_id = FALSE /obj/item/clothing/under/rank/centcom/representative name = "formal Nanotrasen Representative's uniform" @@ -157,7 +157,7 @@ icon_state = "officer" item_state = "g_suit" item_color = "officer" - displays_id = 0 + displays_id = FALSE /obj/item/clothing/under/rank/centcom/representative/New() ..() @@ -169,7 +169,7 @@ icon_state = "officer" item_state = "g_suit" item_color = "officer" - displays_id = 0 + displays_id = FALSE /obj/item/clothing/under/rank/centcom/magistrate/New() ..() @@ -181,7 +181,7 @@ icon_state = "presidente" item_state = "g_suit" item_color = "presidente" - displays_id = 0 + displays_id = FALSE /obj/item/clothing/under/rank/blueshield name = "blueshield's uniform" @@ -777,7 +777,7 @@ righthand_file = 'icons/goonstation/mob/inhands/clothing_righthand.dmi' flags = NODROP resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF - has_sensor = 0 // HUNKE + has_sensor = FALSE // HUNKE /obj/item/clothing/under/victdress name = "black victorian dress" diff --git a/code/modules/clothing/under/oldstation_uni.dm b/code/modules/clothing/under/oldstation_uni.dm index c39add82a3d..d5c281a8132 100644 --- a/code/modules/clothing/under/oldstation_uni.dm +++ b/code/modules/clothing/under/oldstation_uni.dm @@ -6,7 +6,7 @@ icon_state = "retro_sec" item_state = "retro_sec" item_color = "retro_sec" - displays_id = 0 + displays_id = FALSE /obj/item/clothing/under/retro/medical name = "retro medical officer's uniform" @@ -14,7 +14,7 @@ icon_state = "retro_med" item_state = "retro_med" item_color = "retro_med" - displays_id = 0 + displays_id = FALSE /obj/item/clothing/under/retro/engineering name = "retro engineering uniform" @@ -22,7 +22,7 @@ icon_state = "retro_eng" item_state = "retro_eng" item_color = "retro_eng" - displays_id = 0 + displays_id = FALSE /obj/item/clothing/under/retro/science name = "retro science officer's uniform" @@ -30,4 +30,4 @@ icon_state = "retro_sci" item_state = "retro_sci" item_color = "retro_sci" - displays_id = 0 + displays_id = FALSE diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm index 3cd2ddef84c..e7302261c06 100644 --- a/code/modules/clothing/under/shorts.dm +++ b/code/modules/clothing/under/shorts.dm @@ -3,7 +3,7 @@ desc = "95% Polyester, 5% Spandex!" gender = PLURAL body_parts_covered = LOWER_TORSO - displays_id = 0 + displays_id = FALSE /obj/item/clothing/under/shorts/red icon_state = "redshorts" diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm index 8641d0d3d69..e5d0532ac0a 100644 --- a/code/modules/clothing/under/syndicate.dm +++ b/code/modules/clothing/under/syndicate.dm @@ -4,7 +4,7 @@ icon_state = "syndicate" item_state = "bl_suit" item_color = "syndicate" - has_sensor = 0 + has_sensor = FALSE armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 40) /obj/item/clothing/under/syndicate/combat diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index c705a0fa709..db464598e0c 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -78,15 +78,12 @@ used = TRUE update_icon() -/obj/item/fluff/tattoo_gun/update_icon() - ..() - - overlays.Cut() - +/obj/item/fluff/tattoo_gun/update_overlays() + . = ..() if(!used) var/image/ink = image(src.icon, src, "ink_overlay") ink.icon += rgb(tattoo_r, tattoo_g, tattoo_b, 190) - overlays += ink + . += ink /obj/item/fluff/tattoo_gun/New() ..() @@ -1108,7 +1105,7 @@ icon_state = "elishirt" item_state = "elishirt" item_color = "elishirt" - displays_id = 0 + displays_id = FALSE /obj/item/clothing/under/fluff/jay_turtleneck // Jayfeather: Jay Wingler name = "Mar's Pattern Custom Turtleneck" @@ -1117,7 +1114,7 @@ icon_state = "jaywingler" item_state = "jaywingler" item_color = "jaywingler" - displays_id = 0 + displays_id = FALSE /obj/item/clothing/under/psysuit/fluff/isaca_sirius_1 // Xilia: Isaca Sirius name = "Isaca's suit" @@ -1131,7 +1128,7 @@ item_state = "jane_sid_suit" item_color = "jane_sid_suit" has_sensor = 2 - sensor_mode = 3 + sensor_mode = SENSOR_COORDS /obj/item/clothing/under/fluff/jane_sidsuit/verb/toggle_zipper() set name = "Toggle Jumpsuit Zipper" @@ -1159,7 +1156,7 @@ icon_state = "roman" item_state = "maximus_armor" item_color = "maximus_armor" - displays_id = 0 + displays_id = FALSE strip_delay = 100 /obj/item/clothing/under/fluff/aegis //PlagueWalker: A.E.G.I.S. @@ -1171,7 +1168,7 @@ icon_state = "aegisuniform" item_state = "aegisuniform" item_color = "aegisuniform" - displays_id = 0 + displays_id = FALSE /obj/item/clothing/under/fluff/elo_turtleneck // vforcebomber: E.L.O. name = "E.L.O's Turtleneck" @@ -1666,7 +1663,7 @@ icon = 'icons/obj/custom_items.dmi' fluff_material = TRUE -/obj/item/clothing/gloves/ring/fluff/update_icon() +/obj/item/clothing/gloves/ring/fluff/update_icon_state() return /obj/item/clothing/gloves/ring/fluff/attackby(obj/item/I as obj, mob/user as mob, params) diff --git a/code/modules/detective_work/footprints_and_rag.dm b/code/modules/detective_work/footprints_and_rag.dm index a8cb4fcf021..07e20fae128 100644 --- a/code/modules/detective_work/footprints_and_rag.dm +++ b/code/modules/detective_work/footprints_and_rag.dm @@ -21,6 +21,7 @@ flags = NOBLUDGEON container_type = OPENCONTAINER has_lid = FALSE + blocks_emissive = EMISSIVE_BLOCK_GENERIC var/wipespeed = 30 /obj/item/reagent_containers/glass/rag/attack(atom/target as obj|turf|area, mob/user as mob , flag) diff --git a/code/modules/fish/fishtank.dm b/code/modules/fish/fishtank.dm index 380a9981b17..8b3ba274836 100644 --- a/code/modules/fish/fishtank.dm +++ b/code/modules/fish/fishtank.dm @@ -16,9 +16,9 @@ var/tank_type = "" // Type of aquarium, used for icon updating var/water_capacity = 0 // Number of units the tank holds (varies with tank type) var/water_level = 0 // Number of units currently in the tank (new tanks start empty) - var/light_switch = 0 // 0 = off, 1 = on (off by default) + var/light_switch = FALSE var/filth_level = 0 // How dirty the tank is (max 10) - var/lid_switch = 0 // 0 = open, 1 = closed (open by default) + var/lid_switch = FALSE var/max_fish = 0 // How many fish the tank can support (varies with tank type, 1 fish per 50 units sounds reasonable) var/food_level = 0 // Amount of fishfood floating in the tank (max 10) var/fish_count = 0 // Number of fish in the tank @@ -94,7 +94,7 @@ /obj/machinery/fishtank/proc/toggle_lid() lid_switch = !lid_switch - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/machinery/fishtank/verb/toggle_light_verb() set name = "Toggle Tank Light" @@ -129,24 +129,23 @@ // ICON PROCS // ////////////////////////////// -/obj/machinery/fishtank/update_icon() - cut_overlays() - +/obj/machinery/fishtank/update_overlays() + . = ..() //Update Alert Lights if(has_lid) //Skip the alert lights for aquariums that don't have lids (fishbowls) if(egg_count > 0) //There is at least 1 egg to harvest - add_overlay("over_egg") - if(lid_switch == 1) //Lid is closed, lid status light is red - add_overlay("over_lid_1") + . += "over_egg" + if(lid_switch) //Lid is closed, lid status light is red + . += "over_lid_1" else //Lid is open, lid status light is green - add_overlay("over_lid_0") + . += "over_lid_0" if(food_level > 5) //Food_level is high and isn't a concern yet - add_overlay("over_food_0") + . += "over_food_0" else if(food_level > 2) //Food_level is starting to get low, but still above the breeding threshold - add_overlay("over_food_1") + . += "over_food_1" else //Food_level is below breeding threshold, or fully consumed, feed the fish! - add_overlay("over_food_2") - add_overlay("over_leak_[leaking]") //Green if we aren't leaking, light blue and slow blink if minor link, dark blue and rapid flashing for major leak + . += "over_food_2" + . += "over_leak_[leaking]" //Green if we aren't leaking, light blue and slow blink if minor link, dark blue and rapid flashing for major leak //Update water overlay if(!water_level) @@ -154,23 +153,23 @@ var/water_type = "_clean" //Default to clean water if(filth_level > 5) water_type = "_dirty" //Show dirty water above filth_level 5 (breeding threshold) if(water_level > (water_capacity * 0.85)) //Show full if the water_level is over 85% of water_capacity - add_overlay("over_[tank_type]_full[water_type]") + . += "over_[tank_type]_full[water_type]" else if(water_level > (water_capacity * 0.35)) //Show half-full if the water_level is over 35% of water_capacity - add_overlay("over_[tank_type]_half[water_type]") + . += "over_[tank_type]_half[water_type]" -/obj/machinery/fishtank/wall/update_icon() - ..() +/obj/machinery/fishtank/wall/update_overlays() + . = ..() // Update fish overlay for wall tanks var/num_fish = length(fish_list) if(!num_fish) return switch(num_fish) if(1 to 3) - add_overlay("over_tank_fish_33") + . += "over_tank_fish_33" if(4 to 7) - add_overlay("over_tank_fish_66") + . += "over_tank_fish_66" if(7 to INFINITY) - add_overlay("over_tank_fish_100") + . += "over_tank_fish_100" ////////////////////////////// // PROCESS PROC // @@ -183,7 +182,7 @@ /obj/machinery/fishtank/process() //Start by counting fish in the tank fish_count = 0 - var/ate_food = 0 + var/ate_food = FALSE for(var/fish in fish_list) if(fish) fish_count++ @@ -205,7 +204,7 @@ if(prob(((fish_count - 2) * 5)+10)) //Chances increase with each additional fish, 10% base + 5% per additional fish breed_fish() adjust_food_level(-0.1) //Remove extra food for the breeding process - ate_food = 1 + ate_food = TRUE //Handle standard food and filth adjustments if(food_level > 0 && prob(50)) //Chance for the fish to eat some food @@ -213,7 +212,7 @@ adjust_food_level(fish_count * -0.05) else //Use up the last of the food adjust_food_level(-food_level) - ate_food = 1 + ate_food = TRUE if(water_level > 0) //Don't dirty the tank if it has no water if(fish_count == 0) //If the tank has no fish, algae growth can occur @@ -284,7 +283,7 @@ if(istype(fish_type, /datum/fish/glofish)) adjust_tank_light() qdel(fish_type) - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/machinery/fishtank/proc/add_fish(datum/fish/fish_type = null) //Check if we were passed a fish type @@ -294,7 +293,7 @@ fish_count++ //Increase fish_count to reflect the introduction of a fish, so the everything else works fine //Announce the new fish visible_message("A new [fish_type.fish_name] has hatched in [src]!") - update_icon() + update_icon(UPDATE_OVERLAYS) //Null type fish are dud eggs, give a message to inform the player else to_chat(usr, "The eggs disolve in the water. They were duds!") @@ -376,10 +375,10 @@ var/list/breed_candidates = fish_list.Copy() var/datum/fish/parent1 = pick_n_take(breed_candidates) if(!parent1.crossbreeder) //fish with crossbreed = 0 will only breed with their own species, and only leave duds if they can't breed - var/match_found = 0 + var/match_found = FALSE for(var/datum/fish/possible in breed_candidates) if(parent1.type == possible.type) - match_found = 1 + match_found = TRUE break if(match_found) egg_list.Add(parent1.egg_item) @@ -523,7 +522,7 @@ . += "[examine_message]" ////////////////////////////// -// ATACK PROCS // +// ATTACK PROCS // ////////////////////////////// /obj/machinery/fishtank/attack_animal(mob/living/simple_animal/M) diff --git a/code/modules/food_and_drinks/drinks/bottler/bottler.dm b/code/modules/food_and_drinks/drinks/bottler/bottler.dm index 667c64be053..2e5e2ac8e3b 100644 --- a/code/modules/food_and_drinks/drinks/bottler/bottler.dm +++ b/code/modules/food_and_drinks/drinks/bottler/bottler.dm @@ -57,7 +57,7 @@ else if(istype(O, /obj/item/reagent_containers/food/drinks/cans)) var/obj/item/reagent_containers/food/drinks/cans/C = O if(C.reagents) - if(C.canopened && C.reagents.total_volume) //This prevents us from using opened cans that still have something in them + if(C.can_opened && C.reagents.total_volume) //This prevents us from using opened cans that still have something in them to_chat(user, "Only unopened cans and bottles can be processed to ensure product integrity.") return 0 user.unEquip(C) @@ -235,7 +235,7 @@ if(containers[con_type]) //empties aren't sealed, so let's open it quietly drink_container = new drink_container() - drink_container.canopened = TRUE + drink_container.can_opened = TRUE drink_container.container_type |= OPENCONTAINER drink_container.forceMove(loc) containers[con_type]-- @@ -399,7 +399,7 @@ updateUsrDialog() return -/obj/machinery/bottler/update_icon() +/obj/machinery/bottler/update_icon_state() if(stat & BROKEN) icon_state = "bottler_broken" else if(bottling) diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index 0ebb8bcfd75..03f88bdf238 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -10,7 +10,7 @@ throwforce = 15 item_state = "broken_beer" //Generic held-item sprite until unique ones are made. var/const/duration = 13 //Directly relates to the 'weaken' duration. Lowered by armor (i.e. helmets) - var/isGlass = 1 //Whether the 'bottle' is made of glass or not so that milk cartons dont shatter when someone gets hit by it + var/is_glass = TRUE //Whether the 'bottle' is made of glass or not so that milk cartons dont shatter when someone gets hit by it /obj/item/reagent_containers/food/drinks/bottle/proc/smash(mob/living/target, mob/living/user, ranged = FALSE) @@ -29,7 +29,7 @@ I.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0)) B.icon = I - if(isGlass) + if(is_glass) if(prob(33)) new/obj/item/shard(new_location) playsound(src, "shatter", 70, 1) @@ -47,7 +47,7 @@ if(!target) return - if(user.a_intent != INTENT_HARM || !isGlass) + if(user.a_intent != INTENT_HARM || !is_glass) return ..() if(HAS_TRAIT(user, TRAIT_PACIFISM)) @@ -285,7 +285,7 @@ icon_state = "orangejuice" item_state = "carton" throwforce = 0 - isGlass = 0 + is_glass = FALSE list_reagents = list("orangejuice" = 100) /obj/item/reagent_containers/food/drinks/bottle/cream @@ -294,7 +294,7 @@ icon_state = "cream" item_state = "carton" throwforce = 0 - isGlass = 0 + is_glass = FALSE list_reagents = list("cream" = 100) /obj/item/reagent_containers/food/drinks/bottle/tomatojuice @@ -303,7 +303,7 @@ icon_state = "tomatojuice" item_state = "carton" throwforce = 0 - isGlass = 0 + is_glass = FALSE list_reagents = list("tomatojuice" = 100) /obj/item/reagent_containers/food/drinks/bottle/limejuice @@ -312,7 +312,7 @@ icon_state = "limejuice" item_state = "carton" throwforce = 0 - isGlass = 0 + is_glass = FALSE list_reagents = list("limejuice" = 100) /obj/item/reagent_containers/food/drinks/bottle/milk @@ -321,7 +321,7 @@ icon_state = "milk" item_state = "carton" throwforce = 0 - isGlass = 0 + is_glass = FALSE list_reagents = list("milk" = 100) ////////////////////////// MOLOTOV /////////////////////// @@ -334,22 +334,37 @@ /datum/reagent/napalm,/datum/reagent/hellwater,/datum/reagent/plasma,/datum/reagent/plasma_dust) var/active = FALSE -/obj/item/reagent_containers/food/drinks/bottle/molotov/CheckParts(list/parts_list) - ..() +/obj/item/reagent_containers/food/drinks/bottle/molotov/update_desc() + . = ..() + desc = initial(desc) + if(!is_glass) + desc += " You're not sure if making this out of a carton was the brightest idea." + +/obj/item/reagent_containers/food/drinks/bottle/molotov/update_icon_state() var/obj/item/reagent_containers/food/drinks/bottle/B = locate() in contents if(B) icon_state = B.icon_state + +/obj/item/reagent_containers/food/drinks/bottle/molotov/update_overlays() + . = ..() + if(active) + . += GLOB.fire_overlay + +/obj/item/reagent_containers/food/drinks/bottle/molotov/CheckParts(list/parts_list) + ..() + var/obj/item/reagent_containers/food/drinks/bottle/B = locate() in contents + if(B) B.reagents.copy_to(src, 100) - if(!B.isGlass) - desc += " You're not sure if making this out of a carton was the brightest idea." - isGlass = 0 + if(!B.is_glass) + is_glass = FALSE + update_appearance(UPDATE_DESC|UPDATE_ICON) /obj/item/reagent_containers/food/drinks/bottle/molotov/throw_impact(atom/target,mob/thrower) - var/firestarter = 0 + var/firestarter = FALSE for(var/datum/reagent/R in reagents.reagent_list) for(var/A in accelerants) if(istype(R, A)) - firestarter = 1 + firestarter = TRUE break ..() if(firestarter && active) @@ -365,8 +380,7 @@ log_game("[key_name(user)] has primed a [name] for detonation at [bombarea] ([bombturf.x],[bombturf.y],[bombturf.z]).") to_chat(user, "You light [src] on fire.") - overlays += GLOB.fire_overlay - if(!isGlass) + if(!is_glass) spawn(50) if(active) var/counter @@ -383,9 +397,9 @@ /obj/item/reagent_containers/food/drinks/bottle/molotov/attack_self(mob/user) if(active) - if(!isGlass) + if(!is_glass) to_chat(user, "The flame's spread too far on it!") return to_chat(user, "You snuff out the flame on \the [src].") - overlays -= GLOB.fire_overlay active = FALSE + update_icon(UPDATE_OVERLAYS) diff --git a/code/modules/food_and_drinks/drinks/drinks/cans.dm b/code/modules/food_and_drinks/drinks/drinks/cans.dm index e373fa7f78e..3f139e6a509 100644 --- a/code/modules/food_and_drinks/drinks/drinks/cans.dm +++ b/code/modules/food_and_drinks/drinks/drinks/cans.dm @@ -1,28 +1,28 @@ /obj/item/reagent_containers/food/drinks/cans container_type = NONE - var/canopened = FALSE - var/is_glass = 0 - var/is_plastic = 0 - var/times_shaken = 0 + var/can_opened = FALSE + var/is_glass = FALSE + var/is_plastic = FALSE + var/times_shaken = FALSE var/can_shake = TRUE var/can_burst = FALSE var/burst_chance = 0 /obj/item/reagent_containers/food/drinks/cans/examine(mob/user) . = ..() - if(canopened) + if(can_opened) . += "It has been opened." else . += "Alt-click to shake it up!" /obj/item/reagent_containers/food/drinks/cans/attack_self(mob/user) - if(canopened) + if(can_opened) return ..() if(times_shaken) fizzy_open(user) return ..() playsound(loc, 'sound/effects/canopen.ogg', rand(10, 50), 1) - canopened = TRUE + can_opened = TRUE container_type |= OPENCONTAINER to_chat(user, "You open the drink with an audible pop!") return ..() @@ -46,7 +46,7 @@ if(!can_shake || !ishuman(user)) return ..() H = user - if(canopened) + if(can_opened) to_chat(H, "You can't shake up an already opened drink!") return ..() if(src == H.l_hand || src == H.r_hand) @@ -69,7 +69,7 @@ return ..() /obj/item/reagent_containers/food/drinks/cans/attack(mob/M, mob/user, proximity) - if(!canopened) + if(!can_opened) to_chat(user, "You need to open the drink!") return else if(M == user && !reagents.total_volume && user.a_intent == INTENT_HARM && user.zone_selected == "head") @@ -83,16 +83,16 @@ user.visible_message("[user] crushes [src] in [user.p_their()] trash compactor.", "You crush [src] in your trash compactor.") var/obj/can = crush(user) can.attackby(I, user, params) - return 1 + return TRUE ..() /obj/item/reagent_containers/food/drinks/cans/afterattack(obj/target, mob/user, proximity) if(!proximity) return - if(istype(target, /obj/structure/reagent_dispensers) && !canopened) + if(istype(target, /obj/structure/reagent_dispensers) && !can_opened) to_chat(user, "You need to open the drink!") return - else if(target.is_open_container() && !canopened) + else if(target.is_open_container() && !can_opened) to_chat(user, "You need to open the drink!") return else @@ -107,7 +107,7 @@ /obj/item/reagent_containers/food/drinks/cans/proc/fizzy_open(mob/user, burstopen = FALSE) playsound(loc, 'sound/effects/canopenfizz.ogg', rand(10, 50), 1) - canopened = TRUE + can_opened = TRUE container_type |= OPENCONTAINER if(!burstopen && user) @@ -132,7 +132,7 @@ reagents.remove_any(times_shaken / 5 * reagents.total_volume) /obj/item/reagent_containers/food/drinks/cans/proc/handle_bursting(mob/user) - if(times_shaken != 5 || canopened) + if(times_shaken != 5 || can_opened) return if(!can_burst) @@ -170,28 +170,28 @@ name = "space beer" desc = "Contains only water, malt and hops." icon_state = "beer" - is_glass = 1 + is_glass = TRUE list_reagents = list("beer" = 30) /obj/item/reagent_containers/food/drinks/cans/adminbooze name = "admin booze" desc = "Bottled Griffon tears. Drink with caution." icon_state = "adminbooze" - is_glass = 1 + is_glass = TRUE list_reagents = list("adminordrazine" = 5, "capsaicin" = 5, "methamphetamine"= 20, "thirteenloko" = 20) /obj/item/reagent_containers/food/drinks/cans/madminmalt name = "madmin malt" desc = "Bottled essence of angry admins. Drink with EXTREME caution." icon_state = "madminmalt" - is_glass = 1 + is_glass = TRUE list_reagents = list("hell_water" = 20, "neurotoxin" = 15, "thirteenloko" = 15) /obj/item/reagent_containers/food/drinks/cans/badminbrew name = "badmin brew" desc = "Bottled trickery and terrible admin work. Probably shouldn't drink this one at all." icon_state = "badminbrew" - is_glass = 1 + is_glass = TRUE list_reagents = list("mutagen" = 25, "charcoal" = 10, "thirteenloko" = 15) /obj/item/reagent_containers/food/drinks/cans/ale @@ -199,7 +199,7 @@ desc = "A true dorf's drink of choice." icon_state = "alebottle" item_state = "beer" - is_glass = 1 + is_glass = TRUE list_reagents = list("ale" = 30) /obj/item/reagent_containers/food/drinks/cans/space_mountain_wind @@ -275,11 +275,10 @@ icon_state = "glass_bottle" /obj/item/reagent_containers/food/drinks/cans/bottler/on_reagent_change() - update_icon() - -/obj/item/reagent_containers/food/drinks/cans/bottler/update_icon() - overlays.Cut() + update_icon(UPDATE_OVERLAYS) +/obj/item/reagent_containers/food/drinks/cans/bottler/update_overlays() + . = ..() if(reagents.total_volume) var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10") @@ -298,19 +297,19 @@ filling.icon_state = "[icon_state]50" filling.icon += mix_color_from_reagents(reagents.reagent_list) - overlays += filling + . += filling /obj/item/reagent_containers/food/drinks/cans/bottler/glass_bottle name = "glass bottle" desc = "A glass bottle suitable for beverages." icon_state = "glass_bottle" - is_glass = 1 + is_glass = TRUE /obj/item/reagent_containers/food/drinks/cans/bottler/plastic_bottle name = "plastic bottle" desc = "A plastic bottle suitable for beverages." icon_state = "plastic_bottle" - is_plastic = 1 + is_plastic = TRUE /obj/item/reagent_containers/food/drinks/cans/bottler/metal_can name = "metal can" diff --git a/code/modules/food_and_drinks/drinks/drinks/shotglass.dm b/code/modules/food_and_drinks/drinks/drinks/shotglass.dm index 144e280da40..e5c5d749965 100644 --- a/code/modules/food_and_drinks/drinks/drinks/shotglass.dm +++ b/code/modules/food_and_drinks/drinks/drinks/shotglass.dm @@ -2,6 +2,7 @@ name = "shot glass" desc = "No glasses were shot in the making of this glass." icon_state = "shotglass" + custom_fire_overlay = "shotglass_fire" amount_per_transfer_from_this = 15 volume = 15 materials = list(MAT_GLASS=100) @@ -12,10 +13,19 @@ /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/on_reagent_change() if(!isShotFlammable() && (resistance_flags & ON_FIRE)) extinguish() - update_icon() + update_appearance(UPDATE_NAME|UPDATE_OVERLAYS) -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/update_icon() - overlays.Cut() +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/update_name() + . = ..() + if(reagents.total_volume) + name = "shot glass of " + reagents.get_master_reagent_name() //No matter what, the glass will tell you the reagent's name. Might be too abusable in the future. + if(resistance_flags & ON_FIRE) + name = "flaming [name]" + else + name = "shot glass" + +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/update_overlays() + . = ..() if(reagents.total_volume) var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]1") @@ -28,14 +38,7 @@ if(80 to INFINITY) filling.icon_state = "[icon_state]12" filling.icon += mix_color_from_reagents(reagents.reagent_list) - overlays += filling - name = "shot glass of " + reagents.get_master_reagent_name() //No matter what, the glass will tell you the reagent's name. Might be too abusable in the future. - if(resistance_flags & ON_FIRE) - cut_overlay(GLOB.fire_overlay, TRUE) - overlays += "shotglass_fire" - name = "flaming [name]" - else - name = "shot glass" + . += filling /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/proc/clumsilyDrink(mob/living/carbon/human/user) //Clowns beware if(!(resistance_flags & ON_FIRE)) @@ -59,14 +62,14 @@ ..() set_light(light_intensity, null, light_color) visible_message("[src] begins to burn with a blue hue!") - update_icon() + update_appearance(UPDATE_NAME|UPDATE_OVERLAYS) /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/extinguish(silent = FALSE) ..() set_light(0) if(!silent) visible_message("The dancing flame on [src] dies out.") - update_icon() + update_appearance(UPDATE_NAME|UPDATE_OVERLAYS) /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/burn() //Let's override fire deleting the reagents inside the shot return diff --git a/code/modules/food_and_drinks/food/foods/desserts.dm b/code/modules/food_and_drinks/food/foods/desserts.dm index b49b3ef7253..103af89f8fd 100644 --- a/code/modules/food_and_drinks/food/foods/desserts.dm +++ b/code/modules/food_and_drinks/food/foods/desserts.dm @@ -14,13 +14,13 @@ /obj/item/reagent_containers/food/snacks/icecream/New() ..() - update_icon() + update_icon(UPDATE_OVERLAYS) -/obj/item/reagent_containers/food/snacks/icecream/update_icon() - cut_overlays() +/obj/item/reagent_containers/food/snacks/icecream/update_overlays() + . = ..() var/mutable_appearance/filling = mutable_appearance('icons/obj/kitchen.dmi', "icecream_color") filling.color = mix_color_from_reagents(reagents.reagent_list) - add_overlay(filling) + . += filling /obj/item/reagent_containers/food/snacks/icecream/icecreamcone name = "ice cream cone" diff --git a/code/modules/food_and_drinks/food/foods/ingredients.dm b/code/modules/food_and_drinks/food/foods/ingredients.dm index 2d84035879a..89cac389f27 100644 --- a/code/modules/food_and_drinks/food/foods/ingredients.dm +++ b/code/modules/food_and_drinks/food/foods/ingredients.dm @@ -153,15 +153,16 @@ list_reagents = list("nutriment" = 5, "sugar" = 5) tastes = list("dough" = 1, "sugar" = 1) +/obj/item/reagent_containers/food/snacks/cookiedough/update_name() + . = ..() + if(flat) + name = "flat pastry dough" -/obj/item/reagent_containers/food/snacks/cookiedough/update_icon() - if(flat) - icon_state = "cookiedough_flat" - name = "flat pastry dough" - else - icon_state = "cookiedough" - - +/obj/item/reagent_containers/food/snacks/cookiedough/update_icon_state() + if(flat) + icon_state = "cookiedough_flat" + else + icon_state = "cookiedough" // Dough + rolling pin = flat cookie dough // Flat dough + circular cutter = unbaked cookies /obj/item/reagent_containers/food/snacks/cookiedough/attackby(obj/item/I, mob/user, params) @@ -169,7 +170,7 @@ if(isturf(loc)) to_chat(user, "You flatten [src].") flat = TRUE - update_icon() + update_appearance(UPDATE_NAME|UPDATE_ICON_STATE) else to_chat(user, "You need to put [src] on a surface to roll it out!") else if(istype(I, /obj/item/kitchen/cutter) && flat) diff --git a/code/modules/food_and_drinks/food/foods/pizza.dm b/code/modules/food_and_drinks/food/foods/pizza.dm index cdd8dfe3e64..b14ac7b2f5e 100644 --- a/code/modules/food_and_drinks/food/foods/pizza.dm +++ b/code/modules/food_and_drinks/food/foods/pizza.dm @@ -120,62 +120,67 @@ icon_state = "pizzabox1" var/open = FALSE // Is the box open? - var/ismessy = FALSE // Fancy mess on the lid + var/is_messy = FALSE // Fancy mess on the lid var/obj/item/reagent_containers/food/snacks/sliceable/pizza/pizza // Content pizza var/list/boxes = list() // If the boxes are stacked, they come here - var/boxtag = "" + var/box_tag = "" -/obj/item/pizzabox/update_icon() - overlays = list() +/obj/item/pizzabox/Initialize(mapload) + . = ..() + update_appearance(UPDATE_DESC|UPDATE_ICON) - // Set appropriate description +/obj/item/pizzabox/update_desc() + . = ..() if(open && pizza) desc = "A box suited for pizzas. It appears to have a [pizza.name] inside." else if(boxes.len > 0) desc = "A pile of boxes suited for pizzas. There appears to be [boxes.len + 1] boxes in the pile." - var/obj/item/pizzabox/topbox = boxes[boxes.len] - var/toptag = topbox.boxtag - if(toptag != "") - desc = "[desc] The box on top has a tag, it reads: '[toptag]'." + var/obj/item/pizzabox/top_box = boxes[boxes.len] + var/top_tag = top_box.box_tag + if(top_tag != "") + desc = "[desc] The box on top has a tag, it reads: '[top_tag]'." else desc = "A box suited for pizzas." - if(boxtag != "") - desc = "[desc] The box has a tag, it reads: '[boxtag]'." + if(box_tag != "") + desc = "[desc] The box has a tag, it reads: '[box_tag]'." - // Icon states and overlays +/obj/item/pizzabox/update_icon_state() if(open) - if(ismessy) + if(is_messy) icon_state = "pizzabox_messy" else icon_state = "pizzabox_open" - if(pizza) - var/image/pizzaimg = image("food/pizza.dmi", icon_state = pizza.icon_state) - pizzaimg.pixel_y = -3 - overlays += pizzaimg + return + icon_state = "pizzabox[boxes.len+1]" +/obj/item/pizzabox/update_overlays() + . = ..() + if(open && pizza) + var/image/pizzaimg = image("food/pizza.dmi", icon_state = pizza.icon_state) + pizzaimg.pixel_y = -3 + . += pizzaimg return else // Stupid code because byondcode sucks - var/doimgtag = 0 + var/set_tag = TRUE if(boxes.len > 0) - var/obj/item/pizzabox/topbox = boxes[boxes.len] - if(topbox.boxtag != "") - doimgtag = 1 + var/obj/item/pizzabox/top_box = boxes[boxes.len] + if(top_box.box_tag != "") + set_tag = TRUE else - if(boxtag != "") - doimgtag = 1 - if(doimgtag) - var/image/tagimg = image("food/pizza.dmi", icon_state = "pizzabox_tag") - tagimg.pixel_y = boxes.len * 3 - overlays += tagimg - icon_state = "pizzabox[boxes.len+1]" + if(box_tag != "") + set_tag = TRUE + if(!open && set_tag) + var/image/tag = image("food/pizza.dmi", icon_state = "pizzabox_tag") + tag.pixel_y = boxes.len * 3 + . += tag /obj/item/pizzabox/attack_hand(mob/user) if(open && pizza) user.put_in_hands(pizza) to_chat(user, "You take [pizza] out of [src].") pizza = null - update_icon() + update_appearance(UPDATE_DESC|UPDATE_ICON) return if(boxes.len > 0) @@ -186,8 +191,8 @@ boxes -= box user.put_in_hands(box) to_chat(user, "You remove the topmost [src] from your hand.") - box.update_icon() - update_icon() + box.update_appearance(UPDATE_DESC|UPDATE_ICON) + update_appearance(UPDATE_DESC|UPDATE_ICON) return ..() @@ -196,8 +201,8 @@ return open = !open if(open && pizza) - ismessy = TRUE - update_icon() + is_messy = TRUE + update_appearance(UPDATE_DESC|UPDATE_ICON) /obj/item/pizzabox/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/pizzabox/)) @@ -213,8 +218,8 @@ box.loc = src box.boxes = list() // Clear the box boxes so we don't have boxes inside boxes. - Xzibit boxes.Add(boxestoadd) - box.update_icon() - update_icon() + box.update_appearance(UPDATE_DESC|UPDATE_ICON) + update_appearance(UPDATE_DESC|UPDATE_ICON) to_chat(user, "You put [box] on top of [src]!") else to_chat(user, "The stack is too high!") @@ -228,7 +233,7 @@ I.loc = src pizza = I - update_icon() + update_appearance(UPDATE_DESC|UPDATE_ICON) to_chat(user, "You put [I] in [src]!") else @@ -242,32 +247,32 @@ var/obj/item/pizzabox/boxtotagto = src if(boxes.len > 0) boxtotagto = boxes[boxes.len] - boxtotagto.boxtag = copytext("[boxtotagto.boxtag][t]", 1, 30) - update_icon() + boxtotagto.box_tag = copytext("[boxtotagto.box_tag][t]", 1, 30) + update_appearance(UPDATE_DESC|UPDATE_ICON) return ..() -/obj/item/pizzabox/margherita/New() - ..() +/obj/item/pizzabox/margherita/Initialize(mapload) pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/margherita(src) - boxtag = "margherita deluxe" + box_tag = "margherita deluxe" + return ..() -/obj/item/pizzabox/vegetable/New() - ..() +/obj/item/pizzabox/vegetable/Initialize(mapload) pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza(src) - boxtag = "gourmet vegetable" + box_tag = "gourmet vegetable" + return ..() -/obj/item/pizzabox/mushroom/New() - ..() +/obj/item/pizzabox/mushroom/Initialize(mapload) pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/mushroompizza(src) - boxtag = "mushroom special" + box_tag = "mushroom special" + return ..() -/obj/item/pizzabox/meat/New() - ..() +/obj/item/pizzabox/meat/Initialize(mapload) pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza(src) - boxtag = "meatlover's supreme" + box_tag = "meatlover's supreme" + return ..() -/obj/item/pizzabox/hawaiian/New() - ..() +/obj/item/pizzabox/hawaiian/Initialize(mapload) pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/hawaiianpizza(src) - boxtag = "Hawaiian feast" + box_tag = "Hawaiian feast" + return ..() diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index 8467bb05abd..2aa386438a8 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -46,28 +46,23 @@ user.Stun(20 SECONDS) user.forceMove(src) occupant = user - update_icon() + update_icon(UPDATE_OVERLAYS) feedinTopanim() addtimer(CALLBACK(src, .proc/startgibbing, user), 33) return OBLITERATION -/obj/machinery/gibber/update_icon() - overlays.Cut() - +/obj/machinery/gibber/update_overlays() + . = ..() if(dirty) - overlays += image('icons/obj/kitchen.dmi', "grbloody") - + . += "grbloody" if(stat & (NOPOWER|BROKEN)) return - if(!occupant) - overlays += image('icons/obj/kitchen.dmi', "grjam") - + . += "grjam" else if(operating) - overlays += image('icons/obj/kitchen.dmi', "gruse") - + . += "gruse" else - overlays += image('icons/obj/kitchen.dmi', "gridle") + . += "gridle" /obj/machinery/gibber/relaymove(mob/user) if(locked) @@ -151,7 +146,7 @@ victim.forceMove(src) occupant = victim - update_icon() + update_icon(UPDATE_OVERLAYS) feedinTopanim() /obj/machinery/gibber/verb/eject() @@ -178,7 +173,7 @@ occupant.forceMove(get_turf(src)) occupant = null - update_icon() + update_icon(UPDATE_OVERLAYS) return @@ -248,7 +243,7 @@ visible_message("You hear a loud squelchy grinding sound.") operating = TRUE - update_icon() + update_icon(UPDATE_OVERLAYS) var/offset = prob(50) ? -2 : 2 animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = gibtime * 5) //start shaking @@ -310,7 +305,7 @@ pixel_x = initial(pixel_x) //return to it's spot after shaking operating = FALSE - update_icon() + update_icon(UPDATE_OVERLAYS) @@ -374,7 +369,7 @@ victim.forceMove(src) occupant = victim - update_icon() + update_icon(UPDATE_OVERLAYS) feedinTopanim() return 1 diff --git a/code/modules/food_and_drinks/kitchen_machinery/juicer.dm b/code/modules/food_and_drinks/kitchen_machinery/juicer.dm index b17b2cfe0f0..3055e0b1802 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/juicer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/juicer.dm @@ -34,46 +34,47 @@ . = ..() beaker = new /obj/item/reagent_containers/glass/beaker/large(src) -/obj/machinery/juicer/update_icon() - icon_state = "juicer"+num2text(!isnull(beaker)) - return - +/obj/machinery/juicer/update_icon_state() + if(beaker) + icon_state = "juicer1" + else + icon_state = "juicer0" /obj/machinery/juicer/attackby(obj/item/O, mob/user, params) if(istype(O,/obj/item/reagent_containers/glass) || \ istype(O,/obj/item/reagent_containers/food/drinks/drinkingglass)) if(beaker) - return 1 + return TRUE else if(!user.unEquip(O)) to_chat(user, "\the [O] is stuck to your hand, you cannot put it in \the [src]") - return 0 + return O.forceMove(src) beaker = O verbs += /obj/machinery/juicer/verb/detach - update_icon() + update_icon(UPDATE_ICON_STATE) updateUsrDialog() - return 0 + return if(!is_type_in_list(O, allowed_items)) to_chat(user, "It doesn't look like that contains any juice.") - return 1 + return TRUE if(!user.unEquip(O)) to_chat(user, "\the [O] is stuck to your hand, you cannot put it in \the [src]") - return 0 + return O.forceMove(src) updateUsrDialog() - return 0 + return /obj/machinery/juicer/attack_ai(mob/user) - return 0 + return /obj/machinery/juicer/attack_hand(mob/user) user.set_machine(src) interact(user) /obj/machinery/juicer/interact(mob/user) // The microwave Menu - var/is_chamber_empty = 0 - var/is_beaker_ready = 0 + var/is_chamber_empty = FALSE + var/is_beaker_ready = FALSE var/processing_chamber = "" var/beaker_contents = "" @@ -84,16 +85,16 @@ processing_chamber+= "some [O]
" break if(!processing_chamber) - is_chamber_empty = 1 + is_chamber_empty = TRUE processing_chamber = "Nothing." if(!beaker) beaker_contents = "\The [src] has no beaker attached." else if(!beaker.reagents.total_volume) beaker_contents = "\The [src] has attached an empty beaker." - is_beaker_ready = 1 + is_beaker_ready = TRUE else if(beaker.reagents.total_volume < beaker.reagents.maximum_volume) beaker_contents = "\The [src] has attached a beaker with something." - is_beaker_ready = 1 + is_beaker_ready = TRUE else beaker_contents = "\The [src] has attached a beaker and beaker is full!" @@ -137,7 +138,7 @@ verbs -= /obj/machinery/juicer/verb/detach beaker.forceMove(loc) beaker = null - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/machinery/juicer/proc/get_juice_id(obj/item/reagent_containers/food/snacks/grown/O) for (var/i in allowed_items) diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm index 84d05afb61e..874eb61aac4 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -76,7 +76,7 @@ while(amount--) var/obj/item/I = new typekey(src) item_quants[I.name] += 1 - update_icon() + update_icon(UPDATE_OVERLAYS) // Accepted items accepted_items_typecache = typecacheof(list( /obj/item/reagent_containers/food/snacks/grown, @@ -111,32 +111,32 @@ else set_light(light_range_on, light_power_on) if(old_stat != stat) - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/machinery/smartfridge/extinguish_light() set_light(0) underlays.Cut() -/obj/machinery/smartfridge/update_icon() - cut_overlays() +/obj/machinery/smartfridge/update_overlays() + . = ..() underlays.Cut() + if(light) + underlays += emissive_appearance(icon, "[icon_lightmask]_lightmask") if(panel_open) - add_overlay("[icon_state]_panel") + . += "[icon_state]_panel" if(stat & (BROKEN|NOPOWER)) - add_overlay("[icon_state]_off") + . += "[icon_state]_off" if(icon_addon) - add_overlay("[icon_addon]") + . += "[icon_addon]" if(stat & BROKEN) - add_overlay("[icon_state]_broken") + . += "[icon_state]_broken" return if(visible_contents) update_fridge_contents() if(fill_level) - add_overlay("[icon_state][fill_level]") + . += "[icon_state][fill_level]" if(icon_addon) - add_overlay("[icon_addon]") - if(light) - underlays += emissive_appearance(icon, "[icon_lightmask]_lightmask") + . += "[icon_addon]" /obj/machinery/smartfridge/proc/update_fridge_contents() switch(length(contents)) @@ -154,7 +154,7 @@ . = default_deconstruction_screwdriver(user, icon_state, icon_state, I) if(!.) return - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/machinery/smartfridge/wrench_act(mob/living/user, obj/item/I) . = default_unfasten_wrench(user, I) @@ -187,7 +187,7 @@ if(load(O, user)) user.visible_message("[user] has added \the [O] to \the [src].", "You add \the [O] to \the [src].") SStgui.update_uis(src) - update_icon() + update_icon(UPDATE_OVERLAYS) else if(istype(O, /obj/item/storage/bag)) var/obj/item/storage/bag/P = O var/items_loaded = 0 @@ -197,7 +197,7 @@ if(items_loaded) user.visible_message("[user] loads \the [src] with \the [P].", "You load \the [src] with \the [P].") SStgui.update_uis(src) - update_icon() + update_icon(UPDATE_OVERLAYS) var/failed = length(P.contents) if(failed) to_chat(user, "[failed] item\s [failed == 1 ? "is" : "are"] refused.") @@ -237,7 +237,7 @@ items_loaded++ if(items_loaded) user.visible_message("[user] empties \the [P] into \the [src].", "You empty \the [P] into \the [src].") - update_icon() + update_icon(UPDATE_OVERLAYS) var/failed = length(P.contents) if(failed) to_chat(user, "[failed] item\s [failed == 1 ? "is" : "are"] refused.") @@ -304,14 +304,14 @@ if(!user.put_in_hands(O)) O.forceMove(loc) adjust_item_drop_location(O) - update_icon() + update_icon(UPDATE_OVERLAYS) break else for(var/obj/O in contents) if(O.name == K) O.forceMove(loc) adjust_item_drop_location(O) - update_icon() + update_icon(UPDATE_OVERLAYS) i-- if(i <= 0) return TRUE @@ -366,7 +366,7 @@ if(I.name == O) I.forceMove(loc) throw_item = I - update_icon() + update_icon(UPDATE_OVERLAYS) break if(!throw_item) return FALSE @@ -785,7 +785,7 @@ else stat |= NOPOWER toggle_drying(TRUE) - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/machinery/smartfridge/drying_rack/screwdriver_act(mob/living/user, obj/item/I) return @@ -810,22 +810,21 @@ if("drying") drying = !drying use_power = drying ? ACTIVE_POWER_USE : IDLE_POWER_USE - update_icon() + update_icon(UPDATE_OVERLAYS) -/obj/machinery/smartfridge/drying_rack/update_icon() - cut_overlays() +/obj/machinery/smartfridge/drying_rack/update_overlays() if(stat & NOPOWER) - add_overlay("drying_rack_off") + . += "drying_rack_off" return if(drying) - add_overlay("drying_rack_drying") + . += "drying_rack_drying" if(length(contents)) - add_overlay("drying_rack_filled") + . += "drying_rack_filled" /obj/machinery/smartfridge/drying_rack/process() ..() if(drying && rack_dry())//no need to update unless something got dried - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/machinery/smartfridge/drying_rack/accept_check(obj/item/O) . = ..() @@ -848,7 +847,7 @@ else drying = TRUE use_power = ACTIVE_POWER_USE - update_icon() + update_icon(UPDATE_OVERLAYS) /** * Called in [/obj/machinery/smartfridge/drying_rack/process] to dry the contents. diff --git a/code/modules/games/52card.dm b/code/modules/games/52card.dm index dae75a924a1..2eb4ff83e0d 100644 --- a/code/modules/games/52card.dm +++ b/code/modules/games/52card.dm @@ -33,7 +33,7 @@ for(var/jokers in 1 to 2) cards += new /datum/playingcard("Joker", "sc_Joker_[card_style]", "singlecard_down_[card_style]") -/obj/item/deck/cards/update_icon() +/obj/item/deck/cards/update_icon_state() if(!length(cards)) icon_state = "deck_[card_style]_empty" return @@ -78,7 +78,7 @@ card_style = "simple" simple_deck = TRUE -/obj/item/deck/cards/tiny/update_icon() +/obj/item/deck/cards/tiny/update_icon_state() return /obj/item/deck/cards/tiny/doublecards diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm index 18b564e94b1..96c71bae97d 100644 --- a/code/modules/games/cards.dm +++ b/code/modules/games/cards.dm @@ -53,7 +53,7 @@ for(var/deck in 1 to deck_size) build_deck() deck_total = length(cards) - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/deck/proc/build_deck() return @@ -66,7 +66,7 @@ cards += P qdel(H) to_chat(user,"You place your cards on the bottom of [src].") - update_icon() + update_icon(UPDATE_ICON_STATE) return else to_chat(user,"You can't mix cards from different decks!") @@ -159,10 +159,10 @@ var/datum/playingcard/P = cards[1] H.cards += P cards -= P - update_icon() + update_icon(UPDATE_ICON_STATE) H.parentdeck = src H.update_values() - H.update_icon() + H.update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_OVERLAYS) user.visible_message("[user] draws a card.","You draw a card.") to_chat(user,"It's the [P].") @@ -224,11 +224,11 @@ for(var/i in 1 to dcard) H.cards += cards[1] cards -= cards[1] - update_icon() + update_icon(UPDATE_ICON_STATE) H.parentdeck = src H.update_values() H.concealed = TRUE - H.update_icon() + H.update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_OVERLAYS) if(user == target) user.visible_message("[user] deals [dcard] card(s) to \himself.") else @@ -298,7 +298,7 @@ user.unEquip(src, force = 1) qdel(src) - H.update_icon() + H.update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_OVERLAYS) user.put_in_hands(H) /obj/item/cardhand @@ -341,7 +341,7 @@ P.name = t // SNOWFLAKE FOR CAG, REMOVE IF OTHER CARDS ARE ADDED THAT USE THIS. P.card_icon = "cag_white_card" - update_icon() + update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_OVERLAYS) else if(istype(O,/obj/item/cardhand)) var/obj/item/cardhand/H = O if((length(H.cards) + length(cards)) > maxcardlen) @@ -352,7 +352,7 @@ H.cards += P H.concealed = concealed qdel(src) - H.update_icon() + H.update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_OVERLAYS) return else to_chat(user,"You cannot mix cards from other deck!") @@ -368,7 +368,7 @@ /obj/item/cardhand/proc/turn_hand(mob/user) concealed = !concealed - update_icon() + update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_OVERLAYS) user.visible_message("[user] [concealed ? "conceals" : "reveals"] their hand.") /obj/item/cardhand/interact(mob/user) @@ -411,7 +411,18 @@ button_icon_state = "remove_card" use_itemicon = FALSE +/datum/action/item_action/remove_card/IsAvailable() + var/obj/item/cardhand/C = target + if(length(C.cards) <= 1) + return FALSE + var/mob/living/carbon/human/O = owner + if(O.l_hand && O.r_hand) + return FALSE + return ..() + /datum/action/item_action/remove_card/Trigger() + if(!IsAvailable()) + return if(istype(target, /obj/item/cardhand)) var/obj/item/cardhand/C = target return C.Removecard() @@ -464,11 +475,11 @@ H.parentdeck = parentdeck H.update_values() H.concealed = concealed - H.update_icon() + H.update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_OVERLAYS) if(!length(cards)) qdel(src) return - update_icon() + update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_OVERLAYS) /obj/item/cardhand/verb/discard() @@ -487,7 +498,10 @@ for(var/datum/playingcard/P in cards) to_discard[P.name] = P var/discarding = input("Which card do you wish to put down?") as null|anything in to_discard - + + if(!discarding) + continue + if(QDELETED(src)) return @@ -501,9 +515,9 @@ H.parentdeck = parentdeck H.update_values() H.direction = user.dir - H.update_icon() + H.update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_OVERLAYS) if(length(cards)) - update_icon() + update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_OVERLAYS) if(length(H.cards)) user.visible_message("[user] plays the [discarding].", "You play the [discarding].") H.loc = get_step(user, user.dir) @@ -511,19 +525,34 @@ if(!length(cards)) qdel(src) -/obj/item/cardhand/update_icon() - +/obj/item/cardhand/update_appearance(updates=ALL) if(!length(cards)) return - else if(length(cards) > 1) + if(length(cards) <= 2) + for(var/X in actions) + var/datum/action/A = X + A.UpdateButtonIcon() + ..() + +/obj/item/cardhand/update_name() + . = ..() + if(length(cards) > 1) name = "hand of cards" - desc = "Some playing cards." else name = "a playing card" + +/obj/item/cardhand/update_desc() + . = ..() + if(length(cards) > 1) + desc = "Some playing cards." + else desc = "A playing card." - cut_overlays() +/obj/item/cardhand/update_icon_state() + return +/obj/item/cardhand/update_overlays() + . = ..() var/matrix/M = matrix() switch(direction) if(NORTH) @@ -544,7 +573,7 @@ I.transform = M I.pixel_x += (-5+rand(10)) I.pixel_y += (-5+rand(10)) - add_overlay(I) + . += I return var/offset = FLOOR(20/length(cards) + 1, 1) @@ -562,7 +591,7 @@ else I.pixel_x = -7+(offset*i) I.transform = M - add_overlay(I) + . += I i++ /obj/item/cardhand/dropped(mob/user) @@ -571,9 +600,9 @@ direction = user.dir else direction = NORTH - update_icon() + update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_OVERLAYS) /obj/item/cardhand/pickup(mob/user as mob) . = ..() direction = NORTH - update_icon() + update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_OVERLAYS) diff --git a/code/modules/hydroponics/beekeeping/honeycomb.dm b/code/modules/hydroponics/beekeeping/honeycomb.dm index 1d086bae0f0..9e04f39f843 100644 --- a/code/modules/hydroponics/beekeeping/honeycomb.dm +++ b/code/modules/hydroponics/beekeeping/honeycomb.dm @@ -15,20 +15,20 @@ ..() pixel_x = rand(8,-8) pixel_y = rand(8,-8) - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/item/reagent_containers/honeycomb/set_APTFT() set hidden = TRUE -/obj/item/reagent_containers/honeycomb/update_icon() - overlays.Cut() +/obj/item/reagent_containers/honeycomb/update_overlays() + . = ..() var/image/honey if(honey_color) honey = image(icon = 'icons/obj/hydroponics/harvest.dmi', icon_state = "greyscale_honey") honey.color = honey_color else honey = image(icon = 'icons/obj/hydroponics/harvest.dmi', icon_state = "honey") - overlays += honey + . += honey /obj/item/reagent_containers/honeycomb/proc/set_reagent(reagent) @@ -39,4 +39,4 @@ reagents.add_reagent(R.id,5) else honey_color = "" - update_icon() + update_icon(UPDATE_OVERLAYS) diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index e1ac2f3dd10..ad3855103f8 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -57,7 +57,7 @@ if(A != container) return container = null - update_icon() + update_icon(UPDATE_ICON_STATE) SStgui.update_uis(src) /obj/machinery/biogenerator/RefreshParts() @@ -75,7 +75,7 @@ if(effeciency_prev != efficiency) update_ui_product_list() // We have have a higher `efficiency` now, and need to re-calc the product costs. -/obj/machinery/biogenerator/update_icon() +/obj/machinery/biogenerator/update_icon_state() if(panel_open) icon_state = "biogen-empty-o" else if(!container) @@ -118,7 +118,7 @@ O.forceMove(src) container = O to_chat(user, "You add the [container] to [src].") - update_icon() + update_icon(UPDATE_ICON_STATE) SStgui.update_uis(src) return TRUE @@ -260,7 +260,7 @@ processing = TRUE SStgui.update_uis(src) - update_icon() + update_icon(UPDATE_ICON_STATE) var/plants_processed = length(stored_plants) for(var/obj/plant as anything in stored_plants) @@ -276,7 +276,7 @@ /obj/machinery/biogenerator/proc/end_processing() processing = FALSE SStgui.update_uis(src) - update_icon() + update_icon(UPDATE_ICON_STATE) /** * Ejects the biogenerator's stored plants @@ -346,7 +346,7 @@ biomass -= (D.materials[MAT_BIOMASS] / efficiency) * amount SStgui.update_uis(src) - update_icon() + update_icon(UPDATE_ICON_STATE) /** * Detach the `container` from the biogenerator. @@ -356,6 +356,6 @@ return container.forceMove(get_turf(src)) container = null - update_icon() + update_icon(UPDATE_ICON_STATE) #undef BASE_MAX_STORABLE_PLANTS diff --git a/code/modules/hydroponics/fermenting_barrel.dm b/code/modules/hydroponics/fermenting_barrel.dm index 22a7ebb8fa0..224e4a62386 100644 --- a/code/modules/hydroponics/fermenting_barrel.dm +++ b/code/modules/hydroponics/fermenting_barrel.dm @@ -63,7 +63,7 @@ else container_type = DRAINABLE | AMOUNT_VISIBLE to_chat(user, "You close [src], letting you draw from its tap.") - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/fermenting_barrel/crowbar_act(mob/living/user, obj/item/I) . = TRUE @@ -85,7 +85,7 @@ new /obj/item/stack/sheet/wood(drop_location(), mat_drop) ..() -/obj/structure/fermenting_barrel/update_icon() +/obj/structure/fermenting_barrel/update_icon_state() if(open) icon_state = "barrel_open" else diff --git a/code/modules/hydroponics/gene_modder.dm b/code/modules/hydroponics/gene_modder.dm index 89521b41ac8..2ffeec2e297 100644 --- a/code/modules/hydroponics/gene_modder.dm +++ b/code/modules/hydroponics/gene_modder.dm @@ -82,21 +82,22 @@ min_wchance = 0 min_wrate = 0 -/obj/machinery/plantgenes/update_icon() - ..() - overlays.Cut() +/obj/machinery/plantgenes/update_icon_state() if((stat & (BROKEN|NOPOWER))) icon_state = "dnamod-off" else icon_state = "dnamod" + +/obj/machinery/plantgenes/update_overlays() + . = ..() if(seed) - overlays += "dnamod-dna" + . += "dnamod-dna" if(panel_open) - overlays += "dnamod-open" + . += "dnamod-open" /obj/machinery/plantgenes/attackby(obj/item/I, mob/user, params) if(default_deconstruction_screwdriver(user, "dnamod", "dnamod", I)) - update_icon() + update_icon(UPDATE_OVERLAYS) return if(exchange_parts(user, I)) return @@ -301,7 +302,7 @@ seed.verb_pickup() seed = null update_genes() - update_icon() + update_icon(UPDATE_OVERLAYS) else var/obj/item/I = usr.get_active_hand() if(istype(I, /obj/item/seeds)) @@ -309,7 +310,7 @@ return insert_seed(I) to_chat(usr, "You add [I] to the machine.") - update_icon() + update_icon(UPDATE_OVERLAYS) else if(href_list["eject_disk"] && !operation) if(disk) disk.forceMove(loc) @@ -376,7 +377,7 @@ gene.value = max(gene.value, min_wchance) disk.update_name() QDEL_NULL(seed) - update_icon() + update_icon(UPDATE_OVERLAYS) if("replace") if(disk && disk.gene && istype(disk.gene, G.type) && istype(G, /datum/plant_gene/core)) seed.genes -= G @@ -417,7 +418,7 @@ S.forceMove(src) seed = S update_genes() - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/machinery/plantgenes/proc/update_genes() core_genes = list() @@ -477,7 +478,8 @@ if(istype(W, /obj/item/pen)) rename_interactive(user, W) -/obj/item/disk/plantgene/proc/update_name() +/obj/item/disk/plantgene/update_name() + . = ..() if(gene) name = "[gene.get_name()] (Plant Data Disk)" else diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 2c6e24b6f75..6a75e915b37 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -130,7 +130,7 @@ attack_verb = list("chopped", "sliced", "cut", "reaped") hitsound = 'sound/weapons/bladeslice.ogg' sharp = TRUE - var/extend = 1 + var/extend = TRUE var/swiping = FALSE /obj/item/scythe/bone @@ -174,7 +174,7 @@ force = 3 sharp = FALSE w_class = WEIGHT_CLASS_SMALL - extend = 0 + extend = FALSE slot_flags = SLOT_BELT origin_tech = "materials=3;combat=3" attack_verb = list("hit", "poked") @@ -184,8 +184,6 @@ extend = !extend if(extend) to_chat(user, "With a flick of your wrist, you extend the scythe. It's reaping time!") - icon_state = "tscythe1" - item_state = "scythe0" //use the normal scythe in-hands slot_flags = SLOT_BACK //won't fit on belt, but can be worn on belt when extended w_class = WEIGHT_CLASS_BULKY //won't fit in backpacks while extended force = 15 //slightly better than normal scythe damage @@ -195,8 +193,6 @@ playsound(src.loc, 'sound/weapons/blade_unsheath.ogg', 50, 1) //Sound credit to Qat of Freesound.org else to_chat(user, "You collapse the scythe, folding it away for easy storage.") - icon_state = "tscythe0" - item_state = null //no sprite for folded version, like a tele-baton slot_flags = SLOT_BELT //can be worn on belt again, but no longer makes sense to wear on the back w_class = WEIGHT_CLASS_SMALL force = 3 @@ -205,12 +201,21 @@ //Collapse sound (blade sheath) playsound(src.loc, 'sound/weapons/blade_sheath.ogg', 50, 1) //Sound credit to Q.K. of Freesound.org sharp = extend + update_icon(UPDATE_ICON_STATE) if(ishuman(user)) var/mob/living/carbon/human/H = user H.update_inv_l_hand() H.update_inv_r_hand() add_fingerprint(user) +/obj/item/scythe/tele/update_icon_state() + if(extend) + icon_state = "tscythe1" + item_state = "scythe0" //use the normal scythe in-hands + else + icon_state = "tscythe0" + item_state = null //no sprite for folded version, like a tele-baton + // ************************************* // Nutrient defines for hydroponics // ************************************* @@ -240,7 +245,7 @@ /obj/item/reagent_containers/glass/bottle/nutrient/on_reagent_change() . = ..() - update_icon() + update_icon(UPDATE_OVERLAYS) if(reagents.total_volume) hitsound = 'sound/weapons/jug_filled_impact.ogg' mob_throw_hit_sound = 'sound/weapons/jug_filled_impact.ogg' @@ -248,9 +253,8 @@ hitsound = 'sound/weapons/jug_empty_impact.ogg' mob_throw_hit_sound = 'sound/weapons/jug_empty_impact.ogg' -/obj/item/reagent_containers/glass/bottle/nutrient/update_icon() - cut_overlays() - +/obj/item/reagent_containers/glass/bottle/nutrient/update_overlays() + . = ..() if(reagents.total_volume) var/image/filling = image('icons/obj/reagentfillings.dmi', src, "plastic_jug10") @@ -272,10 +276,10 @@ filling.icon_state = "plastic_jug100" filling.icon += mix_color_from_reagents(reagents.reagent_list) - add_overlay(filling) + . += filling if(!is_open_container()) - add_overlay("lid_jug") + . += "lid_jug" /obj/item/reagent_containers/glass/bottle/nutrient/ez diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 65fef36546b..dc01129dc8f 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -125,7 +125,7 @@ lid_closed = !lid_closed to_chat(user, "You [lid_closed ? "close" : "open"] the tray's lid.") - update_icon() + update_state() /obj/machinery/hydroponics/bullet_act(obj/item/projectile/Proj) //Works with the Somatoray to modify plant variables. @@ -253,7 +253,7 @@ weedinvasion() // Weed invasion into empty tray needs_update = 1 if (needs_update) - update_icon() + update_state() return /obj/machinery/hydroponics/proc/nutrimentMutation() @@ -275,36 +275,34 @@ return return -/obj/machinery/hydroponics/update_icon() +/obj/machinery/hydroponics/proc/update_state() //Refreshes the icon and sets the luminosity - overlays.Cut() - if(self_sustaining) if(istype(src, /obj/machinery/hydroponics/soil)) color = rgb(255, 175, 0) - else - overlays += image('icons/obj/hydroponics/equipment.dmi', icon_state = "gaia_blessing") set_light(3) - - if(lid_closed) - overlays += image('icons/obj/hydroponics/equipment.dmi', icon_state = "hydrocover") - - update_icon_hoses() - - if(myseed) - update_icon_plant() - update_icon_lights() - - if(!self_sustaining) + else if(myseed && myseed.get_gene(/datum/plant_gene/trait/glow)) var/datum/plant_gene/trait/glow/G = myseed.get_gene(/datum/plant_gene/trait/glow) set_light(G.glow_range(myseed), G.glow_power(myseed), G.glow_color) else set_light(0) - return + update_icon() -/obj/machinery/hydroponics/proc/update_icon_hoses() +/obj/machinery/hydroponics/update_overlays() + . = ..() + if(self_sustaining && !istype(src, /obj/machinery/hydroponics/soil)) + . += "gaia_blessing" + + if(lid_closed) + . += "hydrocover" + + if(myseed) + . += update_icon_plant() + . += update_icon_lights() + +/obj/machinery/hydroponics/update_icon_state() var/n = 0 for(var/Dir in GLOB.cardinal) var/obj/machinery/hydroponics/t = locate() in get_step(src,Dir) @@ -326,19 +324,20 @@ var/t_growthstate = clamp(round((age / myseed.maturation) * myseed.growthstages), 1, myseed.growthstages) I = image(icon = myseed.growing_icon, icon_state = "[myseed.icon_grow][t_growthstate]") I.layer = OBJ_LAYER + 0.01 - overlays += I + return I /obj/machinery/hydroponics/proc/update_icon_lights() + . = list() if(waterlevel <= 10) - overlays += image('icons/obj/hydroponics/equipment.dmi', icon_state = "over_lowwater3") + . += "over_lowwater3" if(nutrilevel <= 2) - overlays += image('icons/obj/hydroponics/equipment.dmi', icon_state = "over_lownutri3") + . += "over_lownutri3" if(plant_health <= (myseed.endurance / 2)) - overlays += image('icons/obj/hydroponics/equipment.dmi', icon_state = "over_lowhealth3") + . += "over_lowhealth3" if(weedlevel >= 5 || pestlevel >= 5 || toxic >= 40) - overlays += image('icons/obj/hydroponics/equipment.dmi', icon_state = "over_alert3") + . += "over_alert3" if(harvest) - overlays += image('icons/obj/hydroponics/equipment.dmi', icon_state = "over_harvest3") + . += "over_harvest3" /obj/machinery/hydroponics/examine(user) @@ -404,7 +403,7 @@ harvest = FALSE adjustWeeds(-10) // Reset adjustPests(-10) // Reset - update_icon() + update_state() plant_hud_set_health() plant_hud_set_status() visible_message("The [oldPlantName] is overtaken by some [myseed.plantname]!") @@ -441,7 +440,7 @@ adjustWeeds(-10) // Reset sleep(5) // Wait a while - update_icon() + update_state() visible_message("[oldPlantName] suddenly mutates into [myseed.plantname]!") @@ -461,7 +460,7 @@ adjustWeeds(-10) // Reset sleep(5) // Wait a while - update_icon() + update_state() visible_message("The mutated weeds in [src] spawn some [myseed.plantname]!") else to_chat(usr, "The few weeds in [src] seem to react, but only for a moment...") @@ -472,7 +471,7 @@ harvest = FALSE adjustPests(-10) // Pests die if(!dead) - update_icon() + update_state() dead = TRUE plant_hud_set_health() plant_hud_set_status() @@ -802,7 +801,7 @@ S.clear_reagents() qdel(S) - H.update_icon() + H.update_state() if(reagent_source) // If the source wasn't composted and destroyed reagent_source.update_icon() return 1 @@ -821,7 +820,7 @@ plant_hud_set_status() lastcycle = world.time O.forceMove(src) - update_icon() + update_state() else to_chat(user, "[src] already has seeds in it!") @@ -845,7 +844,7 @@ if(weedlevel > 0) user.visible_message("[user] uproots the weeds.", "You remove the weeds from [src].") adjustWeeds(-10) - update_icon() + update_state() else to_chat(user, "This plot is completely devoid of weeds! It doesn't need uprooting.") @@ -877,7 +876,7 @@ plant_hud_set_health() plant_hud_set_status() adjustWeeds(-10) //Has a side effect of cleaning up those nasty weeds - update_icon() + update_state() else if(istype(O, /obj/item/pen) && myseed) myseed.variant_prompt(user, src) else @@ -892,7 +891,7 @@ user.visible_message("[user] [using_irrigation ? "" : "dis"]connects [src]'s irrigation hoses.", \ "You [using_irrigation ? "" : "dis"]connect [src]'s irrigation hoses.") for(var/obj/machinery/hydroponics/h in range(1,src)) - h.update_icon() + h.update_state() /obj/machinery/hydroponics/wrench_act(mob/user, obj/item/I) . = TRUE @@ -933,7 +932,7 @@ dead = FALSE to_chat(user, "You remove the dead plant from [src].") QDEL_NULL(myseed) - update_icon() + update_state() plant_hud_set_status() plant_hud_set_health() else @@ -953,7 +952,7 @@ dead = FALSE plant_hud_set_status() plant_hud_set_health() - update_icon() + update_state() /// Tray Setters - The following procs adjust the tray or plants variables, and make sure that the stat doesn't go out of bounds./// /obj/machinery/hydroponics/proc/adjustNutri(adjustamt) @@ -992,7 +991,7 @@ /obj/machinery/hydroponics/proc/become_self_sufficient() // Ambrosia Gaia effect visible_message("[src] begins to glow with a beautiful light!") self_sustaining = TRUE - update_icon() + update_state() ///Diona Nymph Related Procs/// /obj/machinery/hydroponics/CanPass(atom/movable/mover, turf/target, height=0) //So nymphs can climb over top of trays. @@ -1009,12 +1008,12 @@ if(weedlevel > 0) user.adjust_nutrition(weedlevel * 15) adjustWeeds(-10) - update_icon() + update_state() visible_message("[user] begins rooting through [src], ripping out weeds and eating them noisily.","You begin rooting through [src], ripping out weeds and eating them noisily.") else if(nutrilevel < 10) user.adjust_nutrition(-((10 - nutrilevel) * 5)) adjustNutri(10) - update_icon() + update_state() visible_message("[user] secretes a trickle of green liquid from its tail, refilling [src]'s nutrient tray.","You secrete a trickle of green liquid from your tail, refilling [src]'s nutrient tray.") else return ..() @@ -1028,7 +1027,7 @@ use_power = NO_POWER_USE wrenchable = FALSE -/obj/machinery/hydroponics/soil/update_icon_hoses() +/obj/machinery/hydroponics/soil/update_icon_state() return // Has no hoses /obj/machinery/hydroponics/soil/update_icon_lights() diff --git a/code/modules/instruments/objs/items/headphones.dm b/code/modules/instruments/objs/items/headphones.dm index a4f4fcd7c1e..484cc21bec7 100644 --- a/code/modules/instruments/objs/items/headphones.dm +++ b/code/modules/instruments/objs/items/headphones.dm @@ -25,9 +25,7 @@ ui_interact(user) else on = !on - icon_state = "headphones[on]" - item_state = "headphones[on]" - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/clothing/ears/headphones/ui_data(mob/user) return song.ui_data(user) @@ -42,12 +40,12 @@ return return song.ui_act(action, params) -/obj/item/clothing/ears/headphones/update_icon() +/obj/item/clothing/ears/headphones/update_icon_state() var/mob/living/carbon/human/user = loc if(istype(user)) user.update_action_buttons_icon() user.update_inv_ears() - ..() + icon_state = item_state = "headphones[on]" /obj/item/clothing/ears/headphones/item_action_slot_check(slot) if(slot == slot_l_ear || slot == slot_r_ear) @@ -57,15 +55,15 @@ * Called by a component signal when our song starts playing. */ /obj/item/clothing/ears/headphones/proc/start_playing() - icon_state = item_state = "headphones1" - update_icon() + on = TRUE + update_icon(UPDATE_ICON_STATE) /** * Called by a component signal when our song stops playing. */ /obj/item/clothing/ears/headphones/proc/stop_playing() - icon_state = item_state = "headphones0" - update_icon() + on = FALSE + update_icon(UPDATE_ICON_STATE) /** * Whether the headphone's song should stop playing diff --git a/code/modules/library/library_equipment.dm b/code/modules/library/library_equipment.dm index 5e10191b304..ea411dbd3ac 100644 --- a/code/modules/library/library_equipment.dm +++ b/code/modules/library/library_equipment.dm @@ -24,7 +24,7 @@ if(!user.drop_item()) return O.forceMove(src) - update_icon() + update_icon(UPDATE_ICON_STATE) return TRUE if(istype(O, /obj/item/storage/bag/books)) var/obj/item/storage/bag/books/B = O @@ -32,7 +32,7 @@ if(is_type_in_list(T, allowed_books)) B.remove_from_storage(T, src) to_chat(user, "You empty [O] into [src].") - update_icon() + update_icon(UPDATE_ICON_STATE) return TRUE if(istype(O, /obj/item/pen)) rename_interactive(user, O) @@ -53,7 +53,7 @@ user.put_in_hands(choice) else choice.forceMove(get_turf(src)) - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/bookcase/deconstruct(disassembled = TRUE) new /obj/item/stack/sheet/wood(loc, 5) @@ -62,7 +62,7 @@ I.forceMove(get_turf(src)) ..() -/obj/structure/bookcase/update_icon() +/obj/structure/bookcase/update_icon_state() icon_state = "bookshelf-[min(length(contents), 5)]" @@ -89,7 +89,7 @@ /obj/structure/bookcase/manuals/medical/Initialize() . = ..() new /obj/item/book/manual/medical_cloning(src) - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/bookcase/manuals/engineering @@ -103,7 +103,7 @@ new /obj/item/book/manual/wiki/engineering_guide(src) new /obj/item/book/manual/engineering_singularity_safety(src) new /obj/item/book/manual/wiki/robotics_cyborgs(src) - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/bookcase/manuals/research_and_development name = "R&D Manuals bookcase" @@ -111,7 +111,7 @@ /obj/structure/bookcase/manuals/research_and_development/Initialize() . = ..() new /obj/item/book/manual/research_and_development(src) - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/bookcase/sop name = "bookcase (Standard Operating Procedures)" @@ -127,7 +127,7 @@ new /obj/item/book/manual/wiki/sop_security(src) new /obj/item/book/manual/wiki/sop_service(src) new /obj/item/book/manual/wiki/sop_supply(src) - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/bookcase/random var/category = null @@ -140,7 +140,7 @@ var/list/books = GLOB.library_catalog.get_random_book(book_count, doAsync = FALSE) for(var/datum/cachedbook/book as anything in books) new /obj/item/book(src, book, TRUE, FALSE) - update_icon() + update_icon(UPDATE_ICON_STATE) /* * Book binder diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm index 9c67fcc7407..2000e9af89e 100644 --- a/code/modules/martial_arts/martial.dm +++ b/code/modules/martial_arts/martial.dm @@ -325,9 +325,8 @@ icon_state = "bostaff0" block_chance = 50 -/obj/item/twohanded/bostaff/update_icon() +/obj/item/twohanded/bostaff/update_icon_state() icon_state = "bostaff[wielded]" - return /obj/item/twohanded/bostaff/attack(mob/target, mob/living/user) add_fingerprint(user) diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm index d0568b1fa4c..ccdbcf4d885 100644 --- a/code/modules/mining/equipment/explorer_gear.dm +++ b/code/modules/mining/equipment/explorer_gear.dm @@ -88,9 +88,8 @@ AddComponent(/datum/component/spraycan_paintable) update_icon() -/obj/item/clothing/head/helmet/space/hostile_environment/update_icon() - ..() - cut_overlays() +/obj/item/clothing/head/helmet/space/hostile_environment/update_overlays() + . = ..() var/mutable_appearance/glass_overlay = mutable_appearance(icon, "hostile_env_glass") glass_overlay.appearance_flags = RESET_COLOR - add_overlay(glass_overlay) + . += glass_overlay diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index 1b14e8d52b1..bd3326f6c95 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -154,18 +154,19 @@ else set_light(0) -/obj/item/twohanded/kinetic_crusher/update_icon() - ..() - cut_overlays() +/obj/item/twohanded/kinetic_crusher/update_icon_state() + item_state = "crusher[wielded]" + +/obj/item/twohanded/kinetic_crusher/update_overlays() + . = ..() if(!charged) - add_overlay("[icon_state]_uncharged") + . += "[icon_state]_uncharged" if(light_on) - add_overlay("[icon_state]_lit") + . += "[icon_state]_lit" spawn(1) for(var/X in actions) var/datum/action/A = X A.UpdateButtonIcon() - item_state = "crusher[wielded]" //destablizing force /obj/item/projectile/destabilizer diff --git a/code/modules/mining/equipment/lazarus_injector.dm b/code/modules/mining/equipment/lazarus_injector.dm index f1e06a9f203..a4cab8cd780 100644 --- a/code/modules/mining/equipment/lazarus_injector.dm +++ b/code/modules/mining/equipment/lazarus_injector.dm @@ -118,5 +118,7 @@ colorindex += 1 if(colorindex >= 6) colorindex = 0 + update_icon(UPDATE_ICON_STATE) + +/obj/item/mobcapsule/update_icon_state() icon_state = "mobcap[colorindex]" - update_icon() diff --git a/code/modules/mining/equipment/marker_beacons.dm b/code/modules/mining/equipment/marker_beacons.dm index 77c1e66a926..30c3db2d3c8 100644 --- a/code/modules/mining/equipment/marker_beacons.dm +++ b/code/modules/mining/equipment/marker_beacons.dm @@ -34,14 +34,14 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list( /obj/item/stack/marker_beacon/Initialize(mapload) . = ..() - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/stack/marker_beacon/examine(mob/user) . = ..() . += "Use in-hand to place a [singular_name]." . += "Alt-click to select a color. Current color is [picked_color]." -/obj/item/stack/marker_beacon/update_icon() +/obj/item/stack/marker_beacon/update_icon_state() icon_state = "[initial(icon_state)][lowertext(picked_color)]" /obj/item/stack/marker_beacon/attack_self(mob/user) @@ -65,7 +65,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list( return if(input_color) picked_color = input_color - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/marker_beacon name = "marker beacon" @@ -84,13 +84,13 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list( /obj/structure/marker_beacon/Initialize(mapload, set_color) . = ..() picked_color = set_color - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/marker_beacon/deconstruct(disassembled = TRUE) if(!(flags & NODECONSTRUCT)) var/obj/item/stack/marker_beacon/M = new(loc) M.picked_color = picked_color - M.update_icon() + M.update_icon(UPDATE_ICON_STATE) qdel(src) /obj/structure/marker_beacon/examine(mob/user) @@ -98,7 +98,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list( if(picked_color) . += "Alt-click to select a color. Current color is [picked_color]." -/obj/structure/marker_beacon/update_icon() +/obj/structure/marker_beacon/update_icon_state() while(!picked_color || !GLOB.marker_beacon_colors[picked_color]) picked_color = pick(GLOB.marker_beacon_colors) icon_state = "[initial(icon_state)][lowertext(picked_color)]-on" @@ -115,7 +115,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list( if(do_after(user, remove_speed, target = src)) var/obj/item/stack/marker_beacon/M = new(loc) M.picked_color = picked_color - M.update_icon() + M.update_icon(UPDATE_ICON_STATE) transfer_fingerprints_to(M) user.put_in_hands(M) playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE) @@ -141,7 +141,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list( return if(input_color) picked_color = input_color - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/marker_beacon/dock_marker name = "docking beacon" @@ -149,7 +149,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list( icon_state = "dockingmarker" flags = NODECONSTRUCT -/obj/structure/marker_beacon/dock_marker/update_icon() +/obj/structure/marker_beacon/dock_marker/update_icon_state() set_light(light_range, light_power, LIGHT_COLOR_BLUE) /obj/structure/marker_beacon/dock_marker/attackby() @@ -166,6 +166,5 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list( desc = "A Prism-brand collision illumination device. It is anchored in place and glowing steadily." icon_state = "markerburgundy-on" -/obj/structure/marker_beacon/dock_marker/collision/update_icon() +/obj/structure/marker_beacon/dock_marker/collision/update_icon_state() set_light(light_range, light_power, LIGHT_COLOR_FLARE) - return diff --git a/code/modules/mining/equipment/regenerative_core.dm b/code/modules/mining/equipment/regenerative_core.dm index 4731d8134e9..b1f1dc94af5 100644 --- a/code/modules/mining/equipment/regenerative_core.dm +++ b/code/modules/mining/equipment/regenerative_core.dm @@ -120,11 +120,13 @@ . = ..() update_icon() -/obj/item/organ/internal/regenerative_core/legion/update_icon() +/obj/item/organ/internal/regenerative_core/legion/update_icon_state() icon_state = inert ? "legion_soul_inert" : "legion_soul" - cut_overlays() + +/obj/item/organ/internal/regenerative_core/legion/update_overlays() + . = ..() if(!inert && !preserved) - add_overlay("legion_soul_crackle") + . += "legion_soul_crackle" for(var/X in actions) var/datum/action/A = X A.UpdateButtonIcon() diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index 3c8122695bc..92e454d007f 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -232,9 +232,12 @@ var/obj/item/instrument/guitar/G = new(src) load(G) -/obj/machinery/smartfridge/survival_pod/update_icon() +/obj/machinery/smartfridge/survival_pod/update_icon_state() return +/obj/machinery/smartfridge/survival_pod/update_overlays() + return list() + /obj/machinery/smartfridge/survival_pod/accept_check(obj/item/O) return isitem(O) diff --git a/code/modules/mining/lavaland/loot/hierophant_loot.dm b/code/modules/mining/lavaland/loot/hierophant_loot.dm index eddef1ac65a..484e4d1bc3b 100644 --- a/code/modules/mining/lavaland/loot/hierophant_loot.dm +++ b/code/modules/mining/lavaland/loot/hierophant_loot.dm @@ -108,7 +108,7 @@ chaser_speed = max(chaser_speed + health_percent, 0.5) //one tenth of a second faster for each missing 10% of health blast_range -= round(health_percent * 10) //one additional range for each missing 10% of health -/obj/item/hierophant_club/update_icon() +/obj/item/hierophant_club/update_icon_state() icon_state = "hierophant_club[timer <= world.time ? "_ready":""][(beacon && !QDELETED(beacon)) ? "":"_beacon"]" item_state = icon_state if(ismob(loc)) diff --git a/code/modules/mining/lavaland/loot/tendril_loot.dm b/code/modules/mining/lavaland/loot/tendril_loot.dm index 30547259bd6..1bb61d48b89 100644 --- a/code/modules/mining/lavaland/loot/tendril_loot.dm +++ b/code/modules/mining/lavaland/loot/tendril_loot.dm @@ -104,7 +104,7 @@ desc = "A flask with an almost-holy aura emitting from it. The label on the bottle says: 'erqo'hyy tvi'rf lbh jv'atf'." list_reagents = list("flightpotion" = 5) -/obj/item/reagent_containers/glass/bottle/potion/update_icon() +/obj/item/reagent_containers/glass/bottle/potion/update_icon_state() if(reagents.total_volume) icon_state = "potionflask" else diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm index cd3ae4fe68e..3c9cb4f00b3 100644 --- a/code/modules/mining/machine_redemption.dm +++ b/code/modules/mining/machine_redemption.dm @@ -156,13 +156,13 @@ /obj/machinery/mineral/ore_redemption/power_change() ..() - update_icon() + update_icon(UPDATE_ICON_STATE) if(inserted_id && !powered()) visible_message("The ID slot indicator light flickers on [src] as it spits out a card before powering down.") inserted_id.forceMove(get_turf(src)) inserted_id = null -/obj/machinery/mineral/ore_redemption/update_icon() +/obj/machinery/mineral/ore_redemption/update_icon_state() if(powered()) icon_state = initial(icon_state) else diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 7dac9a56101..f5608be41cd 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -95,12 +95,12 @@ /obj/machinery/mineral/equipment_vendor/power_change() ..() - update_icon() + update_icon(UPDATE_ICON_STATE) if(inserted_id && !powered()) visible_message("The ID slot indicator light flickers on \the [src] as it spits out a card before powering down.") inserted_id.forceMove(loc) -/obj/machinery/mineral/equipment_vendor/update_icon() +/obj/machinery/mineral/equipment_vendor/update_icon_state() if(powered()) icon_state = initial(icon_state) else diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 353f47a8352..58a23a655f5 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -16,6 +16,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) alpha = 127 move_resist = INFINITY // don't get pushed around invisibility = INVISIBILITY_OBSERVER + blocks_emissive = FALSE // Ghosts are transparent, duh var/can_reenter_corpse var/bootime = FALSE var/started_as_observer //This variable is set to 1 when you enter the game as an observer. @@ -230,7 +231,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(istype(M.loc, /obj/structure/morgue)) Morgue = M.loc if(Morgue) - Morgue.update() + Morgue.update_state() // If mob in cryopod, despawn mob if(P) @@ -296,7 +297,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(istype(mind.current.loc,/obj/structure/morgue)) Morgue = mind.current.loc if(Morgue) - Morgue.update() + Morgue.update_state() return 1 diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index c665305e99b..f144f2e6b81 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -235,7 +235,7 @@ /mob/living/stop_pulling() ..() if(pullin) - pullin.update_icon(src) + pullin.update_icon(UPDATE_ICON_STATE) /mob/living/verb/stop_pulling1() set name = "Stop Pulling" @@ -1022,7 +1022,7 @@ pulling = AM AM.pulledby = src if(pullin) - pullin.update_icon(src) + pullin.update_icon(UPDATE_ICON_STATE) if(ismob(AM)) var/mob/M = AM if(!iscarbon(src)) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 9f5f68be054..eb978f33272 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -323,7 +323,6 @@ var/icontype icontype = input(player,"Pick an icon") in sprite icon_state = sprite[icontype] - updateicon() choose_icon(6,sprite) */ diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index ee322a70ef7..6cef54df830 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -1118,7 +1118,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( robot_suit.head.flash2.burn_out() robot_suit.head.flash2 = null robot_suit.head = null - robot_suit.updateicon() + robot_suit.update_icon(UPDATE_OVERLAYS) else new /obj/item/robot_parts/robot_suit(T) new /obj/item/robot_parts/l_leg(T) diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index f6fb357c841..c5c09ca6bd6 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -128,7 +128,7 @@ on = TRUE REMOVE_TRAIT(src, TRAIT_IMMOBILIZED, "depowered") set_light(initial(light_range)) - update_icon() + update_icon(UPDATE_ICON_STATE) update_controls() diag_hud_set_botstat() return 1 @@ -138,7 +138,7 @@ ADD_TRAIT(src, TRAIT_IMMOBILIZED, "depowered") set_light(0) bot_reset() //Resets an AI's call, should it exist. - update_icon() + update_icon(UPDATE_ICON_STATE) update_controls() /mob/living/simple_animal/bot/New() @@ -909,7 +909,7 @@ Pass a positive integer as an argument to override a bot's default speed. bot_reset() add_attack_logs(M, src, "Dehacked") -/mob/living/simple_animal/bot/proc/update_icon() +/mob/living/simple_animal/bot/update_icon_state() icon_state = "[initial(icon_state)][on]" // Machinery to simplify topic and access calls @@ -1001,7 +1001,7 @@ Pass a positive integer as an argument to override a bot's default speed. /mob/living/simple_animal/bot/revive(full_heal = 0, admin_revive = 0) if(..()) - update_icon() + update_icon(UPDATE_ICON_STATE) . = 1 /mob/living/simple_animal/bot/ghost() diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm index 208e6876dfb..b02fd890803 100644 --- a/code/modules/mob/living/simple_animal/bot/construction.dm +++ b/code/modules/mob/living/simple_animal/bot/construction.dm @@ -45,6 +45,7 @@ var/build_step = 0 var/created_name = "\improper ED-209 Security Robot" //To preserve the name if it's a unique securitron I guess var/lasercolor = "" + var/new_name = "" /obj/item/ed209_assembly/attackby(obj/item/W, mob/user, params) ..() @@ -64,13 +65,7 @@ qdel(W) build_step++ to_chat(user, "You add the robot leg to [src].") - name = "legs/frame assembly" - if(build_step == 1) - item_state = "ed209_leg" - icon_state = "ed209_leg" - else - item_state = "ed209_legs" - icon_state = "ed209_legs" + update_appearance(UPDATE_NAME|UPDATE_ICON_STATE) if(2) var/newcolor = "" @@ -85,14 +80,12 @@ qdel(W) build_step++ to_chat(user, "You add the armor to [src].") - name = "vest/legs/frame assembly" - item_state = "[lasercolor]ed209_shell" - icon_state = "[lasercolor]ed209_shell" + update_appearance(UPDATE_NAME|UPDATE_ICON_STATE) if(3) if(W.tool_behaviour == TOOL_WELDER && W.use_tool(src, user, volume = W.tool_volume)) build_step++ - name = "shielded frame assembly" + update_appearance(UPDATE_NAME|UPDATE_ICON_STATE) to_chat(user, "You weld the vest to [src].") if(4) switch(lasercolor) @@ -113,9 +106,7 @@ qdel(W) build_step++ to_chat(user, "You add the helmet to [src].") - name = "covered and shielded frame assembly" - item_state = "[lasercolor]ed209_hat" - icon_state = "[lasercolor]ed209_hat" + update_appearance(UPDATE_NAME|UPDATE_ICON_STATE) if(5) if(isprox(W)) @@ -124,9 +115,7 @@ qdel(W) build_step++ to_chat(user, "You add the prox sensor to [src].") - name = "covered, shielded and sensored frame assembly" - item_state = "[lasercolor]ed209_prox" - icon_state = "[lasercolor]ed209_prox" + update_appearance(UPDATE_NAME|UPDATE_ICON_STATE) if(6) if(istype(W, /obj/item/stack/cable_coil)) @@ -141,32 +130,30 @@ build_step = 7 playsound(loc, W.usesound, 50, 1) to_chat(user, "You wire the ED-209 assembly.") - name = "wired ED-209 assembly" + update_appearance(UPDATE_NAME) if(7) - var/newname = "" + new_name = "" switch(lasercolor) if("b") if(!istype(W, /obj/item/gun/energy/laser/tag/blue)) return - newname = "bluetag ED-209 assembly" + new_name = "bluetag ED-209 assembly" if("r") if(!istype(W, /obj/item/gun/energy/laser/tag/red)) return - newname = "redtag ED-209 assembly" + new_name = "redtag ED-209 assembly" if("") if(!istype(W, /obj/item/gun/energy/disabler)) return - newname = "disabler ED-209 assembly" + new_name = "disabler ED-209 assembly" else return if(!user.unEquip(W)) return - name = newname build_step++ to_chat(user, "You add [W] to [src].") - item_state = "[lasercolor]ed209_taser" - icon_state = "[lasercolor]ed209_taser" + update_appearance(UPDATE_NAME|UPDATE_ICON_STATE) qdel(W) if(8) @@ -175,7 +162,7 @@ to_chat(user, "You start attaching the gun to the frame...") if(do_after(user, 40 * W.toolspeed, target = src)) build_step++ - name = "armed [name]" + update_appearance(UPDATE_NAME) to_chat(user, "Taser gun attached.") if(9) @@ -190,6 +177,47 @@ user.unEquip(src, 1) qdel(src) +/obj/item/ed209_assembly/update_name() + . = ..() + switch(build_step) + if(1,2) + name = "legs/frame assembly" + if(3) + name = "vest/legs/frame assembly" + if(4) + name = "shielded frame assembly" + if(5) + name = "covered and shielded frame assembly" + if(6) + name = "covered, shielded and sensored frame assembly" + if(7) + name = "wired ED-209 assembly" + if(8) + name = new_name + if(9) + name = "armed [name]" + +/obj/item/ed209_assembly/update_icon_state() + switch(build_step) + if(1) + item_state = "ed209_leg" + icon_state = "ed209_leg" + if(2) + item_state = "ed209_legs" + icon_state = "ed209_legs" + if(3,4) + item_state = "[lasercolor]ed209_shell" + icon_state = "[lasercolor]ed209_shell" + if(5) + item_state = "[lasercolor]ed209_hat" + icon_state = "[lasercolor]ed209_hat" + if(6,7) + item_state = "[lasercolor]ed209_prox" + icon_state = "[lasercolor]ed209_prox" + if(8,9) + item_state = "[lasercolor]ed209_taser" + icon_state = "[lasercolor]ed209_taser" + //Floorbot assemblies /obj/item/toolbox_tiles desc = "It's a toolbox with tiles sticking out the top" @@ -239,7 +267,7 @@ B.toolbox_color = "s" if(/obj/item/storage/toolbox/fakesyndi) B.toolbox_color = "s" - B.icon_state = "[B.toolbox_color]toolbox_tiles" + B.update_icon(UPDATE_ICON_STATE) user.put_in_hands(B) to_chat(user, "You add the tiles into the empty toolbox. They protrude from the top.") user.unEquip(src, 1) @@ -248,6 +276,9 @@ to_chat(user, "You need 10 floor tiles to start building a floorbot.") return +/obj/item/toolbox_tiles/update_icon_state() + icon_state = "[toolbox_color]toolbox_tiles" + /obj/item/toolbox_tiles/attackby(obj/item/W, mob/user, params) ..() if(isprox(W)) @@ -255,7 +286,7 @@ var/obj/item/toolbox_tiles/sensor/B = new /obj/item/toolbox_tiles/sensor() B.created_name = created_name B.toolbox_color = src.toolbox_color - B.icon_state = "[B.toolbox_color]toolbox_tiles_sensor" + B.update_icon(UPDATE_ICON_STATE) user.put_in_hands(B) to_chat(user, "You add the sensor to the toolbox and tiles.") user.unEquip(src, 1) @@ -267,6 +298,9 @@ created_name = t log_game("[key_name(user)] has renamed a robot to [t]") +/obj/item/toolbox_tiles/sensor/update_icon_state() + icon_state = "[toolbox_color]toolbox_tiles_sensor" + /obj/item/toolbox_tiles/sensor/attackby(obj/item/W, mob/user, params) ..() if(istype(W, /obj/item/robot_parts/l_arm) || istype(W, /obj/item/robot_parts/r_arm)) @@ -333,15 +367,14 @@ ..() if(new_skin) skin = new_skin - update_icon() + update_icon(UPDATE_OVERLAYS) -/obj/item/firstaid_arm_assembly/update_icon() - overlays.Cut() +/obj/item/firstaid_arm_assembly/update_overlays() + . = ..() if(skin) - overlays += image('icons/obj/aibots.dmi', "kit_skin_[skin]") + . += "kit_skin_[skin]" if(build_step > 0) - overlays += image('icons/obj/aibots.dmi', "na_scanner") - + . += "na_scanner" /obj/item/firstaid_arm_assembly/attackby(obj/item/I, mob/user, params) ..() @@ -359,8 +392,7 @@ qdel(I) build_step++ to_chat(user, "You add the health sensor to [src].") - name = "First aid/robot arm/health analyzer assembly" - update_icon() + update_appearance(UPDATE_NAME) if(1) if(isprox(I)) @@ -385,6 +417,11 @@ user.unEquip(src, 1) qdel(src) +/obj/item/firstaid_arm_assembly/update_name() + . = ..() + if(build_step == 1) + name = "First aid/robot arm/health analyzer assembly" + //Secbot Assembly /obj/item/secbot_assembly name = "incomplete securitron assembly" @@ -417,11 +454,9 @@ if(I.tool_behaviour == TOOL_WELDER && I.use_tool(src, user, volume = I.tool_volume)) if(!build_step) build_step++ - overlays += "hs_hole" to_chat(user, "You weld a hole in [src]!") else if(build_step == 1) build_step-- - overlays -= "hs_hole" to_chat(user, "You weld the hole in [src] shut!") else if(isprox(I) && (build_step == 1)) @@ -429,8 +464,6 @@ return build_step++ to_chat(user, "You add the prox sensor to [src]!") - overlays += "hs_eye" - name = "helmet/signaler/prox sensor assembly" qdel(I) else if(((istype(I, /obj/item/robot_parts/l_arm)) || (istype(I, /obj/item/robot_parts/r_arm))) && (build_step == 2)) @@ -438,8 +471,6 @@ return build_step++ to_chat(user, "You add the robot arm to [src]!") - name = "helmet/signaler/prox sensor/robot arm assembly" - overlays += "hs_arm" robot_arm = I.type qdel(I) @@ -468,13 +499,11 @@ qdel(src) else if(build_step == 2) - overlays -= "hs_eye" new /obj/item/assembly/prox_sensor(get_turf(src)) to_chat(user, "You detach the proximity sensor from [src].") build_step-- else if(build_step == 3) - overlays -= "hs_arm" new /obj/item/robot_parts/l_arm(get_turf(src)) to_chat(user, "You remove the robot arm from [src].") build_step-- @@ -488,6 +517,26 @@ user.unEquip(src, 1) qdel(src) + update_appearance(UPDATE_NAME|UPDATE_OVERLAYS) + +/obj/item/secbot_assembly/update_name() + . = ..() + switch(build_step) + if(2) + name = "helmet/signaler/prox sensor assembly" + if(3) + name = "helmet/signaler/prox sensor/robot arm assembly" + +/obj/item/secbot_assembly/update_overlays() + . = ..() + switch(build_step) + if(1) + . += "hs_hole" + if(2) + . += "hs_eye" + if(3) + . += "hs_arm" + /obj/item/griefsky_assembly name = "\improper Griefsky assembly" desc = "Some sort of bizarre assembly." @@ -576,7 +625,6 @@ return build_step++ to_chat(user, "You add the proximity sensor to [src].") - icon_state = "honkbot_proxy" qdel(W) else if(build_step == 1) if(istype(W, /obj/item/bikehorn)) @@ -584,7 +632,6 @@ return build_step++ to_chat(user, "You add the bikehorn to [src]! Honk!") - desc = "A clown box with a robot arm and a bikehorn permanently grafted to it. It needs a trombone to be finished" qdel(W) else if(build_step == 2) if(istype(W, /obj/item/instrument/trombone)) @@ -595,3 +642,13 @@ var/mob/living/simple_animal/bot/honkbot/A = new /mob/living/simple_animal/bot/honkbot(get_turf(src)) A.robot_arm = robot_arm qdel(src) + update_appearance(UPDATE_DESC|UPDATE_ICON_STATE) + +/obj/item/honkbot_arm_assembly/update_icon_state() + if(build_step == 1) + icon_state = "honkbot_proxy" + +/obj/item/honkbot_arm_assembly/update_desc() + . = ..() + if(build_step == 2) + desc = "A clown box with a robot arm and a bikehorn permanently grafted to it. It needs a trombone to be finished" diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm index f6986117760..36174f02b72 100644 --- a/code/modules/mob/living/simple_animal/bot/floorbot.dm +++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm @@ -312,11 +312,10 @@ target = null return anchored = TRUE - icon_state = "[toolbox_color]floorbot-c" if(istype(target_turf, /turf/space/)) //If we are fixing an area not part of pure space, it is - icon_state = "[toolbox_color]floorbot-c" visible_message("[targetdirection ? "[src] begins installing a bridge plating." : "[src] begins to repair the hole."] ") mode = BOT_REPAIRING + update_icon(UPDATE_ICON_STATE) spawn(50) if(mode == BOT_REPAIRING) if(autotile) //Build the floor and include a tile. @@ -325,13 +324,13 @@ target_turf.ChangeTurf(/turf/simulated/floor/plating) mode = BOT_IDLE amount -= 1 - update_icon() + update_icon(UPDATE_ICON_STATE) anchored = FALSE target = null else var/turf/simulated/floor/F = target_turf mode = BOT_REPAIRING - icon_state = "[toolbox_color]floorbot-c" + update_icon(UPDATE_ICON_STATE) visible_message("[src] begins repairing the floor.") spawn(50) if(mode == BOT_REPAIRING) @@ -340,7 +339,7 @@ F.ChangeTurf(/turf/simulated/floor/plasteel) mode = BOT_IDLE amount -= 1 - update_icon() + update_icon(UPDATE_ICON_STATE) anchored = FALSE target = null @@ -361,9 +360,9 @@ else amount += T.amount qdel(T) - update_icon() target = null mode = BOT_IDLE + update_icon(UPDATE_ICON_STATE) /mob/living/simple_animal/bot/floorbot/proc/maketile(obj/item/stack/sheet/metal/M) if(!istype(M, /obj/item/stack/sheet/metal)) @@ -385,7 +384,10 @@ target = null mode = BOT_IDLE -/mob/living/simple_animal/bot/floorbot/update_icon() +/mob/living/simple_animal/bot/floorbot/update_icon_state() + if(mode == BOT_REPAIRING) + icon_state = "[toolbox_color]floorbot-c" + return if(amount > 0) icon_state = "[toolbox_color]floorbot[on]" else diff --git a/code/modules/mob/living/simple_animal/bot/honkbot.dm b/code/modules/mob/living/simple_animal/bot/honkbot.dm index 526577c82fe..da88e66272b 100644 --- a/code/modules/mob/living/simple_animal/bot/honkbot.dm +++ b/code/modules/mob/living/simple_animal/bot/honkbot.dm @@ -46,7 +46,7 @@ /mob/living/simple_animal/bot/honkbot/proc/sensor_blink() icon_state = "honkbot-c" - addtimer(CALLBACK(src, .proc/update_icon), 5, TIMER_OVERRIDE|TIMER_UNIQUE) + addtimer(CALLBACK(src, /atom/.proc/update_icon), 5, TIMER_OVERRIDE|TIMER_UNIQUE) //honkbots react with sounds. /mob/living/simple_animal/bot/honkbot/proc/react_ping() @@ -159,7 +159,7 @@ playsound(src, "honkbot_e", 50, 0) spam_flag = TRUE // prevent spam icon_state = "honkbot-e" - addtimer(CALLBACK(src, .proc/update_icon), 30, TIMER_OVERRIDE|TIMER_UNIQUE) + addtimer(CALLBACK(src, /atom/.proc/update_icon), 30, TIMER_OVERRIDE|TIMER_UNIQUE) addtimer(CALLBACK(src, .proc/spam_flag_false), cooldowntimehorn) /mob/living/simple_animal/bot/honkbot/proc/honk_attack(mob/living/carbon/C) // horn attack diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm index b66d2b1323e..d915ffcbe50 100644 --- a/code/modules/mob/living/simple_animal/bot/medbot.dm +++ b/code/modules/mob/living/simple_animal/bot/medbot.dm @@ -101,10 +101,7 @@ declare_crit = 0 drops_parts = FALSE -/mob/living/simple_animal/bot/medbot/update_icon() - overlays.Cut() - if(skin) - overlays += "medskin_[skin]" +/mob/living/simple_animal/bot/medbot/update_icon_state() if(!on) icon_state = "medibot0" return @@ -116,6 +113,11 @@ else icon_state = "medibot1" +/mob/living/simple_animal/bot/medbot/update_overlays() + . = ..() + if(skin) + . += "medskin_[skin]" + /mob/living/simple_animal/bot/medbot/New(loc, new_skin) ..() var/datum/job/doctor/J = new /datum/job/doctor diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index d7cc0b8f58e..6a0f09230fd 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -143,18 +143,19 @@ flick("mulebot-emagged", src) playsound(loc, 'sound/effects/sparks1.ogg', 100, 0) -/mob/living/simple_animal/bot/mulebot/update_icon() +/mob/living/simple_animal/bot/mulebot/update_icon_state() if(open) icon_state="mulebot-hatch" else icon_state = "mulebot[wires.is_cut(WIRE_MOB_AVOIDANCE)]" - overlays.Cut() + +/mob/living/simple_animal/bot/mulebot/update_overlays() + . = ..() if(load && !ismob(load))//buckling handles the mob offsets load.pixel_y = initial(load.pixel_y) + 9 if(load.layer < layer) load.layer = layer + 0.1 - overlays += load - return + . += load /mob/living/simple_animal/bot/mulebot/ex_act(severity) unload(0) diff --git a/code/modules/mob/living/simple_animal/bot/syndicate.dm b/code/modules/mob/living/simple_animal/bot/syndicate.dm index 9eeb101feca..94855a636ce 100644 --- a/code/modules/mob/living/simple_animal/bot/syndicate.dm +++ b/code/modules/mob/living/simple_animal/bot/syndicate.dm @@ -36,7 +36,7 @@ access_card.access = list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) prev_access = access_card.access -/mob/living/simple_animal/bot/ed209/syndicate/update_icon() +/mob/living/simple_animal/bot/ed209/syndicate/update_icon_state() icon_state = initial(icon_state) /mob/living/simple_animal/bot/ed209/syndicate/turn_on() diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm index ffb7d10f397..8c8c7e266eb 100644 --- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm +++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm @@ -155,7 +155,7 @@ if(emagged) to_chat(src, "You have been emagged; you are now completely loyal to [emagged_master] and [emagged_master.p_their()] every order!") -/mob/living/simple_animal/spiderbot/proc/update_icon() +/mob/living/simple_animal/spiderbot/update_icon_state() if(mmi) if(istype(mmi, /obj/item/mmi)) icon_state = "spiderbot-chassis-mmi" diff --git a/code/modules/mob/living/simple_animal/hostile/spaceworms.dm b/code/modules/mob/living/simple_animal/hostile/spaceworms.dm index 082cee74232..0fe79aa1da4 100644 --- a/code/modules/mob/living/simple_animal/hostile/spaceworms.dm +++ b/code/modules/mob/living/simple_animal/hostile/spaceworms.dm @@ -102,7 +102,7 @@ for(var/mob/living/simple_animal/hostile/spaceWorm/SW in totalWormSegments) SW.update_icon() -/mob/living/simple_animal/hostile/spaceWorm/wormHead/update_icon() +/mob/living/simple_animal/hostile/spaceWorm/wormHead/update_icon_state() if(stat == CONSCIOUS || stat == UNCONSCIOUS) icon_state = "spacewormhead[previousWorm ? 1 : 0]" if(previousWorm) @@ -115,7 +115,6 @@ continue SW.update_icon() - //Try to move onto target's turf and eat them /mob/living/simple_animal/hostile/spaceWorm/wormHead/AttackingTarget() . = ..() @@ -230,19 +229,16 @@ //Update the appearence of this big weird chain-worm-thingy -/mob/living/simple_animal/hostile/spaceWorm/proc/update_icon() +/mob/living/simple_animal/hostile/spaceWorm/update_icon_state() if(stat != DEAD) if(previousWorm) icon_state = "spaceworm[get_dir(src,previousWorm) | get_dir(src,nextWorm)]" else icon_state = "spacewormtail"//end of rine dir = get_dir(src,nextWorm) - else icon_state = "spacewormdead" - - //Add a new worm segment /mob/living/simple_animal/hostile/spaceWorm/proc/Attach(mob/living/simple_animal/hostile/spaceWorm/toAttach) if(!toAttach) diff --git a/code/modules/mob/living/simple_animal/posessed_object.dm b/code/modules/mob/living/simple_animal/posessed_object.dm index 32868f09099..66ffa4be9ac 100644 --- a/code/modules/mob/living/simple_animal/posessed_object.dm +++ b/code/modules/mob/living/simple_animal/posessed_object.dm @@ -140,7 +140,7 @@ update_icon() -/mob/living/simple_animal/possessed_object/proc/update_icon(update_pixel_xy = 0) +/mob/living/simple_animal/possessed_object/update_icon(update_pixel_xy = 0) name = possessed_item.name // Take on all the attributes of the item we've possessed. real_name = name desc = possessed_item.desc @@ -154,3 +154,4 @@ color = possessed_item.color overlays = possessed_item.overlays set_opacity(possessed_item.opacity) + return ..(NONE) diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm index ffa25e581a1..96fac4bdd19 100644 --- a/code/modules/mob/living/simple_animal/slime/slime.dm +++ b/code/modules/mob/living/simple_animal/slime/slime.dm @@ -114,7 +114,8 @@ coretype = text2path("/obj/item/slime_extract/[sanitizedcolour]") regenerate_icons() -/mob/living/simple_animal/slime/proc/update_name() +/mob/living/simple_animal/slime/update_name() + . = ..() if(slime_name_regex.Find(name)) number = rand(1, 1000) name = "[colour] [is_adult ? "adult" : "baby"] slime ([number])" diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index c080593c4a2..01d064e9268 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -507,4 +507,4 @@ if(hud_used && hud_used.move_intent && hud_used.static_inventory) hud_used.move_intent.icon_state = icon_toggle for(var/obj/screen/mov_intent/selector in hud_used.static_inventory) - selector.update_icon(src) + selector.update_icon() diff --git a/code/modules/newscaster/obj/newscaster.dm b/code/modules/newscaster/obj/newscaster.dm index 2920ef625f1..30b235fa2f9 100644 --- a/code/modules/newscaster/obj/newscaster.dm +++ b/code/modules/newscaster/obj/newscaster.dm @@ -91,25 +91,29 @@ QDEL_NULL(photo) return ..() -/obj/machinery/newscaster/update_icon() - cut_overlays() +/obj/machinery/newscaster/update_icon_state() if(inoperable()) icon_state = "newscaster_off" + return + if(GLOB.news_network.wanted_issue) + icon_state = "newscaster_wanted" else - if(!GLOB.news_network.wanted_issue) //wanted icon state, there can be no overlays on it as it's a priority message - icon_state = "newscaster_normal" - if(alert) //new message alert overlay - add_overlay("newscaster_alert") + icon_state = "newscaster_normal" + +/obj/machinery/newscaster/update_overlays() + . = ..() + if(!GLOB.news_network.wanted_issue && alert) //wanted icon state, there can be no overlays on it as it's a priority message + . += "newscaster_alert" var/hp_percent = obj_integrity * 100 / max_integrity switch(hp_percent) if(75 to INFINITY) return if(50 to 75) - add_overlay("crack1") + . += "crack1" if(25 to 50) - add_overlay("crack2") + . += "crack2" else - add_overlay("crack3") + . += "crack3" /obj/machinery/newscaster/power_change() ..() diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_stars.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_stars.dm index 54a7f4e4206..179fc04431d 100644 --- a/code/modules/ninja/suit/n_suit_verbs/ninja_stars.dm +++ b/code/modules/ninja/suit/n_suit_verbs/ninja_stars.dm @@ -12,7 +12,7 @@ /obj/item/gun/energy/shuriken/update_icon() qdel(src) - return + return ..(NONE) /obj/item/gun/energy/shuriken/dropped() qdel(src) diff --git a/code/modules/ninja/suit/suit_attackby.dm b/code/modules/ninja/suit/suit_attackby.dm index 2a2683a2826..ceb4045f48e 100644 --- a/code/modules/ninja/suit/suit_attackby.dm +++ b/code/modules/ninja/suit/suit_attackby.dm @@ -13,7 +13,7 @@ U.put_in_hands(old_cell) old_cell.add_fingerprint(U) old_cell.corrupt() - old_cell.updateicon() + old_cell.update_icon(UPDATE_ICON_STATE) cell = CELL to_chat(U, "Upgrade complete. Maximum capacity: [round(cell.maxcharge/100)]%") else diff --git a/code/modules/paperwork/carbonpaper.dm b/code/modules/paperwork/carbonpaper.dm index ce9be619fb6..6084d14e97f 100644 --- a/code/modules/paperwork/carbonpaper.dm +++ b/code/modules/paperwork/carbonpaper.dm @@ -6,7 +6,7 @@ var/iscopy = 0 -/obj/item/paper/carbon/update_icon() +/obj/item/paper/carbon/update_icon_state() if(iscopy) if(info) icon_state = "cpaper_words" diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index ca0039d9a0b..3eb65204d5e 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -70,15 +70,14 @@ popup.set_content(dat) popup.open() -/obj/item/clipboard/update_icon() - overlays.Cut() +/obj/item/clipboard/update_overlays() + . = ..() if(toppaper) - overlays += toppaper.icon_state - overlays += toppaper.overlays + . += toppaper.icon_state + . += toppaper.overlays if(containedpen) - overlays += "clipboard_pen" - overlays += "clipboard_over" - ..() + . += "clipboard_pen" + . += "clipboard_over" /obj/item/clipboard/attackby(obj/item/W, mob/user) if(isPaperwork(W)) //If it's a photo, paper bundle, or piece of paper, place it on the clipboard. diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index 24f3026a7d0..de5987d8f73 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -29,18 +29,17 @@ desc = "A white folder." icon_state = "folder_white" -/obj/item/folder/update_icon() - overlays.Cut() +/obj/item/folder/update_overlays() + . = ..() if(contents.len) - overlays += "folder_paper" - ..() + . += "folder_paper" /obj/item/folder/attackby(obj/item/W as obj, mob/user as mob, params) if(istype(W, /obj/item/paper) || istype(W, /obj/item/photo) || istype(W, /obj/item/paper_bundle) || istype(W, /obj/item/documents)) user.drop_item() W.loc = src to_chat(user, "You put [W] into [src].") - update_icon() + update_icon(UPDATE_OVERLAYS) else if(istype(W, /obj/item/pen)) rename_interactive(user, W) else @@ -91,7 +90,7 @@ //Update everything attack_self(usr) - update_icon() + update_icon(UPDATE_OVERLAYS) return /obj/item/folder/documents @@ -101,7 +100,7 @@ /obj/item/folder/documents/New() ..() new /obj/item/documents/nanotrasen(src) - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/item/folder/syndicate name = "folder- 'TOP SECRET'" @@ -113,7 +112,7 @@ /obj/item/folder/syndicate/red/New() ..() new /obj/item/documents/syndicate/red(src) - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/item/folder/syndicate/blue icon_state = "folder_sblue" @@ -121,7 +120,7 @@ /obj/item/folder/syndicate/blue/New() ..() new /obj/item/documents/syndicate/blue(src) - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/item/folder/syndicate/yellow icon_state = "folder_syellow" @@ -129,11 +128,11 @@ /obj/item/folder/syndicate/yellow/full/New() ..() new /obj/item/documents/syndicate/yellow(src) - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/item/folder/syndicate/mining/New() . = ..() new /obj/item/documents/syndicate/mining(src) - update_icon() + update_icon(UPDATE_OVERLAYS) diff --git a/code/modules/paperwork/frames.dm b/code/modules/paperwork/frames.dm index a34773f4fd1..fc251e89104 100644 --- a/code/modules/paperwork/frames.dm +++ b/code/modules/paperwork/frames.dm @@ -25,12 +25,7 @@ qdel(A) return ..() -/obj/item/picture_frame/update_icon() - overlays.Cut() - - if(displayed) - overlays |= getFlatIcon(displayed) - +/obj/item/picture_frame/update_icon_state() if(istype(displayed, /obj/item/photo)) icon_state = "[icon_base]-photo" else if(istype(displayed, /obj/structure/sign/poster)) @@ -38,7 +33,11 @@ else icon_state = "[icon_base]-paper" - overlays |= icon_state +/obj/item/picture_frame/update_overlays() + . = ..() + if(displayed) + . |= getFlatIcon(displayed) + . |= icon_state /obj/item/picture_frame/proc/insert(obj/D) if(istype(D, /obj/item/poster)) @@ -199,16 +198,19 @@ QDEL_NULL(frame) return ..() -/obj/structure/sign/picture_frame/update_icon() - overlays.Cut() +/obj/structure/sign/picture_frame/update_icon_state() if(frame) icon = null icon_state = null - overlays |= getFlatIcon(frame) else icon = initial(icon) icon_state = initial(icon_state) +/obj/structure/sign/picture_frame/update_overlays() + . += ..() + if(frame) + overlays |= getFlatIcon(frame) + /obj/structure/sign/picture_frame/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/screwdriver)) playsound(src, I.usesound, 100, 1) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 665a6e86175..01ff88ee915 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -19,6 +19,7 @@ body_parts_covered = HEAD resistance_flags = FLAMMABLE max_integrity = 50 + blocks_emissive = null attack_verb = list("bapped") dog_fashion = /datum/dog_fashion/head drop_sound = 'sound/items/handling/paper_drop.ogg' @@ -28,6 +29,7 @@ var/footer //The bottom stuff before the stamp but after the body var/info_links //A different version of the paper which includes html links at fields and EOF var/stamps //The (text for the) stamps on the paper. + var/list/stamp_overlays = list() var/fields //Amount of user created fields var/list/stamped var/ico[0] //Icons and @@ -56,8 +58,7 @@ update_icon() updateinfolinks() -/obj/item/paper/update_icon() - ..() +/obj/item/paper/update_icon_state() if(info) icon_state = "paper_words" return @@ -260,11 +261,10 @@ info = null stamps = null stamped = list() - overlays.Cut() + stamp_overlays = list() updateinfolinks() update_icon() - /obj/item/paper/proc/parsepencode(t, obj/item/pen/P, mob/user as mob) t = pencode_to_html(html_encode(t), usr, P, TRUE, TRUE, TRUE, deffont, signfont, crayonfont) return t @@ -484,7 +484,11 @@ if(!stamped) stamped = new stamped += S.type - overlays += stampoverlay + stamp_overlays += stampoverlay + update_icon(UPDATE_OVERLAYS) + +/obj/item/paper/update_overlays() + return stamp_overlays /* * Premade paper @@ -531,7 +535,7 @@ name = "paper scrap" icon_state = "scrap" -/obj/item/paper/crumpled/update_icon() +/obj/item/paper/crumpled/update_icon_state() if(info) icon_state = "scrap_words" @@ -549,9 +553,9 @@ info = "
[fortunemessage]
" info += "Lucky numbers: [rand(1,49)], [rand(1,49)], [rand(1,49)], [rand(1,49)], [rand(1,49)]
" -/obj/item/paper/fortune/update_icon() - ..() +/obj/item/paper/fortune/update_icon_state() icon_state = initial(icon_state) + /* * Premade paper */ diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index 73b980e8f53..4a4679468b7 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -218,36 +218,36 @@ qdel(src) return - -/obj/item/paper_bundle/update_icon() - ..() - if(contents.len) - var/obj/item/paper/P = src[1] - icon_state = P.icon_state - overlays = P.overlays - underlays = 0 - var/i = 0 - var/photo - for(var/obj/O in src) - var/image/img = image('icons/obj/bureaucracy.dmi') - if(istype(O, /obj/item/paper)) - img.icon_state = O.icon_state - img.pixel_x -= min(1*i, 2) - img.pixel_y -= min(1*i, 2) - pixel_x = min(0.5*i, 1) - pixel_y = min( 1*i, 2) - underlays += img - i++ - else if(istype(O, /obj/item/photo)) - var/obj/item/photo/Ph = O - img = Ph.tiny - photo = 1 - overlays += img - if(i>1) - desc = "[i] papers clipped to each other." +/obj/item/paper_bundle/update_desc() + . = ..() + if(amount > 1) + desc = "[amount] papers clipped to each other." else desc = "A single sheet of paper." - if(photo) + if(locate(/obj/item/photo) in src) desc += "\nThere is a photo attached to it." - overlays += image('icons/obj/bureaucracy.dmi', "clip") - return + +/obj/item/paper_bundle/update_icon_state() + if(contents.len) + var/obj/item/paper/P = src[1] + icon_state = P.overlays + +/obj/item/paper_bundle/update_overlays() + . = ..() + underlays.Cut() + if(contents.len) + var/obj/item/paper/P = src[1] + . += P.overlays + for(var/obj/O in src) + var/image/sheet = image('icons/obj/bureaucracy.dmi') + if(istype(O, /obj/item/paper)) + sheet.icon_state = O.icon_state + sheet.pixel_x -= min(1 * amount, 2) + sheet.pixel_y -= min(1 * amount, 2) + pixel_x = min(0.5 * amount, 1) + pixel_y = min(1 * amount, 2) + underlays += sheet + else if(istype(O, /obj/item/photo)) + var/obj/item/photo/picture = O + . += picture.tiny + . += "clip" diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index 7c9a04efc7d..cde2a7dda0e 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -113,12 +113,11 @@ . += "There are no papers in the bin." -/obj/item/paper_bin/update_icon() +/obj/item/paper_bin/update_icon_state() if(amount < 1) icon_state = "paper_bin0" else icon_state = "paper_bin1" - ..() /obj/item/paper_bin/carbon name = "carbonless paper bin" diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm index d642b3a99eb..d4b40ea7c85 100644 --- a/code/modules/paperwork/paperplane.dm +++ b/code/modules/paperwork/paperplane.dm @@ -41,16 +41,15 @@ sleep(10) return BRUTELOSS -/obj/item/paperplane/update_icon() - overlays.Cut() +/obj/item/paperplane/update_overlays() + . = ..() var/list/stamped = internal_paper.stamped if(!stamped) stamped = new else if(stamped) for(var/S in stamped) var/obj/item/stamp = S - var/image/stampoverlay = image('icons/obj/bureaucracy.dmi', "paperplane_[initial(stamp.icon_state)]") - overlays += stampoverlay + . += "paperplane_[initial(stamp.icon_state)]" /obj/item/paperplane/attack_self(mob/user) // Unfold the paper plane to_chat(user, "You unfold [src].") diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 12cc7957b42..edf6a1261e4 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -61,8 +61,8 @@ "green" = list(0, 1, 0), "blue" = list(0.5, 0.5, 1), "yellow" = list(1, 1, 0)) - var/pen_color_iconstate = "pencolor" - var/pen_color_shift = 3 + var/pen_colour_iconstate = "pencolor" + var/pen_colour_shift = 3 /obj/item/pen/multi/Initialize(mapload) ..() @@ -78,14 +78,14 @@ /obj/item/pen/multi/attack_self(mob/living/user as mob) select_colour(user) -/obj/item/pen/multi/update_icon() - overlays.Cut() - var/icon/o = new(icon, pen_color_iconstate) - var/list/c = colour_choices[colour] - o.SetIntensity(c[1], c[2], c[3]) - if(pen_color_shift) - o.Shift(SOUTH, pen_color_shift) - overlays += o +/obj/item/pen/multi/update_overlays() + . = ..() + var/icon/colour_overlay = new(icon, pen_colour_iconstate) + var/list/colours = colour_choices[colour] + colour_overlay.SetIntensity(colours[1], colours[2], colours[3]) + if(pen_colour_shift) + colour_overlay.Shift(SOUTH, pen_colour_shift) + . += colour_overlay /obj/item/pen/fancy name = "fancy pen" @@ -96,13 +96,13 @@ name = "Gilded Pen" desc = "A golden pen that is gilded with a meager amount of gold material. The word 'Nanotrasen' is etched on the clip of the pen." icon_state = "goldpen" - pen_color_shift = 0 + pen_colour_shift = 0 /obj/item/pen/multi/fountain name = "Engraved Fountain Pen" desc = "An expensive looking pen." icon_state = "fountainpen" - pen_color_shift = 0 + pen_colour_shift = 0 /* * Sleepypens @@ -171,7 +171,7 @@ set_light(brightness_on, 1) update_icon() -/obj/item/pen/edagger/update_icon() +/obj/item/pen/edagger/update_icon_state() if(on) icon_state = "edagger" item_state = "edagger" diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 7d058a0fd24..b2bb089310a 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -83,7 +83,7 @@ c.ico = copy.ico c.offset_x = copy.offset_x c.offset_y = copy.offset_y - var/list/temp_overlays = copy.overlays //Iterates through stamps + var/list/temp_overlays = copy.stamp_overlays //Iterates through stamps var/image/img //and puts a matching for(var/j = 1, j <= temp_overlays.len, j++) //gray overlay onto the copy if(copy.ico.len) @@ -95,7 +95,7 @@ img = image('icons/obj/bureaucracy.dmi', "paper_stamp-dots") img.pixel_x = copy.offset_x[j] img.pixel_y = copy.offset_y[j] - c.overlays += img + c.stamp_overlays += img c.updateinfolinks() return c diff --git a/code/modules/paperwork/ticketmachine.dm b/code/modules/paperwork/ticketmachine.dm index c0d121c2177..5e95ed1a3c4 100644 --- a/code/modules/paperwork/ticketmachine.dm +++ b/code/modules/paperwork/ticketmachine.dm @@ -77,7 +77,7 @@ /obj/machinery/door_control/ticket_machine_button/attack_hand(mob/user) if(allowed(usr) || user.can_advanced_admin_interact()) icon_state = "doorctrl1" - addtimer(CALLBACK(src, /obj/machinery/door_control/ticket_machine_button/.proc/update_icon), 15) + addtimer(CALLBACK(src, /atom/.proc/update_icon), 15) for(var/obj/machinery/ticket_machine/M in GLOB.machines) if(M.id == id) if(cooldown) @@ -89,11 +89,11 @@ to_chat(usr, "Access denied.") flick("doorctrl-denied", src) -/obj/machinery/door_control/ticket_machine_button/update_icon() +/obj/machinery/door_control/ticket_machine_button/update_icon_state() if(!(stat & NOPOWER)) icon_state = "doorctrl0" -/obj/machinery/ticket_machine/update_icon() +/obj/machinery/ticket_machine/update_icon_state() switch(ticket_number) //Gives you an idea of how many tickets are left if(0 to 49) icon_state = "ticketmachine_100" diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 857b5772eb9..ca76140c39b 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -322,8 +322,6 @@ status_overlays_environ[3] = image(icon, "apco2-2") status_overlays_environ[4] = image(icon, "apco2-3") - - var/update = check_updates() //returns 0 if no need to update icons. // 1 if we need to update the icon_state // 2 if we need to update the overlays @@ -331,53 +329,54 @@ return if(force_update || update & 1) // Updating the icon state - if(update_state & UPSTATE_ALLGOOD) - icon_state = "apc0" - else if(update_state & (UPSTATE_OPENED1|UPSTATE_OPENED2)) - var/basestate = "apc[ cell ? "2" : "1" ]" - if(update_state & UPSTATE_OPENED1) - if(update_state & (UPSTATE_MAINT|UPSTATE_BROKE)) - icon_state = "apcmaint" //disabled APC cannot hold cell - else - icon_state = basestate - else if(update_state & UPSTATE_OPENED2) - icon_state = "[basestate]-nocover" - else if(update_state & UPSTATE_BROKE) - icon_state = "apc-b" - else if(update_state & UPSTATE_BLUESCREEN) - icon_state = "apcemag" - else if(update_state & UPSTATE_WIREEXP) - icon_state = "apcewires" - - - + ..(UPDATE_ICON_STATE) + if(!(update_state & UPSTATE_ALLGOOD)) - if(overlays.len) - overlays = 0 - return - - + if(managed_overlays) + ..(UPDATE_OVERLAYS) + return if(force_update || update & 2) + ..(UPDATE_OVERLAYS) - if(overlays.len) - overlays.len = 0 +/obj/machinery/power/apc/update_icon_state() + if(update_state & UPSTATE_ALLGOOD) + icon_state = "apc0" + else if(update_state & (UPSTATE_OPENED1|UPSTATE_OPENED2)) + var/basestate = "apc[ cell ? "2" : "1" ]" + if(update_state & UPSTATE_OPENED1) + if(update_state & (UPSTATE_MAINT|UPSTATE_BROKE)) + icon_state = "apcmaint" //disabled APC cannot hold cell + else + icon_state = basestate + else if(update_state & UPSTATE_OPENED2) + icon_state = "[basestate]-nocover" + else if(update_state & UPSTATE_BROKE) + icon_state = "apc-b" + else if(update_state & UPSTATE_BLUESCREEN) + icon_state = "apcemag" + else if(update_state & UPSTATE_WIREEXP) + icon_state = "apcewires" - if(!(stat & (BROKEN|MAINT)) && update_state & UPSTATE_ALLGOOD) - overlays += status_overlays_lock[locked+1] - overlays += status_overlays_charging[charging+1] - if(operating) - overlays += status_overlays_equipment[equipment+1] - overlays += status_overlays_lighting[lighting+1] - overlays += status_overlays_environ[environ+1] +/obj/machinery/power/apc/update_overlays() + . = ..() + if(!(update_state & UPSTATE_ALLGOOD)) + return + if(!(stat & (BROKEN|MAINT)) && update_state & UPSTATE_ALLGOOD) + . += status_overlays_lock[locked+1] + . += status_overlays_charging[charging+1] + if(operating) + . += status_overlays_equipment[equipment+1] + . += status_overlays_lighting[lighting+1] + . += status_overlays_environ[environ+1] /obj/machinery/power/apc/proc/check_updates() var/last_update_state = update_state var/last_update_overlay = update_overlay - update_state = 0 - update_overlay = 0 + update_state = NONE + update_overlay = NONE if(cell) update_state |= UPSTATE_CELL_IN @@ -456,6 +455,7 @@ if(!second_pass) //The first time, we just cut overlays addtimer(CALLBACK(src, /obj/machinery/power/apc/proc.flicker, TRUE), 1) cut_overlays() + managed_overlays = null // APC power distruptions have a chance to propogate to other machines on its network for(var/obj/machinery/M in area) // Please don't cascade, thanks @@ -763,7 +763,7 @@ user.visible_message("[user.name] removes [cell] from [src]!", "You remove [cell].") user.put_in_hands(cell) cell.add_fingerprint(user) - cell.update_icon() + cell.update_icon(UPDATE_OVERLAYS) cell = null charging = APC_NOT_CHARGING update_icon() diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 8e9b353a55e..0f3fe650084 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -107,15 +107,14 @@ By design, d1 is the smallest direction and d2 is the highest if(level == 1 && isturf(loc)) invisibility = i ? INVISIBILITY_MAXIMUM : 0 - updateicon() + update_icon() -/obj/structure/cable/proc/updateicon() +/obj/structure/cable/update_icon_state() if(invisibility) icon_state = "[d1]-[d2]-f" else icon_state = "[d1]-[d2]" - //////////////////////////////////////////// // Power related /////////////////////////////////////////// @@ -587,19 +586,22 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe/cable_restrain C.color = color return C -/obj/item/stack/cable_coil/update_icon() +/obj/item/stack/cable_coil/update_name() + . = ..() + if(amount > 2) + name = "cable coil" + else + name = "cable piece" + +/obj/item/stack/cable_coil/update_icon_state() if(!color) color = pick(COLOR_RED, COLOR_BLUE, COLOR_GREEN, COLOR_ORANGE, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN) if(amount == 1) icon_state = "coil1" - name = "cable piece" else if(amount == 2) icon_state = "coil2" - name = "cable piece" else icon_state = "coil" - name = "cable coil" - ..() /obj/item/stack/cable_coil/proc/update_wclass() if(amount == 1) @@ -686,7 +688,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe/cable_restrain C.d1 = 0 //it's a O-X node cable C.d2 = dirn C.add_fingerprint(user) - C.updateicon() + C.update_icon() //create a new powernet with the cable, if needed it will be merged later var/datum/powernet/PN = new() @@ -796,7 +798,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe/cable_restrain C.d2 = nd2 C.add_fingerprint() - C.updateicon() + C.update_icon() C.mergeConnectedNetworks(C.d1) //merge the powernets... @@ -831,7 +833,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe/cable_restrain src.amount = rand(1,2) pixel_x = rand(-2,2) pixel_y = rand(-2,2) - update_icon() + update_appearance(UPDATE_NAME|UPDATE_ICON_STATE) update_wclass() /obj/item/stack/cable_coil/yellow @@ -877,7 +879,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe/cable_restrain energy_type = /datum/robot_energy_storage/cable is_cyborg = TRUE -/obj/item/stack/cable_coil/cyborg/update_icon() +/obj/item/stack/cable_coil/cyborg/update_icon_state() return // icon_state should always be a full cable /obj/item/stack/cable_coil/cyborg/attack_self(mob/user) diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 0d1e53c1b1d..f42e243c45c 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -28,7 +28,7 @@ charge = maxcharge if(ratingdesc) desc += " This one has a power rating of [DisplayPower(maxcharge)], and you should not swallow it." - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/item/stock_parts/cell/Destroy() STOP_PROCESSING(SSobj, src) @@ -49,16 +49,16 @@ else return PROCESS_KILL -/obj/item/stock_parts/cell/update_icon() - overlays.Cut() +/obj/item/stock_parts/cell/update_overlays() + . = ..() if(grown_battery) - overlays += image('icons/obj/power.dmi', "grown_wires") + . += image('icons/obj/power.dmi', "grown_wires") if(charge < 0.01) return else if(charge/maxcharge >=0.995) - overlays += "cell-o2" + . += "cell-o2" else - overlays += "cell-o1" + . += "cell-o1" /obj/item/stock_parts/cell/proc/percent() // return % charge of cell return 100 * charge / maxcharge @@ -179,7 +179,7 @@ /obj/item/stock_parts/cell/crap/empty/New() ..() charge = 0 - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/item/stock_parts/cell/upgraded name = "upgraded power cell" @@ -204,7 +204,7 @@ /obj/item/stock_parts/cell/secborg/empty/New() ..() charge = 0 - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/item/stock_parts/cell/hos_gun name = "\improper X-01 multiphase energy gun power cell" @@ -243,7 +243,7 @@ /obj/item/stock_parts/cell/high/empty/New() ..() charge = 0 - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/item/stock_parts/cell/super name = "super-capacity power cell" @@ -257,7 +257,7 @@ /obj/item/stock_parts/cell/super/empty/New() ..() charge = 0 - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/item/stock_parts/cell/hyper name = "hyper-capacity power cell" @@ -271,7 +271,7 @@ /obj/item/stock_parts/cell/hyper/empty/New() ..() charge = 0 - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/item/stock_parts/cell/bluespace name = "bluespace power cell" @@ -286,7 +286,7 @@ /obj/item/stock_parts/cell/bluespace/empty/New() ..() charge = 0 - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/item/stock_parts/cell/bluespace/charging name = "self-charging bluespace power cell" @@ -315,9 +315,8 @@ rating = 12 ratingdesc = FALSE -/obj/item/stock_parts/cell/infinite/abductor/update_icon() - return - +/obj/item/stock_parts/cell/infinite/abductor/update_overlays() + return list() /obj/item/stock_parts/cell/potato name = "potato battery" @@ -351,7 +350,7 @@ /obj/item/stock_parts/cell/emproof/empty/New() ..() charge = 0 - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/item/stock_parts/cell/emproof/emp_act(severity) return diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index b0dc421164c..8f7ca7d303d 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -21,10 +21,11 @@ /obj/machinery/power/generator/Initialize(mapload) . = ..() - update_desc() + update_appearance(UPDATE_DESC) connect() -/obj/machinery/power/generator/proc/update_desc() +/obj/machinery/power/generator/update_desc() + . = ..() desc = initial(desc) + " Its cold circulator is located on the [dir2text(cold_dir)] side, and its heat circulator is located on the [dir2text(hot_dir)] side." /obj/machinery/power/generator/Destroy() @@ -74,22 +75,21 @@ set_light(0) else set_light(light_range_on, light_power_on) - update_icon() + update_icon(UPDATE_OVERLAYS) - -/obj/machinery/power/generator/update_icon() +/obj/machinery/power/generator/update_overlays() + . = ..() if(stat & (NOPOWER|BROKEN)) - cut_overlays() - underlays.Cut() return - else - cut_overlays() - if(lastgenlev != 0) - add_overlay(mutable_appearance('icons/obj/power.dmi', "teg-op[lastgenlev]")) - underlays += emissive_appearance(icon, "teg-op[lastgenlev]") - add_overlay(mutable_appearance('icons/obj/power.dmi', "teg-oc[lastcirc]")) - underlays += emissive_appearance(icon, "teg-oc[lastcirc]") + if(lastgenlev != 0) + . += "teg-op[lastgenlev]" + if(light) + . += emissive_appearance(icon, "teg-op[lastgenlev]") + + . += "teg-oc[lastcirc]" + if(light) + . += emissive_appearance(icon, "teg-oc[lastcirc]") /obj/machinery/power/generator/process() if(stat & (NOPOWER|BROKEN)) @@ -152,7 +152,7 @@ if((genlev != lastgenlev) || (circ != lastcirc)) lastgenlev = genlev lastcirc = circ - update_icon() + update_icon(UPDATE_OVERLAYS) updateDialog() @@ -188,7 +188,7 @@ hot_dir = SOUTH connect() to_chat(user, "You reverse the generator's circulator settings. The cold circulator is now on the [dir2text(cold_dir)] side, and the heat circulator is now on the [dir2text(hot_dir)] side.") - update_desc() + update_appearance(UPDATE_DESC) /obj/machinery/power/generator/wrench_act(mob/user, obj/item/I) . = TRUE diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index 7cb831343d2..e921d6e1b45 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -250,15 +250,14 @@ GLOBAL_LIST_EMPTY(gravity_generators) else return "off" -/obj/machinery/gravity_generator/main/update_icon() - ..() - cut_overlays() +/obj/machinery/gravity_generator/main/update_overlays() + . = ..() if(get_status() != "generator_welding" && get_status() != "generator_plasteel") - add_overlay("generator_part") + . += "generator_part" if(get_status() == "off") return - add_overlay("[get_status()]") - add_overlay("[overlay_state]") + . += "[get_status()]" + . += "[overlay_state]" /** * Set the charging state based on external power and the breaker state. diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index c7051772dfb..5edab32a23b 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -279,8 +279,7 @@ // A.update_lights() return ..() -/obj/machinery/light/update_icon() - +/obj/machinery/light/update_icon_state() switch(status) // set icon_states if(LIGHT_OK) if(emergency_mode) @@ -296,7 +295,6 @@ if(LIGHT_BROKEN) icon_state = "[base_state]-broken" on = FALSE - return /** * Updates the light's 'on' state and power consumption based on [/obj/machinery/light/var/on]. diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 31684a9583a..76c78afa518 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -30,7 +30,7 @@ /obj/machinery/power/port_gen/proc/handleInactive() return -/obj/machinery/power/port_gen/update_icon() +/obj/machinery/power/port_gen/update_icon_state() icon_state = "[base_icon]_[active]" /obj/machinery/power/port_gen/process() diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 6757ee090ea..beaf1034315 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -97,13 +97,12 @@ QDEL_NULL(sparks) return ..() -/obj/machinery/power/emitter/update_icon() +/obj/machinery/power/emitter/update_icon_state() if(active && powernet && avail(active_power_usage)) icon_state = "emitter_+a" else icon_state = "emitter" - /obj/machinery/power/emitter/emag_act(mob/living/user) if(!emagged) locked = FALSE diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index d4a2464dae1..5d8692173e6 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -40,15 +40,14 @@ field_generator power level display var/list/obj/machinery/field/generator/connected_gens var/clean_up = FALSE -/obj/machinery/field/generator/update_icon() - overlays.Cut() +/obj/machinery/field/generator/update_overlays() + . = ..() if(warming_up) - overlays += "+a[warming_up]" + . += "+a[warming_up]" if(fields.len) - overlays += "+on" + . += "+on" if(power_level) - overlays += "+p[power_level]" - + . += "+p[power_level]" /obj/machinery/field/generator/Initialize(mapload) . = ..() diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm index 5d383f90a09..7fabc07bfb2 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm @@ -87,11 +87,6 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin icon_state = "end_cap" reference = "end_cap" -/obj/structure/particle_accelerator/update_icon() - ..() - return - - /obj/structure/particle_accelerator/verb/rotate() set name = "Rotate Clockwise" set category = "Object" @@ -155,7 +150,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin if(prob(50)) qdel(src) -/obj/structure/particle_accelerator/update_icon() +/obj/structure/particle_accelerator/update_icon_state() switch(construction_state) if(0,1) icon_state="[reference]" @@ -166,7 +161,6 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin icon_state="[reference]p[strength]" else icon_state="[reference]c" - return /obj/structure/particle_accelerator/proc/update_state() if(master) @@ -292,9 +286,6 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin dir = turn(dir, 90) return 1 -/obj/machinery/particle_accelerator/update_icon() - return - /obj/machinery/particle_accelerator/attackby(obj/item/W, mob/user, params) if(!iscoil(W)) return ..() diff --git a/code/modules/power/singularity/particle_accelerator/particle_chamber.dm b/code/modules/power/singularity/particle_accelerator/particle_chamber.dm index c3c058a5289..78410e02d96 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_chamber.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_chamber.dm @@ -4,7 +4,3 @@ icon = 'icons/obj/machines/particle_accelerator.dmi' icon_state = "fuel_chamber" reference = "fuel_chamber" - -/obj/structure/particle_accelerator/fuel_chamber/update_icon() - ..() - return diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index ebbd0aa34c2..badc288f2c7 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -64,7 +64,7 @@ return -/obj/machinery/particle_accelerator/control_box/update_icon() +/obj/machinery/particle_accelerator/control_box/update_icon_state() if(active) icon_state = "[reference]p[strength]" else @@ -83,7 +83,6 @@ icon_state = "[reference]w" else icon_state = "[reference]c" - return /obj/machinery/particle_accelerator/control_box/Topic(href, href_list) if(..(href, href_list)) diff --git a/code/modules/power/singularity/particle_accelerator/particle_emitter.dm b/code/modules/power/singularity/particle_accelerator/particle_emitter.dm index c598e5cb74d..7e6753b2c4a 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_emitter.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_emitter.dm @@ -18,10 +18,6 @@ icon_state = "emitter_right" reference = "emitter_right" -/obj/structure/particle_accelerator/particle_emitter/update_icon() - ..() - return - /obj/structure/particle_accelerator/particle_emitter/proc/set_delay(delay) if(delay && delay >= 0) fire_delay = delay diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 501e53d2c9b..8aa7a7a2444 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -83,17 +83,17 @@ C += PC.maxcharge capacity = C / (15000) * 1e6 -/obj/machinery/power/smes/update_icon() - cut_overlays() +/obj/machinery/power/smes/update_overlays() + . = ..() if(stat & BROKEN) return - add_overlay("smes-op[outputting ? 1 : 0]") - add_overlay("smes-oc[inputting ? 1 : 0]") + . += "smes-op[outputting ? 1 : 0]" + . += "smes-oc[inputting ? 1 : 0]" - var/clevel = chargedisplay() - if(clevel > 0) - add_overlay("smes-og[clevel]") + var/charge_level = chargedisplay() + if(charge_level > 0) + . += "smes-og[charge_level]" /obj/machinery/power/smes/attackby(obj/item/I, mob/user, params) //opening using screwdriver diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 7da3df614de..2bad3dcc1d6 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -93,15 +93,13 @@ new /obj/item/shard(src.loc) qdel(src) -/obj/machinery/power/solar/update_icon() - ..() - overlays.Cut() +/obj/machinery/power/solar/update_overlays() + . = ..() if(stat & BROKEN) - overlays += image('icons/goonstation/objects/power.dmi', icon_state = "solar_panel-b", layer = FLY_LAYER) + . += image('icons/goonstation/objects/power.dmi', icon_state = "solar_panel-b", layer = FLY_LAYER) else - overlays += image('icons/goonstation/objects/power.dmi', icon_state = "solar_panel", layer = FLY_LAYER) + . += image('icons/goonstation/objects/power.dmi', icon_state = "solar_panel", layer = FLY_LAYER) set_angle(adir) - return //calculates the fraction of the sunlight that the panel recieves /obj/machinery/power/solar/proc/update_solar_exposure() @@ -340,16 +338,16 @@ set_panels(cdir) updateDialog() -/obj/machinery/power/solar_control/update_icon() - overlays.Cut() +/obj/machinery/power/solar_control/update_overlays() + . = ..() if(stat & NOPOWER) - overlays += "[icon_keyboard]_off" + . += "[icon_keyboard]_off" return - overlays += icon_keyboard + . += icon_keyboard if(stat & BROKEN) - overlays += "[icon_state]_broken" + . += "[icon_state]_broken" else - overlays += icon_screen + . += icon_screen /obj/machinery/power/solar_control/attack_ai(mob/user as mob) add_hiddenprint(user) diff --git a/code/modules/power/treadmill.dm b/code/modules/power/treadmill.dm index 70f3ab44c50..6c1ade9e7e6 100644 --- a/code/modules/power/treadmill.dm +++ b/code/modules/power/treadmill.dm @@ -22,7 +22,7 @@ if(anchored) connect_to_network() -/obj/machinery/power/treadmill/update_icon() +/obj/machinery/power/treadmill/update_icon_state() icon_state = speed ? "conveyor-1" : "conveyor0" /obj/machinery/power/treadmill/Crossed(mob/living/M, oldloc) @@ -171,13 +171,13 @@ . = ..() . += "The display reads:[line1]
[line2]
"
-/obj/machinery/treadmill_monitor/update_icon()
- overlays.Cut()
+/obj/machinery/treadmill_monitor/update_overlays()
+ . = ..()
if(stat & NOPOWER || !total_joules || !on)
line1 = ""
line2 = ""
else if(stat & BROKEN)
- overlays += image('icons/obj/status_display.dmi', icon_state = "ai_bsod")
+ . += image('icons/obj/status_display.dmi', icon_state = "ai_bsod")
line1 = "A@#$A"
line2 = "729%!"
else
diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm
index 04315eb6f2f..a1e3422f34c 100644
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -35,13 +35,15 @@
pixel_x = rand(-10.0, 10)
pixel_y = rand(-10.0, 10)
dir = pick(GLOB.alldirs)
- update_icon()
+ update_appearance(UPDATE_DESC|UPDATE_ICON_STATE)
-/obj/item/ammo_casing/update_icon()
- ..()
- icon_state = "[initial(icon_state)][BB ? "-live" : ""]"
+/obj/item/ammo_casing/update_desc()
+ . = ..()
desc = "[initial(desc)][BB ? "" : " This one is spent."]"
+/obj/item/ammo_casing/update_icon_state()
+ icon_state = "[initial(icon_state)][BB ? "-live" : ""]"
+
/obj/item/ammo_casing/proc/newshot(params) //For energy weapons, shotgun shells and wands (!).
if(!BB)
BB = new projectile_type(src, params)
@@ -61,7 +63,7 @@
else
continue
if(boolets > 0)
- box.update_icon()
+ box.update_appearance(UPDATE_DESC|UPDATE_ICON_STATE)
to_chat(user, "You collect [boolets] shell\s. [box] now contains [length(box.stored_ammo)] shell\s.")
playsound(src, 'sound/weapons/gun_interactions/bulletinsert.ogg', 50, 1)
else
@@ -115,7 +117,7 @@
var/list/stored_ammo = list()
var/ammo_type = /obj/item/ammo_casing
var/max_ammo = 7
- var/multi_sprite_step = AMMO_MULTI_SPRITE_STEP_NONE // see update_icon() for details
+ var/multi_sprite_step = AMMO_MULTI_SPRITE_STEP_NONE // see update_icon_state() for details
var/caliber
var/multiload = 1
var/list/initial_mats //For calculating refund values.
@@ -124,7 +126,7 @@
..()
for(var/i in 1 to max_ammo)
stored_ammo += new ammo_type(src)
- update_icon()
+ update_appearance(UPDATE_DESC|UPDATE_ICON)
/obj/item/ammo_box/Destroy()
QDEL_LIST(stored_ammo)
@@ -142,7 +144,7 @@
if(!initial_mats)
initial_mats = materials.Copy()
update_mat_value()
- update_icon()
+ update_appearance(UPDATE_DESC|UPDATE_ICON_STATE)
return b
/obj/item/ammo_box/proc/give_round(obj/item/ammo_casing/R, replace_spent = 0)
@@ -197,8 +199,8 @@
if(!silent)
to_chat(user, "You load [num_loaded] shell\s into \the [src]!")
playsound(src, 'sound/weapons/gun_interactions/shotguninsert.ogg', 50, 1)
- A.update_icon()
- update_icon()
+ A.update_appearance(UPDATE_DESC|UPDATE_ICON_STATE)
+ update_appearance(UPDATE_DESC|UPDATE_ICON_STATE)
return num_loaded
@@ -208,7 +210,7 @@
user.put_in_hands(A)
playsound(src, 'sound/weapons/gun_interactions/remove_bullet.ogg', 50, 1)
to_chat(user, "You remove a round from \the [src]!")
- update_icon()
+ update_appearance(UPDATE_DESC|UPDATE_ICON_STATE)
// `multi_sprite_step` governs whether there are different sprites for different degrees of being loaded.
// AMMO_MULTI_SPRITE_STEP_NONE - just a single `icon_state`, no shenanigans
@@ -216,7 +218,7 @@
// (positive integer) - sprites for intermediate degrees of being loaded are present in the .dmi
// and are named `[icon_state]-[ammo_count]`, with `ammo_count` being incremented in steps of `multi_sprite_step`
// ... except the very final full mag sprite with is just `[icon_state]`
-/obj/item/ammo_box/update_icon()
+/obj/item/ammo_box/update_icon_state()
var/icon_base = initial(icon_state)
switch(multi_sprite_step)
if(AMMO_MULTI_SPRITE_STEP_NONE)
@@ -229,6 +231,9 @@
icon_state = icon_base
else
icon_state = "[icon_base]-[shown_ammo]"
+
+/obj/item/ammo_box/update_desc()
+ . = ..()
desc = "[initial(desc)] There are [length(stored_ammo)] shell\s left!"
/obj/item/ammo_box/proc/update_mat_value()
diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm
index 16d16144c9e..270df98a036 100644
--- a/code/modules/projectiles/ammunition/ammo_casings.dm
+++ b/code/modules/projectiles/ammunition/ammo_casings.dm
@@ -359,11 +359,14 @@
var/modified = 0
harmful = FALSE
-/obj/item/ammo_casing/caseless/foam_dart/update_icon()
- ..()
+/obj/item/ammo_casing/caseless/foam_dart/update_desc()
+ . = ..()
+ if(modified)
+ desc = "Its nerf or nothing! ... Although, this one doesn't look too safe."
+
+/obj/item/ammo_casing/caseless/foam_dart/update_icon_state()
if(modified)
icon_state = "foamdart_empty"
- desc = "Its nerf or nothing! ... Although, this one doesn't look too safe."
if(BB)
BB.icon_state = "foamdart_empty"
else
@@ -416,11 +419,15 @@
projectile_type = /obj/item/projectile/bullet/reusable/foam_dart/sniper
icon_state = "foamdartsniper"
-/obj/item/ammo_casing/caseless/foam_dart/sniper/update_icon()
- ..()
+
+/obj/item/ammo_casing/caseless/foam_dart/sniper/update_desc()
+ . = ..()
+ if(modified)
+ desc = "Its nerf or nothing! ... Although, this one doesn't look too safe."
+
+/obj/item/ammo_casing/caseless/foam_dart/sniper/update_icon_state()
if(modified)
icon_state = "foamdartsniper_empty"
- desc = "Its nerf or nothing! ... Although, this one doesn't look too safe."
if(BB)
BB.icon_state = "foamdartsniper_empty"
else
diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm
index af6ec80673d..8321f240b7b 100644
--- a/code/modules/projectiles/ammunition/magazines.dm
+++ b/code/modules/projectiles/ammunition/magazines.dm
@@ -228,13 +228,11 @@
multi_sprite_step = 1
caliber = "9mm"
-/obj/item/ammo_box/magazine/enforcer/update_icon()
- ..()
- overlays.Cut()
-
+/obj/item/ammo_box/magazine/enforcer/update_overlays()
+ . = ..()
var/ammo = ammo_count()
if(ammo && is_rubber())
- overlays += image('icons/obj/ammo.dmi', icon_state = "enforcer-r")
+ . += image('icons/obj/ammo.dmi', icon_state = "enforcer-r")
/obj/item/ammo_box/magazine/enforcer/examine(mob/user)
. = ..()
@@ -446,15 +444,13 @@
multi_sprite_step = 1
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
-/obj/item/ammo_box/magazine/toy/enforcer/update_icon()
- ..()
- overlays.Cut()
-
+/obj/item/ammo_box/magazine/toy/enforcer/update_overlays()
+ . = ..()
var/ammo = ammo_count()
if(ammo && is_riot())
- overlays += image('icons/obj/ammo.dmi', icon_state = "enforcer-rd")
+ . += image('icons/obj/ammo.dmi', icon_state = "enforcer-rd")
else if(ammo)
- overlays += image('icons/obj/ammo.dmi', icon_state = "enforcer-bd")
+ . += image('icons/obj/ammo.dmi', icon_state = "enforcer-bd")
/obj/item/ammo_box/magazine/toy/enforcer/proc/is_riot()//if the topmost bullet is a riot dart
var/ammo = ammo_count()
@@ -500,11 +496,14 @@
icon_state = "handgun_ammo_battery"
var/charge = 1000
-/obj/item/ammo_box/magazine/detective/speedcharger/update_icon()
+/obj/item/ammo_box/magazine/detective/speedcharger/update_icon_state()
+ return
+
+/obj/item/ammo_box/magazine/detective/speedcharger/update_overlays()
+ . = ..()
var/charge_percent_rounded = round(charge_percent(), 20) // to the nearest 20%
- cut_overlays()
if(charge_percent_rounded)
- add_overlay("hab_charge_[charge_percent_rounded]")
+ . += "hab_charge_[charge_percent_rounded]"
/obj/item/ammo_box/magazine/detective/speedcharger/proc/charge_percent()
return (charge / initial(charge) * 100)
diff --git a/code/modules/projectiles/guns/alien.dm b/code/modules/projectiles/guns/alien.dm
index 4d662c11a9f..9c757931a71 100644
--- a/code/modules/projectiles/guns/alien.dm
+++ b/code/modules/projectiles/guns/alien.dm
@@ -11,9 +11,12 @@
restricted_species = list(/datum/species/vox/armalis)
sprite_sheets_inhand = list("Vox Armalis" = 'icons/mob/clothing/species/armalis/held.dmi') //Big guns big birds.
-/obj/item/gun/energy/noisecannon/update_icon()
+/obj/item/gun/energy/noisecannon/update_icon_state()
return
+/obj/item/gun/energy/noisecannon/update_overlays()
+ return list()
+
//Casing
/obj/item/ammo_casing/energy/sonic
projectile_type = /obj/item/projectile/energy/sonic
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index 94e846e86ad..8ecd0b07e29 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -20,6 +20,9 @@
var/charge_delay = 4
/// Do you want the gun to fit into a turret, defaults to true, used for if a energy gun is too strong to be in a turret, or does not make sense to be in one.
var/can_fit_in_turrets = TRUE
+ var/new_icon_state
+ /// Used when updating icon and overlays to determine the energy pips
+ var/ratio
/obj/item/gun/energy/examine(mob/user)
. = ..()
@@ -141,41 +144,8 @@
update_icon()
return
-/obj/item/gun/energy/update_icon()
- cut_overlays()
- icon_state = initial(icon_state)
- var/ratio = CEILING((cell.charge / cell.maxcharge) * charge_sections, 1)
- var/inhand_ratio = CEILING((cell.charge / cell.maxcharge) * inhand_charge_sections, 1)
- var/obj/item/ammo_casing/energy/shot = ammo_type[select]
- var/iconState = "[icon_state]_charge"
- var/itemState = null
- if(!initial(item_state))
- itemState = icon_state
- if(modifystate)
- add_overlay("[icon_state]_[shot.select_name]")
- iconState += "_[shot.select_name]"
- if(itemState)
- itemState += "[shot.select_name]"
- if(cell.charge < shot.e_cost)
- overlays += "[icon_state]_empty"
- else
- if(!shaded_charge)
- for(var/i = ratio, i >= 1, i--)
- add_overlay(image(icon = icon, icon_state = iconState, pixel_x = ammo_x_offset * (i -1)))
- else
- add_overlay(image(icon = icon, icon_state = "[icon_state]_[modifystate ? "[shot.select_name]_" : ""]charge[ratio]"))
- if(gun_light && can_flashlight)
- var/iconF = "flight"
- if(gun_light.on)
- iconF = "flight_on"
- add_overlay(image(icon = icon, icon_state = iconF, pixel_x = flight_x_offset, pixel_y = flight_y_offset))
- if(bayonet && can_bayonet)
- add_overlay(knife_overlay)
- if(itemState)
- itemState += "[inhand_ratio]"
- item_state = itemState
- if(current_skin)
- icon_state = current_skin
+/obj/item/gun/energy/update_icon(updates=ALL)
+ ..()
var/mob/living/carbon/human/user = loc
if(istype(user))
if(user.hand) //this is kinda ew but whatever
@@ -183,6 +153,46 @@
else
user.update_inv_l_hand()
+/obj/item/gun/energy/update_icon_state()
+ icon_state = initial(icon_state)
+ ratio = CEILING((cell.charge / cell.maxcharge) * charge_sections, 1)
+ var/inhand_ratio = CEILING((cell.charge / cell.maxcharge) * inhand_charge_sections, 1)
+ var/obj/item/ammo_casing/energy/shot = ammo_type[select]
+ new_icon_state = "[icon_state]_charge"
+ var/new_item_state = null
+ if(!initial(item_state))
+ new_item_state = icon_state
+ if(modifystate)
+ new_icon_state += "_[shot.select_name]"
+ if(new_item_state)
+ new_item_state += "[shot.select_name]"
+ if(new_item_state)
+ new_item_state += "[inhand_ratio]"
+ item_state = new_item_state
+ if(current_skin)
+ icon_state = current_skin
+
+/obj/item/gun/energy/update_overlays()
+ . = ..()
+ var/obj/item/ammo_casing/energy/shot = ammo_type[select]
+ if(modifystate)
+ . += "[icon_state]_[shot.select_name]"
+ if(cell.charge < shot.e_cost)
+ . += "[icon_state]_empty"
+ else
+ if(!shaded_charge)
+ for(var/i = ratio, i >= 1, i--)
+ . += image(icon = icon, icon_state = new_icon_state, pixel_x = ammo_x_offset * (i -1))
+ else
+ . += image(icon = icon, icon_state = "[icon_state]_[modifystate ? "[shot.select_name]_" : ""]charge[ratio]")
+ if(gun_light && can_flashlight)
+ var/iconF = "flight"
+ if(gun_light.on)
+ iconF = "flight_on"
+ . += image(icon = icon, icon_state = iconF, pixel_x = flight_x_offset, pixel_y = flight_y_offset)
+ if(bayonet && can_bayonet)
+ . += knife_overlay
+
/obj/item/gun/energy/ui_action_click()
toggle_gunlight()
diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
index ec3e0bd05f8..5355cac315c 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -149,19 +149,18 @@
update_icon()
overheat = FALSE
-/obj/item/gun/energy/kinetic_accelerator/update_icon()
- cut_overlays()
+/obj/item/gun/energy/kinetic_accelerator/update_overlays()
+ . = ..()
if(empty_state && !can_shoot())
- add_overlay(empty_state)
+ . += empty_state
if(gun_light && can_flashlight)
var/iconF = "flight"
if(gun_light.on)
iconF = "flight_on"
- add_overlay(image(icon = icon, icon_state = iconF, pixel_x = flight_x_offset, pixel_y = flight_y_offset))
+ . += image(icon = icon, icon_state = iconF, pixel_x = flight_x_offset, pixel_y = flight_y_offset)
if(bayonet && can_bayonet)
- add_overlay(knife_overlay)
-
+ . += knife_overlay
/obj/item/gun/energy/kinetic_accelerator/experimental
name = "experimental kinetic accelerator"
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index 723e56608e0..6cfeb3e53ce 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -130,12 +130,11 @@
ammo_type = list(/obj/item/ammo_casing/energy/immolator/strong, /obj/item/ammo_casing/energy/immolator/scatter)
origin_tech = "combat=5;magnets=5;powerstorage=4"
-/obj/item/gun/energy/immolator/multi/update_icon()
- ..()
+/obj/item/gun/energy/immolator/multi/update_overlays()
+ . = ..()
var/obj/item/ammo_casing/energy/shot = ammo_type[select]
var/append = shot.select_name
- overlays += image(icon = icon, icon_state = "multilensimmolator-[append]")
-
+ . += image(icon = icon, icon_state = "multilensimmolator-[append]")
/obj/item/gun/energy/immolator/multi/cyborg
name = "cyborg immolator cannon"
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index 8ef30631949..dd92016cbfe 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -44,10 +44,10 @@
cell.maxcharge = 600
cell.charge = 600
-/obj/item/gun/energy/gun/mini/update_icon()
- ..()
+/obj/item/gun/energy/gun/mini/update_overlays()
+ . = ..()
if(gun_light && gun_light.on)
- overlays += "mini-light"
+ . += "mini-light"
/obj/item/gun/energy/gun/hos
name = "\improper X-01 MultiPhase Energy Gun"
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index bd9361c3e52..d7d9309fc90 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -43,11 +43,14 @@
ammo_x_offset = 1
can_holster = TRUE
-/obj/item/gun/energy/decloner/update_icon()
- ..()
+/obj/item/gun/energy/decloner/update_icon_state()
+ return
+
+/obj/item/gun/energy/decloner/update_overlays()
+ . = list()
var/obj/item/ammo_casing/energy/shot = ammo_type[select]
if(cell.charge > shot.e_cost)
- add_overlay("decloner_spin")
+ . += "decloner_spin"
// Flora Gun //
/obj/item/gun/energy/floragun
@@ -191,8 +194,8 @@
else
return ..()
-/obj/item/gun/energy/plasmacutter/update_icon()
- return
+/obj/item/gun/energy/plasmacutter/update_overlays()
+ return list()
/obj/item/gun/energy/plasmacutter/adv
name = "advanced plasma cutter"
@@ -217,10 +220,9 @@
var/obj/effect/portal/orange
-/obj/item/gun/energy/wormhole_projector/update_icon()
+/obj/item/gun/energy/wormhole_projector/update_icon_state()
icon_state = "wormhole_projector[select]"
item_state = icon_state
- return
/obj/item/gun/energy/wormhole_projector/process_chamber()
..()
@@ -262,8 +264,8 @@
ammo_type = list(/obj/item/ammo_casing/energy/c3dbullet)
can_charge = FALSE
-/obj/item/gun/energy/printer/update_icon()
- return
+/obj/item/gun/energy/printer/update_overlays()
+ return list()
/obj/item/gun/energy/printer/emp_act()
return
@@ -519,8 +521,7 @@
..()
update_icon()
-/obj/item/gun/energy/bsg/update_icon()
- . = ..()
+/obj/item/gun/energy/bsg/update_icon_state()
if(core)
if(has_bluespace_crystal)
icon_state = "bsg_finished"
@@ -691,7 +692,7 @@
dat += "Power cost: "
dat += "[powercost]"
-/obj/item/gun/energy/temperature/proc/update_temperature()
+/obj/item/gun/energy/temperature/update_icon_state()
switch(temperature)
if(501 to INFINITY)
item_state = "tempgun_8"
@@ -713,32 +714,26 @@
item_state = "tempgun_0"
icon_state = item_state
-/obj/item/gun/energy/temperature/update_icon()
- overlays = 0
- update_temperature()
- update_user()
- update_charge()
-
-/obj/item/gun/energy/temperature/proc/update_user()
if(istype(loc,/mob/living/carbon))
var/mob/living/carbon/M = loc
M.update_inv_back()
M.update_inv_l_hand()
M.update_inv_r_hand()
-/obj/item/gun/energy/temperature/proc/update_charge()
+/obj/item/gun/energy/temperature/update_overlays()
+ . = ..()
var/charge = cell.charge
switch(charge)
- if(900 to INFINITY) overlays += "900"
- if(800 to 900) overlays += "800"
- if(700 to 800) overlays += "700"
- if(600 to 700) overlays += "600"
- if(500 to 600) overlays += "500"
- if(400 to 500) overlays += "400"
- if(300 to 400) overlays += "300"
- if(200 to 300) overlays += "200"
- if(100 to 202) overlays += "100"
- if(-INFINITY to 100) overlays += "0"
+ if(900 to INFINITY) . += "900"
+ if(800 to 900) . += "800"
+ if(700 to 800) . += "700"
+ if(600 to 700) . += "600"
+ if(500 to 600) . += "500"
+ if(400 to 500) . += "400"
+ if(300 to 400) . += "300"
+ if(200 to 300) . += "200"
+ if(100 to 200) . += "100"
+ if(-INFINITY to 100) . += "0"
// Mimic Gun //
/obj/item/gun/energy/mimicgun
@@ -850,7 +845,7 @@
return
var/new_speedcharger_charge = cell.give(S.charge)
S.charge -= new_speedcharger_charge
- S.update_icon()
+ S.update_icon(UPDATE_OVERLAYS)
update_icon()
/obj/item/gun/energy/detective/process_fire(atom/target, mob/living/user, message, params, zone_override, bonus_spread)
diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm
index 330dd8864ec..2b24510e4ec 100644
--- a/code/modules/projectiles/guns/magic.dm
+++ b/code/modules/projectiles/guns/magic.dm
@@ -72,7 +72,7 @@
charges++
return 1
-/obj/item/gun/magic/update_icon()
+/obj/item/gun/magic/update_icon_state()
return
/obj/item/gun/magic/shoot_with_empty_chamber(mob/living/user as mob|obj)
diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm
index 3fa985e1b0d..0dc8e3c8e82 100644
--- a/code/modules/projectiles/guns/magic/wand.dm
+++ b/code/modules/projectiles/guns/magic/wand.dm
@@ -22,7 +22,7 @@
. = ..()
. += "Has [charges] charge\s remaining."
-/obj/item/gun/magic/wand/update_icon()
+/obj/item/gun/magic/wand/update_icon_state()
icon_state = "[initial(icon_state)][charges ? "" : "-drained"]"
diff --git a/code/modules/projectiles/guns/misc/blastcannon.dm b/code/modules/projectiles/guns/misc/blastcannon.dm
index ffbcfe9dd1c..9aad9847084 100644
--- a/code/modules/projectiles/guns/misc/blastcannon.dm
+++ b/code/modules/projectiles/guns/misc/blastcannon.dm
@@ -22,19 +22,29 @@
user.put_in_hands(bomb)
user.visible_message("[user] detaches [bomb] from [src].")
bomb = null
- update_icon()
+ update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_ICON_STATE)
return ..()
-/obj/item/gun/blastcannon/update_icon()
+/obj/item/gun/blastcannon/update_name()
+ . = ..()
if(bomb)
- icon_state = icon_state_loaded
name = "blast cannon"
+ else
+ name = initial(name)
+
+/obj/item/gun/blastcannon/update_desc()
+ . = ..()
+ if(bomb)
desc = "A makeshift device used to concentrate a bomb's blast energy to a narrow wave."
else
- icon_state = initial(icon_state)
- name = initial(name)
desc = initial(desc)
+/obj/item/gun/blastcannon/update_icon_state()
+ if(bomb)
+ icon_state = icon_state_loaded
+ else
+ icon_state = initial(icon_state)
+
/obj/item/gun/blastcannon/attackby(obj/O, mob/user)
if(istype(O, /obj/item/transfer_valve))
var/obj/item/transfer_valve/T = O
@@ -47,7 +57,7 @@
user.visible_message("[user] attaches [T] to [src]!")
T.forceMove(src)
bomb = T
- update_icon()
+ update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_ICON_STATE)
return TRUE
return ..()
@@ -71,7 +81,7 @@
return ..()
var/power = calculate_bomb()
QDEL_NULL(bomb)
- update_icon()
+ update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_ICON_STATE)
var/heavy = power * 0.2
var/medium = power * 0.5
var/light = power
diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm
index 7c0dc177b84..44208240bf3 100644
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -22,14 +22,30 @@
return "This is a ballistic weapon. To reload, click the weapon in your hand to unload (if needed), then add the appropriate ammo. The description \
will tell you what caliber you need."
-/obj/item/gun/projectile/update_icon()
- ..()
+/obj/item/gun/projectile/update_name()
+ . = ..()
+ if(sawn_state)
+ name = "sawn-off [name]"
+ else
+ name = initial(name)
+
+/obj/item/gun/projectile/update_desc()
+ . = ..()
+ if(sawn_state)
+ desc = sawn_desc
+ else
+ desc = initial(desc)
+
+/obj/item/gun/projectile/update_icon_state()
if(current_skin)
icon_state = "[current_skin][suppressed ? "-suppressed" : ""][sawn_state ? "_sawn" : ""]"
else
icon_state = "[initial(icon_state)][suppressed ? "-suppressed" : ""][sawn_state ? "_sawn" : ""]"
+
+/obj/item/gun/projectile/update_overlays()
+ . = ..()
if(bayonet && can_bayonet)
- overlays += knife_overlay
+ . += knife_overlay
/obj/item/gun/projectile/process_chamber(eject_casing = 1, empty_chamber = 1)
var/obj/item/ammo_casing/AC = chambered //Find chambered round
@@ -201,14 +217,12 @@
if(sawn_state == SAWN_OFF)
return
user.visible_message("[user] shortens \the [src]!", "You shorten \the [src].")
- name = "sawn-off [name]"
- desc = sawn_desc
w_class = WEIGHT_CLASS_NORMAL
item_state = "gun"//phil235 is it different with different skin?
slot_flags &= ~SLOT_BACK //you can't sling it on your back
slot_flags |= SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
sawn_state = SAWN_OFF
- update_icon()
+ update_appearance()
return 1
// Sawing guns related proc
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 9c763b65ead..2a47c99c8ad 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -8,16 +8,15 @@
fire_delay = 2
actions_types = list(/datum/action/item_action/toggle_firemode)
-/obj/item/gun/projectile/automatic/update_icon()
- ..()
- overlays.Cut()
- if(!select)
- overlays += "[initial(icon_state)]semi"
- if(select == 1)
- overlays += "[initial(icon_state)]burst"
+/obj/item/gun/projectile/automatic/update_icon_state()
icon_state = "[initial(icon_state)][magazine ? "-[magazine.max_ammo]" : ""][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
- if(bayonet && can_bayonet)
- overlays += knife_overlay
+
+/obj/item/gun/projectile/automatic/update_overlays()
+ . = ..()
+ if(!select)
+ . += "[initial(icon_state)]semi"
+ if(select == 1)
+ . += "[initial(icon_state)]burst"
/obj/item/gun/projectile/automatic/attackby(obj/item/A as obj, mob/user as mob, params)
. = ..()
@@ -108,8 +107,7 @@
..()
empty_alarm()
-/obj/item/gun/projectile/automatic/c20r/update_icon()
- ..()
+/obj/item/gun/projectile/automatic/c20r/update_icon_state()
icon_state = "c20r[magazine ? "-[CEILING(get_ammo(0)/4, 1)*4]" : ""][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
//WT550//
@@ -130,8 +128,7 @@
knife_x_offset = 25
knife_y_offset = 12
-/obj/item/gun/projectile/automatic/wt550/update_icon()
- ..()
+/obj/item/gun/projectile/automatic/wt550/update_icon_state()
icon_state = "wt550[magazine ? "-[CEILING(get_ammo(0)/4, 1)*4]" : ""]"
//Type-U3 Uzi//
@@ -181,23 +178,24 @@
else
return ..()
-/obj/item/gun/projectile/automatic/m90/update_icon()
- ..()
- overlays.Cut()
- switch(select)
- if(0)
- overlays += "[initial(icon_state)]semi"
- if(1)
- overlays += "[initial(icon_state)]burst"
- if(2)
- overlays += "[initial(icon_state)]gren"
+/obj/item/gun/projectile/automatic/m90/update_icon_state()
icon_state = "[initial(icon_state)][magazine ? "" : "-e"]"
if(magazine)
- overlays += image(icon = icon, icon_state = "m90-[CEILING(get_ammo(0)/6, 1)*6]")
item_state = "m90-[CEILING(get_ammo(0)/7.5, 1)]"
else
item_state = "m90-0"
- return
+
+/obj/item/gun/projectile/automatic/m90/update_overlays()
+ . = ..()
+ switch(select)
+ if(0)
+ . += "[initial(icon_state)]semi"
+ if(1)
+ . += "[initial(icon_state)]burst"
+ if(2)
+ . += "[initial(icon_state)]gren"
+ if(magazine)
+ . += image(icon = icon, icon_state = "m90-[CEILING(get_ammo(0)/6, 1)*6]")
/obj/item/gun/projectile/automatic/m90/burst_select()
var/mob/living/carbon/human/user = usr
@@ -270,10 +268,10 @@
..()
update_icon()
-/obj/item/gun/projectile/automatic/shotgun/bulldog/proc/update_magazine()
+/obj/item/gun/projectile/automatic/shotgun/bulldog/update_overlays()
+ . = ..()
if(magazine)
- overlays.Cut()
- overlays += "[magazine.icon_state]"
+ . += "[magazine.icon_state]"
if(istype(magazine, /obj/item/ammo_box/magazine/m12g/XtrLrg))
w_class = WEIGHT_CLASS_BULKY
else
@@ -281,9 +279,7 @@
else
w_class = WEIGHT_CLASS_NORMAL
-/obj/item/gun/projectile/automatic/shotgun/bulldog/update_icon()
- overlays.Cut()
- update_magazine()
+/obj/item/gun/projectile/automatic/shotgun/bulldog/update_icon_state()
icon_state = "bulldog[chambered ? "" : "-e"]"
/obj/item/gun/projectile/automatic/shotgun/bulldog/attackby(obj/item/A as obj, mob/user as mob, params)
@@ -314,6 +310,5 @@
can_suppress = FALSE
burst_size = 2
-/obj/item/gun/projectile/automatic/lasercarbine/update_icon()
- ..()
+/obj/item/gun/projectile/automatic/lasercarbine/update_icon_state()
icon_state = "lasercarbine[magazine ? "-[CEILING(get_ammo(0)/5, 1)*5]" : ""]"
diff --git a/code/modules/projectiles/guns/projectile/bow.dm b/code/modules/projectiles/guns/projectile/bow.dm
index 638f750d1dd..b6e572c8769 100644
--- a/code/modules/projectiles/guns/projectile/bow.dm
+++ b/code/modules/projectiles/guns/projectile/bow.dm
@@ -11,7 +11,7 @@
var/ready_to_fire = 0
var/slowdown_when_ready = 2
-/obj/item/gun/projectile/bow/update_icon()
+/obj/item/gun/projectile/bow/update_icon_state()
if(magazine.ammo_count() && !ready_to_fire)
icon_state = "bow_loaded"
else if(ready_to_fire)
diff --git a/code/modules/projectiles/guns/projectile/launchers.dm b/code/modules/projectiles/guns/projectile/launchers.dm
index 8f04c5c58fd..7956084b707 100644
--- a/code/modules/projectiles/guns/projectile/launchers.dm
+++ b/code/modules/projectiles/guns/projectile/launchers.dm
@@ -47,10 +47,8 @@
/obj/item/gun/projectile/automatic/gyropistol/process_chamber(eject_casing = 0, empty_chamber = 1)
..()
-/obj/item/gun/projectile/automatic/gyropistol/update_icon()
- ..()
+/obj/item/gun/projectile/automatic/gyropistol/update_icon_state()
icon_state = "[initial(icon_state)][magazine ? "loaded" : ""]"
- return
/obj/item/gun/projectile/automatic/speargun
name = "kinetic speargun"
@@ -69,7 +67,7 @@
select = 0
actions_types = list()
-/obj/item/gun/projectile/automatic/speargun/update_icon()
+/obj/item/gun/projectile/automatic/speargun/update_icon_state()
return
/obj/item/gun/projectile/automatic/speargun/attack_self()
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index 5c1f15677bb..0f56d9ddd5c 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -15,10 +15,8 @@
fire_delay = 0
actions_types = list()
-/obj/item/gun/projectile/automatic/pistol/update_icon()
- ..()
+/obj/item/gun/projectile/automatic/pistol/update_icon_state()
icon_state = "[initial(icon_state)][magazine ? "-[magazine.max_ammo]" : ""][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
- return
//M1911//
/obj/item/gun/projectile/automatic/pistol/m1911
@@ -52,20 +50,21 @@
options["Red Handle"] = "enforcer_redgrip"
options["Cancel"] = null
-/obj/item/gun/projectile/automatic/pistol/enforcer/update_icon()
- ..()
+/obj/item/gun/projectile/automatic/pistol/enforcer/update_icon_state()
if(current_skin)
icon_state = "[current_skin][chambered ? "" : "-e"]"
else
icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
- overlays.Cut()
+
+/obj/item/gun/projectile/automatic/pistol/enforcer/update_overlays()
+ . = list()
if(suppressed)
- overlays += image(icon = icon, icon_state = "enforcer_supp", pixel_x = 4)
+ . += image(icon = icon, icon_state = "enforcer_supp", pixel_x = 4)
if(gun_light)
- var/iconF = "Enforcer_light"
+ var/flashlight = "Enforcer_light"
if(gun_light.on)
- iconF = "Enforcer_light-on"
- overlays += image(icon = icon, icon_state = iconF, pixel_x = 0)
+ flashlight = "Enforcer_light-on"
+ . += image(icon = icon, icon_state = flashlight, pixel_x = 0)
/obj/item/gun/projectile/automatic/pistol/enforcer/ui_action_click()
toggle_gunlight()
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index cd7f3b9e5f6..626e50a91db 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -367,18 +367,16 @@
else
to_chat(user, "You need at least ten lengths of cable if you want to make a sling!")
-/obj/item/gun/projectile/revolver/doublebarrel/improvised/update_icon()
- ..()
- if(sling)
- icon_state = "ishotgun_sling"
- item_state = "ishotgun_sling"
+/obj/item/gun/projectile/revolver/doublebarrel/improvised/update_icon_state()
+ icon_state = "ishotgun[sling ? "_sling" : ""]"
+ item_state = "ishotgun[sling ? "_sling" : ""]"
/obj/item/gun/projectile/revolver/doublebarrel/improvised/sawoff(mob/user)
. = ..()
if(. && sling) //sawing off the gun removes the sling
new /obj/item/stack/cable_coil(get_turf(src), 10)
sling = FALSE
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
//caneshotgun
@@ -408,9 +406,12 @@
/obj/item/gun/projectile/revolver/doublebarrel/improvised/cane/is_crutch()
return 1
-/obj/item/gun/projectile/revolver/doublebarrel/improvised/cane/update_icon()
+/obj/item/gun/projectile/revolver/doublebarrel/improvised/cane/update_icon_state()
return
+/obj/item/gun/projectile/revolver/doublebarrel/improvised/cane/update_overlays()
+ return list()
+
/obj/item/gun/projectile/revolver/doublebarrel/improvised/cane/attackby(obj/item/A, mob/user, params)
if(istype(A, /obj/item/stack/cable_coil))
return
diff --git a/code/modules/projectiles/guns/projectile/saw.dm b/code/modules/projectiles/guns/projectile/saw.dm
index 37d173e09a1..b1fe9c909ff 100644
--- a/code/modules/projectiles/guns/projectile/saw.dm
+++ b/code/modules/projectiles/guns/projectile/saw.dm
@@ -22,7 +22,7 @@
playsound(src, cover_open ? 'sound/weapons/gun_interactions/sawopen.ogg' : 'sound/weapons/gun_interactions/sawclose.ogg', 50, 1)
update_icon()
-/obj/item/gun/projectile/automatic/l6_saw/update_icon()
+/obj/item/gun/projectile/automatic/l6_saw/update_icon_state()
icon_state = "l6[cover_open ? "open" : "closed"][magazine ? CEILING(get_ammo(0)/12.5, 1)*25 : "-empty"][suppressed ? "-suppressed" : ""]"
item_state = "l6[cover_open ? "openmag" : "closedmag"]"
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index 8fbfcfd1186..3126cc695f0 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -58,7 +58,6 @@
playsound(M, 'sound/weapons/gun_interactions/shotgunpump.ogg', 60, 1)
pump_unload(M)
pump_reload(M)
- update_icon() //I.E. fix the desc
return 1
/obj/item/gun/projectile/shotgun/proc/pump_unload(mob/M)
@@ -136,8 +135,6 @@
/obj/item/gun/projectile/shotgun/riot/proc/post_sawoff()
- name = "sawn-off riot shotgun"
- desc = sawn_desc
w_class = WEIGHT_CLASS_NORMAL
current_skin = "riotshotgun_sawn"
item_state = "riotshotgun_sawn" //phil235 is it different with different skin?
@@ -145,7 +142,7 @@
slot_flags |= SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
sawn_state = SAWN_OFF
magazine.max_ammo = 3
- update_icon()
+ update_appearance()
/obj/item/gun/projectile/shotgun/riot/proc/unsaw(obj/item/A, mob/user)
@@ -179,8 +176,6 @@
return 1
/obj/item/gun/projectile/shotgun/riot/proc/post_unsaw()
- name = initial(name)
- desc = initial(desc)
w_class = initial(w_class)
current_skin = "riotshotgun"
item_state = initial(item_state)
@@ -188,10 +183,9 @@
slot_flags |= SLOT_BACK
sawn_state = SAWN_INTACT
magazine.max_ammo = 6
- update_icon()
+ update_appearance()
-/obj/item/gun/projectile/shotgun/riot/update_icon() //Can't use the old proc as it makes it go to riotshotgun-short_sawn
- ..()
+/obj/item/gun/projectile/shotgun/riot/update_icon_state() //Can't use the old proc as it makes it go to riotshotgun-short_sawn
if(current_skin)
icon_state = "[current_skin]"
else
@@ -231,7 +225,6 @@
else
pump_unload(M)
bolt_open = !bolt_open
- update_icon() //I.E. fix the desc
return 1
/obj/item/gun/projectile/shotgun/blow_up(mob/user)
diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm
index 0ae34930234..abb833221c8 100644
--- a/code/modules/projectiles/guns/projectile/sniper.dm
+++ b/code/modules/projectiles/guns/projectile/sniper.dm
@@ -35,7 +35,7 @@
QDEL_NULL(magazine)
magazine = new /obj/item/ammo_box/magazine/sniper_rounds/penetrator(src)
-/obj/item/gun/projectile/automatic/sniper_rifle/update_icon()
+/obj/item/gun/projectile/automatic/sniper_rifle/update_icon_state()
if(magazine)
icon_state = "sniper-mag"
else
@@ -50,7 +50,7 @@
max_ammo = 6
caliber = ".50"
-/obj/item/ammo_box/magazine/sniper_rounds/update_icon()
+/obj/item/ammo_box/magazine/sniper_rounds/update_icon_state()
if(ammo_count())
icon_state = "[initial(icon_state)]-ammo"
else
@@ -178,13 +178,13 @@
max_ammo = 6
caliber = "foam_force_sniper"
-/obj/item/ammo_box/magazine/toy/sniper_rounds/update_icon()
- overlays.Cut()
+/obj/item/ammo_box/magazine/toy/sniper_rounds/update_icon_state()
+ return
+/obj/item/ammo_box/magazine/toy/sniper_rounds/update_overlays()
+ . = ..()
var/ammo = ammo_count()
if(ammo && istype(contents[contents.len], /obj/item/ammo_casing/caseless/foam_dart/sniper/riot))
- overlays += image('icons/obj/ammo.dmi', icon_state = ".50mag-r")
+ . += ".50mag-r"
else if(ammo)
- overlays += image('icons/obj/ammo.dmi', icon_state = ".50mag-f")
- else
- icon_state = "[initial(icon_state)]"
+ . += ".50mag-f"
diff --git a/code/modules/projectiles/guns/projectile/toy.dm b/code/modules/projectiles/guns/projectile/toy.dm
index 4fe035d9a66..1fa508948e4 100644
--- a/code/modules/projectiles/guns/projectile/toy.dm
+++ b/code/modules/projectiles/guns/projectile/toy.dm
@@ -30,8 +30,7 @@
can_holster = TRUE
actions_types = list()
-/obj/item/gun/projectile/automatic/toy/pistol/update_icon()
- ..()
+/obj/item/gun/projectile/automatic/toy/pistol/update_icon_state()
icon_state = "[initial(icon_state)][magazine ? "-[magazine.max_ammo]" : ""][chambered ? "" : "-e"]"
/obj/item/gun/projectile/automatic/toy/pistol/riot
@@ -50,18 +49,16 @@
mag_type = /obj/item/ammo_box/magazine/toy/enforcer
can_flashlight = TRUE
-/obj/item/gun/projectile/automatic/toy/pistol/enforcer/update_icon()
- ..()
+/obj/item/gun/projectile/automatic/toy/pistol/enforcer/update_icon_state()
icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
-/obj/item/gun/projectile/automatic/toy/pistol/enforcer/update_icon()
- ..()
- overlays.Cut()
+/obj/item/gun/projectile/automatic/toy/pistol/enforcer/update_overlays()
+ . = ..()
if(gun_light)
- var/iconF = "Enforcer_light"
+ var/flashlight = "Enforcer_light"
if(gun_light.on)
- iconF = "Enforcer_light-on"
- overlays += image(icon = 'icons/obj/guns/projectile.dmi', icon_state = iconF, pixel_x = 0)
+ flashlight = "Enforcer_light-on"
+ . += image(icon = 'icons/obj/guns/projectile.dmi', icon_state = flashlight, pixel_x = 0)
/obj/item/gun/projectile/automatic/toy/pistol/enforcer/ui_action_click()
toggle_gunlight()
diff --git a/code/modules/projectiles/guns/rocket.dm b/code/modules/projectiles/guns/rocket.dm
index 96a97c8fe1a..8a47db4a50f 100644
--- a/code/modules/projectiles/guns/rocket.dm
+++ b/code/modules/projectiles/guns/rocket.dm
@@ -24,9 +24,6 @@
rockets = null
return ..()
-/obj/item/gun/rocketlauncher/update_icon()
- return
-
/obj/item/gun/rocketlauncher/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/ammo_casing/rocket))
if(rockets.len < max_rockets)
diff --git a/code/modules/projectiles/guns/throw.dm b/code/modules/projectiles/guns/throw.dm
index 58f3db026e1..7e24fc66146 100644
--- a/code/modules/projectiles/guns/throw.dm
+++ b/code/modules/projectiles/guns/throw.dm
@@ -41,9 +41,12 @@
loaded_projectiles = null
return ..()
-/obj/item/gun/throw/update_icon()
+/obj/item/gun/throw/update_icon_state()
return
+/obj/item/gun/throw/update_overlays()
+ return list()
+
/obj/item/gun/throw/attackby(obj/item/I, mob/user, params)
if(istype(I, valid_projectile_type) && !(I.flags & NODROP))
if(get_ammocount() < max_capacity)
diff --git a/code/modules/projectiles/guns/throw/crossbow.dm b/code/modules/projectiles/guns/throw/crossbow.dm
index 156c5b60625..e8fc799362a 100644
--- a/code/modules/projectiles/guns/throw/crossbow.dm
+++ b/code/modules/projectiles/guns/throw/crossbow.dm
@@ -29,7 +29,7 @@
if(cell && severity)
emp_act(severity)
-/obj/item/gun/throw/crossbow/update_icon()
+/obj/item/gun/throw/crossbow/update_icon_state()
if(!tension)
if(!to_launch)
icon_state = "[initial(icon_state)]"
@@ -63,7 +63,7 @@
..()
if(to_launch)
modify_projectile(to_launch, 1)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/item/gun/throw/crossbow/attack_self(mob/living/user)
if(tension)
@@ -77,7 +77,7 @@
else
user.visible_message("[user] relaxes the tension on [src]'s string.","You relax the tension on [src]'s string.")
tension = 0
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
else
draw(user)
@@ -92,7 +92,7 @@
if(do_after(user, 25 * drawtension, target = user))
tension = drawtension
user.visible_message("[usr] draws back the string of [src]!","[src] clunks as you draw the string to its maximum tension!!")
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/item/gun/throw/crossbow/attackby(obj/item/I, mob/user, params)
if(!istype(I, /obj/item/stock_parts/cell))
@@ -145,7 +145,8 @@
/obj/item/gun/throw/crossbow/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params, zone_override)
..()
tension = 0
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
+
/obj/item/gun/throw/crossbow/french
name = "french powered crossbow"
icon_state = "fcrossbow"
diff --git a/code/modules/projectiles/guns/throw/pielauncher.dm b/code/modules/projectiles/guns/throw/pielauncher.dm
index 6df067f45d6..a10b69ead09 100644
--- a/code/modules/projectiles/guns/throw/pielauncher.dm
+++ b/code/modules/projectiles/guns/throw/pielauncher.dm
@@ -24,7 +24,7 @@
/obj/item/gun/throw/piecannon/notify_ammo_count()
return "[src] has [get_ammocount()] of [max_capacity] pies left."
-/obj/item/gun/throw/piecannon/update_icon()
+/obj/item/gun/throw/piecannon/update_icon_state()
if(to_launch)
icon_state = "piecannon1"
else
@@ -33,4 +33,4 @@
/obj/item/gun/throw/piecannon/process_chamber()
..()
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index b70a7bad280..9dd5b57e700 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -144,7 +144,7 @@
var/door_type = pick(door_types)
var/obj/structure/mineral_door/D = new door_type(T)
T.ChangeTurf(/turf/simulated/floor/plasteel)
- D.Open()
+ D.operate()
/obj/item/projectile/magic/door/proc/OpenDoor(obj/machinery/door/D)
if(istype(D,/obj/machinery/door/airlock))
diff --git a/code/modules/projectiles/projectile/reusable.dm b/code/modules/projectiles/projectile/reusable.dm
index 3e0272f9f29..5a43025a9ec 100644
--- a/code/modules/projectiles/projectile/reusable.dm
+++ b/code/modules/projectiles/projectile/reusable.dm
@@ -49,7 +49,7 @@
if(pen)
newdart.add_pen(pen)
pen = null
- newdart.update_icon()
+ newdart.update_appearance(UPDATE_DESC|UPDATE_ICON_STATE)
/obj/item/projectile/bullet/reusable/foam_dart/Destroy()
QDEL_NULL(pen)
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index ca9b1f08214..0f1de2105f5 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -129,7 +129,7 @@
else
stat |= NOPOWER
-/obj/machinery/chem_dispenser/update_icon()
+/obj/machinery/chem_dispenser/update_icon_state()
if(panel_open)
icon_state = "[initial(icon_state)]-o"
return
@@ -228,7 +228,7 @@
if(Adjacent(usr) && !issilicon(usr))
usr.put_in_hands(beaker)
beaker = null
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
else
return FALSE
@@ -257,7 +257,7 @@
I.forceMove(src)
to_chat(user, "You set [I] on the machine.")
SStgui.update_uis(src) // update all UIs attached to src
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
return
return ..()
@@ -429,7 +429,7 @@
cell = new(src)
dispensable_reagents = sortList(dispensable_reagents)
current_reagent = pick(dispensable_reagents)
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
START_PROCESSING(SSobj, src)
/obj/item/handheld_chem_dispenser/Destroy()
@@ -453,7 +453,7 @@
target.reagents.add_reagent(current_reagent, actual)
cell.charge -= actual / efficiency
to_chat(user, "You dispense [actual] unit\s of [current_reagent] into [target].")
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
else if(free) // If actual is nil and there's still free space, it means we're out of juice
to_chat(user, "Insufficient energy to complete operation.")
if("remove")
@@ -511,7 +511,7 @@
if("dispense")
if(params["reagent"] in dispensable_reagents)
current_reagent = params["reagent"]
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
if("mode")
switch(params["mode"])
if("remove")
@@ -520,15 +520,14 @@
mode = "dispense"
if("isolate")
mode = "isolate"
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
else
return FALSE
add_fingerprint(usr)
-/obj/item/handheld_chem_dispenser/update_icon()
- cut_overlays()
-
+/obj/item/handheld_chem_dispenser/update_overlays()
+ . = ..()
if(cell && cell.charge)
var/image/power_light = image('icons/obj/chemical.dmi', src, "light_low")
var/percent = round((cell.charge / cell.maxcharge) * 100)
@@ -539,17 +538,16 @@
power_light.icon_state = "light_mid"
if(67 to INFINITY)
power_light.icon_state = "light_full"
- add_overlay(power_light)
+ . += power_light
var/image/mode_light = image('icons/obj/chemical.dmi', src, "light_remove")
mode_light.icon_state = "light_[mode]"
- add_overlay(mode_light)
+ . += mode_light
var/image/chamber_contents = image('icons/obj/chemical.dmi', src, "reagent_filling")
var/datum/reagent/R = GLOB.chemical_reagents_list[current_reagent]
chamber_contents.icon += R.color
- add_overlay(chamber_contents)
- ..()
+ . += chamber_contents
/obj/item/handheld_chem_dispenser/process() //Every [recharge_time] seconds, recharge some reagents for the cyborg
if(isrobot(loc) && cell.charge < cell.maxcharge)
@@ -559,7 +557,7 @@
R.cell.charge -= actual
cell.charge += actual
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
return TRUE
/obj/item/handheld_chem_dispenser/attackby(obj/item/W, mob/user, params)
@@ -576,7 +574,7 @@
W.loc = src
cell = W
to_chat(user, "You install a cell in [src].")
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/handheld_chem_dispenser/screwdriver_act(mob/user, obj/item/I)
if(!isrobot(loc) && cell)
@@ -584,7 +582,7 @@
cell.loc = get_turf(src)
cell = null
to_chat(user, "You remove the cell from [src].")
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
return
..()
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index c731f4ff2a8..11f33f44351 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -66,11 +66,13 @@
else if(A == loaded_pill_bottle)
loaded_pill_bottle = null
-/obj/machinery/chem_master/update_icon()
- overlays.Cut()
+/obj/machinery/chem_master/update_icon_state()
icon_state = "mixer[beaker ? "1" : "0"][powered() ? "" : "_nopower"]"
+
+/obj/machinery/chem_master/update_overlays()
+ . = ..()
if(powered())
- overlays += "waitlight"
+ . += "waitlight"
/obj/machinery/chem_master/blob_act(obj/structure/blob/B)
if(prob(50))
diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm
index ef259ee0b4c..f6d578c2dca 100644
--- a/code/modules/reagents/chemistry/machinery/pandemic.dm
+++ b/code/modules/reagents/chemistry/machinery/pandemic.dm
@@ -19,9 +19,8 @@
update_icon()
/obj/machinery/computer/pandemic/set_broken()
- icon_state = (beaker ? "mixer1_b" : "mixer0_b")
- overlays.Cut()
stat |= BROKEN
+ update_icon()
/obj/machinery/computer/pandemic/proc/GetVirusByIndex(index)
if(beaker && beaker.reagents)
@@ -54,17 +53,16 @@
update_icon()
playsound(loc, 'sound/machines/ping.ogg', 30, 1)
-/obj/machinery/computer/pandemic/update_icon()
+/obj/machinery/computer/pandemic/update_icon_state()
if(stat & BROKEN)
icon_state = (beaker ? "mixer1_b" : "mixer0_b")
return
-
icon_state = "mixer[(beaker)?"1":"0"][(powered()) ? "" : "_nopower"]"
- if(wait)
- overlays.Cut()
- else
- overlays += "waitlight"
+/obj/machinery/computer/pandemic/update_overlays()
+ . = list()
+ if(!wait)
+ . += "waitlight"
/obj/machinery/computer/pandemic/Topic(href, href_list)
if(..())
diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
index 8cd01f38795..d236b9d476f 100644
--- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
@@ -126,9 +126,9 @@
/obj/machinery/reagentgrinder/handle_atom_del(atom/A)
if(A == beaker)
beaker = null
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
-/obj/machinery/reagentgrinder/update_icon()
+/obj/machinery/reagentgrinder/update_icon_state()
if(beaker)
icon_state = "juicer1"
else
@@ -173,7 +173,7 @@
return FALSE
beaker = I
beaker.loc = src
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
updateUsrDialog()
return TRUE //no afterattack
@@ -310,7 +310,7 @@
return
beaker.loc = src.loc
beaker = null
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
updateUsrDialog()
/obj/machinery/reagentgrinder/proc/eject()
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index bf5e78f04e3..310ba687365 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -66,12 +66,12 @@
/obj/item/reagent_containers/proc/add_lid()
if(has_lid)
container_type ^= REFILLABLE | DRAINABLE
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/reagent_containers/proc/remove_lid()
if(has_lid)
container_type |= REFILLABLE | DRAINABLE
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/reagent_containers/attack_self(mob/user)
if(has_lid)
diff --git a/code/modules/reagents/reagent_containers/applicator.dm b/code/modules/reagents/reagent_containers/applicator.dm
index d7c53f1f5a3..5725225ea1e 100644
--- a/code/modules/reagents/reagent_containers/applicator.dm
+++ b/code/modules/reagents/reagent_containers/applicator.dm
@@ -36,14 +36,20 @@
to_chat(loc, "[src] identifies and removes a harmful substance.")
else
visible_message("[src] identifies and removes a harmful substance.")
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
-/obj/item/reagent_containers/applicator/update_icon()
- cut_overlays()
+/obj/item/reagent_containers/applicator/update_icon_state()
+ if(applying)
+ icon_state = "mender-active"
+ else
+ icon_state = "mender"
+
+/obj/item/reagent_containers/applicator/update_overlays()
+ . = ..()
if(reagents.total_volume)
var/mutable_appearance/filling = mutable_appearance('icons/goonstation/objects/objects.dmi', "mender-fluid")
filling.color = mix_color_from_reagents(reagents.reagent_list)
- add_overlay(filling)
+ . += filling
var/reag_pct = round((reagents.total_volume / volume) * 100)
var/mutable_appearance/applicator_bar = mutable_appearance('icons/goonstation/objects/objects.dmi', "app_e")
switch(reag_pct)
@@ -53,7 +59,7 @@
applicator_bar.icon_state = "app_he"
if(0)
applicator_bar.icon_state = "app_e"
- add_overlay(applicator_bar)
+ . += applicator_bar
/obj/item/reagent_containers/applicator/attack(mob/living/M, mob/user)
if(!reagents.total_volume)
@@ -72,7 +78,7 @@
user.visible_message("[user] begins mending [M] with [src].", "You begin mending [M] with [src].")
if(M.reagents)
applying = TRUE
- icon_state = "mender-active"
+ update_icon(UPDATE_ICON_STATE)
apply_to(M, user, 0.2) // We apply a very weak application up front, then loop.
while(do_after(user, 10, target = M))
measured_health = M.health
@@ -84,7 +90,7 @@
to_chat(user, "[src] is out of reagents and powers down automatically.")
break
applying = FALSE
- icon_state = "mender"
+ update_icon()
user.changeNext_move(CLICK_CD_MELEE)
diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm
index effeb05d1a4..fb1f992a429 100644
--- a/code/modules/reagents/reagent_containers/bottle.dm
+++ b/code/modules/reagents/reagent_containers/bottle.dm
@@ -13,12 +13,11 @@
volume = 30
/obj/item/reagent_containers/glass/bottle/on_reagent_change()
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
-/obj/item/reagent_containers/glass/bottle/update_icon()
- overlays.Cut()
+/obj/item/reagent_containers/glass/bottle/update_overlays()
+ . = ..()
underlays.Cut()
-
if(reagents.total_volume)
var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10")
@@ -39,8 +38,7 @@
underlays += filling
if(!is_open_container())
- var/image/lid = image(icon, src, "lid_[icon_state]")
- overlays += lid
+ . += "lid_[icon_state]"
/obj/item/reagent_containers/glass/bottle/decompile_act(obj/item/matter_decompiler/C, mob/user)
if(!reagents.total_volume)
diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm
index 15d3769e4bc..61fc34f2ea3 100644
--- a/code/modules/reagents/reagent_containers/glass_containers.dm
+++ b/code/modules/reagents/reagent_containers/glass_containers.dm
@@ -14,6 +14,7 @@
container_type = OPENCONTAINER
has_lid = TRUE
resistance_flags = ACID_PROOF
+ blocks_emissive = FALSE
var/label_text = ""
/obj/item/reagent_containers/glass/New()
@@ -128,11 +129,10 @@
var/can_assembly = 1
/obj/item/reagent_containers/glass/beaker/on_reagent_change()
- update_icon()
-
-/obj/item/reagent_containers/glass/beaker/update_icon()
- overlays.Cut()
+ update_icon(UPDATE_OVERLAYS)
+/obj/item/reagent_containers/glass/beaker/update_overlays()
+ . = ..()
if(reagents.total_volume)
var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10")
@@ -154,14 +154,14 @@
filling.icon_state = "[icon_state]100"
filling.icon += mix_color_from_reagents(reagents.reagent_list)
- overlays += filling
+ . += filling
if(!is_open_container())
- var/image/lid = image(icon, src, "lid_[initial(icon_state)]")
- overlays += lid
+ . += "lid_[initial(icon_state)]"
+ if(blocks_emissive == FALSE)
+ . += emissive_blocker(icon, "lid_[initial(icon_state)]")
if(assembly)
- overlays += "assembly"
- ..()
+ . += "assembly"
/obj/item/reagent_containers/glass/beaker/verb/remove_assembly()
set name = "Remove Assembly"
@@ -173,7 +173,7 @@
to_chat(usr, "You detach [assembly] from [src]")
usr.put_in_hands(assembly)
assembly = null
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
else
to_chat(usr, "There is no assembly to remove.")
@@ -189,7 +189,7 @@
assembly = W
user.drop_item()
W.forceMove(src)
- overlays += "assembly"
+ update_icon(UPDATE_OVERLAYS)
else
..()
@@ -254,6 +254,7 @@
amount_per_transfer_from_this = 10
origin_tech = "materials=2;engineering=3;plasmatech=3"
container_type = OPENCONTAINER
+ blocks_emissive = EMISSIVE_BLOCK_GENERIC
/obj/item/reagent_containers/glass/beaker/noreact/New()
..()
@@ -268,6 +269,7 @@
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,25,30,50,100,300)
container_type = OPENCONTAINER
+ blocks_emissive = EMISSIVE_BLOCK_GENERIC
origin_tech = "bluespace=5;materials=4;plasmatech=4"
/obj/item/reagent_containers/glass/beaker/cryoxadone
@@ -297,6 +299,7 @@
armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 75, ACID = 50) //Weak melee protection, because you can wear it on your head
slot_flags = SLOT_HEAD
resistance_flags = NONE
+ blocks_emissive = EMISSIVE_BLOCK_GENERIC
container_type = OPENCONTAINER
dog_fashion = /datum/dog_fashion/head/bucket
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 0a99cb2561a..3fbef587723 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -116,10 +116,10 @@
to_chat(user, "[src] is empty!")
return
..()
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
return TRUE
-/obj/item/reagent_containers/hypospray/autoinjector/update_icon()
+/obj/item/reagent_containers/hypospray/autoinjector/update_icon_state()
if(reagents.total_volume > 0)
icon_state = initial(icon_state)
else
diff --git a/code/modules/reagents/reagent_containers/iv_bag.dm b/code/modules/reagents/reagent_containers/iv_bag.dm
index e6db62b18ba..989a234fcc8 100644
--- a/code/modules/reagents/reagent_containers/iv_bag.dm
+++ b/code/modules/reagents/reagent_containers/iv_bag.dm
@@ -22,24 +22,24 @@
return ..()
/obj/item/reagent_containers/iv_bag/on_reagent_change()
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/reagent_containers/iv_bag/pickup(mob/user)
. = ..()
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/reagent_containers/iv_bag/dropped(mob/user)
..()
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/reagent_containers/iv_bag/attack_self(mob/user)
..()
mode = !mode
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/reagent_containers/iv_bag/attack_hand()
..()
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/reagent_containers/iv_bag/proc/begin_processing(mob/target)
injection_target = target
@@ -70,13 +70,13 @@
var/fraction = min(amount_per_transfer_from_this/reagents.total_volume, 1) //The amount of reagents we'll transfer to the person
reagents.reaction(injection_target, REAGENT_INGEST, fraction) //React the amount we're transfering.
reagents.trans_to(injection_target, amount_per_transfer_from_this)
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
else // Drawing
if(reagents.total_volume < reagents.maximum_volume)
injection_target.transfer_blood_to(src, amount_per_transfer_from_this)
for(var/datum/reagent/x in injection_target.reagents.reagent_list) // Pull small amounts of reagents from the person while drawing blood
injection_target.reagents.trans_to(src, amount_per_transfer_from_this/10)
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/reagent_containers/iv_bag/attack(mob/living/M, mob/living/user, def_zone)
return
@@ -133,21 +133,20 @@
return
-/obj/item/reagent_containers/iv_bag/update_icon()
- overlays.Cut()
-
+/obj/item/reagent_containers/iv_bag/update_overlays()
+ . = ..()
if(reagents.total_volume)
var/percent = round((reagents.total_volume / volume) * 10) // We round the 1's place off of our percent for easy image processing.
var/image/filling = image('icons/goonstation/objects/iv.dmi', src, "[icon_state][percent]")
filling.icon += mix_color_from_reagents(reagents.reagent_list)
- overlays += filling
+ . += filling
if(ismob(loc))
switch(mode)
if(IV_DRAW)
- overlays += "draw"
+ . += "draw"
if(IV_INJECT)
- overlays += "inject"
+ . += "inject"
/obj/item/reagent_containers/iv_bag/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/pen) || istype(I, /obj/item/flashlight/pen))
@@ -171,7 +170,7 @@
if(blood_type != null)
name = "[initial(name)] - [blood_type]"
reagents.add_reagent("blood", 200, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=blood_type,"resistances"=null,"trace_chem"=null))
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/reagent_containers/iv_bag/blood/random/Initialize()
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index bcfec88aeaa..12978b7eb8d 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -149,18 +149,23 @@
mode = SYRINGE_DRAW
update_icon()
-/obj/item/reagent_containers/syringe/update_icon()
- cut_overlays()
+/obj/item/reagent_containers/syringe/update_icon_state()
+ var/rounded_vol
+ if(reagents && reagents.total_volume)
+ rounded_vol = clamp(round((reagents.total_volume / volume * 15), 5), 1, 15)
+ else
+ rounded_vol = 0
+ icon_state = "[rounded_vol]"
+ item_state = "syringe_[rounded_vol]"
+
+/obj/item/reagent_containers/syringe/update_overlays()
+ . = ..()
var/rounded_vol
if(reagents && reagents.total_volume)
rounded_vol = clamp(round((reagents.total_volume / volume * 15), 5), 1, 15)
var/image/filling_overlay = mutable_appearance('icons/obj/reagentfillings.dmi', "syringe[rounded_vol]")
filling_overlay.icon += mix_color_from_reagents(reagents.reagent_list)
- add_overlay(filling_overlay)
- else
- rounded_vol = 0
- icon_state = "[rounded_vol]"
- item_state = "syringe_[rounded_vol]"
+ . += filling_overlay
if(ismob(loc))
var/mob/M = loc
var/injoverlay
@@ -169,7 +174,7 @@
injoverlay = "draw"
if(SYRINGE_INJECT)
injoverlay = "inject"
- add_overlay(injoverlay)
+ . += injoverlay
M.update_inv_l_hand()
M.update_inv_r_hand()
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 987eea8f3f9..9f8a5ea3558 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -93,8 +93,7 @@ GLOBAL_LIST_INIT(conveyor_switches, list())
/obj/machinery/conveyor/attack_hand(mob/user as mob)
user.Move_Pulled(src)
-/obj/machinery/conveyor/update_icon()
- ..()
+/obj/machinery/conveyor/update_icon_state()
if(IS_OPERATING)
icon_state = "conveyor_started_[clockwise ? "cw" : "ccw"]"
if(reversed)
@@ -286,18 +285,20 @@ GLOBAL_LIST_INIT(conveyor_switches, list())
// update the icon depending on the position
-/obj/machinery/conveyor_switch/update_icon()
- overlays.Cut()
+/obj/machinery/conveyor_switch/update_icon_state()
if(!position)
icon_state = "switch-off"
else if(position == DIRECTION_REVERSED)
icon_state = "switch-rev"
- if(!(stat & NOPOWER))
- overlays += "redlight"
else if(position == DIRECTION_FORWARDS)
icon_state = "switch-fwd"
- if(!(stat & NOPOWER))
- overlays += "greenlight"
+
+/obj/machinery/conveyor_switch/update_overlays()
+ . = ..()
+ if(position == DIRECTION_REVERSED && !(stat & NOPOWER))
+ . += "redlight"
+ if(position == DIRECTION_FORWARDS && !(stat & NOPOWER))
+ . += "greenlight"
/obj/machinery/conveyor_switch/oneway
one_way = TRUE
diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm
index a864a4f07ab..f0172fb7ecb 100644
--- a/code/modules/recycling/disposal-construction.dm
+++ b/code/modules/recycling/disposal-construction.dm
@@ -222,7 +222,7 @@
P.base_icon_state = base_state
P.dir = dir
P.dpdir = dpdir
- P.update_icon()
+ P.update_icon(UPDATE_ICON_STATE)
//Needs some special treatment ;)
if(ptype == PIPE_DISPOSALS_SORT_RIGHT || ptype == PIPE_DISPOSALS_SORT_LEFT)
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index e89dfabfcd7..39635cad224 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -742,22 +742,22 @@
/obj/structure/disposalpipe/proc/update()
var/turf/T = get_turf(src)
if(T.transparent_floor)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
return
hide(T.intact && !istype(T, /turf/space)) // space never hides pipes
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
// hide called by levelupdate if turf intact status changes
// change visibility status and force update of icon
/obj/structure/disposalpipe/hide(intact)
invisibility = intact ? INVISIBILITY_MAXIMUM: 0 // hide if floor is intact
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
// update actual icon_state depending on visibility
// if invisible, append "f" to icon_state to show faded version
// this will be revealed if a T-scanner is used
// if visible, use regular icon_state
-/obj/structure/disposalpipe/update_icon()
+/obj/structure/disposalpipe/update_icon_state()
if(invisibility)
icon_state = "[base_icon_state]f"
else
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index 9c55cd8adda..46436093bb1 100755
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -442,7 +442,8 @@
user.unEquip(src)
qdel(src)
-/obj/item/shippingPackage/proc/update_desc()
+/obj/item/shippingPackage/update_desc()
+ . = ..()
desc = "A pre-labeled package for shipping an item to coworkers."
if(sortTag)
desc += " The label says \"Deliver to [GLOB.TAGGERLOCATIONS[sortTag]]\"."
diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm
index 4ceacf94301..fb3fc5fdeb7 100644
--- a/code/modules/research/message_server.dm
+++ b/code/modules/research/message_server.dm
@@ -75,7 +75,7 @@ GLOBAL_LIST_EMPTY(message_servers)
/obj/machinery/message_server/process()
if(active && (stat & (BROKEN | NOPOWER)))
active = FALSE
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
return
if(prob(3))
playsound(loc, "computer_ambience", 50, 1)
@@ -115,10 +115,9 @@ GLOBAL_LIST_EMPTY(message_servers)
/obj/machinery/message_server/attack_hand(user as mob)
to_chat(user, "You toggle PDA message passing from [active ? "On" : "Off"] to [active ? "Off" : "On"]")
active = !active
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
-/obj/machinery/message_server/update_icon()
- ..()
+/obj/machinery/message_server/update_icon_state()
icon_state = "[initial(icon_state)][panel_open ? "_o" : null][active ? null : "_off"]"
/obj/machinery/blackbox_recorder
diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm
index 4cef4b49853..620a1462e23 100644
--- a/code/modules/research/server.dm
+++ b/code/modules/research/server.dm
@@ -44,7 +44,7 @@
tot_rating += SP.rating
heat_gen /= max(1, tot_rating)
-/obj/machinery/r_n_d/server/update_icon()
+/obj/machinery/r_n_d/server/update_icon_state()
if(stat & NOPOWER)
icon_state = "RD-server-off"
else
@@ -52,7 +52,7 @@
/obj/machinery/r_n_d/server/power_change()
. = ..()
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/machinery/r_n_d/server/proc/initialize_serv()
if(!files)
diff --git a/code/modules/ruins/lavalandruin_code/fountain_hall.dm b/code/modules/ruins/lavalandruin_code/fountain_hall.dm
index 26c8ebca7c6..cba077e34ef 100644
--- a/code/modules/ruins/lavalandruin_code/fountain_hall.dm
+++ b/code/modules/ruins/lavalandruin_code/fountain_hall.dm
@@ -39,10 +39,10 @@
last_process = world.time
to_chat(user, "The water feels warm and soothing as you touch it. The fountain immediately dries up shortly afterwards.")
user.reagents.add_reagent("godblood", 20)
- update_icon()
- addtimer(CALLBACK(src, .proc/update_icon), time_between_uses)
+ update_icon(UPDATE_ICON_STATE)
+ addtimer(CALLBACK(src, /atom/.proc/update_icon), time_between_uses)
-/obj/structure/healingfountain/update_icon()
+/obj/structure/healingfountain/update_icon_state()
if(last_process + time_between_uses > world.time)
icon_state = "fountain"
else
diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm
index 9d6604a38f3..209fe687b0c 100644
--- a/code/modules/security_levels/keycard_authentication.dm
+++ b/code/modules/security_levels/keycard_authentication.dm
@@ -197,7 +197,7 @@ GLOBAL_VAR_INIT(station_all_access, 0)
for(var/area/maintenance/A in world) // Why are these global lists? AAAAAAAAAAAAAA
for(var/obj/machinery/door/airlock/D in A)
D.emergency = 1
- D.update_icon(0)
+ D.update_appearance()
GLOB.minor_announcement.Announce("Access restrictions on maintenance and external airlocks have been removed.")
GLOB.maint_all_access = 1
SSblackbox.record_feedback("nested tally", "keycard_auths", 1, list("emergency maintenance access", "enabled"))
@@ -206,7 +206,7 @@ GLOBAL_VAR_INIT(station_all_access, 0)
for(var/area/maintenance/A in world)
for(var/obj/machinery/door/airlock/D in A)
D.emergency = 0
- D.update_icon(0)
+ D.update_appearance()
GLOB.minor_announcement.Announce("Access restrictions on maintenance and external airlocks have been re-added.")
GLOB.maint_all_access = 0
SSblackbox.record_feedback("nested tally", "keycard_auths", 1, list("emergency maintenance access", "disabled"))
@@ -215,7 +215,7 @@ GLOBAL_VAR_INIT(station_all_access, 0)
for(var/obj/machinery/door/airlock/D in GLOB.airlocks)
if(is_station_level(D.z))
D.emergency = 1
- D.update_icon(0)
+ D.update_appearance()
GLOB.minor_announcement.Announce("Access restrictions on all station airlocks have been removed due to an ongoing crisis. Trespassing laws still apply unless ordered otherwise by Command staff.")
GLOB.station_all_access = 1
SSblackbox.record_feedback("nested tally", "keycard_auths", 1, list("emergency station access", "enabled"))
@@ -224,7 +224,7 @@ GLOBAL_VAR_INIT(station_all_access, 0)
for(var/obj/machinery/door/airlock/D in GLOB.airlocks)
if(is_station_level(D.z))
D.emergency = 0
- D.update_icon(0)
+ D.update_appearance()
GLOB.minor_announcement.Announce("Access restrictions on all station airlocks have been re-added. Seek station AI or a colleague's assistance if you are stuck.")
GLOB.station_all_access = 0
SSblackbox.record_feedback("nested tally", "keycard_auths", 1, list("emergency station access", "disabled"))
diff --git a/code/modules/security_levels/security_levels.dm b/code/modules/security_levels/security_levels.dm
index c4b160018d7..c3d6c2e53f7 100644
--- a/code/modules/security_levels/security_levels.dm
+++ b/code/modules/security_levels/security_levels.dm
@@ -60,8 +60,7 @@ GLOBAL_DATUM_INIT(security_announcement_down, /datum/announcement/priority/secur
var/obj/machinery/door/airlock/highsecurity/red/R = locate(/obj/machinery/door/airlock/highsecurity/red) in GLOB.airlocks
if(R && is_station_level(R.z))
- R.locked = FALSE
- R.update_icon()
+ R.unlock(TRUE)
post_status("alert", "redalert")
update_firealarms()
@@ -73,8 +72,7 @@ GLOBAL_DATUM_INIT(security_announcement_down, /datum/announcement/priority/secur
if(GLOB.security_level < SEC_LEVEL_RED)
for(var/obj/machinery/door/airlock/highsecurity/red/R in GLOB.airlocks)
if(is_station_level(R.z))
- R.locked = FALSE
- R.update_icon()
+ R.unlock(TRUE)
post_status("alert", "gammaalert")
update_firealarms()
@@ -122,11 +120,9 @@ GLOBAL_DATUM_INIT(security_announcement_down, /datum/announcement/priority/secur
return "delta"
/proc/update_firealarms()
- var/security_level = get_security_level()
for(var/obj/machinery/firealarm/FA in GLOB.machines)
if(is_station_contact(FA.z))
- FA.cut_overlays()
- FA.add_overlay("overlay_[security_level]")
+ FA.update_icon()
/proc/num2seclevel(num)
switch(num)
diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index 71a938c3808..858d63c09ac 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -343,9 +343,12 @@
icon_state = "dorm_available"
density = FALSE
-/obj/machinery/computer/shuttle/pod/update_icon()
+/obj/machinery/computer/shuttle/pod/update_icon_state()
return
+/obj/machinery/computer/shuttle/pod/update_overlays()
+ return list()
+
/obj/machinery/computer/shuttle/pod/emag_act(mob/user as mob)
to_chat(user, " Access requirements overridden. The pod may now be launched manually at any time.")
admin_controlled = 0
diff --git a/code/modules/shuttle/shuttle_manipulator.dm b/code/modules/shuttle/shuttle_manipulator.dm
index f0b74af9945..48e6963a75b 100644
--- a/code/modules/shuttle/shuttle_manipulator.dm
+++ b/code/modules/shuttle/shuttle_manipulator.dm
@@ -23,16 +23,16 @@
/obj/machinery/shuttle_manipulator/Initialize(mapload)
. = ..()
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
-/obj/machinery/shuttle_manipulator/update_icon()
- overlays.Cut()
+/obj/machinery/shuttle_manipulator/update_overlays()
+ . = ..()
var/image/hologram_projection = image(icon, "hologram_on")
hologram_projection.pixel_y = 22
var/image/hologram_ship = image(icon, "hologram_whiteship")
hologram_ship.pixel_y = 27
- overlays += hologram_projection
- overlays += hologram_ship
+ . += hologram_projection
+ . += hologram_ship
/obj/machinery/shuttle_manipulator/attack_ghost(user as mob)
attack_hand(user)
diff --git a/code/modules/shuttle/shuttle_rotate.dm b/code/modules/shuttle/shuttle_rotate.dm
index 8822dbc51ce..327b0690839 100644
--- a/code/modules/shuttle/shuttle_rotate.dm
+++ b/code/modules/shuttle/shuttle_rotate.dm
@@ -54,7 +54,7 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate
var/temp = d1
d1 = d2
d2 = temp
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/structure/shuttle/engine/shuttleRotate(rotation, params)
setDir(angle2dir(rotation+dir2angle(dir)))
diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm
index 22b1edfeff8..e3f74488933 100644
--- a/code/modules/shuttle/supply.dm
+++ b/code/modules/shuttle/supply.dm
@@ -287,7 +287,7 @@
reqform.info += "[line2]
" reqform.info += "STAMP BELOW TO APPROVE THIS REQUISITION:
" - reqform.update_icon() //Fix for appearing blank when printed. + reqform.update_icon(UPDATE_ICON_STATE) //Fix for appearing blank when printed. return reqform diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm index 12e74d4c34f..1df3cb4384c 100644 --- a/code/modules/station_goals/bsa.dm +++ b/code/modules/station_goals/bsa.dm @@ -288,9 +288,9 @@ /obj/machinery/computer/bsa_control/process() ..() - update_icon() + update_icon(UPDATE_ICON_STATE) -/obj/machinery/computer/bsa_control/update_icon() +/obj/machinery/computer/bsa_control/update_icon_state() if(stat & BROKEN) icon_state = icon_state_broken else if(stat & NOPOWER) @@ -302,6 +302,9 @@ else icon_state = initial(icon_state) +/obj/machinery/computer/bsa_control/update_overlays() + return list() + /obj/machinery/computer/bsa_control/attack_hand(mob/user) if(..()) return 1 @@ -342,7 +345,7 @@ fire(usr) if("recalibrate") calibrate(usr) - update_icon() + update_icon(UPDATE_ICON_STATE) return TRUE /obj/machinery/computer/bsa_control/proc/calibrate(mob/user) diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm index e93cfb5a271..d331e85176a 100644 --- a/code/modules/station_goals/dna_vault.dm +++ b/code/modules/station_goals/dna_vault.dm @@ -188,8 +188,7 @@ GLOBAL_LIST_INIT(non_simple_animals, typecacheof(list(/mob/living/carbon/human/m dna_max = G.human_count break -/obj/machinery/dna_vault/update_icon() - ..() +/obj/machinery/dna_vault/update_icon_state() if(stat & NOPOWER) icon_state = "vaultoff" return @@ -200,7 +199,7 @@ GLOBAL_LIST_INIT(non_simple_animals, typecacheof(list(/mob/living/carbon/human/m stat &= ~NOPOWER else stat |= NOPOWER - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/machinery/dna_vault/Destroy() diff --git a/code/modules/station_goals/shield.dm b/code/modules/station_goals/shield.dm index a41025dd062..24f88699a64 100644 --- a/code/modules/station_goals/shield.dm +++ b/code/modules/station_goals/shield.dm @@ -134,10 +134,10 @@ else animate(src, pixel_y = 0, time = 10) anchored = FALSE - update_icon() + update_icon(UPDATE_ICON_STATE) return TRUE -/obj/machinery/satellite/update_icon() +/obj/machinery/satellite/update_icon_state() icon_state = active ? "sat_active" : "sat_inactive" /obj/machinery/satellite/attackby(obj/item/I, mob/user, params) diff --git a/code/modules/surgery/implant_removal.dm b/code/modules/surgery/implant_removal.dm index 48d99f4a60b..29aacc66150 100644 --- a/code/modules/surgery/implant_removal.dm +++ b/code/modules/surgery/implant_removal.dm @@ -69,7 +69,7 @@ if(case && !case.imp) case.imp = I I.forceMove(case) - case.update_icon() + case.update_state() user.visible_message("[user] places [I] into [case]!", "You place [I] into [case].") else qdel(I) diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm index ee607defda6..3338807cdd4 100644 --- a/code/modules/surgery/organs/augments_arms.dm +++ b/code/modules/surgery/organs/augments_arms.dm @@ -19,11 +19,11 @@ if(ispath(holder)) holder = new holder(src) - update_icon() + update_icon(UPDATE_ICON_STATE) slot = parent_organ + "_device" items_list = contents.Copy() -/obj/item/organ/internal/cyberimp/arm/update_icon() +/obj/item/organ/internal/cyberimp/arm/update_icon_state() if(parent_organ == "r_arm") transform = null else // Mirroring the icon @@ -43,7 +43,7 @@ parent_organ = "r_arm" slot = parent_organ + "_device" to_chat(user, "You modify [src] to be installed on the [parent_organ == "r_arm" ? "right" : "left"] arm.") - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/organ/internal/cyberimp/arm/remove(mob/living/carbon/M, special = 0) diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm index 8e09b37e66b..e178eac9f29 100644 --- a/code/modules/surgery/organs/eyes.dm +++ b/code/modules/surgery/organs/eyes.dm @@ -14,7 +14,7 @@ var/vision_flags = 0 var/see_in_dark = 2 - var/tint = 0 + var/tint = FLASH_PROTECTION_NONE var/flash_protect = FLASH_PROTECTION_NONE var/see_invisible = SEE_INVISIBLE_LIVING var/lighting_alpha = LIGHTING_PLANE_ALPHA_VISIBLE diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm index 870b42d380e..157d1d2afd8 100644 --- a/code/modules/surgery/organs/heart.dm +++ b/code/modules/surgery/organs/heart.dm @@ -9,7 +9,7 @@ dead_icon = "heart-off" var/icon_base = "heart" -/obj/item/organ/internal/heart/update_icon() +/obj/item/organ/internal/heart/update_icon_state() if(beating) icon_state = "[icon_base]-on" else @@ -54,12 +54,12 @@ /obj/item/organ/internal/heart/proc/Stop() beating = FALSE - update_icon() + update_icon(UPDATE_ICON_STATE) return TRUE /obj/item/organ/internal/heart/proc/Restart() beating = TRUE - update_icon() + update_icon(UPDATE_ICON_STATE) return TRUE /obj/item/organ/internal/heart/prepare_eat() diff --git a/code/modules/surgery/organs/organ_icon.dm b/code/modules/surgery/organs/organ_icon.dm index d6c62e54be8..2fc5555a4ee 100644 --- a/code/modules/surgery/organs/organ_icon.dm +++ b/code/modules/surgery/organs/organ_icon.dm @@ -185,7 +185,8 @@ GLOBAL_LIST_EMPTY(limb_icon_cache) // new damage icon system // adjusted to set damage_state to brute/burn code only (without r_name0 as before) -/obj/item/organ/external/update_icon() +/obj/item/organ/external/update_icon(updates=ALL) + ..() var/n_is = damage_state_text() if(n_is != damage_state) damage_state = n_is diff --git a/code/modules/surgery/organs/subtypes/slime.dm b/code/modules/surgery/organs/subtypes/slime.dm index 752375047fe..d5f1cb8aef5 100644 --- a/code/modules/surgery/organs/subtypes/slime.dm +++ b/code/modules/surgery/organs/subtypes/slime.dm @@ -5,7 +5,7 @@ desc = "This is a slime's osmotic pressure regulator, it appears to be some kind of biological pump that uses osmotic pressure to regulate water flow. It seems to work similar to a heart." dead_icon = null -/obj/item/organ/internal/heart/slime/update_icon() +/obj/item/organ/internal/heart/slime/update_icon_state() return /obj/item/organ/internal/lungs/slime diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm index f67aa5a0195..36f82a7bd84 100644 --- a/code/modules/telesci/gps.dm +++ b/code/modules/telesci/gps.dm @@ -34,23 +34,23 @@ GLOBAL_LIST_EMPTY(GPS_list) GLOB.poi_list.Add(src) if(name == initial(name)) name = "global positioning system ([gpstag])" - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/item/gps/Destroy() GLOB.GPS_list.Remove(src) GLOB.poi_list.Remove(src) return ..() -/obj/item/gps/update_icon() - cut_overlays() +/obj/item/gps/update_overlays() + . = ..() if(emped) - add_overlay("emp") + . += "emp" else if(tracking) - add_overlay("working") + . += "working" /obj/item/gps/emp_act(severity) emped = TRUE - update_icon() + update_icon(UPDATE_OVERLAYS) addtimer(CALLBACK(src, .proc/reboot), EMP_DISABLE_TIME) /obj/item/gps/AltClick(mob/user) @@ -61,7 +61,7 @@ GLOBAL_LIST_EMPTY(GPS_list) return tracking = !tracking - update_icon() + update_icon(UPDATE_OVERLAYS) if(tracking) to_chat(user, "[src] is now tracking, and visible to other GPS devices.") else @@ -144,7 +144,7 @@ GLOBAL_LIST_EMPTY(GPS_list) */ /obj/item/gps/proc/reboot() emped = FALSE - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/item/gps/science icon_state = "gps-s" diff --git a/code/modules/vehicle/janicart.dm b/code/modules/vehicle/janicart.dm index 07187e523ec..ede7ce238be 100644 --- a/code/modules/vehicle/janicart.dm +++ b/code/modules/vehicle/janicart.dm @@ -68,22 +68,22 @@ to_chat(user, "You hook [I] onto [src].") I.forceMove(src) mybag = I - update_icon() + update_icon(UPDATE_OVERLAYS) return if(istype(I, /obj/item/janiupgrade)) floorbuffer = TRUE qdel(I) to_chat(user,"You upgrade [src] with [I].") - update_icon() + update_icon(UPDATE_OVERLAYS) return return ..() -/obj/vehicle/janicart/update_icon() - cut_overlays() +/obj/vehicle/janicart/update_overlays() + . = ..() if(mybag) - add_overlay("cart_garbage") + . += "cart_garbage" if(floorbuffer) - add_overlay("cart_buffer") + . += "cart_buffer" /obj/vehicle/janicart/attack_hand(mob/user) @@ -93,4 +93,4 @@ mybag.forceMove(get_turf(user)) user.put_in_hands(mybag) mybag = null - update_icon() + update_icon(UPDATE_OVERLAYS) diff --git a/code/modules/vehicle/vehicle.dm b/code/modules/vehicle/vehicle.dm index 35ecfab5621..92b8bcbd7ed 100644 --- a/code/modules/vehicle/vehicle.dm +++ b/code/modules/vehicle/vehicle.dm @@ -113,10 +113,9 @@ buckled_mob.pixel_y = generic_pixel_y -/obj/vehicle/update_icon() +/obj/vehicle/update_icon_state() return - /obj/item/key name = "key" desc = "A small grey key." diff --git a/icons/mob/clothing/eyes.dmi b/icons/mob/clothing/eyes.dmi index 07fc7f4ef9e2b823ad98b1e113b457b7ffe16785..e2656110c1a938733a8b803a2e10f31da3d3d3a9 100644 GIT binary patch delta 364 zcmV-y0h9jwgaQ170gxmCTd^e#0e`fPeUg4b$LLst%&5Y`){`1h`3cuSKr&#{AhJ)d zr1Q?VHsiN@uFf&}4Lfsh>Po$