From 51026d27adf4ad4d9b5b85a3fd675c24a1434462 Mon Sep 17 00:00:00 2001 From: X0-11 Date: Mon, 3 Jun 2024 18:26:10 +0100 Subject: [PATCH] overheat fix --- code/modules/halo/weapons/gun_overheat.dm | 2 +- code/modules/mob/observer/virtual/base.dm | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/halo/weapons/gun_overheat.dm b/code/modules/halo/weapons/gun_overheat.dm index 9817d7c85b2e9..ba3435e6c3451 100644 --- a/code/modules/halo/weapons/gun_overheat.dm +++ b/code/modules/halo/weapons/gun_overheat.dm @@ -62,7 +62,7 @@ else qdel(heat_bar) heat_bar = null - STOP_PROCESSING(SSobj, src) + STOP_PROCESSING(SSobj, src) /obj/item/weapon/gun/proc/overheat_sfx(var/origin) if(overheat_sfx) diff --git a/code/modules/mob/observer/virtual/base.dm b/code/modules/mob/observer/virtual/base.dm index 51f2e8d102314..762ec2107ad7c 100644 --- a/code/modules/mob/observer/virtual/base.dm +++ b/code/modules/mob/observer/virtual/base.dm @@ -70,4 +70,6 @@ var/list/all_virtual_listeners = list() return TRUE /mob/shall_have_virtual_mob() - return ispath(initial(virtual_mob)) + var/init_virt = initial(virtual_mob) + if(!isnull(init_virt)) + return ispath(init_virt)