Merge pull request #508 from Markolie/master

Fixes grilles, constructable machine upgrade, proper hardsuit conversion, R&D updates, constructable display case

code/game/objects/structures.dm

@@ -25,6 +25,13 @@
 /obj/structure/Destroy()
 	if(hascall(src, "unbuckle"))
 		src:unbuckle()
+		
+/obj/structure/mech_melee_attack(obj/mecha/M)
+	if(M.damtype == "brute")
+		M.occupant_message("<span class='danger'>You hit [src].</span>")
+		visible_message("<span class='danger'>[src] has been hit by [M.name].</span>")
+		return 1
+	return 0
 
 /obj/structure/New()
 	..()