cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a few bugs, I'm bad at finding them.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@234 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
uporotiy
2010-09-30 20:45:55 +00:00
parent 2d21a52a42
commit b2d281d0b6
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/defines/obj.dm
View File

@@ -19,6 +19,7 @@
initialize() initialize()
/obj/blob /obj/blob
name = "magma"
icon = 'blob.dmi' icon = 'blob.dmi'
icon_state = "bloba0" icon_state = "bloba0"
var/health = 30 var/health = 30

2
code/game/gamemodes/blob/theblob.dm
View File

@@ -119,7 +119,7 @@
var/damage = W.force / 4.0 var/damage = W.force / 4.0
if(istype(W, /obj/item/weapon/extinguisher)) if(istype(W, /obj/item/weapon/extinguisher))
damage = 25 damage = 10
playsound(src.loc, 'extinguish.ogg', 100, 1) playsound(src.loc, 'extinguish.ogg', 100, 1)
else if(istype(W, /obj/item/weapon/plantbgone)) else if(istype(W, /obj/item/weapon/plantbgone))

2
code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
View File

@@ -261,7 +261,7 @@ to clean it up, or just beat the shit out of it (which takes ages).
shielded = 1 shielded = 1
var/damage = null var/damage = null
if (src.stat != 2) if (src.stat != 2)
damage = rand(10,30) damage = rand(30,40)
if(shielded) if(shielded)
damage /= 4 damage /= 4

2
code/modules/mob/living/carbon/human/human.dm
View File

@@ -482,7 +482,7 @@
shielded = 1 shielded = 1
var/damage = null var/damage = null
if (src.stat != 2) if (src.stat != 2)
damage = rand(10,30) damage = rand(30,40)
if(shielded) if(shielded)
damage /= 4 damage /= 4