Merge remote-tracking branch 'upstream/dev-freeze' into stunrevolver

code/modules/materials/materials.dm

@@ -292,6 +292,7 @@ var/list/name_to_material
 /material/steel
 	name = DEFAULT_WALL_MATERIAL
 	stack_type = /obj/item/stack/material/steel
+	integrity = 150
 	icon_base = "solid"
 	icon_reinf = "reinf_over"
 	icon_colour = "#666666"
@@ -305,7 +306,7 @@ var/list/name_to_material
 /material/plasteel
 	name = "plasteel"
 	stack_type = /obj/item/stack/material/plasteel
-	integrity = 800
+	integrity = 400
 	melting_point = 6000
 	icon_base = "solid"
 	icon_reinf = "reinf_over"
@@ -456,6 +457,12 @@ var/list/name_to_material
 	weight = 12
 	stack_origin_tech = "materials=3"
 
+/material/plastic/holographic
+	name = "holographic plastic"
+	display_name = "plastic"
+	stack_type = null
+	shard_type = SHARD_NONE
+
 /material/osmium
 	name = "osmium"
 	stack_type = /obj/item/stack/material/osmium

code/modules/mob/living/carbon/brain/life.dm

@@ -108,12 +108,9 @@
 		chem_effects.Cut()
 		analgesic = 0
 
-		if(touching)
-			touching.metabolize(0, CHEM_TOUCH)
-		if(ingested)
-			ingested.metabolize(0, CHEM_INGEST)
-		if(reagents)
-			reagents.metabolize(0, CHEM_BLOOD)
+		if(touching) touching.metabolize()
+		if(ingested) ingested.metabolize()
+		if(bloodstr) bloodstr.metabolize()
 
 		if(CE_PAINKILLER in chem_effects)
 			analgesic = chem_effects[CE_PAINKILLER]

code/modules/mob/living/carbon/carbon.dm

@@ -1,11 +1,10 @@
 /mob/living/carbon/New()
-	create_reagents(1000)
-	var/datum/reagents/R1 = new/datum/reagents(1000)
-	var/datum/reagents/R2 = new/datum/reagents(1000)
-	ingested = R1
-	touching = R2
-	R1.my_atom = src
-	R2.my_atom = src
+	//setup reagent holders
+	bloodstr = new/datum/reagents/metabolism(1000, src, CHEM_BLOOD)
+	ingested = new/datum/reagents/metabolism(1000, src, CHEM_INGEST)
+	touching = new/datum/reagents/metabolism(1000, src, CHEM_TOUCH)
+	reagents = bloodstr
+
 	..()
 
 /mob/living/carbon/Life()

code/modules/mob/living/carbon/carbon_defines.dm

@@ -18,7 +18,8 @@
 	//Active emote/pose
 	var/pose = null
 	var/list/chem_effects = list()
-	var/datum/reagents/ingested = null
-	var/datum/reagents/touching = null
+	var/datum/reagents/metabolism/bloodstr = null
+	var/datum/reagents/metabolism/ingested = null
+	var/datum/reagents/metabolism/touching = null
 
 	var/pulse = PULSE_NORM	//current pulse level

code/modules/mob/living/carbon/human/human_defense.dm

@@ -444,4 +444,41 @@ emp_act
 	if(!istype(wear_suit,/obj/item/clothing/suit/space)) return
 	var/obj/item/clothing/suit/space/SS = wear_suit
 	var/penetrated_dam = max(0,(damage - SS.breach_threshold))
