diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index 75fa0d9b448..fbba17c7b6b 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -43,8 +43,7 @@ /mob/living/carbon/human/proc/remake_hud() //used for preference changes mid-round; can't change hud icons without remaking the hud. - if(hud_used) - QDEL_NULL(hud_used) + QDEL_NULL(hud_used) create_mob_hud() if(hud_used) hud_used.show_hud(hud_used.hud_version) diff --git a/code/game/dna/genes/monkey.dm b/code/game/dna/genes/monkey.dm index bae2c22a95c..52cd4226327 100644 --- a/code/game/dna/genes/monkey.dm +++ b/code/game/dna/genes/monkey.dm @@ -42,8 +42,7 @@ H.set_species(H.species.primitive_form) - if(H.hud_used) - QDEL_NULL(H.hud_used) + QDEL_NULL(H.hud_used) if(H.client) H.hud_used = new /datum/hud/monkey(H, ui_style2icon(H.client.prefs.UI_style), H.client.prefs.UI_style_color, H.client.prefs.UI_style_alpha) @@ -88,8 +87,7 @@ H.real_name = H.dna.real_name H.name = H.real_name - if(H.hud_used) - QDEL_NULL(H.hud_used) + QDEL_NULL(H.hud_used) if(H.client) H.hud_used = new /datum/hud/human(H, ui_style2icon(H.client.prefs.UI_style), H.client.prefs.UI_style_color, H.client.prefs.UI_style_alpha) diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 2599bea7e5a..fb4ba668bef 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -327,8 +327,7 @@ var/round_start_time = 0 //If its actually the end of the round, wait for it to end. //Otherwise if its a verb it will continue on afterwards. spawn(300) - if(cinematic) - QDEL_NULL(cinematic) //end the cinematic + QDEL_NULL(cinematic) //end the cinematic if(temp_buckle) qdel(temp_buckle) //release everybody diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 06f4d60c702..d016a0df7bd 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -198,8 +198,7 @@ if("op") active2.fields["b_type"] = "O+" if("del_r2") - if(active2) - QDEL_NULL(active2) + QDEL_NULL(active2) if(href_list["scan"]) if(scan) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 7147612e9dc..c4aefaa555d 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -157,8 +157,7 @@ if(R.fields["name"] == active1.fields["name"] && R.fields["id"] == active1.fields["id"]) qdel(R) QDEL_NULL(active1) - if(active2) - QDEL_NULL(active2) + QDEL_NULL(active2) update_all_mob_security_hud() screen = SEC_DATA_R_LIST if("criminal") diff --git a/code/modules/food_and_drinks/drinks/bottler/bottler.dm b/code/modules/food_and_drinks/drinks/bottler/bottler.dm index 7c930f26f16..7b97e22f142 100644 --- a/code/modules/food_and_drinks/drinks/bottler/bottler.dm +++ b/code/modules/food_and_drinks/drinks/bottler/bottler.dm @@ -286,8 +286,7 @@ drink_container.desc = "[recipe_to_use.description]" flick("bottler_on", src) spawn(45) - for(var/i = 1, i <= slots.len, i++) - QDEL_NULL(slots[i]) + QDEL_LIST_ASSOC_VAL(slots) bottling = 0 drink_container.forceMove(loc) updateUsrDialog() diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm index 9ae0e6c981c..81281fe3dcc 100644 --- a/code/modules/modular_computers/laptop_vendor.dm +++ b/code/modules/modular_computers/laptop_vendor.dm @@ -31,10 +31,8 @@ /obj/machinery/lapvend/proc/reset_order() state = 0 devtype = 0 - if(fabricated_laptop) - QDEL_NULL(fabricated_laptop) - if(fabricated_tablet) - QDEL_NULL(fabricated_tablet) + QDEL_NULL(fabricated_laptop) + QDEL_NULL(fabricated_tablet) dev_cpu = 1 dev_battery = 1 dev_disk = 1 diff --git a/code/modules/ninja/suit/suit_initialisation.dm b/code/modules/ninja/suit/suit_initialisation.dm index 6e04abf3134..59303b4707c 100644 --- a/code/modules/ninja/suit/suit_initialisation.dm +++ b/code/modules/ninja/suit/suit_initialisation.dm @@ -28,8 +28,8 @@ sleep(10) to_chat(usr, "Disconnecting neural-net interface... Success.") - if(usr.hud_used) - QDEL_NULL(usr.hud_used) + + QDEL_NULL(usr.hud_used) usr.create_mob_hud() usr.regenerate_icons() @@ -63,8 +63,8 @@ sleep(5) to_chat(usr, "Suit secured, extending neural-net interface...") - if(usr.hud_used) - QDEL_NULL(usr.hud_used) + + QDEL_NULL(usr.hud_used) usr.hud_used = new /datum/hud/human(usr, 'icons/mob/screen_ninja.dmi', "#ffffff", 255) if(usr.hud_used) usr.hud_used.show_hud(usr.hud_used.hud_version)