Merge pull request #18 from ARF-SS13/fenwork

Fixes the bar piano

_maps/map_files/coyote_bayou/foxybar.dmm

@@ -4508,7 +4508,6 @@
 /obj/structure/sign/poster/contraband/pinup_bed{
 	pixel_x = -32
 	},
-/obj/structure/piano/fancy,
 /obj/effect/turf_decal/siding/wood{
 	dir = 8;
 	color = "#3B2B1A"
@@ -4517,13 +4516,14 @@
 	dir = 1;
 	color = "#3B2B1A"
 	},
+/obj/effect/turf_decal/siding/wood{
+	color = "#3B2B1A"
+	},
+/obj/structure/musician/piano,
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
 	alpha = 175
 	},
-/obj/effect/turf_decal/siding/wood{
-	color = "#3B2B1A"
-	},
 /turf/open/floor/wood_fancy{
 	color = "#779999"
 	},

code/modules/instruments/instruments/stationary.dm

@@ -34,24 +34,13 @@
 /obj/structure/musician/piano
 	name = "minimoog"
 	icon = 'icons/obj/musician.dmi'
-	icon_state = "minimoog"
+	icon_state = "piano"
 	anchored = TRUE
-	density = TRUE
+	density = FALSE
 
 /obj/structure/musician/piano/unanchored
 	anchored = FALSE
 
-/obj/structure/musician/piano/Initialize(mapload)
-	. = ..()
-	if(prob(50) && icon_state == initial(icon_state))
-		name = "minimoog"
-		desc = "This is a minimoog, like a piano, but more futuristic!"
-		icon_state = "minimoog"
-	else
-		name = "piano"
-		desc = "This old piano can barely hold a tune. Too bad all the piano tuners are dead, more or less."
-		icon_state = "piano"
-
 /obj/structure/piano/fancy
 	name = "piano"
 	icon = 'icons/obj/musician.dmi'