From 0aff37a72ce2eae31ac75f01c9766464626f6762 Mon Sep 17 00:00:00 2001
From: GinjaNinja32 <ginjaninja32@gmail.com>
Date: Thu, 21 May 2015 06:03:15 +0100
Subject: [PATCH 1/2] Fixes floor painter 'side/3 corners'->'black' and another
 state

---
 code/game/objects/items/devices/floor_painter.dm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/code/game/objects/items/devices/floor_painter.dm b/code/game/objects/items/devices/floor_painter.dm
index a1c21a7b3fc..43bc58261b0 100644
--- a/code/game/objects/items/devices/floor_painter.dm
+++ b/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")

From 4e7702b7f32b1a10c4fe4bd028dfa864ec92d4ab Mon Sep 17 00:00:00 2001
From: GinjaNinja32 <ginjaninja32@gmail.com>
Date: Thu, 21 May 2015 07:11:32 +0100
Subject: [PATCH 2/2] DMI change for floor painter (renaming 'black' to
 'blackfloor')

---
 icons/turf/floors.dmi | Bin 313410 -> 313413 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
index 3c2d77e20a3c4c09b503ce7b977c8f77a5dd18cd..0ea7cd38f07977f341890ae3e2f7cd10d9e9b661 100644
GIT binary patch
delta 1355
zcmV-R1+@CYkQ2p_6ObeUxv?dr0e@V=c~_$@p7pAHC0#AmF=&SmuYse_Pt|o9ad4}y
z+i=*H!*&qc8|QrO^#SM87yJk>*!>sm`U`gZ<sKss7<t6V6Gpxg(%lgZp>IYAoDm9V
zgv1%4afU_ioKe12R`AZ>dy#*|bG>J!4yu+4i#C8*l>x*Ox5|p?O6SXF-hb^}+hUQ%
z?q1;7m%(Wq&jG|i9oqHkP-AB&mQZbEiBO2qC-Jz`EgUYzD)C};8HlAakc8|5$vjF=
z5)m3m9HL0#-4{um=^}{}UL<ke8<ofDZ$$Yh5y@~w`8W}&aYXq@5s6ZDLA=vAp+qpR
zj(DgxhjVulZxr5D&0FOiIe!9F-ZCxrz_C*o@6Og4JW49OI}df(1%AzLicz9u^sR(W
zSGaWU(ImShW?kv5l@jN|!QHn*;c#Q*r6NZRBS}^GUMhM_M~*V-@tBv28&E}%AG(oR
z%~;+xrPoN(lTy;<38gG|jXQhi4qOIlUDc>iHn{yAK(<jga#F$hu76R)y#B1bZH)><
z2OLSZ|5e_;`=R8D<&*)(NgYjqR*h4Ywzcx2pv4(mX&>IQ<SRD#3SBoLcQ)S}UA~H6
zI`AKEZz?hBZS}m$Hk&WmwLi<&muiH$^}D-|T3;$FX4an`KWcob5SbZ&O!vI-?scC2
z7F9{L{Cks|3yc4|ihr1n_T*K!XIa~oukW_SQj$`(>VmVv;mT;S92x~#FXTQTiCr&L
zb?~}{!VX?neDJ#VgV&wYuIqo1!F@r`;ijPHaGBq8xF6~{ViKY&ZEM^!49|;urXIv?
zSkK`WaJVt6G|^NIAgeXeP@R=Ad1%BRm{$+Z&Q&?Per7OUM1M0F%P@nn6f>BRV}kJl
zoWXc8%wW6)W-wlk^Pu2GKBtpnNQ?*ObW#+F6+NeM9Ale~^@t?aB9d5#NMa2liJw1`
z{Il~T61;jNiI;99@wzRPF9i29B~v4mM-%#qYyye{Ik7mD6N`g6u{fL)ivv2bL_%tG
z5N6(cZgdcOf`8l^_4g4+!Kl;1+gVRj*|Pm|@#iubP#I%Q*10p5OLGIvWw`<7lH34u
zXVn06XVn1XrO{8d?$$Va_GCtr8=BnG<c=oq6G(g>^yC9=^I=US9OYXHkF?E4+Rw*?
zyA#Py`BuUc?dR77l1QKZs!Ld)cWZod4Jf~uvyAsOOMh{ID76Nb-%lC8p|UN#s<JIF
z!FEj?c0I~(>1;=@>ukrzV7Dep>4Cjp69wtS(t6#mi6VMpX&LU<MBzWN2|D1KZ$#-x
z+^^a5D!X436;ebKLY5G*gn*^Qi$~dLv4zpzIJY=CoiOd4?UW_Ds7T_+k0jPKlDwZd
z`jNy-Du0rAokkKb{z&2-H7buIKcak;h^#WAe4L0JIHEXGULD%tX2a8^?=IA#eg6^5
z0@_)(FjSpE*+Rf~Qv<Wveu;l)*Fno0ta>rj=-5~!d7C(pk;HL~Bo1RF@rH{e-f)q`
z8!nP~!}UMhwwFJ#Udx`f*9T!=g>8-Ey7CB?DSr;<+MdY4fH}@TC+XmpIX5~;PD~UV
z9V923>_!L4i7vm<L2~@1SN!T}j$V5wJ74$}=XWLx(j<=6XtLx?dZ}{qi<R1o*!)Dg
zy6{`n|2X-F0~=*beqePXURfVk>4ghd%{I#HNyB-g%pPkHhn?&vnUUw-<cKu;PT2Tv
znkQ7X<oGkmOCHyPmpq>FUGj?u>gUz>U*A^We*U=q4;&RLt(!gdrGw)JhvNnThvNnU
NhvNnVx8nu`U%}GKqiz5I

delta 1352
zcmV-O1-JUekQ2g?6ObeUwy`Co0e`6pXYrU<<tyoBsg6NAd~OXKeRQg>%ZM{ub=`);
zwj8#D*xoqjYp)MDmA>Fdc){+!VAo%;+b{PRdBDgcMxHS8m5}a^U<iFPLg0*0I3py^
z2#qr=a_5Zlt+IkQ{oafGE1qjRD|Jw{R9LhD#HtJ+mbg_`OjkNzHuFa3+J6>{G<Np_
z$G!|s<9H4r4(iaUSBDxqJF$dnBTIxrj6R9SO>W_E6;_ECqsu@nm4PH=A4uj=dXk9H
zK;jTZ67Rl9;!GDwobV!v^WLaDPJbiHM~O&=Bg)5#NR1=PM~X<4ste+s#t9{Yd3D6|
zv^ku+lX#=>u4>*Y@5t$&@_&};t_O}CxOjKA&fqCh;oW(t!!Gb^c2kTJC8KX8bh^S-
zbB`w3B{AztXRVYt7Y^>e9SVngA}<v=T^LEKxc5@g6FPE=Nl(VSRNQPTg8aOV)N01^
zwkf?vk{*(hE>9?Bxoh0nJ9pqRNb9Obg|fk&?*Otrx{;F#&UcL>Mt}8Z<!x(JAe!Gu
zvaPT3_T6tJS1hN@Hcskj0<>zJs<f?@7X>ZO*h>5GmL*@Y!B^<I3AwZR-stjG{L+E{
zaC=jUQE#i~RkqoD$*%obw!Ty&%&p(uebo9=SuwNz^!QQZONGeH_+z@~g?F#>^tY%=
zs^#CC++0}v-&Mq5w0|eBx;@L<u6%vBEtZm$vQ-zH6%JQMi{;QL$a*370ZHt7p{j$|
zEfjX}y5fV^wI96hoOWIRV+`&KdJZ=QJ%`Kup2Pi6&k>UlU1?k6o?&=i+%xqcZo_&G
zw}8WqS*3}lY5-ZSiH7Q|jLAbI{=mF-aCWZB+4VDn@gkbRSbv5YjHQ^tgd7u$7vK!W
zi(v-iEii-ea-0VRFY-B^6hmS>FsGBENUZ2NjpG>GbgV}tu@;fUIz$p{5J~*}k>sD9
zACchI8%ex$BZ=2-p?o2@pDCFdp*)(<Ph=BN9LR~qp`2J8%!$R}oLC&ti6s(Jqk}N>
z-gBda&=cg=sDHnYI0{Cc7GBJHn#z{#my17_$$-ijYqHLrv0R!PU@prIFqh;8m^-Tm
zm^-Tm7%z=}s&%)<*|R4zn%vOjmL_*Jd7nVy^PndmXqyjfBH<|CN_eDgKGJ?ZCfuD!
zcFMOBo@hV6CXht>>{ngF0=-+~lWRcv#hhiluUU!%M1QF@u>5|?_zjh9=~b0&c?q^_
z;;`#ceoJRNdR=EbJ_frrQA!W&{hBC9CzjUheoYk76HCi*za|R*iA~S}*L)*NN8*0X
zo>$rZny8Q>nh>&th$RFpC0;zrMvE<s_Qtuz$?1e??`)?m(M3fPKYk>!rjg|R#L<r=
zUQ&_7>wh$oc=1OP@2F9E9QhIDqeNtt5#{4V<iHWdk@D)$1~(g?E`4&L4(<EzR~FFD
zx`m<Y49XS)zMC4D&Gt+DJG%~A-eA>>p+?8XBFWptfs7=MV<d4HBZ)U$B=LreB;Ih5
z#2c>v;kLc}iS=6cti3)6`zmZ}6xWqUuuO3{*MIgz4hGC|{v}BVx6HZGL2_cE*ytcR
z(PTF|NKSP5jSiCIkG$dsPjmFz>)83iuQ<OmS&$}itVWY1XVOcRlOL<pUc}}n($$6E
zqW;IpKOER7WAX#56Y;kCxJoZvxN5dhW=|T<8)f!bgE;JDzs8I__a;ZA*>}RmchjV*
zB_zjRNM7=|7QE!~jPH_PJWxNczW@5R`u6k3?SF%JD2pmZ8L5Nj28ZSb0f*)W0*B@X
K1GnY|1Yf~eS+#Be