From 7ba26bcbdc15d10f1c902ceb4cefaf6d1fc08998 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Tue, 14 Jul 2020 03:03:07 -0400 Subject: [PATCH 1/2] Fixes cultist rune reveal not working --- code/game/turfs/open/floor/reinf_floor.dm | 3 +-- code/modules/antagonists/cult/blood_magic.dm | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/turfs/open/floor/reinf_floor.dm b/code/game/turfs/open/floor/reinf_floor.dm index 447f219609c..6ce8f41aa61 100644 --- a/code/game/turfs/open/floor/reinf_floor.dm +++ b/code/game/turfs/open/floor/reinf_floor.dm @@ -148,8 +148,7 @@ return ..() /turf/open/floor/engine/cult/proc/be_removed() - qdel(realappearance) - realappearance = null + QDEL_NULL(realappearance) /turf/open/floor/engine/cult/airless initial_gas_mix = AIRLESS_ATMOS diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index e6813974cd0..027faac35a0 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -294,7 +294,8 @@ for(var/obj/structure/destructible/cult/S in range(5,owner)) S.conceal() for(var/turf/open/floor/engine/cult/T in range(5,owner)) - T.realappearance.alpha = 0 + if(T.realappearance) + T.realappearance.alpha = 0 for(var/obj/machinery/door/airlock/cult/AL in range(5, owner)) AL.conceal() revealing = TRUE @@ -311,7 +312,8 @@ for(var/obj/structure/destructible/cult/S in range(6,owner)) S.reveal() for(var/turf/open/floor/engine/cult/T in range(6,owner)) - T.realappearance.alpha = initial(T.realappearance.alpha) + if(T.realappearance) + T.realappearance.alpha = initial(T.realappearance.alpha) for(var/obj/machinery/door/airlock/cult/AL in range(6, owner)) AL.reveal() revealing = FALSE From 85cbf06b7d35884c85b76c5fcef0057f8d3aa19c Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Tue, 14 Jul 2020 03:14:02 -0400 Subject: [PATCH 2/2] early return --- code/modules/antagonists/cult/blood_magic.dm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index 027faac35a0..f335b3fa898 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -294,8 +294,9 @@ for(var/obj/structure/destructible/cult/S in range(5,owner)) S.conceal() for(var/turf/open/floor/engine/cult/T in range(5,owner)) - if(T.realappearance) - T.realappearance.alpha = 0 + if(!T.realappearance) + continue + T.realappearance.alpha = 0 for(var/obj/machinery/door/airlock/cult/AL in range(5, owner)) AL.conceal() revealing = TRUE @@ -312,8 +313,9 @@ for(var/obj/structure/destructible/cult/S in range(6,owner)) S.reveal() for(var/turf/open/floor/engine/cult/T in range(6,owner)) - if(T.realappearance) - T.realappearance.alpha = initial(T.realappearance.alpha) + if(!T.realappearance) + continue + T.realappearance.alpha = initial(T.realappearance.alpha) for(var/obj/machinery/door/airlock/cult/AL in range(6, owner)) AL.reveal() revealing = FALSE