From 577bcebefff71e7cdc9e85f88caea25b36e54e06 Mon Sep 17 00:00:00 2001
From: Ghom <42542238+Ghommie@users.noreply.github.com>
Date: Mon, 12 Jul 2021 08:23:00 +0200
Subject: [PATCH] cannon balls should no longer destroy "indestructible" walls.
 (#60136)

---
 code/modules/projectiles/projectile/bullets/cannon.dm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/modules/projectiles/projectile/bullets/cannon.dm b/code/modules/projectiles/projectile/bullets/cannon.dm
index c01c1fc867a..b879e80bf97 100644
--- a/code/modules/projectiles/projectile/bullets/cannon.dm
+++ b/code/modules/projectiles/projectile/bullets/cannon.dm
@@ -23,8 +23,9 @@
 		hit_object.take_damage(80, BRUTE, BULLET, FALSE)
 	else if(isclosedturf(target))
 		damage -= max(damage - 30, 10) //lose extra momentum from busting through a wall
-		var/turf/closed/hit_turf = target
-		hit_turf.ScrapeAway()
+		if(!isindestructiblewall(target))
+			var/turf/closed/hit_turf = target
+			hit_turf.ScrapeAway()
 	return ..()
 
 /obj/projectile/bullet/cannonball/explosive