From 169c96db1b2eb9d2a99f0332507057cb8a85c679 Mon Sep 17 00:00:00 2001 From: "rockdtben@gmail.com" Date: Fri, 4 Jan 2013 15:11:06 +0000 Subject: [PATCH] Too remove potential excessive garbage collection per tick. We will be reusing lists for overlays instead of deleting and creating them. the .Cut() proc on a list will empty a list by default. This also will set the len to 0. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5465 316c924e-a436-60f5-8080-3fe189b3f50e --- code/FEA/DEBUG_REMOVE_BEFORE_RELEASE.dm | 6 +++--- code/FEA/FEA_turf_tile.dm | 2 +- .../gamemodes/changeling/changeling_powers.dm | 4 ++-- code/game/gamemodes/events/ninja_equipment.dm | 2 +- code/game/machinery/bots/mulebot.dm | 2 +- code/game/machinery/cell_charger.dm | 4 ++-- code/game/machinery/computer/ai_core.dm | 6 +++--- code/game/machinery/computer/aifixer.dm | 2 +- code/game/machinery/computer/message.dm | 4 ++-- code/game/machinery/doors/airlock.dm | 6 +++--- code/game/machinery/doors/brigdoors.dm | 6 +++--- code/game/machinery/doors/firedoor.dm | 2 +- code/game/machinery/flasher.dm | 2 +- code/game/machinery/hydroponics.dm | 4 ++-- code/game/machinery/kitchen/gibber.dm | 2 +- code/game/machinery/newscaster.dm | 4 ++-- code/game/machinery/spaceheater.dm | 2 +- code/game/machinery/status_display.dm | 18 +++++++++--------- code/game/machinery/vending.dm | 2 +- code/game/objects/items/bodybag.dm | 2 +- code/game/objects/items/devices/PDA/PDA.dm | 4 ++-- code/game/objects/items/devices/paicard.dm | 4 ++-- .../objects/items/devices/transfer_valve.dm | 2 +- code/game/objects/items/robot/robot_parts.dm | 2 +- code/game/objects/items/shooting_range.dm | 2 +- code/game/objects/items/tk_grab.dm | 2 +- .../game/objects/items/weapons/flamethrower.dm | 2 +- code/game/objects/items/weapons/kitchen.dm | 4 ++-- .../items/weapons/secstorage/secstorage.dm | 6 +++--- .../structures/crates_lockers/closets.dm | 2 +- .../closets/secure/secure_closets.dm | 2 +- .../structures/crates_lockers/crates.dm | 14 +++++++------- code/game/objects/structures/electricchair.dm | 2 +- code/game/objects/structures/tank_dispenser.dm | 2 +- code/game/objects/structures/watercloset.dm | 2 +- code/modules/admin/topic.dm | 2 +- code/modules/assembly/holder.dm | 2 +- code/modules/assembly/infrared.dm | 2 +- code/modules/assembly/proximity.dm | 2 +- code/modules/assembly/timer.dm | 2 +- code/modules/clothing/gloves/stungloves.dm | 2 +- code/modules/detectivework/evidence.dm | 2 +- code/modules/mining/mine_turfs.dm | 2 +- .../mob/living/carbon/alien/humanoid/hud.dm | 2 +- .../mob/living/carbon/alien/humanoid/queen.dm | 2 +- .../carbon/alien/humanoid/update_icons.dm | 2 +- .../mob/living/carbon/alien/larva/hud.dm | 2 +- code/modules/mob/living/carbon/human/hud.dm | 2 +- .../mob/living/carbon/human/update_icons.dm | 2 +- code/modules/mob/living/carbon/monkey/hud.dm | 2 +- .../mob/living/carbon/monkey/update_icons.dm | 2 +- code/modules/mob/living/silicon/robot/hud.dm | 2 +- code/modules/mob/living/silicon/robot/robot.dm | 14 +++++++------- code/modules/mob/screen.dm | 2 +- code/modules/paperwork/clipboard.dm | 2 +- code/modules/paperwork/folders.dm | 2 +- code/modules/paperwork/paper.dm | 2 +- code/modules/power/antimatter/shielding.dm | 2 +- code/modules/power/apc.dm | 2 +- code/modules/power/cell.dm | 2 +- code/modules/power/generator.dm | 4 ++-- code/modules/power/generator_type2.dm | 4 ++-- code/modules/power/singularity/collector.dm | 2 +- .../power/singularity/field_generator.dm | 2 +- code/modules/power/smes.dm | 2 +- code/modules/power/solar.dm | 8 ++++---- code/modules/power/turbine.dm | 4 ++-- .../modules/projectiles/guns/energy/nuclear.dm | 2 +- code/modules/projectiles/projectile/change.dm | 2 +- code/modules/reagents/Chemistry-Reagents.dm | 4 ++-- .../reagents/reagent_containers/glass.dm | 2 +- .../reagents/reagent_containers/syringes.dm | 2 +- code/modules/recycling/disposal.dm | 2 +- code/unused/_debug.dm | 10 +++++----- code/unused/filter_control.dm | 2 +- code/unused/hivebot/hivebot.dm | 2 +- code/unused/hivebot/hud.dm | 2 +- code/unused/mining/rail_unused.dm | 2 +- code/unused/pda2/base_os.dm | 2 +- code/unused/pda2/pda2.dm | 2 +- code/unused/pipe.dm | 2 +- code/unused/pipe_filter.dm | 2 +- 82 files changed, 131 insertions(+), 131 deletions(-) diff --git a/code/FEA/DEBUG_REMOVE_BEFORE_RELEASE.dm b/code/FEA/DEBUG_REMOVE_BEFORE_RELEASE.dm index 339af71e297..4c173b7b7ea 100644 --- a/code/FEA/DEBUG_REMOVE_BEFORE_RELEASE.dm +++ b/code/FEA/DEBUG_REMOVE_BEFORE_RELEASE.dm @@ -368,7 +368,7 @@ mob network.marker = rand(1,4) for(var/obj/machinery/atmospherics/pipe/P in world) - P.overlays = null + P.overlays.Cut() var/datum/pipe_network/master = P.return_network() if(master) @@ -378,7 +378,7 @@ mob P.overlays += icon('icons/Testing/atmos_testing.dmi',"marker0") for(var/obj/machinery/atmospherics/valve/V in world) - V.overlays = null + V.overlays.Cut() if(V.network_node1) V.overlays += icon('icons/Testing/atmos_testing.dmi',"marker[V.network_node1.marker]") @@ -396,7 +396,7 @@ turf/simulated verb mark_direction() set src in world - overlays = null + overlays.Cut() for(var/direction in list(NORTH,SOUTH,EAST,WEST)) if(group_border&direction) overlays += icon('icons/Testing/turf_analysis.dmi',"red_arrow",direction) diff --git a/code/FEA/FEA_turf_tile.dm b/code/FEA/FEA_turf_tile.dm index 1fd6aaf7152..65f60c17326 100644 --- a/code/FEA/FEA_turf_tile.dm +++ b/code/FEA/FEA_turf_tile.dm @@ -124,7 +124,7 @@ turf super_conduct() update_visuals(datum/gas_mixture/model) - overlays = null + overlays.Cut() var/siding_icon_state = return_siding_icon_state() if(siding_icon_state) diff --git a/code/game/gamemodes/changeling/changeling_powers.dm b/code/game/gamemodes/changeling/changeling_powers.dm index 939f90e37c3..63ba22d87f8 100644 --- a/code/game/gamemodes/changeling/changeling_powers.dm +++ b/code/game/gamemodes/changeling/changeling_powers.dm @@ -216,7 +216,7 @@ C.monkeyizing = 1 C.canmove = 0 C.icon = null - C.overlays = null + C.overlays.Cut() C.invisibility = 101 var/atom/movable/overlay/animation = new /atom/movable/overlay( C.loc ) @@ -290,7 +290,7 @@ C.monkeyizing = 1 C.canmove = 0 C.icon = null - C.overlays = null + C.overlays.Cut() C.invisibility = 101 var/atom/movable/overlay/animation = new /atom/movable/overlay( C.loc ) animation.icon_state = "blank" diff --git a/code/game/gamemodes/events/ninja_equipment.dm b/code/game/gamemodes/events/ninja_equipment.dm index 6dcd6ea4015..d1ac17688ed 100644 --- a/code/game/gamemodes/events/ninja_equipment.dm +++ b/code/game/gamemodes/events/ninja_equipment.dm @@ -540,7 +540,7 @@ ________________________________________________________________________________ playsound(P.loc, 'sound/machines/twobeep.ogg', 50, 1) for (var/mob/O in hearers(3, P.loc)) O.show_message(text("\icon[P] *[P.ttone]*")) - P.overlays = null + P.overlays.Cut() P.overlays += image('icons/obj/pda.dmi', "pda-r") if("Inject") diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm index 68f9ea26801..aeb855c46f6 100644 --- a/code/game/machinery/bots/mulebot.dm +++ b/code/game/machinery/bots/mulebot.dm @@ -510,7 +510,7 @@ return mode = 1 - overlays = null + overlays.Cut() load.loc = src.loc load.pixel_y -= 9 diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index deb4bbf34ed..a9dcdc537dc 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -21,12 +21,12 @@ if(chargelevel != newlevel) - overlays = null + overlays.Cut() overlays += "ccharger-o[newlevel]" chargelevel = newlevel else - overlays = null + overlays.Cut() examine() set src in oview(5) ..() diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index c0b5132bf3a..11a7209c9e0 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -249,7 +249,7 @@ That prevents a few funky behaviors. A.loc = T.loc//To replace the terminal. C.icon_state = "aicard" C.name = "inteliCard" - C.overlays = null + C.overlays.Cut() A.cancel_camera() A << "You have been uploaded to a stationary terminal. Remote device connection restored." U << "\blue Transfer successful: \black [A.name] ([rand(1000,9999)].exe) installed and executed succesfully. Local copy has been removed." @@ -276,7 +276,7 @@ That prevents a few funky behaviors. else for(var/mob/living/silicon/ai/A in C) C.icon_state = "aicard" C.name = "inteliCard" - C.overlays = null + C.overlays.Cut() A.loc = T T.occupant = A A.control_disabled = 1 @@ -372,7 +372,7 @@ That prevents a few funky behaviors. A_T.loc = T//Throw them into suit. C.icon_state = "aicard" C.name = "inteliCard" - C.overlays = null + C.overlays.Cut() T.AI = A_T A_T.cancel_camera() A_T << "You have been uploaded to a mobile storage device." diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index a8b374a61e8..7e183ee39f3 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -146,7 +146,7 @@ ..() // Broken / Unpowered if((stat & BROKEN) || (stat & NOPOWER)) - overlays = null + overlays.Cut() // Working / Powered else diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index 82011652145..fbf753a450b 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -452,7 +452,7 @@ var/mob/living/carbon/human/H = customrecepient.loc H << "\icon[customrecepient] Message from [customsender] ([customjob]), \"[custommessage]\" (Reply)" log_pda("[usr] (PDA: [customsender]) sent \"[custommessage]\" to [customrecepient.owner]") - customrecepient.overlays = null + customrecepient.overlays.Cut() customrecepient.overlays += image('icons/obj/pda.dmi', "pda-r") //Sender is faking as someone who exists else @@ -466,7 +466,7 @@ var/mob/living/carbon/human/H = customrecepient.loc H << "\icon[customrecepient] Message from [PDARec.owner] ([customjob]), \"[custommessage]\" (Reply)" log_pda("[usr] (PDA: [PDARec.owner]) sent \"[custommessage]\" to [customrecepient.owner]") - customrecepient.overlays = null + customrecepient.overlays.Cut() customrecepient.overlays += image('icons/obj/pda.dmi', "pda-r") //Finally.. ResetMessage() diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 65b27fa1802..edfc9a4f4cb 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -641,7 +641,7 @@ About the new airlock wires panel: source.thermal_conductivity = initial(source.thermal_conductivity) /obj/machinery/door/airlock/update_icon() - if(overlays) overlays = null + if(overlays) overlays.Cut() if(density) if(locked && lights) icon_state = "door_locked" @@ -661,14 +661,14 @@ About the new airlock wires panel: /obj/machinery/door/airlock/animate(animation) switch(animation) if("opening") - if(overlays) overlays = null + if(overlays) overlays.Cut() if(p_open) spawn(2) // The only work around that works. Downside is that the door will be gone for a millisecond. flick("o_door_opening", src) //can not use flick due to BYOND bug updating overlays right before flicking else flick("door_opening", src) if("closing") - if(overlays) overlays = null + if(overlays) overlays.Cut() if(p_open) flick("o_door_closing", src) else diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index ecd710ab4e4..b5dad4ea2f9 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -219,7 +219,7 @@ // Adds an icon in case the screen is broken/off, stolen from status_display.dm proc/set_picture(var/state) picture_state = state - overlays = null + overlays.Cut() overlays += image('icons/obj/status_display.dmi', icon_state=picture_state) @@ -227,10 +227,10 @@ // Stolen from status_display proc/update_display(var/line1, var/line2) if(line2 == null) // single line display - overlays = null + overlays.Cut() overlays += texticon(line1, 23, -13) else // dual line display - overlays = null + overlays.Cut() overlays += texticon(line1, 23, -9) overlays += texticon(line2, 23, -17) // return an icon of a time text string (tn) diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 07228f2709d..d1322f40908 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -71,7 +71,7 @@ update_icon() - overlays = null + overlays.Cut() if(density) icon_state = "door_closed" if(blocked) diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 00ea9f620bf..9de6b2c6aa8 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -112,7 +112,7 @@ if (!src.anchored) user.show_message(text("\red [src] can now be moved.")) - src.overlays = null + src.overlays.Cut() else if (src.anchored) user.show_message(text("\red [src] is now secured.")) diff --git a/code/game/machinery/hydroponics.dm b/code/game/machinery/hydroponics.dm index d9156115662..4aedd180b34 100644 --- a/code/game/machinery/hydroponics.dm +++ b/code/game/machinery/hydroponics.dm @@ -151,7 +151,7 @@ obj/machinery/hydroponics/process() obj/machinery/hydroponics/proc/updateicon() //Refreshes the icon and sets the luminosity - overlays = null + overlays.Cut() if(planted) if(dead) overlays += image('icons/obj/hydroponics.dmi', icon_state="[myseed.species]-dead") @@ -1017,7 +1017,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob) use_power = 0 updateicon() // Same as normal but with the overlays removed - Cheridan. - overlays = null + overlays.Cut() if(planted) if(dead) overlays += image('icons/obj/hydroponics.dmi', icon_state="[myseed.species]-dead") diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm index d47b6b92efd..0c103dbd641 100644 --- a/code/game/machinery/kitchen/gibber.dm +++ b/code/game/machinery/kitchen/gibber.dm @@ -50,7 +50,7 @@ src.overlays += image('icons/obj/kitchen.dmi', "grjam") /obj/machinery/gibber/update_icon() - overlays = null + overlays.Cut() if (dirty) src.overlays += image('icons/obj/kitchen.dmi', "grbloody") if(stat & (NOPOWER|BROKEN)) diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 10ca9fff863..2ecc1b709a4 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -114,11 +114,11 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(!ispowered || isbroken) icon_state = "newscaster_off" if(isbroken) //If the thing is smashed, add crack overlay on top of the unpowered sprite. - src.overlays = null + src.overlays.Cut() src.overlays += image(src.icon, "crack3") return - src.overlays = null //reset overlays + src.overlays.Cut() //reset overlays if(news_network.wanted_issue) //wanted icon state, there can be no overlays on it as it's a priority message icon_state = "newscaster_wanted" diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index 62496653cee..f1602ae1f75 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -23,7 +23,7 @@ return update_icon() - overlays = null + overlays.Cut() icon_state = "sheater[on]" if(open) overlays += "sheater-open" diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index aaa98f16e60..8176f97bbd9 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -47,7 +47,7 @@ process() if(stat & NOPOWER) - overlays = null + overlays.Cut() return update() @@ -68,7 +68,7 @@ return if(mode==0) - overlays = null + overlays.Cut() return if(mode==3) // alert picture, no change @@ -89,7 +89,7 @@ update_display(displayloc, displaytime) return else - overlays = null + overlays.Cut() return if(mode==4) // supply shuttle timer @@ -160,7 +160,7 @@ proc/set_picture(var/state) picture_state = state - overlays = null + overlays.Cut() overlays += image('icons/obj/status_display.dmi', icon_state=picture_state) proc/update_display(var/line1, var/line2) @@ -172,11 +172,11 @@ lastdisplayline2 = line2 if(line2 == null) // single line display - overlays = null + overlays.Cut() overlays += texticon(line1, 23, -13) else // dual line display - overlays = null + overlays.Cut() overlays += texticon(line1, 23, -9) overlays += texticon(line2, 23, -17) @@ -272,7 +272,7 @@ process() if(stat & NOPOWER) - overlays = null + overlays.Cut() return update() @@ -287,7 +287,7 @@ proc/update() if(mode==0) //Blank - overlays = null + overlays.Cut() return if(mode==1) // AI emoticon @@ -328,5 +328,5 @@ proc/set_picture(var/state) picture_state = state - overlays = null + overlays.Cut() overlays += image('icons/obj/status_display.dmi', icon_state=picture_state) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 20d11772fd1..548641f99e2 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -143,7 +143,7 @@ else if(istype(W, /obj/item/weapon/screwdriver)) src.panel_open = !src.panel_open user << "You [src.panel_open ? "open" : "close"] the maintenance panel." - src.overlays = null + src.overlays.Cut() if(src.panel_open) src.overlays += image(src.icon, "[initial(icon_state)]-panel") src.updateUsrDialog() diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 7e655441401..ed2145c5665 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -61,7 +61,7 @@ else if(istype(W, /obj/item/weapon/wirecutters)) user << "You cut the tag off the bodybag" src.name = "body bag" - src.overlays = null + src.overlays.Cut() return diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index e76e1520935..f0c15f744a7 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -682,7 +682,7 @@ var/global/list/obj/item/device/pda/PDAs = list() //EXTRA FUNCTIONS=================================== if (mode == 2||mode == 21)//To clear message overlays. - overlays = null + overlays.Cut() if ((honkamt > 0) && (prob(60)))//For clown virus. honkamt-- @@ -781,7 +781,7 @@ var/global/list/obj/item/device/pda/PDAs = list() L << "\icon[P] Message from [src.owner] ([ownjob]), \"[t]\" (Reply)" log_pda("[usr] (PDA: [src.name]) sent \"[t]\" to [P.name]") - P.overlays = null + P.overlays.Cut() P.overlays += image('icons/obj/pda.dmi', "pda-r") else U << "ERROR: Server isn't responding." diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 9685993c70e..d0bc6a45336 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -110,12 +110,12 @@ /obj/item/device/paicard/proc/removePersonality() src.pai = null - src.overlays = null + src.overlays.Cut() src.overlays += "pai-off" /obj/item/device/paicard/proc/setEmotion(var/emotion) if(pai) - src.overlays = null + src.overlays.Cut() switch(emotion) if(1) src.overlays += "pai-happy" if(2) src.overlays += "pai-cat" diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 7e6b712af96..9a57b4ff579 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -115,7 +115,7 @@ toggle = 1 /obj/item/device/transfer_valve/update_icon() - overlays = null + overlays.Cut() underlays = null if(!tank_one && !tank_two && !attached_device) diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 89cb77ae4eb..88f80026962 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -73,7 +73,7 @@ src.updateicon() /obj/item/robot_parts/robot_suit/proc/updateicon() - src.overlays = null + src.overlays.Cut() if(src.l_arm) src.overlays += "l_arm+o" if(src.r_arm) diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index 94310b70fb9..7e43819fb94 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -36,7 +36,7 @@ if (istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0, user)) - overlays = null + overlays.Cut() usr << "You slice off [src]'s uneven chunks of aluminum and scorch marks." return diff --git a/code/game/objects/items/tk_grab.dm b/code/game/objects/items/tk_grab.dm index 654c6e7e06c..11863e9ae2c 100644 --- a/code/game/objects/items/tk_grab.dm +++ b/code/game/objects/items/tk_grab.dm @@ -97,7 +97,7 @@ update_icon() - overlays = null + overlays.Cut() if(focus && focus.icon && focus.icon_state) overlays += icon(focus.icon,focus.icon_state) return diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index ec284b68bab..c19036a1849 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -48,7 +48,7 @@ /obj/item/weapon/flamethrower/update_icon() - overlays = null + overlays.Cut() if(igniter) overlays += "+igniter[status]" if(ptank) diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 8039e83b2dc..7f8af111616 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -222,7 +222,7 @@ /obj/item/weapon/tray/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) // Drop all the things. All of them. - overlays = null + overlays.Cut() for(var/obj/item/I in carrying) I.loc = M.loc carrying.Remove(I) @@ -391,7 +391,7 @@ foundtable = 1 break - overlays = null + overlays.Cut() for(var/obj/item/I in carrying) I.loc = loc diff --git a/code/game/objects/items/weapons/secstorage/secstorage.dm b/code/game/objects/items/weapons/secstorage/secstorage.dm index 6f15d46a2a4..adc6ef82e01 100644 --- a/code/game/objects/items/weapons/secstorage/secstorage.dm +++ b/code/game/objects/items/weapons/secstorage/secstorage.dm @@ -106,7 +106,7 @@ emagged = 1 src.overlays += image('icons/obj/storage.dmi', icon_sparking) sleep(6) - src.overlays = null + src.overlays.Cut() overlays += image('icons/obj/storage.dmi', icon_locking) locked = 0 if(istype(W, /obj/item/weapon/melee/energy/blade)) @@ -225,7 +225,7 @@ src.l_set = 1 else if ((src.code == src.l_code) && (src.emagged == 0) && (src.l_set == 1)) src.locked = 0 - src.overlays = null + src.overlays.Cut() overlays += image('icons/obj/storage.dmi', icon_opened) src.code = null else @@ -233,7 +233,7 @@ else if ((href_list["type"] == "R") && (src.emagged == 0) && (!src.l_setshort)) src.locked = 1 - src.overlays = null + src.overlays.Cut() src.code = null src.close(usr) else diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index c6bce45ebb2..38662ddcf52 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -275,7 +275,7 @@ 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) - overlays = null + overlays.Cut() if(!opened) icon_state = icon_closed if(welded) 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 87d964ada16..ff7d582fb11 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 @@ -151,7 +151,7 @@ usr << "This mob type can't use this verb." /obj/structure/closet/secure_closet/update_icon()//Putting the welded stuff in updateicon() so it's easy to overwrite for special cases (Fridges, cabinets, and whatnot) - overlays = null + overlays.Cut() if(!opened) if(locked) icon_state = icon_locked diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 0d321d1aae7..09cf8161d63 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -211,10 +211,10 @@ /obj/structure/closet/crate/secure/New() ..() if(locked) - overlays = null + overlays.Cut() overlays += redlight else - overlays = null + overlays.Cut() overlays += greenlight /obj/structure/closet/crate/rcd/New() @@ -287,7 +287,7 @@ if (allowed(user)) user << "You unlock [src]." src.locked = 0 - overlays = null + overlays.Cut() overlays += greenlight return else @@ -300,11 +300,11 @@ if(istype(W, /obj/item/weapon/card) && src.allowed(user) && !locked && !opened && !broken) user << "You lock \the [src]." src.locked = 1 - overlays = null + overlays.Cut() overlays += redlight return else if ( (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && locked &&!broken) - overlays = null + overlays.Cut() overlays += emag overlays += sparks spawn(6) overlays -= sparks //Tried lots of stuff but nothing works right. so i have to use this *sadface* @@ -357,10 +357,10 @@ if(!broken && !opened && prob(50/severity)) if(!locked) src.locked = 1 - overlays = null + overlays.Cut() overlays += redlight else - overlays = null + overlays.Cut() overlays += emag overlays += sparks spawn(6) overlays -= sparks //Tried lots of stuff but nothing works right. so i have to use this *sadface* diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm index 611f3df45eb..200f0142979 100644 --- a/code/game/objects/structures/electricchair.dm +++ b/code/game/objects/structures/electricchair.dm @@ -39,7 +39,7 @@ /obj/structure/stool/bed/chair/e_chair/rotate() ..() - overlays = null + overlays.Cut() overlays += image('icons/obj/objects.dmi', src, "echair_over", MOB_LAYER + 1, dir) //there's probably a better way of handling this, but eh. -Pete return diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index 53bc0581aa0..76622dcb729 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -23,7 +23,7 @@ /obj/structure/dispenser/update_icon() - overlays = null + overlays.Cut() switch(oxygentanks) if(1 to 3) overlays += "oxygen-[oxygentanks]" if(4 to INFINITY) overlays += "oxygen-4" diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 8ff178b2a83..48eba9f394a 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -165,7 +165,7 @@ user.visible_message("[user] adjusts the shower with the [I].", "You adjust the shower with the [I].") /obj/machinery/shower/update_icon() //this is terribly unreadable, but basically it makes the shower mist up - overlays = null //once it's been on for a while, in addition to handling the water overlay. + overlays.Cut() //once it's been on for a while, in addition to handling the water overlay. if(mymist) del(mymist) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 8408edd8dfb..c5df7248a04 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -2077,7 +2077,7 @@ if(F.z == 1) F.name = initial(F.name) F.desc = initial(F.desc) - F.overlays = null + F.overlays.Cut() F.lava = 0 F.update_icon() floorIsLava = 0 diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index 4605a4aa313..154a7785353 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -60,7 +60,7 @@ update_icon() - overlays = null + overlays.Cut() if(a_left) overlays += "[a_left.icon_state]_left" for(var/O in a_left.attached_overlays) diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index 564d980e17f..68277d92872 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -39,7 +39,7 @@ update_icon() - overlays = null + overlays.Cut() attached_overlays = list() if(on) overlays += "infrared_on" diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index 235869667d6..aa9a9581380 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -78,7 +78,7 @@ update_icon() - overlays = null + overlays.Cut() attached_overlays = list() if(timing) overlays += "prox_timing" diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index 3cce208ebe7..758e7cc64d6 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -55,7 +55,7 @@ update_icon() - overlays = null + overlays.Cut() attached_overlays = list() if(timing) overlays += "timer_timing" diff --git a/code/modules/clothing/gloves/stungloves.dm b/code/modules/clothing/gloves/stungloves.dm index 4b8387f8f68..9d245316f73 100644 --- a/code/modules/clothing/gloves/stungloves.dm +++ b/code/modules/clothing/gloves/stungloves.dm @@ -47,7 +47,7 @@ /obj/item/clothing/gloves/update_icon() ..() - overlays = null + overlays.Cut() if(wired) overlays += "gloves_wire" if(cell) diff --git a/code/modules/detectivework/evidence.dm b/code/modules/detectivework/evidence.dm index 4481d209394..c0991dcd3a2 100644 --- a/code/modules/detectivework/evidence.dm +++ b/code/modules/detectivework/evidence.dm @@ -68,7 +68,7 @@ var/obj/item/I = contents[1] user.visible_message("[user] takes [I] out of [src]", "You take [I] out of [src].",\ "You hear someone rustle around in a plastic bag, and remove something.") - overlays = null //remove the overlays + overlays.Cut() //remove the overlays user.put_in_hands(I) w_class = 1 icon_state = "evidenceobj" diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 2d992fede69..8f6c4966429 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -408,7 +408,7 @@ commented out in r5061, I left it because of the shroom thingies /turf/simulated/floor/plating/airless/asteroid/proc/updateMineralOverlays() - src.overlays = null + src.overlays.Cut() if(istype(get_step(src, NORTH), /turf/simulated/mineral)) src.overlays += image('icons/turf/walls.dmi', "rock_side_n") diff --git a/code/modules/mob/living/carbon/alien/humanoid/hud.dm b/code/modules/mob/living/carbon/alien/humanoid/hud.dm index 78b705871f5..7c8b55da13b 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/hud.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/hud.dm @@ -183,7 +183,7 @@ mymob.zone_sel = new /obj/screen/zone_sel() mymob.zone_sel.icon = 'icons/mob/screen1_alien.dmi' - mymob.zone_sel.overlays = null + mymob.zone_sel.overlays.Cut() mymob.zone_sel.overlays += image('icons/mob/zone_sel.dmi', "[mymob.zone_sel.selecting]") mymob.client.screen = null diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm index 56daa4addeb..1b98392b814 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm @@ -80,7 +80,7 @@ /mob/living/carbon/alien/humanoid/queen/large/update_icons() lying_prev = lying //so we don't update overlays for lying/standing unless our stance changes again update_hud() //TODO: remove the need for this to be here - overlays = null + overlays.Cut() if(lying) if(resting) icon_state = "queen_sleep" else icon_state = "queen_l" diff --git a/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm b/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm index 0e2c6bed099..b647c5d714f 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm @@ -13,7 +13,7 @@ /mob/living/carbon/alien/humanoid/update_icons() lying_prev = lying //so we don't update overlays for lying/standing unless our stance changes again update_hud() //TODO: remove the need for this to be here - overlays = null + overlays.Cut() if(lying) if(resting) icon_state = "alien[caste]_sleep" else icon_state = "alien[caste]_l" diff --git a/code/modules/mob/living/carbon/alien/larva/hud.dm b/code/modules/mob/living/carbon/alien/larva/hud.dm index c26a6035465..25543eb5ac9 100644 --- a/code/modules/mob/living/carbon/alien/larva/hud.dm +++ b/code/modules/mob/living/carbon/alien/larva/hud.dm @@ -73,7 +73,7 @@ mymob.flash.layer = 17 mymob.zone_sel = new /obj/screen/zone_sel() - mymob.zone_sel.overlays = null + mymob.zone_sel.overlays.Cut() mymob.zone_sel.overlays += image("icon" = 'icons/mob/zone_sel.dmi', "icon_state" = text("[]", mymob.zone_sel.selecting)) mymob.client.screen = null diff --git a/code/modules/mob/living/carbon/human/hud.dm b/code/modules/mob/living/carbon/human/hud.dm index 5ded037ac14..2ab243a3c2e 100644 --- a/code/modules/mob/living/carbon/human/hud.dm +++ b/code/modules/mob/living/carbon/human/hud.dm @@ -322,7 +322,7 @@ mymob.zone_sel = new /obj/screen/zone_sel() mymob.zone_sel.icon = ui_style - mymob.zone_sel.overlays = null + mymob.zone_sel.overlays.Cut() mymob.zone_sel.overlays += image('icons/mob/zone_sel.dmi', "[mymob.zone_sel.selecting]") mymob.client.screen = null diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 0f00d208055..47476fb24d2 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -131,7 +131,7 @@ Please contact me on #coderbus IRC. ~Carn x lying_prev = lying //so we don't update overlays for lying/standing unless our stance changes again update_hud() //TODO: remove the need for this - overlays = null + overlays.Cut() if(lying) //can't be cloaked when lying. (for now) icon = lying_icon diff --git a/code/modules/mob/living/carbon/monkey/hud.dm b/code/modules/mob/living/carbon/monkey/hud.dm index 8ab65850b01..88681994a02 100644 --- a/code/modules/mob/living/carbon/monkey/hud.dm +++ b/code/modules/mob/living/carbon/monkey/hud.dm @@ -168,7 +168,7 @@ mymob.zone_sel = new /obj/screen/zone_sel() mymob.zone_sel.icon = ui_style - mymob.zone_sel.overlays = null + mymob.zone_sel.overlays.Cut() mymob.zone_sel.overlays += image('icons/mob/zone_sel.dmi', "[mymob.zone_sel.selecting]") mymob.client.screen = null diff --git a/code/modules/mob/living/carbon/monkey/update_icons.dm b/code/modules/mob/living/carbon/monkey/update_icons.dm index 4df4f6623b4..8ff72af8d36 100644 --- a/code/modules/mob/living/carbon/monkey/update_icons.dm +++ b/code/modules/mob/living/carbon/monkey/update_icons.dm @@ -26,7 +26,7 @@ /mob/living/carbon/monkey/update_icons() update_hud() lying_prev = lying //so we don't update overlays for lying/standing unless our stance changes again - overlays = null + overlays.Cut() if(lying) icon_state = "monkey0" for(var/image/I in overlays_lying) diff --git a/code/modules/mob/living/silicon/robot/hud.dm b/code/modules/mob/living/silicon/robot/hud.dm index 88ef5577055..d5ff0ad6e62 100644 --- a/code/modules/mob/living/silicon/robot/hud.dm +++ b/code/modules/mob/living/silicon/robot/hud.dm @@ -140,7 +140,7 @@ mymob.zone_sel = new /obj/screen/zone_sel() mymob.zone_sel.icon = 'icons/mob/screen1_robot.dmi' - mymob.zone_sel.overlays = null + mymob.zone_sel.overlays.Cut() mymob.zone_sel.overlays += image('icons/mob/zone_sel.dmi', "[mymob.zone_sel.selecting]") mymob.client.screen = null diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index f156a972b21..586647d7428 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -761,26 +761,26 @@ /mob/living/silicon/robot/proc/updateicon() - overlays = null + overlays.Cut() if(stat == 0) overlays += "eyes" if(icon_state == "robot") - overlays = null + overlays.Cut() overlays += "eyes-standard" if(icon_state == "toiletbot") - overlays = null + overlays.Cut() overlays += "eyes-toiletbot" if(icon_state == "bloodhound") - overlays = null + overlays.Cut() overlays += "eyes-bloodhound" if(icon_state =="landmate") - overlays = null + overlays.Cut() overlays += "eyes-landmate" if(icon_state =="mopgearrex") - overlays = null + overlays.Cut() overlays += "eyes-mopgearrex" if(icon_state =="Miner") - overlays = null + overlays.Cut() overlays += "eyes-Miner" else overlays -= "eyes" diff --git a/code/modules/mob/screen.dm b/code/modules/mob/screen.dm index b0571c813d6..c548cd15408 100644 --- a/code/modules/mob/screen.dm +++ b/code/modules/mob/screen.dm @@ -218,7 +218,7 @@ else return - overlays = null + overlays.Cut() overlays += image('icons/mob/zone_sel.dmi', "[selecting]") return diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index f2f2dd05303..a99a5fcf085 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -35,7 +35,7 @@ return /obj/item/weapon/clipboard/update_icon() - overlays = null + overlays.Cut() if(toppaper) overlays += toppaper.icon_state overlays += toppaper.overlays diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index 727f841d859..cb70206cbfc 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -23,7 +23,7 @@ icon_state = "folder_white" /obj/item/weapon/folder/update_icon() - overlays = null + overlays.Cut() if(contents.len) overlays += "folder_paper" return diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 4fe296f333c..48153eeeecb 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -150,7 +150,7 @@ info = null stamps = null stamped = list() - overlays = null + overlays.Cut() updateinfolinks() update_icon() diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm index 9c646e25deb..59d49c39af4 100644 --- a/code/modules/power/antimatter/shielding.dm +++ b/code/modules/power/antimatter/shielding.dm @@ -123,7 +123,7 @@ proc/cardinalrange(var/center) /obj/machinery/am_shielding/update_icon() - overlays = null + overlays.Cut() for(var/direction in alldirs) var/machine = locate(/obj/machinery, get_step(loc, direction)) if((istype(machine, /obj/machinery/am_shielding) && machine:control_unit == control_unit)||(istype(machine, /obj/machinery/power/am_control_unit) && machine == control_unit)) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 9981d79ac53..c3139f1682d 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -178,7 +178,7 @@ // also add overlays for indicator lights /obj/machinery/power/apc/update_icon() - overlays = null + overlays.Cut() if(opened) var/basestate = "apc[ cell ? "2" : "1" ]" // if opened, show cell if it's inserted if (opened==1) diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 0a8390c33b7..0eabed3c341 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -10,7 +10,7 @@ updateicon() /obj/item/weapon/cell/proc/updateicon() - overlays = null + overlays.Cut() if(charge < 0.01) return diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index 913dc7d8634..0d1aad17c71 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -43,9 +43,9 @@ /obj/machinery/power/generator/proc/updateicon() if(stat & (NOPOWER|BROKEN)) - overlays = null + overlays.Cut() else - overlays = null + overlays.Cut() if(lastgenlev != 0) overlays += image('icons/obj/power.dmi', "teg-op[lastgenlev]") diff --git a/code/modules/power/generator_type2.dm b/code/modules/power/generator_type2.dm index 0ee05dc3c18..4c3db8bc3f9 100644 --- a/code/modules/power/generator_type2.dm +++ b/code/modules/power/generator_type2.dm @@ -26,9 +26,9 @@ /obj/machinery/power/generator_type2/proc/updateicon() if(stat & (NOPOWER|BROKEN)) - overlays = null + overlays.Cut() else - overlays = null + overlays.Cut() if(lastgenlev != 0) overlays += image('icons/obj/power.dmi', "teg-op[lastgenlev]") diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index ba7413d7870..885947f90df 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -129,7 +129,7 @@ var/global/list/rad_collectors = list() /obj/machinery/power/rad_collector/proc/update_icons() - overlays = null + overlays.Cut() if(P) overlays += image('icons/obj/singularity.dmi', "ptank") if(stat & (NOPOWER|BROKEN)) diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index 8a64f68c735..edd773ec4ae 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -34,7 +34,7 @@ field_generator power level display /obj/machinery/field_generator/update_icon() - overlays = null + overlays.Cut() if(!active) if(warming_up) overlays += "+a[warming_up]" diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 8c2b91d4563..10b7fde1d08 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -44,7 +44,7 @@ /obj/machinery/power/smes/proc/updateicon() - overlays = null + overlays.Cut() if(stat & BROKEN) return overlays += image('icons/obj/power.dmi', "smes-op[online]") diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 7d2950c5db7..01003ed2911 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -101,7 +101,7 @@ var/list/solars_list = list() /obj/machinery/power/solar/update_icon() ..() - overlays = null + overlays.Cut() if(stat & BROKEN) overlays += image('icons/obj/power.dmi', icon_state = "solar_panel-b", layer = FLY_LAYER) else @@ -306,14 +306,14 @@ var/list/solars_list = list() /obj/machinery/power/solar_control/update_icon() if(stat & BROKEN) icon_state = "broken" - overlays = null + overlays.Cut() return if(stat & NOPOWER) icon_state = "c_unpowered" - overlays = null + overlays.Cut() return icon_state = "solar" - overlays = null + overlays.Cut() if(cdir > 0) overlays += image('icons/obj/computer.dmi', "solcon-o", FLY_LAYER, angle2dir(cdir)) return diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index aed49f67dd4..6f663f2ee1b 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -58,7 +58,7 @@ /obj/machinery/compressor/process() if(!starter) return - overlays = null + overlays.Cut() if(stat & BROKEN) return if(!turbine) @@ -113,7 +113,7 @@ /obj/machinery/power/turbine/process() if(!compressor.starter) return - overlays = null + overlays.Cut() if(stat & BROKEN) return if(!compressor) diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index 5674ddd073b..488376b88f2 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -121,7 +121,7 @@ update_icon() - overlays = null + overlays.Cut() update_charge() update_reactor() update_mode() diff --git a/code/modules/projectiles/projectile/change.dm b/code/modules/projectiles/projectile/change.dm index f4a10d663ff..e76b6f8874f 100644 --- a/code/modules/projectiles/projectile/change.dm +++ b/code/modules/projectiles/projectile/change.dm @@ -16,7 +16,7 @@ M.monkeyizing = 1 M.canmove = 0 M.icon = null - M.overlays = null + M.overlays.Cut() M.invisibility = 101 if(istype(M, /mob/living/silicon/robot)) diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 4eaa8a2a269..04e384a3bff 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -844,7 +844,7 @@ datum if(volume >= 5) if(istype(T, /turf/simulated/wall)) T:thermite = 1 - T.overlays = null + T.overlays.Cut() T.overlays = image('icons/effects/effects.dmi',icon_state = "thermite") return @@ -1034,7 +1034,7 @@ datum O.clean_blood() reaction_turf(var/turf/T, var/volume) if(volume >= 1) - T.overlays = null + T.overlays.Cut() T.clean_blood() for(var/obj/effect/decal/cleanable/C in src) del(C) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 5d6b41af53d..3524b04b8c7 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -112,7 +112,7 @@ update_icon() update_icon() - overlays = null + overlays.Cut() if(reagents.total_volume) var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10") diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 1dc76f06ad6..b07334c5b52 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -168,7 +168,7 @@ update_icon() var/rounded_vol = round(reagents.total_volume,5) - overlays = null + overlays.Cut() if(ismob(loc)) var/injoverlay switch(mode) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 847b9d0de79..a6501a97494 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -304,7 +304,7 @@ // update the icon & overlays to reflect mode & status proc/update() - overlays = null + overlays.Cut() if(stat & BROKEN) icon_state = "disposal-broken" mode = 0 diff --git a/code/unused/_debug.dm b/code/unused/_debug.dm index fde3de0486b..f3d691ba80d 100644 --- a/code/unused/_debug.dm +++ b/code/unused/_debug.dm @@ -28,7 +28,7 @@ if(!O) O = new /obj/effect/mark(T) else - O.overlays = null + O.overlays.Cut() var/obj/move/OM = locate(/obj/move/, T) @@ -137,7 +137,7 @@ Doing this because FindTurfs() isn't even used if(!O) O = new /obj/effect/mark(T) else - O.overlays = null + O.overlays.Cut() var/temp = round(T.temp-T0C, 0.1) @@ -168,7 +168,7 @@ Doing this because FindTurfs() isn't even used if(!O) O = new /obj/effect/mark(T) else - O.overlays = null + O.overlays.Cut() if(istype(M, /obj/machinery/pipes)) var/obj/machinery/pipes/P = M @@ -199,7 +199,7 @@ Doing this because FindTurfs() isn't even used if(!O) O = new /obj/effect/mark(T) else - O.overlays = null + O.overlays.Cut() var/marked = 0 for(var/obj/M in T) @@ -242,7 +242,7 @@ Doing this because FindTurfs() isn't even used if(!O) O = new /obj/effect/mark(T) else - O.overlays = null + O.overlays.Cut() var/obj/machinery/power/solar/S diff --git a/code/unused/filter_control.dm b/code/unused/filter_control.dm index 0bcce29e1dc..2e7188bd104 100644 --- a/code/unused/filter_control.dm +++ b/code/unused/filter_control.dm @@ -112,7 +112,7 @@ return /obj/machinery/filter_control/proc/updateicon() - overlays = null + overlays.Cut() if(stat & NOPOWER) icon_state = "filter_control-nopower" return diff --git a/code/unused/hivebot/hivebot.dm b/code/unused/hivebot/hivebot.dm index 5270d05ce27..31175d344a4 100644 --- a/code/unused/hivebot/hivebot.dm +++ b/code/unused/hivebot/hivebot.dm @@ -278,7 +278,7 @@ /mob/living/silicon/hivebot/proc/updateicon() - src.overlays = null + src.overlays.Cut() if(src.stat == 0) src.overlays += "eyes" diff --git a/code/unused/hivebot/hud.dm b/code/unused/hivebot/hud.dm index c4e28acd46e..c649993deee 100644 --- a/code/unused/hivebot/hud.dm +++ b/code/unused/hivebot/hud.dm @@ -239,7 +239,7 @@ mymob.zone_sel = new /obj/screen/zone_sel( null ) - mymob.zone_sel.overlays = null + mymob.zone_sel.overlays.Cut() mymob.zone_sel.overlays += image("icon" = 'icons/mob/zone_sel.dmi', "icon_state" = text("[]", mymob.zone_sel.selecting)) mymob.client.screen = null diff --git a/code/unused/mining/rail_unused.dm b/code/unused/mining/rail_unused.dm index cd963638771..bedc268715f 100644 --- a/code/unused/mining/rail_unused.dm +++ b/code/unused/mining/rail_unused.dm @@ -223,7 +223,7 @@ for (var/client/C) if(!load) return - overlays = null + overlays.Cut() load.loc = src.loc load.pixel_y -= 9 diff --git a/code/unused/pda2/base_os.dm b/code/unused/pda2/base_os.dm index fae00e9d7fa..71f0c98405b 100644 --- a/code/unused/pda2/base_os.dm +++ b/code/unused/pda2/base_os.dm @@ -95,7 +95,7 @@ if(2) //Messenger. Uses Radio. Is a messenger. //TO-DO: ~file sharing~ - src.master.overlays = null //Remove existing alerts + src.master.overlays.Cut() //Remove existing alerts dat += "

