Merge remote-tracking branch 'citadel/master' into combat_v7

2021-06-13 15:37:35 -07:00
parent 8224546cfc eb353c9687
commit 8595e05ad9
180 changed files with 78539 additions and 75395 deletions
@@ -215,7 +215,8 @@

 	switch(animal_origin)
 		if(ALIEN_BODYPART,LARVA_BODYPART) //aliens take some additional burn //nothing can burn with so much snowflake code around
-			burn *= 1.75
+			burn *= 1.2
+			stamina = 0

 	/*
 	// START WOUND HANDLING