diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm index 2eea9f6fb07..9d4c181238f 100644 --- a/code/game/objects/structures/shower.dm +++ b/code/game/objects/structures/shower.dm @@ -130,7 +130,7 @@ wash_atom(loc) for(var/am in loc) var/atom/movable/movable_content = am - reagents.expose(movable_content, TOUCH, reaction_volume) + reagents.expose(movable_content, TOUCH, 5) //There's not many reagents leaving the sink at once! if(!ismopable(movable_content)) // Mopables will be cleaned anyways by the turf wash above wash_atom(movable_content) else diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index aedde1ad3ac..f344a91f929 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -723,18 +723,13 @@ color = "#808080" // rgb: 128, 128, 128 taste_mult = 0 // oderless and tasteless -/datum/reagent/oxygen/expose_obj(obj/exposed_obj, reac_volume) - . = ..() - if((!exposed_obj) || (!reac_volume)) - return - var/temp = holder ? holder.chem_temp : T20C - exposed_obj.atmos_spawn_air("o2=[reac_volume/2];TEMP=[temp]") /datum/reagent/oxygen/expose_turf(turf/open/exposed_turf, reac_volume) . = ..() if(istype(exposed_turf)) var/temp = holder ? holder.chem_temp : T20C - exposed_turf.atmos_spawn_air("o2=[reac_volume/2];TEMP=[temp]") + exposed_turf.atmos_spawn_air("o2=[reac_volume/20];TEMP=[temp]") + return /datum/reagent/copper name = "Copper" @@ -760,19 +755,11 @@ color = "#808080" // rgb: 128, 128, 128 taste_mult = 0 -/datum/reagent/nitrogen/expose_obj(obj/exposed_obj, reac_volume) - . = ..() - if((!exposed_obj) || (!reac_volume)) - return - var/temp = holder ? holder.chem_temp : T20C - exposed_obj.atmos_spawn_air("n2=[reac_volume/2];TEMP=[temp]") - /datum/reagent/nitrogen/expose_turf(turf/open/exposed_turf, reac_volume) - . = ..() if(istype(exposed_turf)) var/temp = holder ? holder.chem_temp : T20C - exposed_turf.atmos_spawn_air("n2=[reac_volume/2];TEMP=[temp]") - return + exposed_turf.atmos_spawn_air("n2=[reac_volume/20];TEMP=[temp]") + return ..() /datum/reagent/hydrogen name = "Hydrogen" @@ -1268,18 +1255,11 @@ color = "#B0B0B0" // rgb : 192, 192, 192 taste_description = "something unknowable" -/datum/reagent/carbondioxide/expose_obj(obj/exposed_obj, reac_volume) - . = ..() - if((!exposed_obj) || (!reac_volume)) - return - var/temp = holder ? holder.chem_temp : T20C - exposed_obj.atmos_spawn_air("co2=[reac_volume/5];TEMP=[temp]") - /datum/reagent/carbondioxide/expose_turf(turf/open/exposed_turf, reac_volume) - . = ..() if(istype(exposed_turf)) var/temp = holder ? holder.chem_temp : T20C - exposed_turf.atmos_spawn_air("co2=[reac_volume/5];TEMP=[temp]") + exposed_turf.atmos_spawn_air("co2=[reac_volume/20];TEMP=[temp]") + return ..() /datum/reagent/nitrous_oxide name = "Nitrous Oxide" @@ -1289,18 +1269,11 @@ color = "#808080" taste_description = "sweetness" -/datum/reagent/nitrous_oxide/expose_obj(obj/exposed_obj, reac_volume) - . = ..() - if((!exposed_obj) || (!reac_volume)) - return - var/temp = holder ? holder.chem_temp : T20C - exposed_obj.atmos_spawn_air("n2o=[reac_volume/5];TEMP=[temp]") - /datum/reagent/nitrous_oxide/expose_turf(turf/open/exposed_turf, reac_volume) . = ..() if(istype(exposed_turf)) var/temp = holder ? holder.chem_temp : T20C - exposed_turf.atmos_spawn_air("n2o=[reac_volume/5];TEMP=[temp]") + exposed_turf.atmos_spawn_air("n2o=[reac_volume/20];TEMP=[temp]") /datum/reagent/nitrous_oxide/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume) . = ..() diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index 0589e2f9291..34aae23aa07 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -87,21 +87,13 @@ A.atmos_spawn_air("plasma=[volume];TEMP=[holder.chem_temp]") holder.del_reagent(type) -/datum/reagent/toxin/plasma/expose_obj(obj/exposed_obj, reac_volume) - . = ..() - if((!exposed_obj) || (!reac_volume)) - return - var/temp = holder ? holder.chem_temp : T20C - if(temp >= LIQUID_PLASMA_BP) - exposed_obj.atmos_spawn_air("plasma=[reac_volume];TEMP=[temp]") - /datum/reagent/toxin/plasma/expose_turf(turf/open/exposed_turf, reac_volume) - . = ..() if(!istype(exposed_turf)) return var/temp = holder ? holder.chem_temp : T20C if(temp >= LIQUID_PLASMA_BP) exposed_turf.atmos_spawn_air("plasma=[reac_volume];TEMP=[temp]") + return ..() /datum/reagent/toxin/plasma/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume)//Splashing people with plasma is stronger than fuel! . = ..()