SpaceMessenger V4.0.5

" if (!src.message_mode) diff --git a/code/unused/pda2/pda2.dm b/code/unused/pda2/pda2.dm index 697a7cabac7..41402a50e16 100644 --- a/code/unused/pda2/pda2.dm +++ b/code/unused/pda2/pda2.dm @@ -253,7 +253,7 @@ for (var/mob/O in hearers(3, src.loc)) O.show_message(text("\icon[src] *[alert_message]*")) - src.overlays = null + src.overlays.Cut() src.overlays += image('icons/obj/pda.dmi', "pda-r") return diff --git a/code/unused/pipe.dm b/code/unused/pipe.dm index 7acef994e6a..60e552e3406 100644 --- a/code/unused/pipe.dm +++ b/code/unused/pipe.dm @@ -348,7 +348,7 @@ var/linenums = 0 src.icon_state = is if(node1 && node2) - overlays = null + overlays.Cut() else if(!node1 && !node2) overlays += image('icons/obj/pipes.dmi', "discon", FLY_LAYER, dirs[1]) overlays += image('icons/obj/pipes.dmi', "discon", FLY_LAYER, dirs[2]) diff --git a/code/unused/pipe_filter.dm b/code/unused/pipe_filter.dm index aa3dbcee922..8c67b9031f1 100644 --- a/code/unused/pipe_filter.dm +++ b/code/unused/pipe_filter.dm @@ -222,7 +222,7 @@ updateicon() /obj/machinery/pipefilter/proc/updateicon() - src.overlays = null + src.overlays.Cut() if(stat & NOPOWER) icon_state = "filter-off" else