Merge pull request #8195 from Cerebulon/skyratmisc

Misc. Skyrat Sprites Port

code/game/objects/structures/stool_bed_chair_nest/chairs.dm

@@ -383,6 +383,41 @@
 	base_icon = "corp_sofacorner"
 	corner_piece = TRUE
 
+//Metal benches
+
+/obj/structure/bed/chair/sofa/bench
+	name = "metal bench"
+	desc = "Almost as comfortable as waiting at a shuttle station for hours on end."
+	base_icon = "benchmiddle"
+	icon_state = "benchmiddle"
+	applies_material_colour = FALSE
+	color = null
+	var/padding_color = "#CC0000"
+
+/obj/structure/bed/chair/sofa/bench/Initialize()
+	. = ..()
+	var/mutable_appearance/MA
+	MA = mutable_appearance(icon, icon_state = "o[icon_state]")
+	// If we're north-facing, metal goes above mob, padding overlay goes below mob.
+	if((dir & NORTH) && !corner_piece)
+		plane = MOB_PLANE
+		layer = ABOVE_MOB_LAYER
+	MA.color = padding_color
+	add_overlay(MA)
+
+/obj/structure/bed/chair/sofa/bench/left
+	icon_state = "bench_left"
+	base_icon = "bench_left"
+
+/obj/structure/bed/chair/sofa/bench/right
+	icon_state = "bench_right"
+	base_icon = "bench_right"
+
+/obj/structure/bed/chair/sofa/bench/corner
+	icon_state = "benchcorner"
+	base_icon = "benchcorner"
+
+
 //color variations
 
 /obj/structure/bed/chair/sofa
@@ -517,4 +552,4 @@
 	icon_state = "sofaend_right"
 
 /obj/structure/bed/chair/sofa/orange/corner
-	icon_state = "sofacorner"
+	icon_state = "sofacorner"

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)
+	..()