From e30c3ec5ad7aa3d65df1eefb633332751ee48130 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Tue, 2 May 2023 16:04:12 +1000 Subject: [PATCH] Revert "Plating & Tech Maint resprites (#15817)" (#16002) --- Resources/Textures/Tiles/attributions.yml | 11 +++-------- Resources/Textures/Tiles/plating.png | Bin 271 -> 302 bytes Resources/Textures/Tiles/tech_maint.png | Bin 320 -> 213 bytes 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Resources/Textures/Tiles/attributions.yml b/Resources/Textures/Tiles/attributions.yml index bb86336bb6..9ce6c90cd0 100644 --- a/Resources/Textures/Tiles/attributions.yml +++ b/Resources/Textures/Tiles/attributions.yml @@ -3,8 +3,8 @@ - files: ["tech_maint.png"] license: "CC-BY-SA-3.0" - copyright: "Sprite created by Flareguy, with parts and inspiration taken from moonheart08's tiles and the original tiles from CEV-Eris at commit 28e589f0ff72a009adf17db767e90be39054f0f2." - source: "https://github.com/space-wizards/space-station-14/pull/15817" + copyright: "CEV-Eris commit 28e589f0ff72a009adf17db767e90be39054f0f2" + source: "https://github.com/discordia-space/CEV-Eris/" - files: [ "asteroid_sand.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" @@ -28,7 +28,7 @@ - files: ["shuttleblue.png", "shuttleorange.png", "shuttlepurple.png", "shuttlered.png", "shuttlewhite.png"] license: "CC-BY-SA-3.0" - copyright: "original sprites from paradisestation commit 69c831afcd9aef25a2889b507e4f36a3a5fc6def, originally from /VG/ eris" + copyright: "paradisestation commit 69c831afcd9aef25a2889b507e4f36a3a5fc6def, originally from /VG/ eris" source: "https://github.com/ParadiseSS13/Paradise" - files: ["deprecated.png"] @@ -60,8 +60,3 @@ license: "CC0-1.0" copyright: "Created by EmoGarbage404 (github) for space-station-14." source: "https://github.com/space-wizards/space-station-14/pull/13766" - -- files: ["plating.png"] - license: "CC-BY-SA-3.0" - copyright: "Edited by Flareguy for https://github.com/space-wizards/space-station-14, original sprite taken from tgstation at commit fb2d71495bfe81446159ef528534193d09dd8d34." - source: "https://github.com/space-wizards/space-station-14/pull/15817" diff --git a/Resources/Textures/Tiles/plating.png b/Resources/Textures/Tiles/plating.png index 46d311cf6df3daa199ea5a2510f9cb121cc2c7a2..18dfaca091d9ee00e69bf67c2bab68088b73a629 100644 GIT binary patch delta 275 zcmV+u0qp*d0NqGjTLa08SMz8p^#2*c=|dhq?I`JR4XdX~oUv z0Dmc1%wHdK^+r*bCWS%tX6vZoAvR?Qc}P Z0bWINm)Ii*Ukm^M002ovPDHLkV1i2`YwG|2 delta 243 zcmZ3-)Xy|QrJk`k$lZxy-8q?;3=9k`>5jgR3=A9lx&I`x0{Nl=J|V7YDJg1dYNbU* zrlzL0wzgJQRxU0seAh$lfeJVaJR*x382Ao@Fyrz36)8Z$W=|K#5RLP9C!XeQFyL|K z77j3E%xP#~)Kc9W&Lv&)U((~u@*2OG%JvuhiQNo*BwK zX+mC;IfM^SkkM>Esdn&!^A+C7wa&^iX-2Jy+?I-mRD}c<3VC+usD64YW_amLo7BI? qV*9E)yLT?W-1{!}+h6lN@r-pB60LLo&r$)phr!d;&t;ucLK6Ut6<4?b diff --git a/Resources/Textures/Tiles/tech_maint.png b/Resources/Textures/Tiles/tech_maint.png index 25d97f655590faa0edf71de659686e2ff48ecc33..97b1e865ad4e806d9dd8734c5a34f6e800379820 100644 GIT binary patch delta 185 zcmV;q07n170@VSKB!47OOjJcvSX)C$O(!QOGB!CnK0!rGO-W5qK0rf1Lq|+eR69UJ zBqSt&)&ise003-BL_t(2kz-(h03iVg&BVa$0s_uVFq(liEj=x*ER~5htqjOYWny5d z=m3HeCJ0>&RFOGj=FCo@ipgqLLZesy|MLC00000NkvXXu0mjfi%>!t delta 293 zcmV+=0owl60l)%~B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP0000OP)t-sQBhGf zG&Dj&LPbPGR8&+pFu}MTh zR4C7tkUM^qN@ve&nXunOy}