Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync

# Conflicts:
#	code/ATMOSPHERICS/pipes.dm
#	code/game/turfs/flooring/flooring.dm
#	code/modules/clothing/clothing_accessories.dm
#	code/modules/mob/living/carbon/human/inventory.dm
#	html/changelogs/.all_changelog.yml

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm

@@ -175,7 +175,7 @@
 	else
 		..()
 
-/datum/reagent/fuel/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/water/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
 	if(alien == IS_SLIME)
 		M.adjustToxLoss(6 * removed)
 	else

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm

@@ -319,6 +319,8 @@
 			M.update_inv_wear_mask(0)
 	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
+		if(alien == IS_SLIME)
+			M.adjustToxLoss(rand(5, 10))
 		if(H.head)
 			if(H.head.clean_blood())
 				H.update_inv_head(0)
@@ -336,6 +338,14 @@
 			return
 	M.clean_blood()
 
+/datum/reagent/space_cleaner/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+	if(alien == IS_SLIME)
+		M.adjustToxLoss(6 * removed)
+	else
+		M.adjustToxLoss(3 * removed)
+		if(prob(5))
+			M.vomit()
+
 /datum/reagent/lube // TODO: spraying on borgs speeds them up
 	name = "Space Lube"
 	id = "lube"