From 17640b22ecbb47735567b5f68036c46f1fd0b883 Mon Sep 17 00:00:00 2001
From: DGamerL <108773801+DGamerL@users.noreply.github.com>
Date: Thu, 1 Aug 2024 17:09:55 +0200
Subject: [PATCH] Makes incorporeal moving mobs immune to tipping (#26303)

* Makes incorporeal moving mobs immune to tipping

* Lewc review
---
 code/game/atoms_movable.dm             | 3 +++
 code/game/machinery/vendors/vending.dm | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index bcdcde39a4c..058f0bbea64 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -795,6 +795,9 @@
 		if(isliving(target))
 			var/mob/living/L = target
 
+			if(L.incorporeal_move)
+				continue
+
 			if(crit_case)
 				damage_to_deal *= crit_damage_factor
 			if(iscarbon(L))
diff --git a/code/game/machinery/vendors/vending.dm b/code/game/machinery/vendors/vending.dm
index 4f5603c2567..00d957ab810 100644
--- a/code/game/machinery/vendors/vending.dm
+++ b/code/game/machinery/vendors/vending.dm
@@ -420,6 +420,9 @@
 		return
 
 	if(isliving(AM) && prob(aggressive_tilt_chance))
+		var/mob/living/to_be_tipped = AM
+		if(to_be_tipped.incorporeal_move) // OooOooOoo spooky ghosts
+			return
 		AM.visible_message(
 			"<span class='danger'>[src] suddenly topples over onto [AM]!</span>",
 			"<span class='userdanger'>[src] topples over onto you without warning!</span>"