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
+5
View File
@@ -20,6 +20,8 @@
opacity = 1
var/health = 50
autoignition_temperature = AUTOIGNITION_WOOD
/obj/structure/bookcase/initialize()
for(var/obj/item/I in loc)
if(istype(I, /obj/item/weapon/book))
@@ -149,6 +151,9 @@
w_class = 3 //upped to three because books are, y'know, pretty big. (and you could hide them inside eachother recursively forever)
flags = FPRINT | TABLEPASS
attack_verb = list("bashed", "whacked", "educated")
autoignition_temperature = AUTOIGNITION_PAPER
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