From 094b6e506e6cb50ca817de43edcf5639a7082deb Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Fri, 20 Mar 2015 15:33:27 -0400 Subject: [PATCH 1/3] Dragon's Breath Fix --- code/ZAS/Fire.dm | 5 +++++ code/modules/projectiles/projectile/bullets.dm | 1 + 2 files changed, 6 insertions(+) diff --git a/code/ZAS/Fire.dm b/code/ZAS/Fire.dm index 6af57fc4870..1bf43337769 100644 --- a/code/ZAS/Fire.dm +++ b/code/ZAS/Fire.dm @@ -102,6 +102,11 @@ turf/simulated/hotspot_expose(exposed_temperature, exposed_volume, soh) //black fire, go atmos! l_color = "#010000" +/obj/fire/Crossed(mob/living/L) + ..() + if(isliving(L)) + L.fire_act() + /obj/fire/process() . = 1 diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 0cf1a336331..6b80ea83d9d 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -101,6 +101,7 @@ /obj/item/projectile/bullet/incendiary/shell/Move() ..() var/turf/location = get_turf(src) + new/obj/fire(location) location.hotspot_expose(700, 50, 1) /obj/item/projectile/bullet/incendiary/shell/dragonsbreath From ba28d8e5b331a1550954c91f2b6058f512f6f715 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Fri, 20 Mar 2015 17:02:22 -0400 Subject: [PATCH 2/3] Incendiary Grenade --- .../items/weapons/grenades/chem_grenade.dm | 14 +++++++------- code/modules/reagents/Chemistry-Recipes.dm | 16 +++------------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 72ebabc0283..02c7d142b0f 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -404,14 +404,14 @@ New() ..() - var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src) - var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src) + var/obj/item/weapon/reagent_containers/glass/beaker/large/B1 = new(src) + var/obj/item/weapon/reagent_containers/glass/beaker/large/B2 = new(src) + + B1.reagents.add_reagent("aluminum", 25) + B1.reagents.add_reagent("incendiaryfuel",25) + B2.reagents.add_reagent("plasma", 25) + B2.reagents.add_reagent("sacid", 25) - B1.reagents.add_reagent("aluminum", 15) - B1.reagents.add_reagent("fuel",20) - B2.reagents.add_reagent("plasma", 15) - B2.reagents.add_reagent("sacid", 15) - B1.reagents.add_reagent("incendiaryfuel",20) beakers += B1 beakers += B2 diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 98806674a51..288e5a98c70 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -382,19 +382,9 @@ datum required_reagents = list("aluminum" = 1, "plasma" = 1, "sacid" = 1 ) result_amount = 1 on_reaction(var/datum/reagents/holder, var/created_volume) - var/turf/location = get_turf(holder.my_atom.loc) - for(var/turf/simulated/floor/target_tile in range(0,location)) - - var/datum/gas_mixture/napalm = new - var/datum/gas/volatile_fuel/fuel = new - fuel.moles = created_volume - napalm.trace_gases += fuel - - napalm.temperature = 400+T0C - napalm.update_values() - - target_tile.assume_air(napalm) - spawn (0) target_tile.hotspot_expose(700, 400) + var/turf/simulated/T = get_turf(holder.my_atom) + for(var/turf/simulated/turf in range(created_volume/10,T)) + new /obj/fire(turf) holder.del_reagent("napalm") return From 5de7506e84b9389110f20ad11af86245e9b5e857 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Sun, 22 Mar 2015 21:06:50 -0400 Subject: [PATCH 3/3] pre-emptive fix --- code/ZAS/Fire.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/ZAS/Fire.dm b/code/ZAS/Fire.dm index 1bf43337769..debe6190f80 100644 --- a/code/ZAS/Fire.dm +++ b/code/ZAS/Fire.dm @@ -218,6 +218,10 @@ turf/simulated/hotspot_expose(exposed_temperature, exposed_volume, soh) firelevel = fl air_master.active_hotspots.Add(src) + for(var/mob/living/L in loc) + L.fire_act() + + /obj/fire/Del() if (istype(loc, /turf/simulated))