Merge pull request #895 from tigercat2000/okayletstrysomethingslightlydifferent

LINDA
This commit is contained in:
ZomgPonies
2015-04-30 13:18:48 -04:00
126 changed files with 3153 additions and 4869 deletions
-2
View File
@@ -6,8 +6,6 @@
w_class = 2
pressure_resistance = 2
autoignition_temperature = 522 // Kelvin
/obj/item/weapon/folder/blue
desc = "A blue folder."
icon_state = "folder_blue"
+2 -2
View File
@@ -10,7 +10,7 @@
pressure_resistance = 10
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)
@@ -24,7 +24,7 @@
papers=0
amount=0
update_icon()
*///LINDA shit figure out later
/obj/item/weapon/paper_bin/MouseDrop(atom/over_object)
var/mob/M = usr
if(M.restrained() || M.stat || !Adjacent(M))