From f2200c0378de1f7e6ab7cd43b95092d8ea69d881 Mon Sep 17 00:00:00 2001 From: Morrow Date: Wed, 1 Nov 2023 03:48:02 -0400 Subject: [PATCH] stop jiggling --- code/game/turfs/walls/r_wall.dm | 22 ------------------- .../xenomorph/ai/movement/base_define.dm | 6 ++--- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/code/game/turfs/walls/r_wall.dm b/code/game/turfs/walls/r_wall.dm index 837e991ce4..d903324b0f 100644 --- a/code/game/turfs/walls/r_wall.dm +++ b/code/game/turfs/walls/r_wall.dm @@ -204,9 +204,6 @@ walltype = WALL_REINFORCED hull = 1 -/turf/closed/wall/r_wall/unmeltable/attackby() //This should fix everything else. No cables, etc - return - //Chigusa /turf/closed/wall/r_wall/chigusa @@ -249,15 +246,6 @@ walltype = WALL_REINFORCED hull = 1 -/turf/closed/wall/r_wall/prison_unmeltable/ex_act(severity) //Should make it indestructible - return - -/turf/closed/wall/r_wall/prison_unmeltable/fire_act(exposed_temperature, exposed_volume) - return - -/turf/closed/wall/r_wall/prison_unmeltable/attackby() //This should fix everything else. No cables, etc - return - //Biodome /turf/closed/wall/r_wall/biodome @@ -272,16 +260,6 @@ icon_state = "h_dome" hull = TRUE -/turf/closed/wall/r_wall/biodome/biodome_unmeltable/ex_act(severity) //Should make it indestructible - return - -/turf/closed/wall/r_wall/biodome/biodome_unmeltable/fire_act(exposed_temperature, exposed_volume) - return - -/turf/closed/wall/r_wall/biodome/biodome_unmeltable/attackby() //This should fix everything else. No cables, etc - return - - /// Destructible elevator walls, for when you want the elevator to act as a prop rather than an actual elevator /turf/closed/wall/r_wall/elevator icon = 'icons/turf/elevator.dmi' diff --git a/code/modules/mob/living/carbon/xenomorph/ai/movement/base_define.dm b/code/modules/mob/living/carbon/xenomorph/ai/movement/base_define.dm index 7e36e89260..9219c78e32 100644 --- a/code/modules/mob/living/carbon/xenomorph/ai/movement/base_define.dm +++ b/code/modules/mob/living/carbon/xenomorph/ai/movement/base_define.dm @@ -143,13 +143,13 @@ if(!potential_weeded_wall) continue - var/hive_to_potential_nest_distance = get_dist(closest_hive, potential_nest) - if(hive_to_potential_nest_distance > shortest_distance) + var/xeno_to_potential_nest_distance = get_dist(capping_xeno, potential_nest) + if(xeno_to_potential_nest_distance > shortest_distance) continue nest_turf = potential_nest weeded_wall = potential_weeded_wall - shortest_distance = hive_to_potential_nest_distance + shortest_distance = xeno_to_potential_nest_distance if(!nest_turf) return