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

* Harvesters are more fun to play

* resolve .rej
This commit is contained in:
CitadelStationBot
2017-05-18 07:12:29 -05:00
committed by Poojawa
parent 593a784583
commit 6617f68604
27 changed files with 211 additions and 164 deletions
@@ -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
@@ -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)
@@ -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