Merge pull request #9934 from nukeop/rcd

Makes RCDs more useful

code/game/objects/structures/grille.dm

@@ -158,6 +158,8 @@
 			icon_state = "grille"
 			R.use(1)
 			return
+	else if(istype(W, /obj/item/weapon/rcd) && istype(loc, /turf/simulated)) //Do not attack the grille if the user is holding an RCD
+		return
 
 //window placing begin
 	else if(istype(W, /obj/item/stack/sheet/rglass) || istype(W, /obj/item/stack/sheet/glass))

code/game/objects/structures/window.dm

@@ -256,6 +256,8 @@
 			disassembled = 1
 			user << "<span class='notice'>You successfully disassemble [src].</span>"
 			qdel(src)
+	else if(istype(I, /obj/item/weapon/rcd)) //Do not attack the window if the user is holding an RCD
+		return
 
 	else
 		if(I.damtype == BRUTE || I.damtype == BURN)