Bay Update 26JUN2014

code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm

@@ -306,7 +306,7 @@
 	switch(trap_type)
 		if("sawburst")
 			M << "\red <b>A sawblade shoots out of the ground and strikes you!</b>"
-			M.apply_damage(rand(5,10), BRUTE)
+			M.apply_damage(rand(5,10), BRUTE, sharp=1, edge=1)
 
 			var/atom/myloc = src.loc
 			var/image/flicker = image('code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dmi',"sawblade")

code/WorkInProgress/Cael_Aislinn/Jungle/jungle_turfs.dm

@@ -143,25 +143,25 @@
 					var/turf/T = get_turf(M)
 					if(istype(T, /turf/unsimulated/jungle/water))
 						M << pick("\red Something sharp bites you!","\red Sharp teeth grab hold of you!","\red You feel something take a chunk out of your leg!")
-						M.apply_damage(rand(0,1), BRUTE)
+						M.apply_damage(rand(0,1), BRUTE, sharp=1)
 			if(prob(50))
 				spawn(rand(25,50))
 					var/turf/T = get_turf(M)
 					if(istype(T, /turf/unsimulated/jungle/water))
 						M << pick("\red Something sharp bites you!","\red Sharp teeth grab hold of you!","\red You feel something take a chunk out of your leg!")
-						M.apply_damage(rand(0,1), BRUTE)
+						M.apply_damage(rand(0,1), BRUTE, sharp=1)
 			if(prob(50))
 				spawn(rand(25,50))
 					var/turf/T = get_turf(M)
 					if(istype(T, /turf/unsimulated/jungle/water))
 						M << pick("\red Something sharp bites you!","\red Sharp teeth grab hold of you!","\red You feel something take a chunk out of your leg!")
-						M.apply_damage(rand(0,1), BRUTE)
+						M.apply_damage(rand(0,1), BRUTE, sharp=1)
 			if(prob(50))
 				spawn(rand(25,50))
 					var/turf/T = get_turf(M)
 					if(istype(T, /turf/unsimulated/jungle/water))
 						M << pick("\red Something sharp bites you!","\red Sharp teeth grab hold of you!","\red You feel something take a chunk out of your leg!")
-						M.apply_damage(rand(0,1), BRUTE)
+						M.apply_damage(rand(0,1), BRUTE, sharp=1)
 
 /turf/unsimulated/jungle/water/deep
 	plants_spawn = 0

code/WorkInProgress/Ported/policetape.dm

@@ -136,7 +136,7 @@
 	breaktape(/obj/item/weapon/wirecutters,user)
 
 /obj/item/tape/proc/breaktape(obj/item/weapon/W as obj, mob/user as mob)
-	if(user.a_intent == "help" && ((!is_sharp(W) && src.allowed(user))))
+	if(user.a_intent == "help" && ((!can_puncture(W) && src.allowed(user))))
 		user << "You can't break the [src] with that!"
 		return
 	user.show_viewers("\blue [user] breaks the [src]!")

code/WorkInProgress/Susan/susan_desert_turfs.dm

@@ -227,7 +227,7 @@ Alien plants should do something if theres a lot of poison
 		del(src)
 
 
-/obj/effect/alien/flesh/weeds/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+/obj/effect/alien/flesh/weeds/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
 	if(exposed_temperature > 300)
 		health -= 5
 		healthcheck()

code/WorkInProgress/buildmode.dm

@@ -259,7 +259,8 @@
 
 		if(4)
 			if(pa.Find("left"))
-				holder.throw_atom = object
+				if(istype(object, /atom/movable))
+					holder.throw_atom = object
 			if(pa.Find("right"))
 				if(holder.throw_atom)
 					holder.throw_atom.throw_at(object, 10, 1)