From 6e8ed007b8a498eed9063f54c46332348863d7b7 Mon Sep 17 00:00:00 2001 From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Thu, 16 Nov 2023 23:57:00 -0600 Subject: [PATCH] Adds damaged plating (#21711) * adds damaged & burnt plating tiles, corrects a miscrediting in attributions.yml * placeholder BEGONE * fix those attributions --- Resources/Prototypes/Tiles/floors.yml | 2 +- Resources/Prototypes/Tiles/plating.yml | 29 +++++++++++++++++++ Resources/Textures/Tiles/attributions.yml | 12 +++++++- Resources/Textures/Tiles/plating_burnt.png | Bin 0 -> 1565 bytes Resources/Textures/Tiles/plating_damaged.png | Bin 0 -> 3428 bytes 5 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Tiles/plating_burnt.png create mode 100644 Resources/Textures/Tiles/plating_damaged.png diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 13d2985319..23980b98ce 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -803,7 +803,7 @@ canCrowbar: true footstepSounds: collection: FootstepFloor - itemDrop: FloorTileItemSteel #This should probably be made null when it becomes possible to make it such. + 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 diff --git a/Resources/Prototypes/Tiles/plating.yml b/Resources/Prototypes/Tiles/plating.yml index ee15c11157..7cf841eec0 100644 --- a/Resources/Prototypes/Tiles/plating.yml +++ b/Resources/Prototypes/Tiles/plating.yml @@ -10,6 +10,35 @@ friction: 0.3 heatCapacity: 10000 +- type: tile + id: PlatingDamaged + name: tiles-plating + sprite: /Textures/Tiles/plating_damaged.png + variants: 3 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + baseTurf: Lattice + isSubfloor: true + canAxe: true + footstepSounds: + collection: FootstepPlating + friction: 0.3 + heatCapacity: 10000 + +- type: tile + id: PlatingBurnt + name: tiles-plating + sprite: /Textures/Tiles/plating_burnt.png + baseTurf: Lattice + isSubfloor: true + canAxe: true + footstepSounds: + collection: FootstepPlating + friction: 0.3 + heatCapacity: 10000 + - type: tile id: PlatingAsteroid name: tiles-asteroid-plating diff --git a/Resources/Textures/Tiles/attributions.yml b/Resources/Textures/Tiles/attributions.yml index 49cb108eb0..fdda1f914d 100644 --- a/Resources/Textures/Tiles/attributions.yml +++ b/Resources/Textures/Tiles/attributions.yml @@ -6,6 +6,16 @@ copyright: "CEV-Eris commit 28e589f0ff72a009adf17db767e90be39054f0f2" source: "https://github.com/discordia-space/CEV-Eris/" +- files: ["plating.png"] + license: "CC-BY-SA-3.0" + copyright: "Taken from CEV-Eris commit 8e74e4370f4d5885f15c3f834973b1223ddb8b1b, modified by github user @Flareguy" + source: "https://github.com/discordia-space/CEV-Eris/" + +- files: ["plating_damaged.png", "plating_burnt.png"] + license: "CC-BY-SA-3.0" + copyright: "Modified by github user @Flareguy from plating.png, using damaged plating sprites from /tg/station at commit https://github.com/tgstation/tgstation/blob/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae/icons/turf/floors.dmi" + source: "https://github.com/space-wizards/space-station-14/pull/21711" + - files: [ "asteroid_red.png", "asteroid_tile.png", "elevator_shaft.png", "freezer.png", "green_circuit.png", "lino.png", "mono.png", "rock_vault.png", "showroom.png"] license: "CC-BY-SA-3.0" copyright: "vgstation13 at roughly commit e4d3ea7f69d21c3667be12b114fa935c4640cb05, asteroid_red and asteroid_tile taken from commit /vg/station at commit 02b9f6894af4419c9f7e699a22c402b086d8067e." @@ -16,7 +26,7 @@ copyright: "Taken from /tg/station at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae." source: "https://github.com/tgstation/tgstation/" -- files: ["blue_circuit.png", "cropped_parallax.png", "eighties.png", "gold.png", "grass.png", "ironsand1.png", "ironsand2.png", "ironsand3.png", "ironsand4.png", "junglegrass.png", "lattice.png", "plating.png", "reinforced.png", "silver.png", "snow.png", "wood.png"] +- files: ["blue_circuit.png", "cropped_parallax.png", "eighties.png", "gold.png", "grass.png", "ironsand1.png", "ironsand2.png", "ironsand3.png", "ironsand4.png", "junglegrass.png", "lattice.png", "reinforced.png", "silver.png", "snow.png", "wood.png"] license: "CC-BY-SA-3.0" copyright: "tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49, cropped_parallax modified from parallax." source: "https://github.com/tgstation/tgstation/" diff --git a/Resources/Textures/Tiles/plating_burnt.png b/Resources/Textures/Tiles/plating_burnt.png new file mode 100644 index 0000000000000000000000000000000000000000..7c89de081eb6328dab96fc81a71e1483b8c23e1a GIT binary patch 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>vR88c({F`KbvXEuzbj3p^ci7YP)l}L)n5{a_ZtCY$zp|TVu z6r~8g$P%xVER~ORD-Dj002#q&}o}Y2FeJd zq9EfVsGLxlkUO|d-~f>JB4%ZZ;y!z^JpfR5R{cki5&$4S;o<7VGdDNa)6>%jgTV&B z0f9iEP^bx)OCpira5xn9KfvKcB2iyo-^9e^|2eOb`ep5C}0C3=)B&P$(P@#}I=7>+2gD z8X6fHVX;`E5fNjEA(6>M5{XQqkjZ2m4u_YSWFBZV&DhwOLZQ>?R1!%?M~6Tp5M*`1 z;~6xX4iHG8{)Ws2Pax3fbT|S|H>Mji7%=wY0TiFt|V<(9qBz5lOnbx;8d8#tdUT2IJu1fX5rLIczW(!k|!CYz~1$ zQd3hypitJ<)>JB8U0t2QWI&-X2n;66l}4k>$;rv4MMXsgjzl7mNM&VZCQ< z!Vo5069SQBY|JDY8S(jieFFn3iOl2kXmpyhNMwk^34{W)p&^ApAQK2sS^Hoxq-+|& zU?z)+K)`M7>|DiSa|;WR$l1)?oJ=Aa(`ifwlSZXe>2!0M!PJz?;gBd4CY#MIr2v-yi=%dggYdzka-*8aQi{Yv0OPE=^5lmZ*m zrW@6Mwu8GBYh>RB6+PuRTPCE_SqgDYwM$kq4|}Sf4?-7MZwc| zwn^XnIV>mcT56B={);mA{?ft3efzqk#n92j)%E+!L#$2w7MlpGsnwkQ9e}{=2Kt9B zdzZ_CAO!lethLhga6jRs8OS##{)xp;V_Nq5YW2k!Odl+&YAI{pl^WK; zPMtKIIf+rRI(5oN(T6zy~;DM0fv>d9=GDjst5KEKBP zSgMZCw91)#LdTr-ybkdSSJ{9Vo0oNp=kA%Q6Wb1V5M=Vce7>RhxF5C#F->cv*=I*= ztxZIxekpQVp$^mYUD2sSwMynsaUb7)=T}zJ^`ipPh1v9TZ?qN#SGm?Hj<(tvZLvF2 zM(jbMiank$aPJ~Z6{o~+A%W2alR)G{ao1YF_z9I$bv~6X&EJZYHfvfs!EK7CYwLW& zgN@=;eHu;5fe~4hNBXm4CXqLkm#vOXnQ$FLl@(KPrOy-6+h#Euu< zr^1|403g3ZJuXtXZm<}&=e?WU&VfVYMw4@j&sy#v!oj)uN(**#fi(Tvw&#Ox=3Cv!+zdrM5^PRkHRGP~i)-tFe!0`rPzg`K6>mN0((^xtr;%X=H zcJ;@QEl-xw)!QNninUN9ST+Wp6ztGuZ-#@v%9_*>M|5=){!93lPvcDTLm z9+2YeTR$^96dYCjIW>pAyEnA%`Ku-Q+fxUR3dXWmm8V=Ecm2yemLQtXsPXpp{61cK zF{ykhpr#;tFhS838>TRh?ZRFu7|~RI0*gq!%NK`tMw8S`9@U107402$dGw(aY!;IL z?Btq)b&YqG=vK=^ss7peUHHjYxL68hZh!OHBYm)Aizh-qCB3RhYe`vD&RlxEvDCUa z?WSaykbC*s-Sm^7ep3*Fc*4`nanxbh9wv^Aehuo3N0H9VKM>6rp?$3%zj&J!)Ufj8 z4KQyz`pCuSm$qCc=pZ&v1dSFiuO@H4tWU|;;mI8^)i*BViu>+{FuvsL7W1}#MVRF~ zcBp9N)~$H;Do9-QC2=d-*6nv}UuZ=@{t>!kkCKeKYmWdn|KSD7*}c0nx?rqvx5~ms z0Wdjj)kFXMNddphUYdohcrQ(DDS#CPNlPoP#xxEP=AYVS>6!Ko8s>ak^KKgaZfmi< z0DLh_UQHCJ{0x|wv|bmzHnY!W)1u2(`sdp}oEwt=Q%^f_H~sy`{vDGch#1~R#KbaJ zjDvlE_`5&(nWrOJRT@=)y7Xq!z~E)x=X_^$P^d{qt**}2`stH#+j|iU@#x*_0~f@* z^>_xlONCc&hF!C85@Y>!c2>*&zF5y!6~U1als<^^;GN#j?JBBu9x;;Y;X;icBST8X z*RNIOX{NkSy5d0;2lB?_9#2q4>dGHpqp30bO7yN&^uc5C0|jA_p7iughG~-8kqq>` zf))7p?2mg!!^5XaqXb_vDs1$--IX^6uVrIi?NP(rqtFFIqbH7_))jKg3-k@B(ySRW zrOi+4drf}+Ii2C6y5rHz2q#{t64ls(CF*tdzK70Aos`NoOzKW4VjSziO(q4 z4^%geoP`BHe_Bs1`E+6@HbdSa_-3`VYT~K@n0!Hgog2^}qM>Dl$glJ-W?Z6W(wACu zi(f^!RcGHyeybf5NrNQQ9^6I_$2;9l)!9~>8sl35zje*%LDSbtgPE_OPskxjU}L{R zo3D-EKwM~+idU_z&^czaCVdkoxj>AbMe>UM~t?qpD1x{uq2*|FUz(;Kc#rHGto zExMagz>r+|u!c)s8Ac=t=i!8?fShrlOgtK8mc@PjoYyaW7q|VB952llU=3I_*E=A> z+je%wZdkPjP$iVKmjm|9#&HDX#&KcLo?Z5El#9#!F?CaD z7Wd+YqWbL__2h219WUcEn{Rcpt$7y|T0i$;etc&ns~(Tb<-WUI|M7}_bN)Ht@t<3i zq1OBVx;HLy#)g^$12n205F z={da%d(~+*%XbI&CG^$QRNvGkVYo6`9kim?aHLtkix$$e9w95}r0EJJz0EyJUT#{8T|Hk?3 zmjk11rc27)y@xwa9>*WwSl*qgoVLFr@xMEX-$-6fJ2xAvONOzlH+?QP4JNX)-Ca%- zf|_aU3?u#@X3>hZyx@#nAq_7HsO~} o!+!0)JU9O9`yXRaH2McxYfgU#TX>HyTNeQ$o|}`@Au#p-0EkzFXaE2J literal 0 HcmV?d00001 -- 2.52.0