From f15e0800bdcfd23f237e2a910b63183389fd2737 Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Tue, 21 Oct 2025 22:55:47 -0700 Subject: [PATCH] [MIRROR] Photosynthesis and photodegredation should not affect phased shadekin (#11855) Co-authored-by: Will <7099514+Willburd@users.noreply.github.com> --- code/datums/components/traits/burninlight.dm | 2 ++ code/datums/components/traits/photosynth.dm | 2 ++ 2 files changed, 4 insertions(+) diff --git a/code/datums/components/traits/burninlight.dm b/code/datums/components/traits/burninlight.dm index f0635003cd..357c9bf1bc 100644 --- a/code/datums/components/traits/burninlight.dm +++ b/code/datums/components/traits/burninlight.dm @@ -23,6 +23,8 @@ return if(owner.stat == DEAD) return + if(owner.is_incorporeal()) + return if(!isturf(owner.loc)) return if(owner.inStasisNow()) diff --git a/code/datums/components/traits/photosynth.dm b/code/datums/components/traits/photosynth.dm index 2ed25d822b..d681219bd9 100644 --- a/code/datums/components/traits/photosynth.dm +++ b/code/datums/components/traits/photosynth.dm @@ -15,6 +15,8 @@ return if(owner.stat == DEAD) return + if(owner.is_incorporeal()) + return if(owner.inStasisNow()) return if(!isturf(owner.loc))