powder that makes you say yes

2026-08-24 21:57:53 +01:00 · 2021-08-25 23:15:44 -04:00
parent ab680fd295
commit 4d023f33f1
1 changed files with 0 additions and 5 deletions
@@ -404,16 +404,11 @@

 		if(istype(target, /turf/simulated/wall)) // I hate turf code.
 			var/turf/simulated/wall/W = target
-<<<<<<< HEAD
-			W.dismantle_wall(1)
-		else
-=======
 			W.dismantle_wall()
 		else if(isfloor(target))
 			var/turf/simulated/floor/T = target
 			T.ex_act(1)
 		else if(isobj(target))
->>>>>>> 181a26b039 (Merge pull request #11434 from MisterGrimm/XenomorphOverhaul)
 			qdel(target)
 		qdel(src)
 		return