fix damage

DaedalusDock · Aug 2, 2023 · f55073d · f55073d
1 parent 97d9e77
commit f55073d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
@@ -165,7 +165,9 @@
 			LAZYCLEARLIST(cached_tentacle_turfs)
 			last_location = loc
 			tentacle_recheck_cooldown = world.time + initial(tentacle_recheck_cooldown)
-			for(var/turf/open/T in RANGE_TURFS(4, loc))
+			var/list/nearby_turfs = RANGE_TURFS(4, loc)
+			var/nearby_turfs -= get_turf(src)
+			for(var/turf/open/T in nearby_turfs)
 				LAZYADD(cached_tentacle_turfs, T)
 		for(var/t in cached_tentacle_turfs)
 			if(isopenturf(t))

diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm
@@ -579,10 +579,6 @@
 
 	if(can_inflict <= 0)
 		return FALSE
-	if(brute)
-		set_brute_dam(brute_dam + brute)
-	if(burn)
-		set_burn_dam(burn_dam + burn)
 
 	update_damage()
 	if(owner)
@@ -654,7 +650,6 @@
 
 	//update damage counts
 	for(var/datum/wound/W as anything in wounds)
-
 		if(W.damage <= 0)
 			qdel(W)
 			continue