cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makes burn_state use defines

Browse Source
This commit is contained in:
KorPhaeron
2015-12-13 05:36:55 -06:00
parent 1019b057c5
commit d8a37204e7
87 changed files with 179 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/__DEFINES/misc.dm
View File

@@ -303,3 +303,9 @@ var/list/bloody_footprints_cache = list()
#define SENTIENCE_ORGANIC 1
#define SENTIENCE_ARTIFICIAL 2
#define SENTIENCE_OTHER 3
//Fire stuff, for burn_state
#define LAVA_PROOF -2
#define FIRE_PROOF -1
#define FLAMMABLE 0
#define ON_FIRE 1

2
code/controllers/subsystem/objects.dm
View File

@@ -39,7 +39,7 @@ var/datum/subsystem/objects/SSobj
continue
SSobj.processing.Remove(thing)
for(var/obj/burningobj in SSobj.burning)
if(burningobj && (burningobj.burn_state == 1))
if(burningobj && (burningobj.burn_state == ON_FIRE))
if(burningobj.burn_world_time < world.time)
burningobj.burn()
else

2
code/game/gamemodes/wizard/artefact.dm
View File

@@ -495,7 +495,7 @@ var/global/list/multiverse = list()
var/cooldown_time = 30 //3s
var/cooldown = 0
burntime = 0
burn_state = 0
burn_state = FLAMMABLE
/obj/item/voodoo/attackby(obj/item/I, mob/user, params)
if(target && cooldown < world.time)

2
code/game/machinery/syndicatebomb.dm
View File

@@ -182,7 +182,7 @@
item_state = "eshield0"
w_class = 3
origin_tech = "syndicate=6;combat=5"
burn_state = 0 //Burnable (but the casing isn't)
burn_state = FLAMMABLE //Burnable (but the casing isn't)
var/adminlog = null
/obj/item/weapon/bombcore/ex_act(severity, target) //Little boom can chain a big boom

2
code/game/objects/buckling.dm
View File

@@ -49,7 +49,7 @@
/obj/buckle_mob(mob/living/M, force = 0)
. = ..()
if(.)
if(burn_state == 1) //Sets the mob on fire if you buckle them to a burning atom/movableect
if(burn_state == FLAMMABLE) //Sets the mob on fire if you buckle them to a burning atom/movableect
M.adjust_fire_stacks(1)
M.IgniteMob()

2
code/game/objects/effects/decals/contraband.dm
View File

