Shit catches on fire now

Conflicts:
	code/ZAS/Fire.dm
	code/game/objects/items/weapons/storage/bible.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/modules/mob/living/living_defines.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/photography.dm
	code/setup.dm
This commit is contained in:
Rob Nelson
2014-07-18 06:32:15 -04:00
committed by ZomgPonies
parent dd31f75ae3
commit f7b516a5ab
17 changed files with 76 additions and 34 deletions
+2
View File
@@ -6,6 +6,8 @@
w_class = 2
pressure_resistance = 2
autoignition_temperature = 522 // Kelvin
/obj/item/weapon/folder/blue
desc = "A blue folder."
icon_state = "folder_blue"
+2 -1
View File
@@ -16,7 +16,8 @@
pressure_resistance = 1
slot_flags = SLOT_HEAD
body_parts_covered = HEAD
attack_verb = list("")
attack_verb = list("slapped")
autoignition_temperature = AUTOIGNITION_PAPER
var/info //What's actually written on the paper.
var/info_links //A different version of the paper which includes html links at fields and EOF
+13
View File
@@ -11,6 +11,19 @@
var/amount = 30 //How much paper is in the bin.
var/list/papers = new/list() //List of papers put in the bin for reference.
autoignition_temperature = 519.15 // Kelvin
/obj/item/weapon/paper_bin/ignite(var/temperature)
on_fire=1
visible_message("\The [src]'s paper bursts into flame!")
overlays += fire_sprite
spawn(rand(3,10) SECONDS)
if(!on_fire)
return
new ashtype(src.loc)
papers=0
amount=0
update_icon()
/obj/item/weapon/paper_bin/MouseDrop(mob/user as mob)
if((user == usr && (!( usr.restrained() ) && (!( usr.stat ) && (usr.contents.Find(src) || in_range(src, usr))))))
+5 -2
View File
@@ -27,8 +27,11 @@
icon_state = "photo"
item_state = "paper"
w_class = 1.0
var/icon/img //Big photo image
var/scribble //Scribble on the back.
var/icon/img //Big photo image
var/scribble //Scribble on the back.
autoignition_temperature = 530 // Kelvin
/obj/item/weapon/photo/attack_self(mob/user as mob)
examine()