mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-13 16:13:19 +01:00
fire update
enabled fire to destroy floors and objects also tweaked the behaviour of glass to enable glasslocks against fire also made fire extingiushers stop being useless
This commit is contained in:
@@ -0,0 +1,15 @@
|
||||
obj/effect/decal/cleanable/scorchmark
|
||||
//this is used as an additional visual result of fire and as a reagent holder for fuel created by burning of turfs and items.
|
||||
icon = 'icons/effects/scorchmark.dmi'
|
||||
name = "Soot"
|
||||
icon_state = "1"
|
||||
layer = TURF_LAYER+0.1
|
||||
anchored = 1
|
||||
var/amount = 0 //starts always empty and is filled by procs called by fire
|
||||
|
||||
New(newLoc,start_amount=0)
|
||||
..()
|
||||
|
||||
icon_state = pick("1","2","3","4","5","6","7","8","9")
|
||||
dir = pick(cardinal)
|
||||
amount = start_amount
|
||||
@@ -39,25 +39,25 @@ would spawn and follow the beaker, even if it is carried or thrown.
|
||||
|
||||
/obj/effect/effect/water/New()
|
||||
..()
|
||||
//var/turf/T = src.loc
|
||||
//if (istype(T, /turf))
|
||||
// T.firelevel = 0 //TODO: FIX
|
||||
var/turf/simulated/floor/T = src.loc
|
||||
if (istype(T, /turf/simulated/floor))
|
||||
T.fire_protection = world.time
|
||||
spawn( 70 )
|
||||
delete()
|
||||
return
|
||||
return
|
||||
|
||||
/obj/effect/effect/water/Del()
|
||||
//var/turf/T = src.loc
|
||||
//if (istype(T, /turf))
|
||||
// T.firelevel = 0 //TODO: FIX
|
||||
var/turf/simulated/floor/T = src.loc
|
||||
if (istype(T, /turf/simulated/floor))
|
||||
T.fire_protection = world.time
|
||||
..()
|
||||
return
|
||||
|
||||
/obj/effect/effect/water/Move(turf/newloc)
|
||||
//var/turf/T = src.loc
|
||||
//if (istype(T, /turf))
|
||||
// T.firelevel = 0 //TODO: FIX
|
||||
var/turf/simulated/floor/T = src.loc
|
||||
if (istype(T, /turf/simulated/floor))
|
||||
T.fire_protection = world.time
|
||||
if (--src.life < 1)
|
||||
//SN src = null
|
||||
delete()
|
||||
|
||||
Reference in New Issue
Block a user