Revert #3316 from BEF due to compile errors and (assumed) missing files.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
This commit is contained in:
Mloc-Argent
2013-07-20 18:38:00 +01:00
parent f29cd5946f
commit adc3c14779
13 changed files with 79 additions and 407 deletions
@@ -1,15 +0,0 @@
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
+9 -9
View File
@@ -39,25 +39,25 @@ would spawn and follow the beaker, even if it is carried or thrown.
/obj/effect/effect/water/New()
..()
var/turf/simulated/floor/T = src.loc
if (istype(T, /turf/simulated/floor))
T.fire_protection = world.time
//var/turf/T = src.loc
//if (istype(T, /turf))
// T.firelevel = 0 //TODO: FIX
spawn( 70 )
delete()
return
return
/obj/effect/effect/water/Del()
var/turf/simulated/floor/T = src.loc
if (istype(T, /turf/simulated/floor))
T.fire_protection = world.time
//var/turf/T = src.loc
//if (istype(T, /turf))
// T.firelevel = 0 //TODO: FIX
..()
return
/obj/effect/effect/water/Move(turf/newloc)
var/turf/simulated/floor/T = src.loc
if (istype(T, /turf/simulated/floor))
T.fire_protection = world.time
//var/turf/T = src.loc
//if (istype(T, /turf))
// T.firelevel = 0 //TODO: FIX
if (--src.life < 1)
//SN src = null
delete()
@@ -103,9 +103,6 @@ var/global/list/datum/stack_recipe/uranium_recipes = list ( \
origin_tech = "plasmatech=2;materials=2"
perunit = 2000
sheettype = "plasma"
fire_min_burn_temp = 500
fire_burn_multiplier = 3 //made of burnium
fire_fuel_worth = 0
var/global/list/datum/stack_recipe/plasma_recipes = list ( \
new/datum/stack_recipe("plasma door", /obj/structure/mineral_door/transparent/plasma, 10, one_per_turf = 1, on_floor = 1), \
@@ -117,18 +114,6 @@ var/global/list/datum/stack_recipe/plasma_recipes = list ( \
pixel_y = rand(0,4)-4
..()
/obj/item/stack/sheet/mineral/plasma/fire_burn()
//get location and check if it is in a proper ZAS zone
var/turf/simulated/floor/S = loc
if(S.zone)
var/datum/gas_mixture/air_contents = S.return_air()
if(air_contents)
air_contents.toxins += 20
air_contents.update_values()
amount -= 1
if(amount <= 0)
del src
/obj/item/stack/sheet/mineral/plastic
name = "Plastic"
icon_state = "sheet-plastic"
@@ -139,6 +124,7 @@ var/global/list/datum/stack_recipe/plasma_recipes = list ( \
throw_range = 3
origin_tech = "materials=3"
perunit = 2000
sheettype = "plastic"
var/global/list/datum/stack_recipe/plastic_recipes = list ( \
new/datum/stack_recipe("plastic crate", /obj/structure/closet/pcrate, 10, one_per_turf = 1, on_floor = 1), \
@@ -268,4 +254,4 @@ var/global/list/datum/stack_recipe/silver_recipes = list ( \
throw_speed = 3
throw_range = 3
origin_tech = "materials=4"
perunit = 2000
perunit = 2000
@@ -20,10 +20,6 @@
var/construction_cost = list("metal"=750,"glass"=75)
var/construction_time=100
fire_min_burn_temp = 1000
fire_burn_multiplier = 0.75
fire_fuel_worth = 0
suicide_act(mob/user)
viewers(user) << "\red <b>[user] is licking the electrodes of the [src.name]! It looks like \he's trying to commit suicide.</b>"
return (FIRELOSS)
@@ -118,7 +114,9 @@
g_amt = 0
/obj/item/weapon/cell/fire_burn()
viewers(src) << "\red <b>Charge: [src.charge]</b>"
var/radius = round( (sqrt(charge)/30)+0.5, 1 )
viewers(src) << "\red <b>Radius: [radius]</b>"
if (radius >= 1)
explosion(src.loc,0,0,radius)
..()
..()
+1 -13
View File
@@ -16,11 +16,6 @@
var/integrity = 3
var/volume = 70
m_amt = 3750
fire_min_burn_temp = 800
fire_burn_multiplier = 0.75
fire_fuel_worth = 0
/obj/item/weapon/tank/New()
..()
@@ -266,11 +261,4 @@
integrity--
else if(integrity < 3)
integrity++
/obj/item/weapon/tank/fire_burn()
//get location and check if it is in a proper ZAS zone
var/turf/simulated/floor/S = loc
if(S.zone)
S.assume_air(air_contents)
..()
integrity++
@@ -76,19 +76,11 @@
icon_state = "wooden_chair"
name = "wooden chair"
desc = "Old is never too old to not be in fashion."
fire_min_burn_temp = 500
fire_burn_multiplier = 1.25
fire_fuel_worth = 5
m_amt = 0
/obj/structure/stool/bed/chair/wood/wings
icon_state = "wooden_chair_wings"
name = "wooden chair"
desc = "Old is never too old to not be in fashion."
fire_min_burn_temp = 500
fire_burn_multiplier = 1.25
fire_fuel_worth = 5
m_amt = 0
/obj/structure/stool/bed/chair/wood/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W, /obj/item/weapon/wrench))
@@ -101,9 +93,6 @@
/obj/structure/stool/bed/chair/comfy
name = "comfy chair"
desc = "It looks comfy."
fire_min_burn_temp = 500
fire_burn_multiplier = 1.25
fire_fuel_worth = 4
/obj/structure/stool/bed/chair/comfy/brown
icon_state = "comfychair_brown"
@@ -6,10 +6,6 @@
anchored = 1.0
flags = FPRINT
pressure_resistance = 15
m_amt = 3750
fire_min_burn_temp = 600
fire_burn_multiplier = 1
fire_fuel_worth = 2
/obj/structure/stool/ex_act(severity)
switch(severity)
+2 -3
View File
@@ -373,9 +373,8 @@
return
/obj/structure/window/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
//Since glasslocks are the only thing you can do to prevent spreading atmos issues, this was disabled for the time being
//if(exposed_temperature > T0C + 800)
// hit(round(exposed_volume / 100), 0)
if(exposed_temperature > T0C + 800)
hit(round(exposed_volume / 100), 0)
..()