cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Chems with touch_turf should now also do the proper touch_mob and affect_touch

Browse Source
This commit is contained in:
Anewbe
2017-01-01 21:32:00 -06:00
parent 2210a41922
commit 426bb55bfc
3 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/modules/reagents/Chemistry-Holder.dm
View File

@@ -323,13 +323,13 @@
// This does not handle transferring reagents to things. // 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, // 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. // even if they are wearing an impermeable suit that prevents the reagents from contacting the skin.
/datum/reagents/proc/touch(var/atom/target) /datum/reagents/proc/touch(var/atom/target, var/amount)
if(ismob(target)) if(ismob(target))
touch_mob(target) touch_mob(target, amount)
if(isturf(target)) if(isturf(target))
touch_turf(target) touch_turf(target, amount)
if(isobj(target)) if(isobj(target))
touch_obj(target) touch_obj(target, amount)
return return
/datum/reagents/proc/touch_mob(var/mob/target) /datum/reagents/proc/touch_mob(var/mob/target)
@@ -341,21 +341,21 @@
update_total() update_total()
/datum/reagents/proc/touch_turf(var/turf/target) /datum/reagents/proc/touch_turf(var/turf/target, var/amount)
if(!target || !istype(target)) if(!target || !istype(target))
return return
for(var/datum/reagent/current in reagent_list) for(var/datum/reagent/current in reagent_list)
current.touch_turf(target, current.volume) current.touch_turf(target, amount)
update_total() update_total()
/datum/reagents/proc/touch_obj(var/obj/target) /datum/reagents/proc/touch_obj(var/obj/target, var/amount)
if(!target || !istype(target)) if(!target || !istype(target))
return return
for(var/datum/reagent/current in reagent_list) for(var/datum/reagent/current in reagent_list)
current.touch_obj(target, current.volume) current.touch_obj(target, amount)
update_total() update_total()
@@ -402,7 +402,7 @@
var/datum/reagents/R = new /datum/reagents(amount * multiplier) var/datum/reagents/R = new /datum/reagents(amount * multiplier)
. = trans_to_holder(R, amount, multiplier, copy) . = trans_to_holder(R, amount, multiplier, copy)
R.touch_turf(target) R.touch_turf(target, amount)
return return
/datum/reagents/proc/trans_to_obj(var/obj/target, var/amount = 1, var/multiplier = 1, var/copy = 0) // Objects may or may not; if they do, it's probably a beaker or something and we need to transfer properly; otherwise, just touch. /datum/reagents/proc/trans_to_obj(var/obj/target, var/amount = 1, var/multiplier = 1, var/copy = 0) // Objects may or may not; if they do, it's probably a beaker or something and we need to transfer properly; otherwise, just touch.
@@ -412,7 +412,7 @@
if(!target.reagents) if(!target.reagents)
var/datum/reagents/R = new /datum/reagents(amount * multiplier) var/datum/reagents/R = new /datum/reagents(amount * multiplier)
. = trans_to_holder(R, amount, multiplier, copy) . = trans_to_holder(R, amount, multiplier, copy)
R.touch_obj(target) R.touch_obj(target, amount)
return return
return trans_to_holder(target.reagents, amount, multiplier, copy) return trans_to_holder(target.reagents, amount, multiplier, copy)

6
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
View File

@@ -156,9 +156,9 @@
glass_name = "welder fuel" glass_name = "welder fuel"
glass_desc = "Unless you are an industrial tool, this is probably not safe for consumption." glass_desc = "Unless you are an industrial tool, this is probably not safe for consumption."
/datum/reagent/fuel/touch_turf(var/turf/T) /datum/reagent/fuel/touch_turf(var/turf/T, var/amount)
new /obj/effect/decal/cleanable/liquid_fuel(T, volume) new /obj/effect/decal/cleanable/liquid_fuel(T, amount)
remove_self(volume) remove_self(amount)
return return
/datum/reagent/fuel/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) /datum/reagent/fuel/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)

9
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
View File

@@ -59,11 +59,11 @@
if(prob(50)) if(prob(50))
M.pl_effects() M.pl_effects()
/datum/reagent/toxin/phoron/touch_turf(var/turf/simulated/T) /datum/reagent/toxin/phoron/touch_turf(var/turf/simulated/T, var/amount)
if(!istype(T)) if(!istype(T))
return return
T.assume_gas("volatile_fuel", volume, T20C) T.assume_gas("volatile_fuel", amount, T20C)
remove_self(volume) remove_self(amount)
/datum/reagent/toxin/cyanide //Fast and Lethal /datum/reagent/toxin/cyanide //Fast and Lethal
name = "Cyanide" name = "Cyanide"
@@ -212,17 +212,14 @@
W.visible_message("<span class='notice'>The fungi are completely dissolved by the solution!</span>") W.visible_message("<span class='notice'>The fungi are completely dissolved by the solution!</span>")
/datum/reagent/toxin/plantbgone/touch_obj(var/obj/O, var/volume) /datum/reagent/toxin/plantbgone/touch_obj(var/obj/O, var/volume)
..()
if(istype(O, /obj/effect/plant)) if(istype(O, /obj/effect/plant))
qdel(O) qdel(O)
/datum/reagent/toxin/plantbgone/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) /datum/reagent/toxin/plantbgone/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
..()
if(alien == IS_DIONA) if(alien == IS_DIONA)
M.adjustToxLoss(50 * removed) M.adjustToxLoss(50 * removed)
/datum/reagent/toxin/plantbgone/affect_touch(var/mob/living/carbon/M, var/alien, var/removed) /datum/reagent/toxin/plantbgone/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
..()
if(alien == IS_DIONA) if(alien == IS_DIONA)
M.adjustToxLoss(50 * removed) M.adjustToxLoss(50 * removed)