Refactors virus spreading

2017-10-09 08:55:57 -05:00
parent 6f2b89ae88
commit 7a0ce217db
60 changed files with 1057 additions and 187 deletions
@@ -869,7 +869,12 @@
 	var/obj/item/device/flightpack/pack = null
 	var/mob/living/carbon/human/wearer = null
 	var/active = FALSE
+<<<<<<< HEAD
 	resistance_flags = FIRE_PROOF
+=======
+	permeability_coefficient = 0.01
+	resistance_flags = FIRE_PROOF | ACID_PROOF
+>>>>>>> db0c10e... Refactors virus spreading (#31066)

 /obj/item/clothing/shoes/flightshoes/Destroy()
 	pack = null