Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos

2021-06-11 16:28:12 -07:00
parent 571a25c052 979aa04a69
commit 833d34ba8e
179 changed files with 2371 additions and 709 deletions
@@ -214,6 +214,7 @@
 	switch(animal_origin)
 		if(ALIEN_BODYPART,LARVA_BODYPART) //aliens take some additional burn //nothing can burn with so much snowflake code around
 			burn *= 1.2
+			stamina = 0

 	/*
 	// START WOUND HANDLING