@@ -103,7 +103,7 @@ list(name = "- Carbon Dioxide", desc = " This informational poster teaches the v
desc = "You probably shouldn't be holding this."
icon = 'icons/obj/contraband.dmi'
force = 0
burn_state = 0 //Burnable
burn_state = FLAMMABLE
var/serial_number = 0
var/obj/structure/sign/poster/resulting_poster = null //The poster that will be created is initialised and stored through contraband/poster's constructor
var/official = 0

2
code/game/objects/items.dm
View File

@@ -205,7 +205,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s
/obj/item/attack_hand(mob/user)
if (!user) return
if(burn_state == 1)
if(burn_state == FLAMMABLE)
var/mob/living/carbon/human/H = user
if(istype(H))
if(H.gloves && (H.gloves.max_heat_protection_temperature > 360))

2
code/game/objects/items/devices/instruments.dm
View File

@@ -1,7 +1,7 @@
//copy pasta of the space piano, don't hurt me -Pete
/obj/item/device/instrument
name = "generic instrument"
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 20
var/datum/song/handheld/song
var/instrumentId = "generic"

2
code/game/objects/items/devices/pizza_bomb.dm
View File

@@ -4,7 +4,7 @@
icon = 'icons/obj/food/containers.dmi'
icon_state = "pizzabox1"
item_state = "pizzabox"
burn_state = 0 //Burnable
burn_state = FLAMMABLE
var/timer = 10 //Adjustable timer
var/timer_set = 0
var/primed = 0

2
code/game/objects/items/stacks/cash.dm
View File

@@ -10,7 +10,7 @@
throw_speed = 2
throw_range = 2
w_class = 1
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/obj/item/stack/spacecash/c10
icon_state = "spacecash10"

2
code/game/objects/items/stacks/medical.dm
View File

@@ -7,7 +7,7 @@
w_class = 1
throw_speed = 3
throw_range = 7
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 5
var/heal_brute = 0
var/heal_burn = 0

2
code/game/objects/items/stacks/sheets/mineral.dm
View File

@@ -118,7 +118,7 @@ var/global/list/datum/stack_recipe/uranium_recipes = list ( \
throw_range = 3
origin_tech = "plasmatech=2;materials=2"
sheettype = "plasma"
burn_state = 0
burn_state = FLAMMABLE
burntime = 5
materials = list(MAT_PLASMA=MINERAL_MATERIAL_AMOUNT)

6
code/game/objects/items/stacks/sheets/sheet_types.dm
View File

@@ -115,7 +115,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
icon = 'icons/obj/items.dmi'
origin_tech = "materials=1;biotech=1"
sheettype = "wood"
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/obj/item/stack/sheet/mineral/wood/New(var/loc, var/amount=null)
recipes = wood_recipes
@@ -130,7 +130,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
singular_name = "cloth roll"
icon_state = "sheet-cloth"
origin_tech = "materials=2"
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/*
* Cardboard
@@ -153,7 +153,7 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list ( \
singular_name = "cardboard sheet"
icon_state = "sheet-card"
origin_tech = "materials=1"
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/obj/item/stack/sheet/cardboard/New(var/loc, var/amount=null)
recipes = cardboard_recipes

8
code/game/objects/items/stacks/tiles/tile_types.dm
View File

@@ -70,7 +70,7 @@
icon_state = "tile_grass"
origin_tech = "biotech=1"
turf_type = /turf/simulated/floor/grass
burn_state = 0 //Burnable
burn_state = FLAMMABLE
//Wood
@@ -81,7 +81,7 @@
icon_state = "tile-wood"
origin_tech = "biotech=1"
turf_type = /turf/simulated/floor/wood
burn_state = 0 //Burnable
burn_state = FLAMMABLE
//Carpets
@@ -91,7 +91,7 @@
desc = "A piece of carpet. It is the same size as a floor tile."
icon_state = "tile-carpet"
turf_type = /turf/simulated/floor/carpet
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/obj/item/stack/tile/fakespace
@@ -100,7 +100,7 @@
desc = "A piece of carpet with a convincing star pattern."
icon_state = "tile_space"
turf_type = /turf/simulated/floor/fakespace
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/obj/item/stack/tile/fakespace/loaded
amount = 30

14
code/game/objects/items/toys.dm
View File

@@ -270,7 +270,7 @@
item_state = "arm_blade"
attack_verb = list("pricked", "absorbed", "gored")
w_class = 2
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/*
@@ -709,7 +709,7 @@
/obj/item/toy/cards
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 5
var/parentdeck = null
var/deckstyle = "nanotrasen"
@@ -953,8 +953,8 @@
newobj.card_throw_speed = sourceobj.card_throw_speed
newobj.card_throw_range = sourceobj.card_throw_range
newobj.card_attack_verb = sourceobj.card_attack_verb
if(sourceobj.burn_state == -1)
newobj.burn_state = -1
if(sourceobj.burn_state == FIRE_PROOF)
newobj.burn_state = FIRE_PROOF
/obj/item/toy/cards/singlecard
name = "card"
@@ -1070,7 +1070,7 @@
card_throw_speed = 3
card_throw_range = 7
card_attack_verb = list("attacked", "sliced", "diced", "slashed", "cut")
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF
/*
* Fake nuke
@@ -1130,7 +1130,7 @@
item_state = "carp_plushie"
w_class = 2
attack_verb = list("bitten", "eaten", "fin slapped")
burn_state = 0 //Burnable
burn_state = FLAMMABLE
var/bitesound = 'sound/weapons/bite.ogg'
//Attack mob
@@ -1220,7 +1220,7 @@
icon_state = "toy_mouse"
w_class = 2.0
var/cooldown = 0
burn_state = 0 // Burnable
burn_state = FLAMMABLE
/*

9
code/game/objects/items/trash.dm
View File

@@ -3,7 +3,7 @@
icon = 'icons/obj/janitor.dmi'
desc = "This is rubbish."
w_class = 1
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/obj/item/trash/raisins
name = "\improper 4no raisins"
@@ -40,7 +40,7 @@
/obj/item/trash/plate
name = "plate"
icon_state = "plate"
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF
/obj/item/trash/pistachios
name = "pistachios pack"
@@ -53,7 +53,7 @@
/obj/item/trash/tray
name = "tray"
icon_state = "tray"
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF
/obj/item/trash/candle
name = "candle"
@@ -63,7 +63,6 @@
/obj/item/trash/can
name = "crushed can"
icon_state = "cola"
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF
/obj/item/trash/attack(mob/M, mob/living/user)
return

4
code/game/objects/items/weapons/courtroom.dm
View File

@@ -11,7 +11,7 @@
throwforce = 6
w_class = 2
attack_verb = list("bashed", "battered", "judged", "whacked")
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/obj/item/weapon/gavelhammer/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] has sentenced \himself to death with the [src.name]! It looks like \he's trying to commit suicide.</span>")
@@ -26,7 +26,7 @@
force = 2
throwforce = 2
w_class = 1
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/obj/item/weapon/gavelblock/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/gavelhammer))

4
code/game/objects/items/weapons/gift_wrappaper.dm
View File

@@ -13,7 +13,7 @@
icon = 'icons/obj/storage.dmi'
icon_state = "giftcrate3"
item_state = "gift1"
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/obj/item/weapon/a_gift/New()
..()
@@ -88,7 +88,7 @@
flags = NOBLUDGEON
amount = 25
max_amount = 25
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/obj/item/stack/wrapping_paper/attack_self(mob/user)
user << "<span class='warning'>You need to use it on a package that has already been wrapped!</span>"

2
code/game/objects/items/weapons/grenades/grenade.dm
View File

@@ -9,7 +9,7 @@
throw_range = 7
flags = CONDUCT
slot_flags = SLOT_BELT
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 5
var/active = 0
var/det_time = 50

2
code/game/objects/items/weapons/mop.dm
View File

@@ -11,7 +11,7 @@
throw_range = 7
w_class = 3
attack_verb = list("mopped", "bashed", "bludgeoned", "whacked")
burn_state = 0 //Burnable
burn_state = FLAMMABLE
var/mopping = 0
var/mopcount = 0
var/mopcap = 5

2
code/game/objects/items/weapons/paint.dm
View File

@@ -10,7 +10,7 @@
item_color = "FFFFFF"
item_state = "paintcan"
w_class = 3
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 5
var/paintleft = 10

2
code/game/objects/items/weapons/scrolls.dm
View File

@@ -9,7 +9,7 @@
throw_speed = 3
throw_range = 7
origin_tech = "bluespace=4"
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/obj/item/weapon/teleportation_scroll/apprentice
name = "lesser scroll of teleportation"

2
code/game/objects/items/weapons/signs.dm
View File

@@ -5,7 +5,7 @@
force = 5
w_class = 4
attack_verb = list("bashed","smacked")
burn_state = 0 //Burnable
burn_state = FLAMMABLE
var/label = ""
var/last_wave = 0

22
code/game/objects/items/weapons/storage/backpack.dm
View File

@@ -19,7 +19,7 @@
max_w_class = 3
max_combined_w_class = 21
storage_slots = 21
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 20
/obj/item/weapon/storage/backpack/attackby(obj/item/weapon/W, mob/user, params)
@@ -37,7 +37,7 @@
icon_state = "holdingpack"
max_w_class = 5
max_combined_w_class = 35
burn_state = -1 // NotBurnable
burn_state = FIRE_PROOF
var/pshoom = 'sound/items/PSHOOM.ogg'
var/alt_sound = 'sound/items/PSHOOM_2.ogg'
@@ -148,14 +148,14 @@
desc = "It's a special backpack made exclusively for Nanotrasen officers."
icon_state = "captainpack"
item_state = "captainpack"
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF
/obj/item/weapon/storage/backpack/industrial
name = "industrial backpack"
desc = "It's a tough backpack for the daily grind of station life."
icon_state = "engiepack"
item_state = "engiepack"
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF
/obj/item/weapon/storage/backpack/botany
name = "botany backpack"
@@ -180,7 +180,7 @@
desc = "A specially designed backpack. It's fire resistant and smells vaguely of plasma."
icon_state = "toxpack"
item_state = "toxpack"
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF
/obj/item/weapon/storage/backpack/virology
name = "virology backpack"
@@ -197,7 +197,7 @@
name = "leather satchel"
desc = "It's a very fancy satchel made with fine leather."
icon_state = "satchel"
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF
/obj/item/weapon/storage/backpack/satchel/withwallet/New()
..()
@@ -213,7 +213,7 @@
desc = "A tough satchel with extra pockets."
icon_state = "satchel-eng"
item_state = "engiepack"
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF
/obj/item/weapon/storage/backpack/satchel_med
name = "medical satchel"
@@ -244,7 +244,7 @@
desc = "Useful for holding research materials."
icon_state = "satchel-tox"
item_state = "satchel-tox"
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF
/obj/item/weapon/storage/backpack/satchel_hyd
name = "botanist satchel"
@@ -263,7 +263,7 @@
desc = "An exclusive satchel for Nanotrasen officers."
icon_state = "satchel-cap"
item_state = "captainpack"
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF
/obj/item/weapon/storage/backpack/satchel_flat
name = "smuggler's satchel"
@@ -361,7 +361,7 @@
desc = "A large dufflebag for holding extra captainly goods."
icon_state = "duffle-captain"
item_state = "duffle-captain"
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF
/obj/item/weapon/storage/backpack/dufflebag/med
name = "medical dufflebag"
@@ -380,7 +380,7 @@
desc = "A large dufflebag for holding extra tools and supplies."
icon_state = "duffle-eng"
item_state = "duffle-eng"
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF
/obj/item/weapon/storage/backpack/dufflebag/clown
name = "clown's dufflebag"

8
code/game/objects/items/weapons/storage/bags.dm
View File

@@ -111,7 +111,7 @@
max_w_class = 3
w_class = 1
can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/grown,/obj/item/seeds,/obj/item/weapon/grown)
burn_state = 0 //Burnable
burn_state = FLAMMABLE
////////
@@ -289,7 +289,7 @@
max_w_class = 3
w_class = 4 //Bigger than a book because physics
can_hold = list(/obj/item/weapon/book, /obj/item/weapon/storage/book, /obj/item/weapon/spellbook)
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/*
* Trays - Agouri
@@ -359,7 +359,7 @@
w_class = 1
preposition = "in"
can_hold = list(/obj/item/weapon/reagent_containers/pill, /obj/item/weapon/reagent_containers/glass/beaker, /obj/item/weapon/reagent_containers/glass/bottle)
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/*
* Biowaste bag (mostly for xenobiologists)
@@ -375,4 +375,4 @@
w_class = 1
preposition = "in"
can_hold = list(/obj/item/slime_extract, /obj/item/weapon/reagent_containers/syringe, /obj/item/weapon/reagent_containers/glass/beaker, /obj/item/weapon/reagent_containers/glass/bottle, /obj/item/weapon/reagent_containers/blood, /obj/item/weapon/reagent_containers/hypospray/medipen, /obj/item/trash/deadmouse)
burn_state = 0 //Burnable
burn_state = FLAMMABLE

2
code/game/objects/items/weapons/storage/book.dm
View File

@@ -6,7 +6,7 @@
throw_speed = 2
throw_range = 5
w_class = 3
burn_state = 0 //Burnable
burn_state = FLAMMABLE
var/title = "book"
/obj/item/weapon/storage/book/attack_self(mob/user)
user << "<span class='notice'>The pages of [title] have been cut out!</span>"

2
code/game/objects/items/weapons/storage/boxes.dm
View File

@@ -24,7 +24,7 @@
desc = "It's just an ordinary box."
icon_state = "box"
item_state = "syringe_kit"
burn_state = 0 //Burnable
burn_state = FLAMMABLE
var/foldable = /obj/item/stack/sheet/cardboard

2
code/game/objects/items/weapons/storage/briefcase.dm
View File

@@ -11,7 +11,7 @@
max_w_class = 3
max_combined_w_class = 21
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 20
/obj/item/weapon/storage/briefcase/New()

2
code/game/objects/items/weapons/storage/fancy.dm
View File

@@ -17,7 +17,7 @@
icon = 'icons/obj/food/containers.dmi'
icon_state = "donutbox6"
name = "donut box"
burn_state = 0 //Burnable
burn_state = FLAMMABLE
var/icon_type = "donut"
var/spawn_type = null

2
code/game/objects/items/weapons/storage/wallets.dm
View File

@@ -4,7 +4,7 @@
storage_slots = 4
icon_state = "wallet"
w_class = 2
burn_state = 0 //Burnable
burn_state = FLAMMABLE
can_hold = list(
/obj/item/stack/spacecash,
/obj/item/weapon/card,

4
code/game/objects/items/weapons/weaponry.dm
View File

@@ -240,14 +240,14 @@
w_class = 2
flags = NOSHIELD
attack_verb = list("bludgeoned", "whacked", "disciplined")
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/obj/item/weapon/staff/broom
name = "broom"
desc = "Used for sweeping, and flying into the night while cackling. Black cat not included."
icon = 'icons/obj/wizard.dmi'
icon_state = "broom"
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/obj/item/weapon/staff/stick
name = "stick"

8
code/game/objects/objs.dm
View File

@@ -9,7 +9,7 @@
var/damtype = "brute"
var/force = 0
var/burn_state = -1 // -1=fireproof | 0=will burn in fires | 1=currently on fire
var/burn_state = FIRE_PROOF // LAVA_PROOF | FIRE_PROOF | FLAMMABLE | ON_FIRE
var/burntime = 10 //How long it takes to burn to ashes, in seconds
var/burn_world_time //What world time the object will burn up completely
@@ -165,7 +165,7 @@
/obj/fire_act(global_overlay=1)
if(!burn_state)
burn_state = 1
burn_state = ON_FIRE
SSobj.burning += src
burn_world_time = world.time + burntime*rand(10,20)
if(global_overlay)
@@ -180,8 +180,8 @@
qdel(src)
/obj/proc/extinguish()
if(burn_state == 1)
burn_state = 0
if(burn_state == ON_FIRE)
burn_state = FLAMMABLE
overlays -= fire_overlay
SSobj.burning -= src

4
code/game/objects/structures/artstuff.dm
View File

@@ -9,7 +9,7 @@
icon = 'icons/obj/artstuff.dmi'
icon_state = "easel"
density = 1
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 15
var/obj/item/weapon/canvas/painting = null
@@ -52,7 +52,7 @@ var/global/list/globalBlankCanvases[AMT_OF_CANVASES]
desc = "draw out your soul on this canvas!"
icon = 'icons/obj/artstuff.dmi'
icon_state = "11x11"
burn_state = 0 //Burnable
burn_state = FLAMMABLE
var/whichGlobalBackup = 1 //List index
/obj/item/weapon/canvas/nineteenXnineteen

4
code/game/objects/structures/beds_chairs/bed.dm
View File

@@ -15,7 +15,7 @@
anchored = 1
can_buckle = 1
buckle_lying = 1
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 30
var/buildstacktype = /obj/item/stack/sheet/metal
var/buildstackamount = 2
@@ -86,7 +86,7 @@
icon = 'icons/obj/rollerbed.dmi'
icon_state = "down"
anchored = 0
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF
foldabletype = /obj/item/roller
/obj/structure/bed/roller/post_buckle_mob(mob/living/M)

6
code/game/objects/structures/beds_chairs/chair.dm
View File

@@ -3,7 +3,7 @@
desc = "You sit in this. Either by will or force.\n<span class='notice'>Alt-click to rotate it clockwise.</span>"
icon_state = "chair"
buckle_lying = 0 //you sit in a chair, not lay
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF
buildstackamount = 1
/obj/structure/bed/chair/New()
@@ -85,7 +85,7 @@
// Chair types
/obj/structure/bed/chair/wood
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 20
buildstacktype = /obj/item/stack/sheet/mineral/wood
buildstackamount = 3
@@ -105,7 +105,7 @@
desc = "It looks comfy.\n<span class='notice'>Alt-click to rotate it clockwise.</span>"
icon_state = "comfychair"
color = rgb(255,255,255)
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 30
buildstackamount = 2
var/image/armrest = null

4
code/game/objects/structures/bedsheet_bin.dm
View File

@@ -17,7 +17,7 @@ LINEN BINS
throw_range = 2
w_class = 1
item_color = "white"
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/obj/item/weapon/bedsheet/attack(mob/living/M, mob/user)
@@ -175,7 +175,7 @@ LINEN BINS
icon = 'icons/obj/structures.dmi'
icon_state = "linenbin-full"
anchored = 1
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 20
var/amount = 10
var/list/sheets = list()

2
code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
View File

@@ -4,7 +4,7 @@
icon_state = "cardboard"
health = 10
mob_storage_capacity = 1
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 20
can_weld_shut = 0
cutting_tool = /obj/item/weapon/wirecutters

2
code/game/objects/structures/crates_lockers/closets/gimmick.dm
View File

@@ -2,7 +2,7 @@
name = "cabinet"
desc = "Old will forever be in fashion."
icon_state = "cabinet"
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 20
/obj/structure/closet/acloset

2
code/game/objects/structures/crates_lockers/closets/job_closets.dm
View File

@@ -117,7 +117,7 @@
name = "coffin"
desc = "It's a burial receptacle for the dearly departed."
icon_state = "coffin"
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 20
/obj/structure/closet/wardrobe/red

2
code/game/objects/structures/crates_lockers/closets/secure/bar.dm
View File

@@ -2,7 +2,7 @@
name = "booze storage"
req_access = list(access_bar)
icon_state = "cabinet"
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 20
/obj/structure/closet/secure_closet/bar/New()

2
code/game/objects/structures/crates_lockers/closets/secure/personal.dm
View File

@@ -25,7 +25,7 @@
/obj/structure/closet/secure_closet/personal/cabinet
icon_state = "cabinet"
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 20
/obj/structure/closet/secure_closet/personal/cabinet/New()

2
code/game/objects/structures/crates_lockers/closets/secure/security.dm
View File

@@ -155,7 +155,7 @@
name = "\proper detective's cabinet"
req_access = list(access_forensics_lockers)
icon_state = "cabinet"
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 20
/obj/structure/closet/secure_closet/detective/New()

4
code/game/objects/structures/flora.dm
View File

@@ -1,5 +1,5 @@
/obj/structure/flora
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 30
//trees
@@ -221,7 +221,7 @@
icon_state = "rock1"
icon = 'icons/obj/flora/rocks.dmi'
anchored = 1
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF
/obj/structure/flora/rock/New()
..()

2
code/game/objects/structures/mineral_doors.dm
View File

@@ -242,7 +242,7 @@
hardness = 1
openSound = 'sound/effects/doorcreaky.ogg'
closeSound = 'sound/effects/doorcreaky.ogg'
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 30
/obj/structure/mineral_door/wood/Dismantle(devastated = 0)

2
code/game/objects/structures/signs.dm
View File

@@ -73,7 +73,7 @@
icon = 'icons/obj/decals.dmi'
icon_state = "backing"
w_class = 3
burn_state = 0 //Burnable, made of wood
burn_state = FLAMMABLE
/obj/item/sign_backing/afterattack(atom/target, mob/user, proximity)
if(!isturf(target))

2
code/game/objects/structures/table_frames.dm
View File

@@ -86,7 +86,7 @@
icon_state = "wood_frame"
framestack = /obj/item/stack/sheet/mineral/wood
framestackamount = 2
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/obj/structure/table_frame/wood/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/wrench))

2
code/game/objects/structures/tables_racks.dm
View File

@@ -309,7 +309,7 @@
frame = /obj/structure/table_frame/wood
framestack = /obj/item/stack/sheet/mineral/wood
buildstack = /obj/item/stack/sheet/mineral/wood
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 20
canSmoothWith = list(/obj/structure/table/wood, /obj/structure/table/wood/poker)

4
code/game/turfs/simulated/floor/plating.dm
View File

@@ -208,8 +208,8 @@
if(istype(O, /obj/effect/decal/cleanable/ash)) //So we don't get stuck burning the same ash pile forever
qdel(O)
return
if(O.burn_state == -1)
O.burn_state = 0 //Even fireproof things burn up in lava
if(O.burn_state == FIRE_PROOF)
O.burn_state = FLAMMABLE //Even fireproof things burn up in lava
O.fire_act()
else if (istype(AM, /mob/living))
var/mob/living/L = AM

12
code/modules/clothing/clothing.dm
View File

@@ -1,6 +1,6 @@
/obj/item/clothing
name = "clothing"
burn_state = 0 //Burnable
burn_state = FLAMMABLE
var/flash_protect = 0 //Malk: What level of bright light protection item has. 1 = Flashers, Flashes, & Flashbangs | 2 = Welding | -1 = OH GOD WELDING BURNT OUT MY RETINAS
var/tint = 0 //Malk: Sets the item's level of visual impairment tint, normally set to the same as flash_protect
var/up = 0 // but seperated to allow items to protect but not impair vision, like space helmets
@@ -25,7 +25,7 @@
w_class = 1
throwforce = 0
slot_flags = SLOT_EARS
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF
/obj/item/clothing/ears/earmuffs
name = "earmuffs"
@@ -35,7 +35,7 @@
flags = EARBANGPROTECT
strip_delay = 15
put_on_delay = 25
burn_state = 0 //Burnable
burn_state = FLAMMABLE
//Glasses
/obj/item/clothing/glasses
@@ -52,7 +52,7 @@
var/list/icon/current = list() //the current hud icons
strip_delay = 20
put_on_delay = 25
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF
/*
SEE_SELF // can see self, no matter what
SEE_MOBS // can see all mobs, no matter what
@@ -240,7 +240,7 @@ BLIND // can't see anything
strip_delay = 50
put_on_delay = 50
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF
/obj/item/clothing/suit/space
name = "space suit"
@@ -262,7 +262,7 @@ BLIND // can't see anything
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
strip_delay = 80
put_on_delay = 80
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF
//Under clothing

10
code/modules/clothing/gloves/color.dm
View File

@@ -6,7 +6,7 @@
siemens_coefficient = 0
permeability_coefficient = 0.05
item_color="yellow"
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
/obj/item/clothing/gloves/color/yellow/fake
desc = "These gloves will protect the wearer from electric shock. They don't feel like rubber..."
@@ -20,7 +20,7 @@
siemens_coefficient = 1 //Set to a default of 1, gets overridden in New()
permeability_coefficient = 0.05
item_color="yellow"
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
/obj/item/clothing/gloves/color/fyellow/New()
siemens_coefficient = pick(0,0.5,0.5,0.5,0.5,0.75,1.5)
@@ -35,7 +35,7 @@
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
/obj/item/clothing/gloves/color/black/hos
item_color = "hosred" //Exists for washing machines. Is not different from black gloves in any way.
@@ -71,7 +71,7 @@
desc = "These gloves will protect the wearer from electric shock."
siemens_coefficient = 0
permeability_coefficient = 0.05
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
/obj/item/clothing/gloves/color/rainbow
name = "rainbow gloves"
@@ -157,7 +157,7 @@
permeability_coefficient = 0.01
item_color="white"
transfer_prints = TRUE
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
/obj/item/clothing/gloves/color/latex/nitrile
name = "nitrile gloves"

4
code/modules/clothing/gloves/miscellaneous.dm
View File

@@ -21,7 +21,7 @@
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF
/obj/item/clothing/gloves/combat
name = "combat gloves"
@@ -35,4 +35,4 @@
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF

6
code/modules/clothing/head/collectable.dm
View File

@@ -58,7 +58,7 @@
desc = "A collectable welding helmet. Now with 80% less lead! Not for actual welding. Any welding done while wearing this helmet is done so at the owner's own risk!"
icon_state = "welding"
item_state = "welding"
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
/obj/item/clothing/head/collectable/slime
name = "collectable slime hat"
@@ -111,11 +111,11 @@
desc = "Go Red! I mean Green! I mean Red! No Green!"
icon_state = "thunderdome"
item_state = "thunderdome"
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
/obj/item/clothing/head/collectable/swat
name = "collectable SWAT helmet"
desc = "That's not real blood. That's red paint." //Reference to the actual description
icon_state = "swat"
item_state = "swat"
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF

2
code/modules/clothing/head/hardhat.dm
View File

@@ -9,7 +9,7 @@
armor = list(melee = 15, bullet = 5, laser = 20,energy = 10, bomb = 20, bio = 10, rad = 20)
flags_inv = 0
action_button_name = "Toggle Helmet Light"
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
/obj/item/clothing/head/hardhat/attack_self(mob/user)
if(!isturf(user.loc))

2
code/modules/clothing/head/helmet.dm
View File

@@ -11,7 +11,7 @@
heat_protection = HEAD
max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT
strip_delay = 60
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
flags_cover = HEADCOVERSEYES

2
code/modules/clothing/head/misc.dm
View File

@@ -222,7 +222,7 @@
throw_range = 5
w_class = 2
attack_verb = list("warned", "cautioned", "smashed")
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
/obj/item/clothing/head/santa
name = "santa hat"

2
code/modules/clothing/head/misc_special.dm
View File

@@ -25,7 +25,7 @@
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
action_button_name = "Toggle Welding Helmet"
visor_flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
/obj/item/clothing/head/welding/attack_self()
toggle()

2
code/modules/clothing/masks/breath.dm
View File

@@ -12,7 +12,7 @@
action_button_name = "Adjust Breath Mask"
ignore_maskadjust = 0
flags_cover = MASKCOVERSMOUTH
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
/obj/item/clothing/mask/breath/attack_self(mob/user)
adjustmask(user)

16
code/modules/clothing/masks/gasmask.dm
View File

@@ -9,7 +9,7 @@
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
// **** Welding gas mask ****
@@ -73,7 +73,7 @@
icon_state = "clown"
item_state = "clown_hat"
flags_cover = MASKCOVERSEYES
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/obj/item/clothing/mask/gas/clown_hat/attack_self(mob/user)
@@ -98,7 +98,7 @@
icon_state = "sexyclown"
item_state = "sexyclown"
flags_cover = MASKCOVERSEYES
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/obj/item/clothing/mask/gas/mime
name = "mime mask"
@@ -107,7 +107,7 @@
icon_state = "mime"
item_state = "mime"
flags_cover = MASKCOVERSEYES
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/obj/item/clothing/mask/gas/monkeymask
name = "monkey mask"
@@ -116,7 +116,7 @@
icon_state = "monkeymask"
item_state = "monkeymask"
flags_cover = MASKCOVERSEYES
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/obj/item/clothing/mask/gas/sexymime
name = "sexy mime mask"
@@ -125,7 +125,7 @@
icon_state = "sexymime"
item_state = "sexymime"
flags_cover = MASKCOVERSEYES
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/obj/item/clothing/mask/gas/death_commando
name = "Death Commando Mask"
@@ -136,7 +136,7 @@
name = "cyborg visor"
desc = "Beep boop."
icon_state = "death"
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/obj/item/clothing/mask/gas/owl_mask
name = "owl mask"
@@ -144,7 +144,7 @@
icon_state = "owl"
flags = MASKINTERNALS
flags_cover = MASKCOVERSEYES
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/obj/item/clothing/mask/gas/carp
name = "carp mask"

2
code/modules/clothing/shoes/magboots.dm
View File

@@ -8,7 +8,7 @@
action_button_name = "Toggle Magboots"
strip_delay = 70
put_on_delay = 70
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
origin_tech = "magnets=2"
/obj/item/clothing/shoes/magboots/verb/toggle()

8
code/modules/clothing/shoes/miscellaneous.dm
View File

@@ -15,7 +15,7 @@
permeability_coefficient = 0.05
flags = NOSLIP
origin_tech = "syndicate=3"
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
/obj/item/clothing/shoes/sneakers/mime
name = "mime shoes"
@@ -29,7 +29,7 @@
item_state = "jackboots"
armor = list(melee = 25, bullet = 25, laser = 25, energy = 25, bomb = 50, bio = 10, rad = 0)
strip_delay = 70
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
/obj/item/clothing/shoes/combat/swat //overpowered boots for death squads
name = "\improper SWAT boots"
@@ -60,7 +60,7 @@
slowdown = SHOES_SLOWDOWN+1
strip_delay = 50
put_on_delay = 50
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
/obj/item/clothing/shoes/galoshes/dry
name = "absorbent galoshes"
@@ -96,7 +96,7 @@
item_color = "hosred"
strip_delay = 50
put_on_delay = 50
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
/obj/item/clothing/shoes/winterboots
name = "winter boots"

6
code/modules/clothing/suits/armor.dm
View File

@@ -7,7 +7,7 @@
max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
strip_delay = 60
put_on_delay = 40
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
/obj/item/clothing/suit/armor/vest
name = "armor"
@@ -46,7 +46,7 @@
cold_protection = CHEST|GROIN|ARMS|HANDS
heat_protection = CHEST|GROIN|ARMS|HANDS
strip_delay = 70
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/obj/item/clothing/suit/armor/vest/warden/alt
name = "warden's armored jacket"
@@ -119,7 +119,7 @@
desc = "An armored vest with a detective's badge on it."
icon_state = "detective-armor"
allowed = list(/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder)
burn_state = 0 //Burnable
burn_state = FLAMMABLE
//Reactive armor

4
code/modules/clothing/suits/bio.dm
View File

@@ -8,7 +8,7 @@
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20)
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
unacidable = 1
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
/obj/item/clothing/suit/bio_suit
@@ -28,7 +28,7 @@
strip_delay = 70
put_on_delay = 70
unacidable = 1
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF
//Standard biosuit, orange stripe
/obj/item/clothing/head/bio_hood/general

2
code/modules/clothing/suits/jobs.dm
View File

@@ -100,7 +100,7 @@
item_state = "hazard"
blood_overlay_type = "armor"
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/device/t_scanner,)
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
//Lawyer
/obj/item/clothing/suit/toggle/lawyer

8
code/modules/clothing/suits/miscellaneous.dm
View File

@@ -16,7 +16,7 @@
blood_overlay_type = "armor"
body_parts_covered = CHEST
allowed = list (/obj/item/weapon/gun/energy/laser/bluetag)
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
/obj/item/clothing/suit/redtag
name = "red laser tag armor"
@@ -26,7 +26,7 @@
blood_overlay_type = "armor"
body_parts_covered = CHEST
allowed = list (/obj/item/weapon/gun/energy/laser/redtag)
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
/*
* Costume
@@ -91,7 +91,7 @@
w_class = 3
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/toy)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
/obj/item/clothing/suit/hastur
name = "\improper Hastur's robe"
@@ -290,7 +290,7 @@
desc = "Pompadour not included."
icon_state = "leatherjacket"
item_state = "hostrench"
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF
max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/toy,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/weapon/gun/projectile/automatic/pistol,/obj/item/weapon/gun/projectile/revolver,/obj/item/weapon/gun/projectile/revolver/detective)

10
code/modules/clothing/suits/utility.dm
View File

@@ -28,7 +28,7 @@
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
strip_delay = 60
put_on_delay = 60
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF
/obj/item/clothing/suit/fire/firefighter
icon_state = "firesuit"
@@ -66,7 +66,7 @@
strip_delay = 70
put_on_delay = 70
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF
/obj/item/clothing/suit/bomb_suit
name = "bomb suit"
@@ -87,7 +87,7 @@
min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
strip_delay = 70
put_on_delay = 70
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF
/obj/item/clothing/head/bomb_hood/security
@@ -112,7 +112,7 @@
strip_delay = 60
put_on_delay = 60
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF
/obj/item/clothing/suit/radiation
name = "radiation suit"
@@ -130,4 +130,4 @@
strip_delay = 60
put_on_delay = 60
flags_inv = HIDEJUMPSUIT
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF

10
code/modules/clothing/suits/wiz_robe.dm
View File

@@ -8,7 +8,7 @@
strip_delay = 50
put_on_delay = 50
unacidable = 1
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
/obj/item/clothing/head/wizard/red
name = "red wizard hat"
@@ -64,7 +64,7 @@
strip_delay = 50
put_on_delay = 50
unacidable = 1
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
/obj/item/clothing/suit/wizrobe/red
name = "red wizard robe"
@@ -118,7 +118,7 @@
permeability_coefficient = 1
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
unacidable = 0
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/obj/item/clothing/head/wizard/marisa/fake
name = "witch hat"
@@ -128,7 +128,7 @@
permeability_coefficient = 1
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
unacidable = 0
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/obj/item/clothing/suit/wizrobe/marisa/fake
name = "witch robe"
@@ -139,4 +139,4 @@
permeability_coefficient = 1
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
unacidable = 0
burn_state = 0 //Burnable
burn_state = FLAMMABLE

2
code/modules/clothing/under/chameleon.dm
View File

@@ -11,7 +11,7 @@
random_sensor = 0
var/list/clothing_choices = list()
var/malfunctioning = 0
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
/obj/item/clothing/under/chameleon/New()
..()

2
code/modules/clothing/under/color.dm
View File

@@ -15,7 +15,7 @@
icon_state = "black"
item_state = "bl_suit"
item_color = "black"
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
/obj/item/clothing/under/color/grey
name = "grey jumpsuit"

4
code/modules/clothing/under/jobs/engineering.dm
View File

@@ -6,7 +6,7 @@
item_state = "gy_suit"
item_color = "chief"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
/obj/item/clothing/under/rank/atmospheric_technician
desc = "It's a jumpsuit worn by atmospheric technicians."
@@ -14,7 +14,7 @@
icon_state = "atmos"
item_state = "atmos_suit"
item_color = "atmos"
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
/obj/item/clothing/under/rank/engineer
desc = "It's an orange high visibility jumpsuit worn by engineers. It has minor radiation shielding."

8
code/modules/clothing/under/miscellaneous.dm
View File

@@ -37,7 +37,7 @@
item_state = "armor"
can_adjust = 0
strip_delay = 100
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
/obj/item/clothing/under/waiter
name = "waiter's outfit"
@@ -117,7 +117,7 @@
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
can_adjust = 0
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
/obj/item/clothing/under/acj
name = "administrative cybernetic jumpsuit"
@@ -134,7 +134,7 @@
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
can_adjust = 0
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
/obj/item/clothing/under/owl
name = "owl uniform"
@@ -359,7 +359,7 @@
body_parts_covered = CHEST|GROIN|ARMS
fitted = NO_FEMALE_UNIFORM
can_adjust = 0
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
/obj/item/clothing/under/sundress
name = "sundress"

2
code/modules/clothing/under/ties.dm
View File

@@ -85,7 +85,7 @@
icon_state = "bronze"
item_color = "bronze"
materials = list(MAT_METAL=1000)
burn_state = -1 //Won't burn in fires
burn_state = FIRE_PROOF
//Pinning medals on people
/obj/item/clothing/tie/medal/attack(mob/living/carbon/human/M, mob/living/user)

2
code/modules/food&drinks/drinks/drinks.dm
View File

@@ -10,7 +10,7 @@
var/gulp_size = 5 //This is now officially broken ... need to think of a nice way to fix it.
possible_transfer_amounts = list(5,10,25)
volume = 50
burn_state = -1
burn_state = FIRE_PROOF
/obj/item/weapon/reagent_containers/food/drinks/New()
..()

2
code/modules/food&drinks/drinks/drinks/drinkingglass.dm
View File

@@ -6,7 +6,7 @@
icon_state = "glass_empty"
amount_per_transfer_from_this = 10
volume = 50
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 5
spillable = 1

2
code/modules/food&drinks/food.dm
View File

@@ -4,7 +4,7 @@
/obj/item/weapon/reagent_containers/food
possible_transfer_amounts = list()
volume = 50 //Sets the default container amount for all food items.
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/obj/item/weapon/reagent_containers/food/New()
..()

2
code/modules/holodeck/area_copy.dm
View File

@@ -21,7 +21,7 @@
O.vars[V] = original.vars[V]
if(istype(O))
O.burn_state = -1 // holoitems do not burn
O.burn_state = FIRE_PROOF // holoitems do not burn
if(nerf && istype(O,/obj/item))
var/obj/item/I = O
I.damtype = STAMINA // thou shalt not

2
code/modules/hydroponics/grown.dm
View File

@@ -20,7 +20,7 @@
icon = 'icons/obj/hydroponics/harvest.dmi'
potency = -1
dried_type = -1 //bit different. saves us from having to define each stupid grown's dried_type as itself. If you don't want a plant to be driable (watermelons) set this to null in the time definition.
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/obj/item/weapon/reagent_containers/food/snacks/grown/New(newloc, new_potency = 50)
..()

2
code/modules/hydroponics/growninedible.dm
View File

@@ -5,7 +5,7 @@
/obj/item/weapon/grown // Grown weapons
name = "grown_weapon"
icon = 'icons/obj/hydroponics/harvest.dmi'
burn_state = 0 //Burnable
burn_state = FLAMMABLE
var/seed = null
var/plantname = ""
var/product //a type path

2
code/modules/hydroponics/seeds.dm
View File

@@ -7,7 +7,7 @@
icon = 'icons/obj/hydroponics/seeds.dmi'
icon_state = "seed" //Unknown plant seed - these shouldn't exist in-game.
w_class = 1 //Pocketable.
burn_state = 0 //Burnable
burn_state = FLAMMABLE
var/plantname = "Plants" //Name of plant when planted.
var/product //A type path. The thing that is created when the plant is harvested.
var/species = "" //Used to update icons. Should match the name in the sprites.

4
code/modules/library/lib_items.dm
View File

@@ -17,7 +17,7 @@
anchored = 0
density = 1
opacity = 0
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 30
var/state = 0
var/list/allowed_books = list(/obj/item/weapon/book, /obj/item/weapon/spellbook, /obj/item/weapon/storage/book) //Things allowed in the bookcase
@@ -167,7 +167,7 @@
throw_range = 5
w_class = 3 //upped to three because books are, y'know, pretty big. (and you could hide them inside eachother recursively forever)
attack_verb = list("bashed", "whacked", "educated")
burn_state = 0 //Burnable
burn_state = FLAMMABLE
var/dat //Actual page content
var/due_date = 0 //Game time in 1/10th seconds
var/author //Who wrote the thing, can be changed by pen or PC. It is not automatically assigned

2
code/modules/mining/money_bag.dm
View File

@@ -8,7 +8,7 @@
force = 10
throwforce = 0
w_class = 4
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 20
/obj/item/weapon/moneybag/attack_hand(mob/user)

2
code/modules/paperwork/clipboard.dm
View File

@@ -10,7 +10,7 @@
var/obj/item/weapon/pen/haspen //The stored pen.
var/obj/item/weapon/paper/toppaper //The topmost piece of paper.
slot_flags = SLOT_BELT
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/obj/item/weapon/clipboard/New()
update_icon()

2
code/modules/paperwork/folders.dm
View File

@@ -5,7 +5,7 @@
icon_state = "folder"
w_class = 2
pressure_resistance = 2
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/obj/item/weapon/folder/blue
desc = "A blue folder."

6
code/modules/paperwork/paper.dm
View File

@@ -18,7 +18,7 @@
pressure_resistance = 0
slot_flags = SLOT_HEAD
body_parts_covered = HEAD
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 5
var/info //What's actually written on the paper.
@@ -40,7 +40,7 @@
/obj/item/weapon/paper/update_icon()
if(burn_state == 1)
if(burn_state == ON_FIRE)
icon_state = "paper_onfire"
return
if(info)
@@ -283,7 +283,7 @@
/obj/item/weapon/paper/attackby(obj/item/weapon/P, mob/living/carbon/human/user, params)
..()
if(burn_state == 1)
if(burn_state == ON_FIRE)
return
if(is_blind(user))

2
code/modules/paperwork/paperbin.dm
View File

@@ -8,7 +8,7 @@
throw_speed = 3
throw_range = 7
pressure_resistance = 8
burn_state = 0 //Burnable
burn_state = FLAMMABLE
var/amount = 30 //How much paper is in the bin.
var/list/papers = new/list() //List of papers put in the bin for reference.

6
code/modules/paperwork/photography.dm
View File

@@ -17,7 +17,7 @@
icon_state = "film"
item_state = "electropack"
w_class = 1
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/*
* Photo
@@ -28,7 +28,7 @@
icon_state = "photo"
item_state = "paper"
w_class = 1
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 5
var/icon/img //Big photo image
var/scribble //Scribble on the back.
@@ -94,7 +94,7 @@
icon_state = "album"
item_state = "briefcase"
can_hold = list(/obj/item/weapon/photo)
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/*
* Camera

2
code/modules/recycling/sortingmachinery.dm
View File

@@ -117,7 +117,7 @@
flags = NOBLUDGEON
amount = 25
max_amount = 25
burn_state = 0 //burnable
burn_state = FLAMMABLE
/obj/item/stack/packageWrap/afterattack(obj/target, mob/user, proximity)

2
code/modules/research/xenobiology/xenobiology.dm
View File

@@ -347,7 +347,7 @@
C.color = "#000080"
C.max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
C.heat_protection = C.body_parts_covered
C.burn_state = -1
C.burn_state = FIRE_PROOF
uses --
if(!uses)
qdel(src)