Merge pull request #1612 from Citadel-Station-13/upstream-merge-28456

[MIRROR] Knocked-over chairs have materials.
2017-06-16 11:08:35 -05:00
parent 09a43466b0 c97658e39a
commit 63ae7e2d58
1 changed files with 2 additions and 0 deletions
@@ -234,6 +234,7 @@
 	throw_range = 3
 	hitsound = 'sound/items/trayhit1.ogg'
 	hit_reaction_chance = 50
+	materials = list(MAT_METAL = 2000)
 	var/break_chance = 5 //Likely hood of smashing the chair.
 	var/obj/structure/chair/origin_type = /obj/structure/chair

@@ -317,6 +318,7 @@
 	max_integrity = 70
 	hitsound = 'sound/weapons/genhit1.ogg'
 	origin_type = /obj/structure/chair/wood
+	materials = null
 	break_chance = 50

 /obj/item/chair/wood/narsie_act()