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

2019-12-31 17:52:49 +08:00
parent 0f38b79571 8ac23f41e6
commit 54f859fe06
228 changed files with 2974 additions and 1902 deletions
@@ -622,7 +622,7 @@
 		M.adjustBruteLoss(-1*REM, 0)
 		M.adjustFireLoss(-1*REM, 0)
 		M.adjustOxyLoss(-1*REM, 0)
-		M.adjustToxLoss(-1*REM, 0)
+		M.adjustToxLoss(-1*REM, 0, TRUE) //heals TOXINLOVERs
 	..()

 /datum/reagent/consumable/honey/reaction_mob(mob/living/M, method=TOUCH, reac_volume)