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.
This commit is contained in:
Tigercat2000
2015-04-29 14:42:57 -07:00
parent 173bdc4c27
commit 38ab273dda
3 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -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)
+2 -2
View File
@@ -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
@@ -246,7 +246,7 @@
else
usr << "<span class='notice'>There is no assembly to remove.</span>"
/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()