From 801288190c7bfd2a23fde2e9f3fa9e4bcce25caf Mon Sep 17 00:00:00 2001
From: Cameron Lennox <killer65311@gmail.com>
Date: Thu, 9 Oct 2025 09:16:30 -0400
Subject: [PATCH] Dephase shots (#18609)

---
 .../species/shadekin/powers/phase_shift.dm    |  9 +++++++++
 code/modules/projectiles/projectile.dm        | 19 ++++++++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/code/datums/components/species/shadekin/powers/phase_shift.dm b/code/datums/components/species/shadekin/powers/phase_shift.dm
index 37ef14ccbe..1945af0a8e 100644
--- a/code/datums/components/species/shadekin/powers/phase_shift.dm
+++ b/code/datums/components/species/shadekin/powers/phase_shift.dm
@@ -102,6 +102,15 @@
 		phase_out(T, SK)
 
 /mob/living/proc/phase_in(var/turf/T, var/datum/component/shadekin/SK)
+	//In case we're not passed args, do it ourself.
+	if(!T)
+		T = get_turf(src)
+		if(!T)
+			return
+	if(!SK)
+		SK = get_shadekin_component()
+		if(!SK)
+			return
 	if(SK.in_phase)
 
 		// pre-change
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 5ad6b2da40..12316a17cf 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -144,6 +144,11 @@
 	var/hud_state = "unknown" // What HUD state we use when we have ammunition.
 	var/hud_state_empty = "unknown" // The empty state. DON'T USE _FLASH IN THE NAME OF THE EMPTY STATE STRING, THAT IS ADDED BY THE CODE.
 
+	///If the rounds dephase or not
+	var/dephasing = FALSE
+	///If the rounds hit phased entities or not.
+	var/hits_phased = FALSE
+
 	var/obj/item/ammo_casing/my_case = null
 
 
@@ -242,13 +247,15 @@
 	Range()
 
 /obj/item/projectile/Crossed(atom/movable/AM) //A mob moving on a tile with a projectile is hit by it.
-	if(AM.is_incorporeal())
+	if(AM.is_incorporeal() && !hits_phased)
 		return
 	..()
 	if(isliving(AM) && !(pass_flags & PASSMOB))
 		var/mob/living/L = AM
 		if(can_hit_target(L, permutated, (AM == original)))
 			Bump(AM)
+			if(dephasing)
+				L.phase_in() //If the mob is phased, dephase them. If they're not phased, this does nothing.
 
 /obj/item/projectile/proc/process_homing()			//may need speeding up in the future performance wise.
 	if(!homing_target)
@@ -554,7 +561,9 @@
 			if(L.GetComponent(/datum/component/swarming) && L.stat != DEAD && !L.lying)
 				return TRUE
 			if(!L.density)
-				return FALSE
+				var/datum/component/shadekin/SK = L.GetComponent(/datum/component/shadekin)
+				if(!SK || (SK.in_phase && !hits_phased)) //We don't have the phasing component, or we do but we're currently phased and the bullet can't hit phased things...This is needed for simple mobs.
+					return FALSE
 	return TRUE
 
 /obj/item/projectile/Bump(atom/A)
@@ -678,7 +687,7 @@
 	if(!istype(target_mob))
 		return
 
-	if(target_mob.is_incorporeal())
+	if(target_mob.is_incorporeal() && !hits_phased)
 		return
 
 	if(target_mob in impacted_mobs)
@@ -735,6 +744,10 @@
 		if(istype(firer, /mob) && istype(target_mob))
 			add_attack_logs(firer,target_mob,"Shot with \a [src.type] projectile")
 
+	if(dephasing)
+		target_mob.phase_in() //If the mob is phased, dephase them. If they're not phased, this does nothing.
+
+
 	//sometimes bullet_act() will want the projectile to continue flying
 	if (result == PROJECTILE_CONTINUE)
 		return FALSE