Skip to content

Commit

Permalink
fire stacking pass (#12899)
Browse files Browse the repository at this point in the history
  • Loading branch information
DeltaFire15 authored May 7, 2023
1 parent ee90e40 commit f9e1000
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion code/game/objects/effects/decals/Cleanable/fuel.dm
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@
/obj/effect/decal/cleanable/liquid_fuel/proc/ignite_fuel(igniter)
if(igniter)
visible_message(span_warning("[igniter] ignites the spilled fuel!"))
new /obj/flamer_fire(loc, fire_lvl, burn_lvl, f_color)
var/turf/S = get_turf(src)
S.ignite(fire_lvl, burn_lvl, f_color)
for(var/D in CARDINAL_DIRS)
var/turf/T = get_step(S, D)
for(var/obj/effect/decal/cleanable/liquid_fuel/other in T)
Expand Down
6 changes: 4 additions & 2 deletions code/game/objects/items/explosives/grenades/marines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,14 @@
if(.)
return
RegisterSignal(stuck_to, COMSIG_MOVABLE_MOVED, PROC_REF(make_fire))
new /obj/flamer_fire(get_turf(src), 25, 25)
var/turf/T = get_turf(src)
T.ignite(25, 25)

///causes fire tiles underneath target when stuck_to
/obj/item/explosive/grenade/sticky/trailblazer/proc/make_fire(datum/source, old_loc, movement_dir, forced, old_locs)
SIGNAL_HANDLER
new /obj/flamer_fire(get_turf(src), 25, 25)
var/turf/T = get_turf(src)
T.ignite(25, 25)

/obj/item/explosive/grenade/sticky/trailblazer/clean_refs()
UnregisterSignal(stuck_to, COMSIG_MOVABLE_MOVED)
Expand Down
6 changes: 4 additions & 2 deletions code/game/objects/structures/mineral_doors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -149,14 +149,16 @@
if(istype(W, /obj/item/tool/weldingtool))
var/obj/item/tool/weldingtool/WT = W
if(WT.remove_fuel(0, user))
new /obj/flamer_fire(get_turf(src), 25, 25)
var/turf/T = get_turf(src)
T.ignite(25, 25)
visible_message(span_danger("[src] suddenly combusts!"))
return ..()


/obj/structure/mineral_door/transparent/phoron/fire_act(exposed_temperature, exposed_volume)
if(exposed_temperature > 300)
new /obj/flamer_fire(get_turf(src), 25, 25)
var/turf/T = get_turf(src)
T.ignite(25, 25)


/obj/structure/mineral_door/transparent/diamond
Expand Down

0 comments on commit f9e1000

Please sign in to comment.