From 0b3ed70a2a2fd49410b233ee9aa5da40d3d34472 Mon Sep 17 00:00:00 2001 From: "giacomand@gmail.com" Date: Mon, 21 Jan 2013 03:42:21 +0000 Subject: [PATCH] - Changed the min/max damage of plasma to be less deadly. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5594 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/items/weapons/flamethrower.dm | 2 +- code/setup.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index 247b8beaca..86fb3a87e2 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/flamethrower.dmi' icon_state = "flamethrowerbase" item_state = "flamethrower_0" - flags = FPRINT | TABLEPASS| CONDUCT | USEDELAY + flags = FPRINT | TABLEPASS| CONDUCT | USEDELAY // USEDELAY flag needed in order to use afterattack() for things that are not in reach. I.E: Shooting flames. force = 3.0 throwforce = 10.0 throw_speed = 1 diff --git a/code/setup.dm b/code/setup.dm index 3c173d207b..f1d7f83b5e 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -17,8 +17,8 @@ #define MOLES_N2STANDARD MOLES_CELLSTANDARD*N2STANDARD // N2 standard value (79%) #define MOLES_PLASMA_VISIBLE 0.7 //Moles in a standard cell after which plasma is visible -#define MIN_PLASMA_DAMAGE 5 -#define MAX_PLASMA_DAMAGE 15 +#define MIN_PLASMA_DAMAGE 1 +#define MAX_PLASMA_DAMAGE 10 #define BREATH_VOLUME 0.5 //liters in a normal breath #define BREATH_PERCENTAGE BREATH_VOLUME/CELL_VOLUME