-	if(penetrated_dam) SS.create_breaches(damtype, penetrated_dam)
+	if(penetrated_dam) SS.create_breaches(damtype, penetrated_dam)
+
+/mob/living/human/reagent_permeability()
+	var/perm = 0
+	
+	var/list/perm_by_part = list(
+		"head" = THERMAL_PROTECTION_HEAD, 
+		"upper_torso" = THERMAL_PROTECTION_UPPER_TORSO, 
+		"lower_torso" = THERMAL_PROTECTION_LOWER_TORSO, 
+		"legs" = THERMAL_PROTECTION_LEG_LEFT + THERMAL_PROTECTION_LEG_RIGHT, 
+		"feet" = THERMAL_PROTECTION_FOOT_LEFT + THERMAL_PROTECTION_FOOT_RIGHT, 
+		"arms" = THERMAL_PROTECTION_ARM_LEFT + THERMAL_PROTECTION_ARM_RIGHT, 
+		"hands" = THERMAL_PROTECTION_HAND_LEFT + THERMAL_PROTECTION_HAND_RIGHT
+		)
+	
+	for(var/obj/item/clothing/C in src.get_equipped_items())
+		if(C.permeability_coefficient == 1 || !C.body_parts_covered)
+			continue
+		if(C.body_parts_covered & HEAD)
+			perm_by_part["head"] *= C.permeability_coefficient
+		if(C.body_parts_covered & UPPER_TORSO)
+			perm_by_part["upper_torso"] *= C.permeability_coefficient
+		if(C.body_parts_covered & LOWER_TORSO)
+			perm_by_part["lower_torso"] *= C.permeability_coefficient
+		if(C.body_parts_covered & LEGS)
+			perm_by_part["legs"] *= C.permeability_coefficient
+		if(C.body_parts_covered & FEET)
+			perm_by_part["feet"] *= C.permeability_coefficient
+		if(C.body_parts_covered & ARMS)
+			perm_by_part["arms"] *= C.permeability_coefficient
+		if(C.body_parts_covered & HANDS)
+			perm_by_part["hands"] *= C.permeability_coefficient
+	
+	for(var/part in perm_by_part)
+		perm += perm_by_part[part]
+	
+	return perm
+

code/modules/mob/living/carbon/human/life.dm

@@ -858,15 +858,14 @@
 
 	proc/handle_chemicals_in_body()
 
-		if(reagents && !(species.flags & IS_SYNTHETIC)) //Synths don't process reagents.
+		if(!(species.flags & IS_SYNTHETIC)) //Synths don't process reagents.
 			chem_effects.Cut()
 			analgesic = 0
-			var/alien = 0
-			if(species && species.reagent_tag)
-				alien = species.reagent_tag
-			touching.metabolize(alien, CHEM_TOUCH)
-			ingested.metabolize(alien, CHEM_INGEST)
-			reagents.metabolize(alien, CHEM_BLOOD)
+
+			if(touching) touching.metabolize()
+			if(ingested) ingested.metabolize()
+			if(bloodstr) bloodstr.metabolize()
+			
 			if(CE_PAINKILLER in chem_effects)
 				analgesic = chem_effects[CE_PAINKILLER]
 

code/modules/mob/living/carbon/metroid/life.dm

@@ -85,12 +85,9 @@
 	chem_effects.Cut()
 	analgesic = 0
 
-	if(touching)
-		touching.metabolize(0, CHEM_TOUCH)
-	if(ingested)
-		ingested.metabolize(0, CHEM_INGEST)
-	if(reagents)
-		reagents.metabolize(0, CHEM_BLOOD)
+	if(touching) touching.metabolize()
+	if(ingested) ingested.metabolize()
+	if(bloodstr) bloodstr.metabolize()
 
 	if(CE_PAINKILLER in chem_effects)
 		analgesic = chem_effects[CE_PAINKILLER]

code/modules/mob/living/carbon/resist.dm

@@ -3,14 +3,14 @@
 
 	//drop && roll
 	if(on_fire)
-		fire_stacks -= 2 //reduced
-		Weaken(3)
-		spin(32,2)
+		fire_stacks -= 2
+		Weaken(5)
+		spin(52,2)
 		visible_message(
 			"<span class='danger'>[src] rolls on the floor, trying to put themselves out!</span>",
 			"<span class='notice'>You stop, drop, and roll!</span>"
 			)
