[MIRROR] Harvesters are more fun to play (#894)

* Harvesters are more fun to play

* resolve .rej

code/game/turfs/simulated/floor.dm

@@ -188,8 +188,9 @@
 		else if(prob(50))
 			ReplaceWithLattice()
 
-/turf/open/floor/narsie_act()
-	if(prob(20))
+/turf/open/floor/narsie_act(force, ignore_mobs, probability = 20)
+	. = ..()
+	if(.)
 		ChangeTurf(/turf/open/floor/engine/cult)
 
 /turf/open/floor/ratvar_act(force, ignore_mobs)

code/game/turfs/simulated/floor/fancy_floor.dm

@@ -158,8 +158,14 @@
 		if(smooth)
 			queue_smooth_neighbors(src)
 
-/turf/open/floor/carpet/narsie_act()
-	return
+/turf/open/floor/carpet/narsie_act(force, ignore_mobs, probability = 20)
+	. = (prob(probability) || force)
+	for(var/I in src)
+		var/atom/A = I
+		if(ignore_mobs && ismob(A))
+			continue
+		if(ismob(A) || .)
+			A.narsie_act()
 
 /turf/open/floor/carpet/break_tile()
 	broken = 1

code/game/turfs/simulated/floor/misc_floor.dm

@@ -250,9 +250,10 @@
 	if(severity < 3 || target == src)
 		ChangeTurf(src.baseturf)
 
-/turf/open/floor/vines/narsie_act()
-	if(prob(20))
-		ChangeTurf(src.baseturf) //nar sie eats this shit
+/turf/open/floor/vines/narsie_act(force, ignore_mobs, probability = 20)
+	if(prob(probability) || force)
+		ChangeTurf(baseturf) //nar sie eats this shit
+		narsie_act(force, ignore_mobs, probability)
 
 /turf/open/floor/vines/singularity_pull(S, current_size)
 	if(current_size >= STAGE_FIVE)

code/game/turfs/simulated/floor/reinf_floor.dm

@@ -125,9 +125,6 @@
 	qdel(realappearence)
 	realappearence = null
 
-/turf/open/floor/engine/cult/narsie_act()
-	return
-
 /turf/open/floor/engine/cult/ratvar_act()
 	. = ..()
 	if(istype(src, /turf/open/floor/engine/cult)) //if we haven't changed type

code/game/turfs/simulated/wall/misc_walls.dm

@@ -4,19 +4,27 @@
 	icon = 'icons/turf/walls/cult_wall.dmi'
 	icon_state = "cult"
 	canSmoothWith = null
+	smooth = SMOOTH_MORE
 	sheet_type = /obj/item/stack/sheet/runed_metal
 	sheet_amount = 1
 	girder_type = /obj/structure/girder/cult
 
 /turf/closed/wall/mineral/cult/Initialize()
 	new /obj/effect/overlay/temp/cult/turf(src)
-	..()
+	. = ..()
 
 /turf/closed/wall/mineral/cult/devastate_wall()
 	new sheet_type(get_turf(src), sheet_amount)
 
-/turf/closed/wall/mineral/cult/narsie_act()
-	return
+/turf/closed/wall/mineral/cult/Exited(atom/movable/AM, atom/newloc)
+	. = ..()
+	if(istype(AM, /mob/living/simple_animal/hostile/construct/harvester)) //harvesters can go through cult walls, dragging something with
+		var/mob/living/simple_animal/hostile/construct/harvester/H = AM
+		var/atom/movable/stored_pulling = H.pulling
+		if(stored_pulling)
+			stored_pulling.setDir(get_dir(stored_pulling.loc, newloc))
+			stored_pulling.forceMove(src)
+			H.start_pulling(stored_pulling, TRUE)
 
 /turf/closed/wall/mineral/cult/ratvar_act()
 	. = ..()

code/game/turfs/simulated/walls.dm

@@ -238,8 +238,9 @@
 		if(prob(30))
 			dismantle_wall()
 
-/turf/closed/wall/narsie_act()
-	if(prob(20))
+/turf/closed/wall/narsie_act(force, ignore_mobs, probability = 20)
+	. = ..()
+	if(.)
 		ChangeTurf(/turf/closed/wall/mineral/cult)
 
 /turf/closed/wall/ratvar_act(force, ignore_mobs)