Merge pull request #9407 from GinjaNinja32/floorpainter

Fixes floor painter 'side/3 corners'->'black' and another state

code/game/objects/items/devices/floor_painter.dm

@@ -108,7 +108,7 @@
 			mode_nice = design
 			mode = "[replacetext(design, "-", "")]full"
 		if("corner")
-			var/design = input("Which design?", "Floor painter") in list("black", "red", "blue", "green", "yellow", "purple", "neutral", "white", "white-grey", "white-red", "white-blue", "white-green", "white-yellow", "white-purple")
+			var/design = input("Which design?", "Floor painter") in list("black", "red", "blue", "green", "yellow", "purple", "neutral", "white", "white-red", "white-blue", "white-green", "white-yellow", "white-purple")
 			mode_nice = "[design] corner"
 			mode = "[replacetext(design, "-", "")]corner"
 			tile_dir_mode = 2
@@ -128,11 +128,13 @@
 			if(design == "white")
 				mode = "whitehall"
 				mode_nice = "white side"
-				tile_dir_mode = 1
+			else if(design == "black") // because SOMEONE made the black/grey side/corner sprite have the same name as the 'empty space' sprite :(
+				mode = "blackfloor"
+				mode_nice = design
 			else
 				mode_nice = design
 				mode = replacetext(design, "-", "")
-				tile_dir_mode = 1
+			tile_dir_mode = 1
 		if("special")
 			var/design = input("Which design?", "Floor painter") in list("arrival", "escape", "caution", "warning", "white-warning", "white-blue-green", "loadingarea", "delivery", "bot", "white-delivery", "white-bot")
 			if(design == "white-blue-green")