-		sleep(30)
+		sleep(50)
 		if(fire_stacks <= 0)
 			visible_message(
 				"<span class='danger'>[src] has successfully extinguished themselves!</span>",

code/modules/mob/living/living_defense.dm

@@ -236,7 +236,7 @@
 	location.hotspot_expose(fire_burn_temperature(), 50, 1)
 
 /mob/living/fire_act()
-	adjust_fire_stacks(0.5)
+	adjust_fire_stacks(2)
 	IgniteMob()
 
 //Finds the effective temperature that the mob is burning at.
@@ -245,4 +245,8 @@
 		return 0
 
 	//Scale quadratically so that single digit numbers of fire stacks don't burn ridiculously hot.
-	return round(FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE*(fire_stacks/FIRE_MAX_FIRESUIT_STACKS)**2)
+	//lower limit of 700 K, same as matches and roughly the temperature of a cool flame. 
+	return max(2.25*round(FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE*(fire_stacks/FIRE_MAX_FIRESUIT_STACKS)**2), 700)
+
+/mob/living/proc/reagent_permeability()
+	return 1

code/modules/reagents/Chemistry-Holder.dm

@@ -4,8 +4,10 @@
 	var/maximum_volume = 100
 	var/atom/my_atom = null
 
-/datum/reagents/New(var/max = 100)
-	maximum_volume = max
+/datum/reagents/New(var/max = 100, atom/A = null)
+	maximum_volume = max
+	my_atom = A
+	
 	//I dislike having these here but map-objects are initialised before world/New() is called. >_>
 	if(!chemical_reagents_list)
 		//Chemical Reagents - Initialises all /datum/reagent into a list indexed by reagent id
@@ -288,53 +290,26 @@
 
 /* Holder-to-atom and similar procs */
 
-/datum/reagents/proc/touch(var/atom/target) // This picks the appropriate reaction. Reagents are not guaranteed to transfer to the target.
-	if(ismob(target))
-		touch_mob(target)
-	if(isturf(target))
-		touch_turf(target)
-	if(isobj(target))
-		touch_obj(target)
-	return
-
-/datum/reagents/proc/touch_mob(var/mob/target)
-	if(!target || !istype(target))
-		return
-
-	for(var/datum/reagent/current in reagent_list)
-		current.touch_mob(target)
-
-	update_total()
-
-/datum/reagents/proc/touch_turf(var/turf/target)
-	if(!target || !istype(target))
-		return
-
-	for(var/datum/reagent/current in reagent_list)
-		current.touch_turf(target)
-
-	update_total()
-
-/datum/reagents/proc/touch_obj(var/obj/target)
-	if(!target || !istype(target))
-		return
-
-	for(var/datum/reagent/current in reagent_list)
-		current.touch_obj(target)
-
-	update_total()
-
+//The general proc for applying reagents to things. This proc assumes the reagents are being applied externally, 
+//not directly injected into the contents. It first calls touch, then the appropriate trans_to_*() or splash_mob().
+//If for some reason touch effects are bypassed (e.g. injecting stuff directly into a reagent container or person), 
+//call the appropriate trans_to_*() proc.
 /datum/reagents/proc/trans_to(var/atom/target, var/amount = 1, var/multiplier = 1, var/copy = 0)
+	touch(target) //First, handle mere touch effects
+
 	if(ismob(target))
-		//warning("[my_atom] is trying to transfer reagents to [target], which is a mob, using trans_to()")
-		//return trans_to_mob(target, amount, multiplier, copy)
-		return splash_mob(target, amount)
+		return splash_mob(target, amount, copy)
 	if(isturf(target))
 		return trans_to_turf(target, amount, multiplier, copy)
 	if(isobj(target))
 		return trans_to_obj(target, amount, multiplier, copy)
 	return 0
 
+//Using this in case we want to differentiate splashing an atom from transferring reagents to it later down the road.
+//For now it just calls trans_to.
+/datum/reagents/proc/splash(var/atom/target, var/amount = 1, var/multiplier = 1, var/copy = 0)
+	trans_to(target, amount, multiplier, copy)
+
 /datum/reagents/proc/trans_id_to(var/atom/target, var/id, var/amount = 1)
 	if (!target || !target.reagents)
 		return
@@ -351,30 +326,55 @@
 
 	return F.trans_to(target, amount) // Let this proc check the atom's type
 
-/datum/reagents/proc/splash_mob(var/mob/target, var/amount = 1, var/clothes = 1)
-	var/perm = 0
-	var/list/L = list("head" = THERMAL_PROTECTION_HEAD, "upper_torso" = THERMAL_PROTECTION_UPPER_TORSO, "lower_torso" = THERMAL_PROTECTION_LOWER_TORSO, "legs" = THERMAL_PROTECTION_LEG_LEFT + THERMAL_PROTECTION_LEG_RIGHT, "feet" = THERMAL_PROTECTION_FOOT_LEFT + THERMAL_PROTECTION_FOOT_RIGHT, "arms" = THERMAL_PROTECTION_ARM_LEFT + THERMAL_PROTECTION_ARM_RIGHT, "hands" = THERMAL_PROTECTION_HAND_LEFT + THERMAL_PROTECTION_HAND_RIGHT)
-	if(clothes)
-		for(var/obj/item/clothing/C in target.get_equipped_items())
-			if(C.permeability_coefficient == 1 || C.body_parts_covered == 0)
-				continue
-			if(C.body_parts_covered & HEAD)
-				L["head"] *= C.permeability_coefficient
-			if(C.body_parts_covered & UPPER_TORSO)
-				L["upper_torso"] *= C.permeability_coefficient
-			if(C.body_parts_covered & LOWER_TORSO)
-				L["lower_torso"] *= C.permeability_coefficient
-			if(C.body_parts_covered & LEGS)
-				L["legs"] *= C.permeability_coefficient
-			if(C.body_parts_covered & FEET)
-				L["feet"] *= C.permeability_coefficient
-			if(C.body_parts_covered & ARMS)
-				L["arms"] *= C.permeability_coefficient
-			if(C.body_parts_covered & HANDS)
-				L["hands"] *= C.permeability_coefficient
-	for(var/t in L)
-		perm += L[t]
-	return trans_to_mob(target, amount, CHEM_TOUCH, perm)
+// When applying reagents to an atom externally, touch() is called to trigger any on-touch effects of the reagent.
+// This does not handle transferring reagents to things.
+// For example, splashing someone with water will get them wet and extinguish them if they are on fire,
+// even if they are wearing an impermeable suit that prevents the reagents from contacting the skin.
+/datum/reagents/proc/touch(var/atom/target)
+	if(ismob(target))
+		touch_mob(target)
+	if(isturf(target))
+		touch_turf(target)
+	if(isobj(target))
+		touch_obj(target)
+	return
+
+/datum/reagents/proc/touch_mob(var/mob/target)
+	if(!target || !istype(target))
+		return
+
+	for(var/datum/reagent/current in reagent_list)
+		current.touch_mob(target, current.volume)
+
+	update_total()
+
+/datum/reagents/proc/touch_turf(var/turf/target)
+	if(!target || !istype(target))
+		return
+
+	for(var/datum/reagent/current in reagent_list)
+		current.touch_turf(target, current.volume)
+
+	update_total()
+
+/datum/reagents/proc/touch_obj(var/obj/target)
+	if(!target || !istype(target))
+		return
+
+	for(var/datum/reagent/current in reagent_list)
+		current.touch_obj(target, current.volume)
+
+	update_total()
+
+// Attempts to place a reagent on the mob's skin.
+// Reagents are not guaranteed to transfer to the target.
+// Do not call this directly, call trans_to() instead.
+/datum/reagents/proc/splash_mob(var/mob/target, var/amount = 1, var/copy = 0)
+	var/perm = 1
+	if(isliving(target)) //will we ever even need to tranfer reagents to non-living mobs?
+		var/mob/living/L = target
+		perm = L.reagent_permeability()
+	return trans_to_mob(target, amount, CHEM_TOUCH, perm, copy)
 
 /datum/reagents/proc/trans_to_mob(var/mob/target, var/amount = 1, var/type = CHEM_BLOOD, var/multiplier = 1, var/copy = 0) // Transfer after checking into which holder...
 	if(!target || !istype(target))
@@ -416,18 +416,7 @@
 
 	return trans_to_holder(target.reagents, amount, multiplier, copy)
 
-/datum/reagents/proc/metabolize(var/alien, var/location)
-	if(!iscarbon(my_atom))
-		return
-	var/mob/living/carbon/C = my_atom
-	if(!C || !istype(C))
-		return
-	for(var/datum/reagent/current in reagent_list)
-		current.on_mob_life(C, alien, location)
-	update_total()
-
 /* Atom reagent creation - use it all the time */
 
 /atom/proc/create_reagents(var/max_vol)
-	reagents = new/datum/reagents(max_vol)
-	reagents.my_atom = src
+	reagents = new/datum/reagents(max_vol, src)

code/modules/reagents/Chemistry-Metabolism.dm

@@ -0,0 +1,21 @@
+/datum/reagents/metabolism
+	var/metabolism_class //CHEM_TOUCH, CHEM_INGEST, or CHEM_BLOOD
+	var/mob/living/carbon/parent
+
+/datum/reagents/metabolism/New(var/max = 100, mob/living/carbon/parent_mob, var/met_class)
+	..(max, parent_mob)
+	
+	metabolism_class = met_class
+	if(istype(parent_mob))
+		parent = parent_mob
+
+/datum/reagents/metabolism/proc/metabolize()
+	
+	var/metabolism_type = 0 //non-human mobs
+	if(ishuman(parent))
+		var/mob/living/carbon/human/H = parent
+		metabolism_type = H.species.reagent_tag
+	
+	for(var/datum/reagent/current in reagent_list)
+		current.on_mob_life(parent, metabolism_type, metabolism_class)
+	update_total()

code/modules/reagents/Chemistry-Readme.dm

@@ -88,7 +88,12 @@ About the Holder:
 			Transfers [amount] reagents from [src] to [target], multiplying them by [multiplier]. Returns actual amount removed from [src] (not amount transferred to [target]). If [copy] is 1, copies reagents instead.
 
 		touch(var/atom/target)
-			Not recommended to use. Calls touch_mob(target), touch_turf(target), or touch_obj(target), depending on target's type.
+			When applying reagents to an atom externally, touch() is called to trigger any on-touch effects of the reagent.
+			This does not handle transferring reagents to things.
+			For example, splashing someone with water will get them wet and extinguish them if they are on fire,
+			even if they are wearing an impermeable suit that prevents the reagents from contacting the skin.
+			Basically just defers to touch_mob(target), touch_turf(target), or touch_obj(target), depending on target's type.
+			Not recommended to use this directly, since trans_to() calls it before attempting to transfer.
 
 		touch_mob(var/mob/target)
 			Calls each reagent's touch_mob(target).
@@ -100,13 +105,18 @@ About the Holder:
 			Calls each reagent's touch_obj(target).
 
 		trans_to(var/atom/target, var/amount = 1, var/multiplier = 1, var/copy = 0)
-			Checks the type of [target], calling splash_mob(target, amount), trans_to_turf(target, amount, multiplier, copy), or trans_to_obj(target, amount, multiplier, copy).
+			The general proc for applying reagents to things externally (as opposed to directly injected into the contents). 
+			It first calls touch, then the appropriate trans_to_*() or splash_mob().
+			If for some reason you want touch effects to be bypassed (e.g. injecting stuff directly into a reagent container or person), call the appropriate trans_to_*() proc.
+			
+			Calls touch() before checking the type of [target], calling splash_mob(target, amount), trans_to_turf(target, amount, multiplier, copy), or trans_to_obj(target, amount, multiplier, copy).
 
 		trans_id_to(var/atom/target, var/id, var/amount = 1)
 			Transfers [amount] of [id] to [target]. Returns amount transferred.
 
 		splash_mob(var/mob/target, var/amount = 1, var/clothes = 1)
 			Checks mob's clothing if [clothes] is 1 and transfers [amount] reagents to mob's skin.
+			Don't call this directly. Call apply_to() instead.
 
 		trans_to_mob(var/mob/target, var/amount = 1, var/type = CHEM_BLOOD, var/multiplier = 1, var/copy = 0)
 			Transfers [amount] reagents to the mob's appropriate holder, depending on [type]. Ignores protection.

code/modules/reagents/Chemistry-Reagents.dm

@@ -24,13 +24,14 @@
 /datum/reagent/proc/remove_self(var/amount) // Shortcut
 	holder.remove_reagent(id, amount)
 
-/datum/reagent/proc/touch_mob(var/mob/M) // This doesn't apply to being splashed - this is for, e.g. extinguishers and sprays. The difference is that reagent is not on the mob - it's in another object.
+// This doesn't apply to skin contact - this is for, e.g. extinguishers and sprays. The difference is that reagent is not directly on the mob's skin - it might just be on their clothing.
+/datum/reagent/proc/touch_mob(var/mob/M, var/amount)
 	return
 
-/datum/reagent/proc/touch_obj(var/obj/O) // Acid melting, cleaner cleaning, etc
+/datum/reagent/proc/touch_obj(var/obj/O, var/amount) // Acid melting, cleaner cleaning, etc
 	return
 
-/datum/reagent/proc/touch_turf(var/turf/T) // Cleaner cleaning, lube lubbing, etc, all go here
+/datum/reagent/proc/touch_turf(var/turf/T, var/amount) // Cleaner cleaning, lube lubbing, etc, all go here
 	return
 
 /datum/reagent/proc/on_mob_life(var/mob/living/carbon/M, var/alien, var/location) // Currently, on_mob_life is called on carbons. Any interaction with non-carbon mobs (lube) will need to be done in touch_mob.

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

@@ -55,19 +55,34 @@
 		M.adjustToxLoss(removed)
 	if(dose > 15)
 		M.adjustToxLoss(removed)
+	if(data && data["viruses"])
+		for(var/datum/disease/D in data["viruses"])
+			if(D.spread_type == SPECIAL || D.spread_type == NON_CONTAGIOUS)
+				continue
+			if(D.spread_type in list(CONTACT_FEET, CONTACT_HANDS, CONTACT_GENERAL))
+				M.contract_disease(D)
+	if(data && data["virus2"])
+		var/list/vlist = data["virus2"]
+		if(vlist.len)
+			for(var/ID in vlist)
+				var/datum/disease2/disease/V = vlist[ID]
+				if(V.spreadtype == "Contact")
+					infect_virus2(M, V.getcopy())
 
 /datum/reagent/blood/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
 	if(data && data["viruses"])
 		for(var/datum/disease/D in data["viruses"])
 			if(D.spread_type == SPECIAL || D.spread_type == NON_CONTAGIOUS)
 				continue
-			M.contract_disease(D)
+			if(D.spread_type in list(CONTACT_FEET, CONTACT_HANDS, CONTACT_GENERAL))
+				M.contract_disease(D)
 	if(data && data["virus2"])
 		var/list/vlist = data["virus2"]
 		if(vlist.len)
 			for(var/ID in vlist)
 				var/datum/disease2/disease/V = vlist[ID]
-				infect_virus2(M, V.getcopy())
+				if(V.spreadtype == "Contact")
+					infect_virus2(M, V.getcopy())
 	if(data && data["antibodies"])
 		M.antibodies |= data["antibodies"]
 
@@ -155,6 +170,17 @@
 		if(!cube.wrapped)
 			cube.Expand()
 
+/datum/reagent/water/touch_mob(var/mob/living/L, var/amount)
+	if(istype(L))
+		var/needed = L.fire_stacks * 10
+		if(amount > needed)
+			L.fire_stacks = 0
+			L.ExtinguishMob()
+			remove_self(needed)
+		else
+			L.adjust_fire_stacks(-(amount / 10))
+			remove_self(amount)
+
 /datum/reagent/water/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
 	if(istype(M, /mob/living/carbon/slime))
 		var/mob/living/carbon/slime/S = M
@@ -165,15 +191,6 @@
 				++S.Discipline
 		if(dose == removed)
 			S.visible_message("<span class='warning'>[S]'s flesh sizzles where the water touches it!</span>", "<span class='danger'>Your flesh burns in the water!</span>")
-	var/needed = M.fire_stacks * 10
-	if(volume > needed)
-		M.fire_stacks = 0
-		M.ExtinguishMob()
-		remove_self(needed)
-	else
-		M.adjust_fire_stacks(-(volume / 10))
-		remove_self(volume)
-	return
 
 /datum/reagent/fuel
 	name = "Welding fuel"
@@ -194,5 +211,7 @@
 /datum/reagent/fuel/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
 	M.adjustToxLoss(2 * removed)
 
-/datum/reagent/fuel/affect_touch(var/mob/living/carbon/M, var/alien, var/removed) // Splashing people with welding fuel to make them easy to ignite!
-	M.adjust_fire_stacks(0.1 * removed)
+/datum/reagent/fuel/touch_mob(var/mob/living/L, var/amount)
+	if(istype(L))
+		L.adjust_fire_stacks(amount / 10) // Splashing people with welding fuel to make them easy to ignite!
+

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

@@ -70,9 +70,9 @@
 	glass_name = "glass of ethanol"
 	glass_desc = "A well-known alcohol with a variety of applications."
 
-/datum/reagent/ethanol/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
-	M.adjust_fire_stacks(removed / 15)
-	return
+/datum/reagent/ethanol/touch_mob(var/mob/living/L, var/amount)
+	if(istype(L))
+		L.adjust_fire_stacks(amount / 15)
 
 /datum/reagent/ethanol/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
 	M.adjustToxLoss(removed * 2 * toxicity)
@@ -318,7 +318,7 @@
 			return
 
 	if(volume < meltdose) // Not enough to melt anything
-		M.take_organ_damage(removed * power * 0.2)
+		M.take_organ_damage(0, removed * power * 0.2) //burn damage, since it causes chemical burns. Acid doesn't make bones shatter, like brute trauma would.
 		return
 	if(!M.unacidable && removed > 0)
 		if(istype(M, /mob/living/carbon/human) && volume >= meltdose)

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

@@ -67,10 +67,7 @@
 
 /datum/reagent/paint/touch_mob(var/mob/M)
 	if(istype(M) && !istype(M, /mob/dead)) //painting ghosts: not allowed
-		M.color = color
-
-/datum/reagent/paint/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
-	M.color = color
+		M.color = color //maybe someday change this to paint only clothes and exposed body parts for human mobs.
 
 /datum/reagent/paint/get_data()
 	return color
@@ -265,9 +262,9 @@
 			remove_self(5)
 	return
 
-/datum/reagent/thermite/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
-	M.adjust_fire_stacks(removed * 0.2)
-	return
+/datum/reagent/thermite/touch_mob(var/mob/living/L, var/amount)
+	if(istype(L))
+		L.adjust_fire_stacks(amount / 5)
 
 /datum/reagent/thermite/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
 	M.adjustFireLoss(3 * removed)

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

@@ -45,9 +45,12 @@
 	color = "#9D14DB"
 	strength = 30
 
+/datum/reagent/toxin/phoron/touch_mob(var/mob/living/L, var/amount)
+	if(istype(L))
+		L.adjust_fire_stacks(amount / 5)
+
 /datum/reagent/toxin/phoron/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
-	..()
-	M.adjust_fire_stacks(removed / 5)
+	M.take_organ_damage(0, removed * 0.1) //being splashed directly with phoron causes minor chemical burns
 
 /datum/reagent/toxin/phoron/touch_turf(var/turf/simulated/T)
 	if(!istype(T))
@@ -494,7 +497,7 @@
 
 /datum/reagent/nanites/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
 	if(prob(10))
-		M.contract_disease(new /datum/disease/robotic_transformation(0), 1)
+		M.contract_disease(new /datum/disease/robotic_transformation(0), 1) //What
 
 /datum/reagent/nanites/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
 	M.contract_disease(new /datum/disease/robotic_transformation(0), 1)

code/modules/reagents/reagent_containers.dm

@@ -72,7 +72,7 @@
 	msg_admin_attack("[user.name] ([user.ckey]) splashed [target.name] ([target.key]) with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 
 	user.visible_message("<span class='danger'>[target] has been splashed with something by [user]!", "<span class = 'notice'>You splash the solution onto [target].</span>")
-	reagents.splash_mob(target, reagents.total_volume)
+	reagents.splash(target, reagents.total_volume)
 	return 1
 
 /obj/item/weapon/reagent_containers/proc/self_feed_message(var/mob/user)

code/modules/reagents/reagent_containers/dropper.dm

@@ -64,7 +64,7 @@
 				return
 
 			else
-				trans = reagents.trans_to(target, amount_per_transfer_from_this)
+				trans = reagents.splash(target, amount_per_transfer_from_this) //sprinkling reagents on generic non-mobs
 				user << "<span class='notice'>You transfer [trans] units of the solution.</span>"
 
 		else // Taking from something

code/modules/reagents/reagent_containers/food/drinks/bottle.dm

@@ -78,7 +78,7 @@
 	//The reagents in the bottle splash all over the target, thanks for the idea Nodrak
 	if(reagents)
 		user.visible_message("<span class='notice'>The contents of the [src] splash all over [target]!</span>")
-		reagents.splash_mob(target, reagents.total_volume)
+		reagents.splash(target, reagents.total_volume)
 
 	//Finally, smash the bottle. This kills (qdel) the bottle.
 	src.smash(target, user)

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -483,7 +483,7 @@
 /obj/item/weapon/reagent_containers/food/snacks/egg/throw_impact(atom/hit_atom)
 	..()
 	new/obj/effect/decal/cleanable/egg_smudge(src.loc)
-	src.reagents.trans_to(hit_atom, reagents.total_volume)
+	src.reagents.splash(hit_atom, reagents.total_volume)
 	src.visible_message("\red [src.name] has been squashed.","\red You hear a smack.")
 	qdel(src)
 

code/modules/reagents/reagent_containers/glass.dm

@@ -88,7 +88,7 @@
 
 		if(reagents.total_volume)
 			user << "<span class='notice'>You splash the solution onto [target].</span>"
-			reagents.trans_to(target, reagents.total_volume)
+			reagents.splash(target, reagents.total_volume)
 			return
 
 	attackby(obj/item/weapon/W as obj, mob/user as mob)

code/modules/reagents/reagent_containers/spray.dm

@@ -53,7 +53,7 @@
 /obj/item/weapon/reagent_containers/spray/proc/Spray_at(atom/A as mob|obj, mob/user as mob, proximity)
 	if (A.density && proximity)
 		A.visible_message("[usr] sprays [A] with [src].")
-		reagents.trans_to(A, amount_per_transfer_from_this)
+		reagents.splash(A, amount_per_transfer_from_this)
 	else
 		spawn(0)
 			var/obj/effect/effect/water/chempuff/D = new/obj/effect/effect/water/chempuff(get_turf(src))
@@ -88,7 +88,7 @@
 		return
 	if(isturf(usr.loc))
 		usr << "<span class='notice'>You empty \the [src] onto the floor.</span>"
-		reagents.trans_to(usr.loc, reagents.total_volume)
+		reagents.splash(usr.loc, reagents.total_volume)
 
 //space cleaner
 /obj/item/weapon/reagent_containers/spray/cleaner

code/modules/tables/presets.dm

@@ -1,19 +1,19 @@
 /obj/structure/table
 
 	standard
+		icon_state = "plain_preview"
+		color = "#EEEEEE"
+		New()
+			material = get_material_by_name(DEFAULT_TABLE_MATERIAL)
+			..()
+
+	steel
 		icon_state = "plain_preview"
 		color = "#666666"
 		New()
 			material = get_material_by_name(DEFAULT_WALL_MATERIAL)
 			..()
 
-	plastic
-		icon_state = "plain_preview"
-		color = "#EEEEEE"
-		New()
-			material = get_material_by_name("plastic")
-			..()
-
 	marble
 		icon_state = "stone_preview"
 		color = "#CCCCCC"
@@ -22,6 +22,14 @@
 			..()
 
 	reinforced
+		icon_state = "reinf_preview"
+		color = "#EEEEEE"
+		New()
+			material = get_material_by_name(DEFAULT_TABLE_MATERIAL)
+			reinforced = get_material_by_name(DEFAULT_WALL_MATERIAL)
+			..()
+	
+	steel_reinforced
 		icon_state = "reinf_preview"
 		color = "#666666"
 		New()
@@ -53,9 +61,9 @@
 
 	holotable
 		icon_state = "holo_preview"
-		color = "#666666"
+		color = "#EEEEEE"
 		New()
-			material = get_material_by_name("holographic [DEFAULT_WALL_MATERIAL]")
+			material = get_material_by_name("holographic [DEFAULT_TABLE_MATERIAL]")
 			..()
 
 	woodentable/holotable