Олавалендивание астероида часть 1

code/__DEFINES/dcs/signals.dm

@@ -94,7 +94,7 @@
 #define COMSIG_MOB_SET_A_INTENT "mob_set_a_intent"
 
 // /area signals
-///from base of area/Entered(): (area/entered, atom/OldLoc)
+///from base of area/Entered(): (atom/movable/M)
 #define COMSIG_AREA_ENTERED "area_entered"
 ///from base of area/Exited(): (area/exited, atom/NewLoc)
 #define COMSIG_AREA_EXITED "area_exited"

code/__DEFINES/traits.dm

@@ -171,7 +171,6 @@
 // self explanatory
 #define BEAUTY_ELEMENT_TRAIT "beauty_element"
 #define MOOD_COMPONENT_TRAIT "mood_component"
-#define SPAWN_AREA_TRAIT "spawn_area_trait"
 // medical stuff I guess
 #define OBESITY_TRAIT      "obesity"
 #define LIFE_ASSIST_MACHINES_TRAIT            "life_assist_machines"

code/__HELPERS/game.dm

@@ -4,26 +4,6 @@
     locate(max(CENTER.x-(RADIUS),1),          max(CENTER.y-(RADIUS),1),          CENTER.z), \
     locate(min(CENTER.x+(RADIUS),world.maxx), min(CENTER.y+(RADIUS),world.maxy), CENTER.z) \
   )
-
-//gets an empty square with RADIUS from CENTER
-#define BORDER_TURFS(RADIUS, CENTER) \
-	block( \
-		locate(max(CENTER.x-(RADIUS),1), min(CENTER.y+(RADIUS),world.maxy),CENTER.z), \
-		locate(min(CENTER.x+(RADIUS),world.maxx), min(CENTER.y+(RADIUS),world.maxy),CENTER.z) \
-	) + \
-	block( \
-		locate(min(CENTER.x+(RADIUS),world.maxx), min(CENTER.y+(RADIUS),world.maxy),CENTER.z), \
-		locate(min(CENTER.x+(RADIUS),world.maxx), max(CENTER.y-(RADIUS),1),CENTER.z) \
-	) + \
-	block( \
-		locate(max(CENTER.x-(RADIUS),1), max(CENTER.y-(RADIUS),1),CENTER.z), \
-		locate(min(CENTER.x+(RADIUS),world.maxx), max(CENTER.y-(RADIUS),1),CENTER.z) \
-	) + \
-	block( \
-		locate(max(CENTER.x-(RADIUS),1), min(CENTER.y+(RADIUS),world.maxy),CENTER.z), \
-		locate(max(CENTER.x-(RADIUS),1), max(CENTER.y-(RADIUS),1),CENTER.z), \
-	) \
-
 /proc/dopage(src,target)
 	var/href_list
 	var/href

code/modules/mining/drilling/drill.dm

@@ -343,6 +343,10 @@
 			if(active)
 				visible_message("<span class='notice'>\The [src] lurches downwards, grinding noisily.</span>")
 				need_update_field = 1
+				var/turf/T = get_turf(src)
+				for(var/obj/structure/spawner/S in T.contents)
+					if(S.is_alive)
+						S.is_alive = FALSE
 			else
 				visible_message("<span class='notice'>\The [src] shudders to a grinding halt.</span>")
 		else