Merge pull request #8195 from Cerebulon/skyratmisc

Misc. Skyrat Sprites Port

code/modules/power/singularity/containment_field.dm

@@ -3,7 +3,7 @@
 /obj/machinery/containment_field
 	name = "Containment Field"
 	desc = "An energy field."
-	icon = 'icons/obj/singularity.dmi'
+	icon = 'icons/obj/machines/field_generator.dmi'
 	icon_state = "Contain_F"
 	anchored = 1
 	density = 0

code/modules/tables/rack.dm

@@ -24,3 +24,38 @@
 /obj/structure/table/rack/holorack/dismantle(obj/item/weapon/tool/wrench/W, mob/user)
 	to_chat(user, "<span class='warning'>You cannot dismantle \the [src].</span>")
 	return
+
+/obj/structure/table/rack/steel
+	color = "#666666"
+
+/obj/structure/table/rack/steel/New()
+	material = get_material_by_name(MAT_STEEL)
+	..()
+
+//Shelves
+
+/obj/structure/table/rack/shelf
+	name = "shelving"
+	desc = "Some nice metal shelves."
+	icon_state = "shelf"
+
+/obj/structure/table/rack/shelf/steel
+	color = "#666666"
+
+/obj/structure/table/rack/shelf/steel/New()
+	material = get_material_by_name(MAT_STEEL)
+	..()
+
+//Gunrack
+// SOMEONE should add cool overlay stuff to this
+/obj/structure/table/rack/gun_rack
+	name = "gun rack"
+	desc = "Seems like you could prop up some rifles here."
+	icon_state = "gunrack"
+
+/obj/structure/table/rack/gun_rack/steel
+	color = "#666666"
+
+/obj/structure/table/rack/gun_rack/steel/New()
+	material = get_material_by_name(MAT_STEEL)
+	..()