From 56fd7cbb6f2d2422fb01790b89c0b50cf39e3dab Mon Sep 17 00:00:00 2001 From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Thu, 28 Nov 2024 00:49:41 -0600 Subject: [PATCH] Removes burnt tiles (#33422) remove burnt tiles --- Resources/Prototypes/Tiles/floors.yml | 17 ----------------- Resources/Prototypes/Tiles/plating.yml | 11 ----------- Resources/Prototypes/Tiles/tile_migrations.yml | 14 ++++++++++++++ Resources/Textures/Tiles/plating_burnt.png | Bin 1565 -> 0 bytes Resources/Textures/Tiles/steel_burnt.png | Bin 3689 -> 0 bytes 5 files changed, 14 insertions(+), 28 deletions(-) delete mode 100644 Resources/Textures/Tiles/plating_burnt.png delete mode 100644 Resources/Textures/Tiles/steel_burnt.png diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index c98ee6d582ccc5..0a7d2c0af6e994 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -884,23 +884,6 @@ itemDrop: FloorTileItemSteel #This should probably be made null when it becomes possible to make it such, in SS13 prying destroyed tiles wouldn't give you anything. heatCapacity: 10000 -- type: tile - id: FloorSteelBurnt - name: tiles-steel-floor - sprite: /Textures/Tiles/steel_burnt.png - variants: 2 - placementVariants: - - 1.0 - - 1.0 - baseTurf: Plating - isSubfloor: false - deconstructTools: [ Prying ] - footstepSounds: - collection: FootstepFloor - itemDrop: FloorTileItemSteel #Same case as FloorSteelDamaged, make it null when possible - heatCapacity: 10000 - - # Concrete - type: tile id: FloorConcrete diff --git a/Resources/Prototypes/Tiles/plating.yml b/Resources/Prototypes/Tiles/plating.yml index 7edb1ae784c9a6..9627ab21f2d5a3 100644 --- a/Resources/Prototypes/Tiles/plating.yml +++ b/Resources/Prototypes/Tiles/plating.yml @@ -25,17 +25,6 @@ friction: 0.3 heatCapacity: 10000 -- type: tile - id: PlatingBurnt - name: tiles-plating - sprite: /Textures/Tiles/plating_burnt.png - baseTurf: Lattice - isSubfloor: true - footstepSounds: - collection: FootstepPlating - friction: 0.3 - heatCapacity: 10000 - - type: tile id: PlatingAsteroid name: tiles-asteroid-plating diff --git a/Resources/Prototypes/Tiles/tile_migrations.yml b/Resources/Prototypes/Tiles/tile_migrations.yml index 7b0b9d5d767208..400e4f95a0fd91 100644 --- a/Resources/Prototypes/Tiles/tile_migrations.yml +++ b/Resources/Prototypes/Tiles/tile_migrations.yml @@ -49,6 +49,8 @@ id: FloorAsteroidCoarseSandDug target: FloorAsteroidSandDug +# 2023-09-09 + - type: tileAlias id: FloorGlassAlt target: FloorGlass @@ -56,3 +58,15 @@ - type: tileAlias id: FloorRGlassAlt target: FloorRGlass + +# 2024-11-15 +# Burnt tiles now exist, but they don't use the tiles system. They're decals. +# There's presently no way to add decals over existing tiles, so this will have to suffice for now. + +- type: tileAlias + id: PlatingBurnt + target: PlatingDamaged + +- type: tileAlias + id: FloorSteelBurnt + target: FloorSteelDamaged \ No newline at end of file diff --git a/Resources/Textures/Tiles/plating_burnt.png b/Resources/Textures/Tiles/plating_burnt.png deleted file mode 100644 index 7c89de081eb6328dab96fc81a71e1483b8c23e1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1565 zcmWktX;c$e6b`$BY%vRDUuGtgnaN~dNC*TB*#Hr7sUjd&R8CukL_GpZrB)HGiVGkv zC@P#vDz>1wAZUrWpn_Ftu~yKdNL5g)o&v3vjz8|b=iPJP{l53z`^siaw+06?0!buN zu-#^!NkrZ!o8&`y^RX>gh~VX#X^kf}cC(%n2j8V}$#EpoPdkD>Wc!gw-sp^^SqVy| zl0u=7$>i|xa3-0oR;#B@ok}KCX=Iv0q0neFp`oENnM^8`Vi+bCivbW63WXvVh9Foh zMu?OK*Wfq~!>~vs0zoi7K0YBK!E81=91e@wY_r+o;^IsulUA$M>kR+^0sz3{@i`n0 z8wA;GHiN;S(P$A75gZOTGBT1*r*qkC9*0BJ$t4njK)~noQK1k;RVa$WpYHMy0t^OV zxjZ^LS}Ik`<#LT&E<;fSK{N`5L?VG8C^0dSpvYpelsFz17N%9HxLmH?ZWr z+v9K?RO7gYm3s8nhc01!e+ z6jO-BxJZPGiLMd^!PFQ=OxK`PX*F7@Tn<4ZkdOlsK_U^1qGALU0)R+_fS{=CY*jX~ zMw9bw^IRlSi06}eU0w10ViL)x$Zn3CrAslUEvaSv=6L9@qFx^u&+9o@^s047d1cOh z>pb7zD^K70C)AqW())aQ^U!e1ASqw`;1%07oPYJuqvrKREW^R^%&)JO1#R5`c7@r7 zfIjiJebiU_sKBHAZM)O%0CsEs+84RYhgR~IzPBv6Hk?#kd9t$3Z*^n$vmq>~daJ9n zbz8^Z?EJ%kv#=&+!kaU#Bk-cDHhs=U_u!a-w}^k@a^RArak`-&Irc}^`OB%`oRajD z8G%omHXhq`=Sjoi`GfBANxieZP@noOdBy-|fiwqhaE#we{e^W(S$DH^kFy(^JM85g zT==wVbLOSo&bRJ`AyG%S#C-&6tOmcYNQlx~?;&%>J-xMAtI^Xa(H!R;FkjOj`3W-w)uv zZ@Kbc=Y|cP{fj1=Kc4+({-PYCY4i4&rZ; N>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D4gN_)K~z{r)tJkU zBu5p7TXRe6ofjO07nW{;3qP@1W(t~?QOF8}$@AFY4);fKx84a2xhQy9lbPo5^uD6N-y zo`$g~vPG$3>~D|fPd@(m(c{OrH#hJ7{Qav(SKfK=)3)urwO!vUtM+A;71gtX2r^yj}^UtcdvoTgbR6=U>1G1{a)O%h-EG}~;eJU7lvzckFTKwp`k>}%l zx?GN@^UGJS?$2jZ!@0!#*=L`brt7rU!_bo)NiZ>x-IalO&n<(=?TNj=k0*UK6F}*O5KOVF+^= z+J;>9-KA~E5M=*x>ifQF`uqD6uev^+&i6MrFFEP%?zX+0&gc8{>2!B@By{n4!cnF0 zII;MvBB8Wx!h^*)TqY)m|dFZKjz_h8C z7zMZZIgpcaT$TmLseVr`3BM0v>>IM(^!$pQqU=)?ha@P|wl$?AiSmf__C1NC6lA4t z+ck4FNaP{LYeWeyTVu4<{ATc*nt-c$>B;#NyRL8R7W=k7vxxviFh`E#G6qfnPrx*Q z@4i1CPj|=Lmp89uf1l?h$yys|+O7-p;*6>LmLgN(sH4%E4Tv+e5{Y(B-nHHD_qf%K z5lcWg4~wrVwjwHkO90*Kkh44_3ga9x$jj2QR5f(dIN&JH34l@nOY9e=CEUapS*{$B z>S3N199PsrD_{&RmWBOqZ`S~dGNX_bVQi%sSde{82?H$AC_@MUjFy@(mlX<((zoFL zLaz^lO;h{>6pBpvKlv$C9Ly`$a?qP@!ptOagE>RA^XS^q* z`sU_bpXn!{#Cd5^Cf-*?LAgl}JxvtYlkzMB_*Q9UjfUz1o-S%qi**{XU=L}B0MQAi z!zk@eJVq-$FA8#`GK+RuBD`JXukkDjS^A)*=I{O|v=%%S|>v0}& zVIHIhz%G@P7}jo)+S9)=&LD0aArr_5gz(Y|E>LAraW2b=ffV4Y2oAYZF%$0Z;^>pGfFZSZN7TwJ0VWT+y`6xv5zu zZh$+f_%cy{$eSJxkq9)HiQj?w6k~@)iRP%Bi$V7 z8bkPzN? zRK}Pp-%0@98$krDB27txm9}Y~5DAUOS2H|=ks!tLGxa&b1p9S@sVvK{4u{=#SEf0& z6Gqay8+urddM{F6+CylfIiH!;@-4ect+YHehI)$tk!F=N7@K@o0m@TuHY#zKeh|7P z4=W5I2$shfw2gK(9fuWkN>~V|nl6w<$fE@OFwVsoBnsTY`ZyW4 z1n|%7nioii27udzi#QdaNP1NdyY%fig-c5@8AmfD0`;5#89g_&eVn~_I6&&K$3;nz zoX1(h=s-=9nq^s0mWRU=@+xFJ3}lW4(ty!Qhb+?Mm;Q2hysL*AEb#*EDH9eyT4Cii z00AqzGp-PL1P_mqrInvy5(Pa@BTh_-TT3k67g0)(E0dAnnx;lCSuIUrtu!j@*k|=w zncaTN)Oq#tqzQP_l2Z|_})A4vYpW6m{3uJcaPz znUPIHhcTdjP*ijTU2%6j3L!3ff|x*{(0K+YZD>azEeasb38NPGS`qS+8EJ8&ECVIw z`s19)s8xaTPBIxb?1|`vEiva%QWFN$i-^kAQU1g3nNUTZI-kNqV4HogPrWO-NkHgO zvCHTtV!&@?6dzWpKtAbsX$d~tx8J@_eaR)JKoMD6rv9+qifShz35_+wRmf{Vg$%|; zrUVR9`24CYcKcoCOuDkiGETH_o^tWa;>d{Oym)ha_uA8E2x)F-jA8+sv8jd5nZzrf zCpc)ioDm~~j|xA2bcK&B*2-e5eN&hl)b?VZh$fcnje(9T=8zWb*t|rZ)?|qiZ zUo$ z3n&kyIYIV_P{cSIh#o*zcwlNwo~L=a^_k2WP)o=VIiEGRxGeFal^vXc(t%L{KN6Je zV2KTGTH)bES5+Z{mm4%)5o9o80v9& znvf9OA{QH4e+__p@CvL9#1l0>((3rf2S&7XT$EBIh>f*@*u&!BJ4> z!gZX7s5oGYFPTIE$ONKNiE>kNv1DoBrU02saEX`o5{z)32uG87aY+7Zg!ew_z`#6n z0U!)y%*fSwn$RDcyu<);hkg}HM>=tyia|bbu|~j20kx%d1A`y^Bx)ZIB|&5vI8YOY z5kah+1!>VQ(&=QL1k&_im8TO(D~eVZHo!Es3$u({BDh_f zn9m%*C&-6fGBgBLtBOHY%LYu7B~bs&3*-z^oxa3l85MFV7O^>;YxEE7A>XWjI0BL=;214wXUZtU7 zXY6HKQE{py;nK2Tgm)<&-~)yP&Ve*KcTEZ4@Z?Fwm8Gf(nugsA%;i$#Tqd3}d z5xSh&Rsx1pL}*La1up_W4#O`kt)ggUb`lsMha~_2!%74s2%!OBJ7T2Dd`2Lgo95Wm z*onkl4`BU%zsG5rudH;2%yAc_4|*B6GZUYq5h{d&eOXonCele{@LJs0!|@!CU>1eGMa-S%*`-&Q-UP1l4rwD9a^ zw?RJ0pvz&z6hXl!$OP~}qt6Zpq%8|P!&YuZ1_Ovv*q|(7Y7&O$>z@G_$tyo7fkerj zIP;s$mVF>tk_ku<(%d|u6?&1h(8JquTW!T5XBP$~O!{!SkWz?fkP6Tr?8<>`wb|_1 z3VVC~_74Fj`GuotbSRYy0bF1RCz3rVdM$hU*H1n{?*8NNU;N;WH$*APEpfl!ZUNA? z+H7|_mSKr(f)7x25Xe_wfBn|=TkyzQb8&=!!gKtexP%J1t?G_Um@mF~&i>DzfBF5_ zU-x-I