From b2d281d0b6de6f41ce83e090ec1b207aa9a6eac3 Mon Sep 17 00:00:00 2001
From: uporotiy <uporotiy@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Thu, 30 Sep 2010 20:45:55 +0000
Subject: [PATCH] Fixed a few bugs, I'm bad at finding them.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@234 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/defines/obj.dm                                       | 1 +
 code/game/gamemodes/blob/theblob.dm                       | 2 +-
 code/modules/mob/living/carbon/alien/humanoid/humanoid.dm | 2 +-
 code/modules/mob/living/carbon/human/human.dm             | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/code/defines/obj.dm b/code/defines/obj.dm
index 0ddaf6e5ce5..1a8fc2b330f 100644
--- a/code/defines/obj.dm
+++ b/code/defines/obj.dm
@@ -19,6 +19,7 @@
 		initialize()
 
 /obj/blob
+		name = "magma"
 		icon = 'blob.dmi'
 		icon_state = "bloba0"
 		var/health = 30
diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm
index cc7dbc02f6e..a98d018a360 100644
--- a/code/game/gamemodes/blob/theblob.dm
+++ b/code/game/gamemodes/blob/theblob.dm
@@ -119,7 +119,7 @@
 	var/damage = W.force / 4.0
 
 	if(istype(W, /obj/item/weapon/extinguisher))
-		damage = 25
+		damage = 10
 		playsound(src.loc, 'extinguish.ogg', 100, 1)
 
 	else if(istype(W, /obj/item/weapon/plantbgone))
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
index e8d20b39a05..144358d3f76 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -261,7 +261,7 @@ to clean it up, or just beat the shit out of it (which takes ages).
 			shielded = 1
 	var/damage = null
 	if (src.stat != 2)
-		damage = rand(10,30)
+		damage = rand(30,40)
 
 	if(shielded)
 		damage /= 4
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index b7b3104fef3..4d8aab28a01 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -482,7 +482,7 @@
 			shielded = 1
 	var/damage = null
 	if (src.stat != 2)
-		damage = rand(10,30)
+		damage = rand(30,40)
 
 	if(shielded)
 		damage /= 4