diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index 9ca77defe8f..ed740f85d16 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -17,8 +17,6 @@ var/global/list/landmarks_list = list() //list of all landmarks created var/global/list/surgery_steps = list() //list of all surgery steps |BS12 var/global/list/mechas_list = list() //list of all mechs. Used by hostile mobs target tracking. -var/global/list/portals = list() //for use by portals - //Preferences stuff //Hairstyles var/global/list/hair_styles_list = list() //stores /datum/sprite_accessory/hair indexed by name diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index 56ce1b9e97b..d3e7144297a 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -32,6 +32,8 @@ would spawn and follow the beaker, even if it is carried or thrown. /obj/effect/proc/delete() loc = null + if(reagents) + reagents.delete() return diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 2d7beb90ab2..df35b4f9e88 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -105,6 +105,7 @@ holder.icon_state = "hudunknown" C.images += holder else + perpname = perp.name holder.icon_state = "hudunknown" C.images += holder diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 36b039dc89b..aa7a5ace8c1 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1022,7 +1022,7 @@ for(var/image/hud in client.images) if(copytext(hud.icon_state,1,4) == "hud") //ugly, but icon comparison is worse, I believe - del(hud) + client.images.Remove(hud) client.screen.Remove(global_hud.blurry, global_hud.druggy, global_hud.vimpaired, global_hud.darkMask) diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index edef1e910b9..a4d6cdc7481 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -160,7 +160,7 @@ for(var/image/hud in client.images) //COPIED FROM the human handle_regular_hud_updates() proc if(copytext(hud.icon_state,1,4) == "hud") //ugly, but icon comparison is worse, I believe - del(hud) + client.images.Remove(hud) var/obj/item/borg/sight/hud/hud = (locate(/obj/item/borg/sight/hud) in src) if(hud && hud.hud) hud.hud.process_hud(src) diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index ec2205241e3..403c31b17f2 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -40,7 +40,7 @@ T = L break - if(istype(A, /obj/mecha)) + else if(istype(A, /obj/mecha)) // Our line of sight stuff was already done in ListTargets(). var/obj/mecha/M = A if (M.occupant) stance = HOSTILE_STANCE_ATTACK diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index b274e09ffde..68cb8c4e2ab 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -515,6 +515,12 @@ datum //world << "reagent data set ([reagent_id])" D.data = new_data + delete() + for(var/datum/reagent/R in reagent_list) + R.holder = null + if(my_atom) + my_atom.reagents = null + ///////////////////////////////////////////////////////////////////////////////////