From 1bce3f70ef0c3e8de5dcbfdf591804e574c3c1ff Mon Sep 17 00:00:00 2001 From: "I.K" <45953835+notquitehadouken@users.noreply.github.com> Date: Tue, 11 Jul 2023 14:34:07 -0500 Subject: [PATCH] New glass floor textures (#17948) * change * Update attributions.yml --- Resources/Prototypes/Tiles/floors.yml | 4 ++++ Resources/Textures/Tiles/attributions.yml | 12 +++++++++++- Resources/Textures/Tiles/glass.png | Bin 547 -> 2350 bytes Resources/Textures/Tiles/rglass.png | Bin 413 -> 3158 bytes 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 1592b4efdd..170b200188 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -853,6 +853,8 @@ id: FloorGlass name: tiles-glass-floor sprite: /Textures/Tiles/glass.png + variants: 4 + placementVariants: [0, 1, 2, 3] baseTurf: Plating isSubfloor: false canCrowbar: true @@ -865,6 +867,8 @@ id: FloorRGlass name: tiles-reinforced-glass-floor sprite: /Textures/Tiles/rglass.png + variants: 4 + placementVariants: [0, 1, 2, 3] baseTurf: Plating isSubfloor: false canCrowbar: true diff --git a/Resources/Textures/Tiles/attributions.yml b/Resources/Textures/Tiles/attributions.yml index 1ff0882277..13b1b1c43c 100644 --- a/Resources/Textures/Tiles/attributions.yml +++ b/Resources/Textures/Tiles/attributions.yml @@ -11,10 +11,20 @@ copyright: "vgstation13 at roughly commit e4d3ea7f69d21c3667be12b114fa935c4640cb05, asteroid.png renamed to asteroid_sand.png, asteroidfloor.png renamed to asteroid_tile.png" source: "https://github.com/vgstation-coders/vgstation13" -- files: ["blue_circuit.png", "cropped_parallax.png", "glass.png", "eighties.png", "gold.png", "grass.png", "ironsand1.png", "ironsand2.png", "ironsand3.png", "ironsand4.png", "junglegrass.png", "lattice.png", "plating.png", "rglass.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", "plating.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/" + +- files: ["rglass.png"] + license: "CC-BY-SA-3.0" + copyright: "tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49, rglass modified by github user @notquitehadouken." + source: "https://github.com/space-wizards/space-station-14/pull/17948" + +- files: ["glass.png"] + license: "CC0-1.0" + copyright: "Created by github user @notquitehadouken." + source: "https://github.com/space-wizards/space-station-14/pull/17948" - files: [ "bar.png", "blue.png", "kitchen.png", "laundry.png", "mime.png", "steel.png", "steel_dirty.png", "steel_diagonal.png", "steel_mini.png", "steel_offset.png", "steel_pavement.png", "white.png", "white_diagonal.png", "white_mini.png", "white_offset.png", "white_pavement.png", "white_plastic.png", "dark.png", "dark_diagonal.png", "dark_mini.png", "dark_offset.png", "dark_pavement.png", "dark_plastic.png", "hydro.png", "clown.png" ] license: "CC0-1.0" diff --git a/Resources/Textures/Tiles/glass.png b/Resources/Textures/Tiles/glass.png index 6f47c3d2c1760754b841d554e0e7bcc22ed97c54..37adc67679ee5ef61ffb63558c06cc608a25d803 100644 GIT binary patch literal 2350 zcmeAS@N?(olHy`uVBq!ia0y~yU}#`qU{K&-V_;yorBtBGz`(#*9OUlAuNSs54@I14-?iy0XB4uLSEsD@Vq0|UolPZ!6Kin!icu|;!s3bLr? zwcPvrBzs+d;{1dAUbyL`igdJm(q>XlW4Td(_3i?TIg*op{d>Ou|L^|y_xIQT{`vX& z_K3-MexLuIU%%(?$B7;9{?@))v;V7A`6d3}$v5_=eL9etx8qFJlS6CG*UXbY{P(qX z?fj0km+GR$@@oR~-rX^Ryf}S1R+N zI_&fAs%K_ztiJAYTVJ|--@T9flJ*7cw$rhzX4>}L$7{0WXTJP=`HxA@{EBZlpWm>u z+FnKN{jb^Vm)^)+aGA>(;o-vuZkN{IdOg ztn~gX&$*k0_J5i6-ZEqP(fIodj>jJQdOW->jk~I_<2>tvZtgrfXSKzazFL_R zr-M&0>-@aD*YCs5g#DL{%U{2&Ja+YZabxwu_j@}nH+B2^YUjsxn%iv#>1UY`~se{EnSl( zRah^Skrdtk?OSJi+W@_G}hnqSIl}oh-nvj!)eDzk;(sv1E>`%yY$^wKEIzteWj^l+S<8v{Bbq{V(V1{5xs$ zo>lw3l6kPbqd~5B?Qf_16Ytmh?Eg0F$i2&7|1wyJ?stmU>EHHXkA8vjtT~h0Vy?e9 z=s)-It%5$|HQzJ8$vm7>n>L~P#kAZ-4=wEOrfx3VbE$yeWckkibOzyx(vogD7b*)j zoHPA>=9!9Gx|RI>IiITAo&|khXLqp9!QO7one{(6{;*}9!~eqnPS*08G^_J{Pd=-dB`P*I#_6a$oAKqD%6XZZq?`r!e-(W8{Umds|89A(Y|!nm z%=0+cf7!e(?Ow^e%1bKOrRwEw{AKtsVarcbwhI*k@23bCcf8#G@5H5h-z3w{N|jyw zyRiK6=j6x@YSXU2`f->4NwVdWjWQ*NXKr;^d(-mji9-JG58ux*sm_=9xBPtak^cQ` zho)%0cYAGpzVV8s`nIyj|7&ujX9&LD_rvndLbp2$>9%ZC&8p)O*-76$`Fvm4 zIiG#=^UO7IoeP`GU%r>WadZ2thl$hW*KGHlCuMQ{*Mz7f`J#2-d3HQK`)B%x1M43> zjA^N;skpNCrR_8t3q zP2ha(*Y^`{z2r-L72YfP^LCTG%jSJ1zF999PmkTae8IHuR{ialb1qyqxRB6s@$9|Q zya?(0)=lx%hdtf%-bGfv?`hvxt^P&N=6r3!+r{Bh-r|XTJOX%gyd%-%oy=+w}SO@&++gHw(Kn z%dcH~xY*g5Z@%5RIXfMMXEgU8-EL;Ee&O@0>u#@^8~#S}jGd$YSKI7@&%Wu-t7M`)4L{b5O2HkN#y;FJ5|Lok6F%l_}}?8aYmue-V3%j3T_oAy}MZ5`Xc^o zQ1;n5oBb{qFDiVuO}#SC$oaKU@aMSSX?6@jE(Y=2uU~lb%t?3S{Og<6nQxc+{h~Z) zm)UD=yS>ZWR|>w{{*KK!Kj3xs**(9?-f`b4xp}eJ{nJO~;_pJopS_W6`m=m`!%w!< z+N6d54+@pPW3yWG{X=q)#aZjOANS1pGI{q|C-!g7-%IybUU8dWU4Hf->viL1iQDBq z_s)AfT=}Dvz3-)L-TH4YB@cXYbt;SCjC5O|QkZ;=9d!G2H8p|N499tFOX@_l-v`-GpZj`||(z zZ;VsFZT4l^J4@vsGnW1e&&*9a$N6o+$GE!fj6YsDe@{61*gs6>8S{bsXL;97J01Tx zIeF&vBA??gn!m2)J{Mc6{BCze``-yWif2yTX?bOD{;R3RXI|Ake_a0l+KM)@H|=+g zEzT-$|84U<{{PSW_T>T1Cu^k)6sGrAw)7=UGA>_~KIdEOx%(yR>ux={R`*V@MqFX~ ze^2TAvo61R=bFyF{9nVdueW0!+gwz+uQ#cEB?QdW8ah6&%nUI;OXk;vd$@? F2>^~63Df`p literal 547 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANNfuRL8GLn2zYhM)CfHWZk5 z?XJT@g$}u@3(gCFd}ote;{UL_;!^kVeclJV{R3=%uvNWrcfY19Ie$q{#2Ydo3wiO_WFR{*7+H} z_f{3|iBOT8wWsgurn{Tg9IJd@U>u&%IQQRGU;UG{R?`+gWY9MK>-_2z>x~%izi0))}SNhH4E%@M2SlX`z+yR0UguI!3 zu1pB@ZIJq5F0yW^+XP`&o^ElYxn~o9eflHKc>TQpxpRrz?>-94GhXySSV(*+?;QE( z=j+{DwjG$jvg-2MN!)_V1GGGUsD!u%Ugq7q$&6{v<|iBt1$8f9HQZdJzbvgokVA06 z0k@^POiIZf{sF=hrUd!5y!z2L=>mtlrb&C}rT!TzOgmbFjB?vFRE5|4m$>C`l<&jS@Fz+91n^dN@IfOmYV_;xl@O1TaS?83{ F1OO#*_CEjs diff --git a/Resources/Textures/Tiles/rglass.png b/Resources/Textures/Tiles/rglass.png index da20b686807400aa5d2b5c73a398227f32893bf6..bae2908132bbdd4ac4ed025e37c8bcedc775970a 100644 GIT binary patch literal 3158 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 U0VA_00|Nttr>mdKI;Vst02wf^VE_OC