From cc5080ea1935a19150aaf7747d337fe8f5f98082 Mon Sep 17 00:00:00 2001 From: Will <7099514+Willburd@users.noreply.github.com> Date: Sat, 14 Jun 2025 05:31:11 -0400 Subject: [PATCH] airflow thrown objects don't hit phased shadekin (#17857) --- code/ZAS/Airflow.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/ZAS/Airflow.dm b/code/ZAS/Airflow.dm index 2ec1c7186c9..70e32d57b1b 100644 --- a/code/ZAS/Airflow.dm +++ b/code/ZAS/Airflow.dm @@ -95,6 +95,8 @@ Contains helper procs for airflow, handled in /connection_group. airflow_dest = null /mob/airflow_hit(atom/A) + if(is_incorporeal()) + return for(var/mob/M in hearers(src)) M.show_message(span_danger("\The [src] slams into \a [A]!"),1,span_danger("You hear a loud slam!"),2) playsound(src, "smash.ogg", 25, 1, -1) @@ -113,6 +115,8 @@ Contains helper procs for airflow, handled in /connection_group. airflow_dest = null /mob/living/carbon/human/airflow_hit(atom/A) + if(is_incorporeal()) + return // for(var/mob/M in hearers(src)) // M.show_message(span_danger("[src] slams into [A]!"),1,span_danger("You hear a loud slam!"),2) playsound(src, "punch", 25, 1, -1)