Refactor Lung Handling

2017-07-18 09:59:09 -05:00
parent c294d781b6
commit 1ebdf19cdb
11 changed files with 211 additions and 82 deletions
@@ -67,8 +67,8 @@
 #define PLASMA_MINIMUM_OXYGEN_NEEDED		2
 #define PLASMA_MINIMUM_OXYGEN_PLASMA_RATIO	30
 #define PLASMA_OXYGEN_FULLBURN				10
-#define MIN_PLASMA_DAMAGE					1
-#define MAX_PLASMA_DAMAGE					10
+#define MIN_TOXIC_GAS_DAMAGE				1
+#define MAX_TOXIC_GAS_DAMAGE				10
 #define MOLES_PLASMA_VISIBLE				0.5		//Moles in a standard cell after which plasma is visible
 	//Plasma fusion properties
 #define PLASMA_BINDING_ENERGY				3000000
@@ -0,0 +1,9 @@
+diff a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm	(rejected hunks)
+@@ -9,6 +9,7 @@
+ #define OXY			"oxy"
+ #define CLONE		"clone"
+ #define STAMINA 	"stamina"
+#define BRAIN		"brain"
+ 
+ //bitflag damage defines used for suicide_act
+ #define BRUTELOSS 1