Chaplains are no longer immune to cult magic. Instead, a new item, the null rod, spawns in the chaplains office. Having the rod on your person will make you immune to cult magic.

Runes are now dispelled with the null rod, not the bible.

Chaplains can no longer self heal with the bible.

Simple animals can now attack mechas and critters 

Constructs no longer take extra damage from bibles.

Fueltanks now explode when shot by lasers or bullets.



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3125 316c924e-a436-60f5-8080-3fe189b3f50e

code/modules/chemical/Chemistry-Tools.dm

@@ -2861,6 +2861,25 @@
 		..()
 		reagents.add_reagent("fuel",1000)
 
+
+	bullet_act(var/obj/item/projectile/Proj)
+		if(istype(Proj ,/obj/item/projectile/beam)||istype(Proj,/obj/item/projectile/bullet))
+			explosion(src.loc,-1,0,2)
+			if(src)
+				del(src)
+
+
+
+	blob_act()
+		explosion(src.loc,0,1,5,7,10)
+		if(src)
+			del(src)
+
+	ex_act()
+		explosion(src.loc,-1,0,2)
+		if(src)
+			del(src)
+
 /obj/structure/reagent_dispensers/peppertank
 	name = "Pepper Spray Refiller"
 	desc = "Refill pepper spray canisters."
@@ -2873,15 +2892,6 @@
 		..()
 		reagents.add_reagent("condensedcapsaicin",1000)
 
-/obj/structure/reagent_dispensers/fueltank/blob_act()
-	explosion(src.loc,0,1,5,7,10)
-	if(src)
-		del(src)
-
-/obj/structure/reagent_dispensers/fueltank/ex_act()
-	explosion(src.loc,-1,0,2)
-	if(src)
-		del(src)
 
 /obj/structure/reagent_dispensers/water_cooler
 	name = "Water-Cooler"

code/modules/critters/critter_defenses.dm

@@ -116,3 +116,13 @@ Contains the procs that control attacking critters
 		if(prob(25))
 			src.Die()
 		return
+
+	attack_animal(mob/living/simple_animal/M as mob)
+		if(M.melee_damage_upper == 0)
+			M.emote("[M.friendly] [src]")
+		else
+			for(var/mob/O in viewers(src, null))
+				O.show_message("\red <B>[M]</B> [M.attacktext] [src]!", 1)
+			var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
+			TakeDamage(damage)
+		return

code/modules/mob/simple_animal/constructs.dm

@@ -38,30 +38,21 @@
 			return
 
 /mob/living/simple_animal/constructarmoured/attackby(var/obj/item/O as obj, var/mob/user as mob)
-	if(istype(O, /obj/item/weapon/storage/bible))
-		if(user.mind && (user.mind.assigned_role == "Chaplain"))
-			health -= 75
+	if(O.force)
+		if(O.force >= 11)
+			health -= O.force
 			for(var/mob/M in viewers(src, null))
 				if ((M.client && !( M.blinded )))
-					M.show_message("\red \b [src] lets out a pained screech, its armoured skin fizzling and melting. ")
+					M.show_message("\red \b [src] has been attacked with the [O] by [user]. ")
 		else
-			usr << "\red Your faith is not strong enough!"
+			for(var/mob/M in viewers(src, null))
+				if ((M.client && !( M.blinded )))
+					M.show_message("\red \b The [O] bounces harmlessly off of [src]. ")
 	else
-		if(O.force)
-			if(O.force >= 11)
-				health -= O.force
-				for(var/mob/M in viewers(src, null))
-					if ((M.client && !( M.blinded )))
-						M.show_message("\red \b [src] has been attacked with the [O] by [user]. ")
-			else
-				for(var/mob/M in viewers(src, null))
-					if ((M.client && !( M.blinded )))
-						M.show_message("\red \b The [O] bounces harmlessly off of [src]. ")
-		else
-			usr << "\red This weapon is ineffective, it does no damage."
-			for(var/mob/M in viewers(src, null))
-				if ((M.client && !( M.blinded )))
-					M.show_message("\red [user] gently taps [src] with the [O]. ")
+		usr << "\red This weapon is ineffective, it does no damage."
+		for(var/mob/M in viewers(src, null))
+			if ((M.client && !( M.blinded )))
+				M.show_message("\red [user] gently taps [src] with the [O]. ")
 
 
 /mob/living/simple_animal/constructarmoured/Bump(atom/movable/AM as mob|obj, yes)
@@ -140,26 +131,16 @@
 
 
 /mob/living/simple_animal/constructwraith/attackby(var/obj/item/O as obj, var/mob/user as mob)
-	if(istype(O, /obj/item/weapon/storage/bible))
-		if(user.mind && (user.mind.assigned_role == "Chaplain"))
-			health -= 75
-			for(var/mob/M in viewers(src, null))
-				if ((M.client && !( M.blinded )))
-					M.show_message("\red \b [src] lets out a pained screech, its armoured skin fizzling and melting. ")
-		else
-			usr << "\red Your faith is not strong enough!"
-
+	if(O.force)
+		health -= O.force
+		for(var/mob/M in viewers(src, null))
+			if ((M.client && !( M.blinded )))
+				M.show_message("\red \b [src] has been attacked with the [O] by [user]. ")
 	else
-		if(O.force)
-			health -= O.force
-			for(var/mob/M in viewers(src, null))
-				if ((M.client && !( M.blinded )))
-					M.show_message("\red \b [src] has been attacked with the [O] by [user]. ")
-		else
-			usr << "\red This weapon is ineffective, it does no damage."
-			for(var/mob/M in viewers(src, null))
-				if ((M.client && !( M.blinded )))
-					M.show_message("\red [user] gently taps [src] with the [O]. ")
+		usr << "\red This weapon is ineffective, it does no damage."
+		for(var/mob/M in viewers(src, null))
+			if ((M.client && !( M.blinded )))
+				M.show_message("\red [user] gently taps [src] with the [O]. ")
 
 /mob/living/simple_animal/constructwraith/Bump(atom/movable/AM as mob|obj, yes)
 

code/modules/projectiles/guns/energy/laser.dm

@@ -12,7 +12,7 @@
 /obj/item/weapon/gun/energy/laser/practice
 	name = "practice laser gun"
 	desc = "A modified version of the basic laser gun, this one fires less concentrated energy bolts designed for target practice."
-	projectile_type = "/obj/item/projectile/beam/practice"
+	projectile_type = "/obj/item/projectile/practice"
 
 
 obj/item/weapon/gun/energy/laser/retro

code/modules/projectiles/projectile/beams.dm

@@ -7,8 +7,14 @@
 	flag = "laser"
 	eyeblur = 2
 
-/obj/item/projectile/beam/practice
+/obj/item/projectile/practice
+	name = "laser"
+	icon_state = "laser"
+	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
 	damage = 0
+	damage_type = BURN
+	flag = "laser"
+	eyeblur = 2
 
 
 /obj/item/projectile/beam/heavylaser