From 38ab273ddab2211bd56704a6135880c0b0896145 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Wed, 29 Apr 2015 14:42:57 -0700 Subject: [PATCH] Fix up reagent bombs, remove carbon fire_act Carbon mobs do not actually need a fire_act, all it was doing was breaking things with hardsuits. Reagent bombs are supposed to have a unique proc instead of fire_act, so fixed. --- code/modules/assembly/igniter.dm | 2 +- code/modules/mob/living/carbon/carbon.dm | 4 ++-- code/modules/reagents/reagent_containers/glass_containers.dm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm index 74ea16c0740..49cfe687eb1 100644 --- a/code/modules/assembly/igniter.dm +++ b/code/modules/assembly/igniter.dm @@ -22,7 +22,7 @@ if (istype(src.loc.loc, /obj/item/weapon/reagent_containers/glass/beaker/)) var/obj/item/weapon/reagent_containers/glass/beaker/beakerbomb = src.loc.loc if(beakerbomb) - beakerbomb.fire_act() + beakerbomb.ignite() var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, src) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 33b15cd4d4f..925636dbba5 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -439,12 +439,12 @@ mob/living item.throw_at(target, item.throw_range, item.throw_speed, src) - +/* /mob/living/carbon/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) ..() src.IgniteMob() bodytemperature = max(bodytemperature, BODYTEMP_HEAT_DAMAGE_LIMIT+10) - +*/ /mob/living/carbon/can_use_hands() if(handcuffed) return 0 diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm index fdf8494a3a4..831cd775c11 100644 --- a/code/modules/reagents/reagent_containers/glass_containers.dm +++ b/code/modules/reagents/reagent_containers/glass_containers.dm @@ -246,7 +246,7 @@ else usr << "There is no assembly to remove." -/obj/item/weapon/reagent_containers/glass/beaker/fire_act() +/obj/item/weapon/reagent_containers/glass/beaker/proc/ignite() if(reagents) reagents.chem_temp += 30 reagents.handle_reactions()