Mining Mobs - More mob behavior overhaul, kinetic gun tweaks, etc

Conflicts:
	code/modules/mob/living/simple_animal/hostile/hostile.dm
	code/modules/projectiles/ammunition/energy.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/special.dm
	icons/mob/animal.dmi
	icons/obj/projectiles.dmi
This commit is contained in:
Ergovisavi
2014-01-22 16:39:54 -05:00
committed by ZomgPonies
parent 9428677ab6
commit 78bea65a44
12 changed files with 327 additions and 266 deletions
+13 -3
View File
@@ -104,7 +104,7 @@
return src.attack_hand(user)
/turf/simulated/wall/attack_animal(mob/living/simple_animal/M as mob)
/*/turf/simulated/wall/attack_animal(mob/living/simple_animal/M as mob)
if(M.wall_smash)
if (istype(src, /turf/simulated/wall/r_wall) && !rotting)
M << text("\blue This wall is far too strong for you to destroy.")
@@ -119,7 +119,17 @@
return
M << "\blue You push the wall but nothing happens!"
return
return*/
/turf/simulated/wall/attack_animal(var/mob/living/simple_animal/M)
if(M.wall_smash)
if (istype(src, /turf/simulated/wall/r_wall))
M << text("\blue This wall is far too strong for you to destroy.")
return
else
M << text("\blue You smash through the wall.")
dismantle_wall(1)
return
/turf/simulated/wall/attack_hand(mob/user as mob)
if (M_HULK in user.mutations)
@@ -394,4 +404,4 @@
/turf/simulated/wall/ChangeTurf(var/newtype)
for(var/obj/effect/E in src) if(E.name == "Wallrot") del E
..(newtype)
..(newtype)