Stun batons will no longer randomly stun people when they bump/are bumped by a guy holding one.

Bit of blob mode work.
Added a Blob Core sprite by Scottzar


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

code/modules/mob/living/blob/blob.dm

@@ -68,19 +68,19 @@
 		return ..(gibbed)
 
 
-/mob/living/blob/bullet_act(var/obj/item/projectile/Proj)
+/mob/living/blob/bullet_act(var/obj/item/projectile/Proj, var/datum/organ/external/def_zone)
 	for(var/i = 1, i<= Proj.mobdamage.len, i++)
 		switch(i)
 			if(1)
-				bruteloss = Proj.mobdamage[BRUTE]
+				bruteloss += Proj.mobdamage[BRUTE]
 			if(2)
-				fireloss = Proj.mobdamage[BURN]
+				fireloss += Proj.mobdamage[BURN]
 	return
 
 
 /mob/living/blob/blob_act()
 	src << "The blob attempts to reabsorb you."
-	toxloss += 10
+	toxloss += 20
 	return
 
 
@@ -108,6 +108,10 @@
 			usr << "There is another node nearby, move away from it!"
 			creating_blob = 0
 			return
+	for(var/obj/blob/blob in orange(2))
+		if(blob.blobtype == "Factory")
+			usr << "There is a porus blob nearby, move away from it!"
+			creating_blob = 0
 	B.blobdebug = 2
 	spawn(0)
 		B.Life()
@@ -134,7 +138,7 @@
 		usr << "Unable to use this blob, find another one."
 		creating_blob = 0
 		return
-	for(var/obj/blob/blob in orange(1))//Not right next to nodes/cores
+	for(var/obj/blob/blob in orange(2))//Not right next to nodes/cores
 		if(blob.blobtype == "Node")
 			usr << "There is a node nearby, move away from it!"
 			creating_blob = 0
@@ -143,6 +147,10 @@
 			usr << "There is a core nearby, move away from it!"
 			creating_blob = 0
 			return
+		if(blob.blobtype == "Factory")
+			usr << "There is another porous blob nearby, move away from it!"
+			creating_blob = 0
+			return
 	B.blobdebug = 3
 	spawn(0)
 		B.Life()
@@ -150,6 +158,54 @@
 	return
 
 
+/mob/living/blob/verb/revert()
+	set category = "Blob"
+	set name = "Purge Defense"
+	set desc = "Removes a porous blob."
+	if(creating_blob)	return
+	var/turf/T = get_turf(src)
+	creating_blob = 1
+	if(!T)
+		creating_blob = 0
+		return
+	var/obj/blob/B = (locate(/obj/blob) in T)
+	if(!B)
+		usr << "There is no blob here!"
+		creating_blob = 0
+		return
+	if(B.blobtype != "Factory")
+		usr << "Unable to use this blob, find another one."
+		creating_blob = 0
+		return
+	B.revert()
+	src.gib()
+	return
+
+
+/mob/living/blob/verb/spawn_blob()
+	set category = "Blob"
+	set name = "Create new blob"
+	set desc = "Attempts to create a new blob in this tile, note might not work."
+	if(creating_blob)	return
+	var/turf/T = get_turf(src)
+	creating_blob = 1
+	if(!T)
+		creating_blob = 0
+		return
+	var/obj/blob/B = (locate(/obj/blob) in T)
+	if(B)
+		usr << "There is a blob here!"
+		creating_blob = 0
+		return
+	if(prob(50))
+		new/obj/blob(src.loc)
+		src << "\blue Success."
+	else
+		src << "\red Creation failed."
+	src.gib()
+	return
+
+
 ///mob/proc/Blobize()
 /client/proc/Blobize()//Mostly stolen from the respawn command
 	set category = "Debug"
@@ -161,11 +217,9 @@
 		src << "Only administrators may use this command."
 		return
 	var/input = input(src, "Please specify which key will be turned into a bloby.", "Key", "")
-	if(!input)
-		return
 
 	var/mob/dead/observer/G_found
-	if(input == "Random")
+	if(!input)
 		var/list/ghosts = list()
 		for(var/mob/dead/observer/G in world)
 			if(G.client)

code/modules/mob/living/carbon/human/human.dm

@@ -85,27 +85,8 @@
 			for(var/mob/living/carbon/metroid/Metroid in view(1,tmob))
 				if(Metroid.Victim == tmob)
 					Metroid.UpdateFeed()
-
 			return
-		if(istype(equipped(), /obj/item/weapon/melee/baton)) // add any other item paths you think are necessary
-			if(loc:sd_lumcount < 3 || blinded)
-				var/obj/item/weapon/W = equipped()
-				if (world.time > lastDblClick+2)
-					lastDblClick = world.time
-					if((prob(40)) || (prob(95) && mutations & CLOWN))
-						//src << "\red You accidentally stun yourself with the [W.name]."
-						visible_message("\red [src] accidentally stun \himself with the [W.name].", \
-							"\red You accidentally stun yourself with the [W.name].")
-						weakened = max(12, weakened)
-					else
-						visible_message("\red[src] accidentally bumps into [tmob] with the [W.name].", \
-							"\red You accidentally bumps into [tmob] with the [W.name].")
-						tmob.weakened = max(4, tmob.weakened)
-						tmob.stunned = max(4, tmob.stunned)
-					playsound(loc, 'Egloves.ogg', 50, 1, -1)
-					W:charges--
-					now_pushing = 0
-					return
+
 		if(istype(tmob, /mob/living/carbon/human) && tmob.mutations & FAT)
 			if(prob(40) && !(mutations & FAT))
 				visible_message("\red <B>[src] fails to push [tmob]'s fat ass out of the way.</B>", \