Merge remote-tracking branch 'upstream/master' into FERMICHEMCurTweaks

2019-09-03 20:33:33 +01:00
parent 7890ad08d5 c7941fda58
commit 91cace6812
302 changed files with 9402 additions and 5056 deletions
@@ -69,11 +69,7 @@
 			L.Insert(C)
 			to_chat(C, "<span class='notice'>You feel your lungs reform in your chest.</span>")
 			holder.remove_reagent(src.id, "10")
-
-<<<<<<< HEAD
-=======
 	C.adjustOxyLoss(-3)
->>>>>>> upstream/master
 	..()

 /datum/reagent/fermi/yamerol/reaction_mob(var/mob/living/L)