From fc667f8f44b2094eb00c5a7a55eb103ef78fc34a Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Sun, 27 Feb 2022 07:01:48 +0000 Subject: [PATCH] Big tile PR (3 carpets, 4 red sands, 1 grass, 5 shuttle floors) (#6864) --- .../Entities/Objects/Misc/tiles.yml | 144 +++++++++++++ .../Prototypes/Stacks/floor_tile_stacks.yml | 40 ++++ Resources/Prototypes/Tiles/floors.yml | 195 ++++++++++++++++++ .../Objects/Tiles/tile.rsi/arcadeblue.png | Bin 0 -> 359 bytes .../Objects/Tiles/tile.rsi/arcadered.png | Bin 0 -> 396 bytes .../Objects/Tiles/tile.rsi/eighties.png | Bin 0 -> 424 bytes .../Objects/Tiles/tile.rsi/grassjungle.png | Bin 0 -> 778 bytes .../Textures/Objects/Tiles/tile.rsi/meta.json | 29 ++- .../Objects/Tiles/tile.rsi/shuttleblue.png | Bin 0 -> 272 bytes .../Objects/Tiles/tile.rsi/shuttleorange.png | Bin 0 -> 284 bytes .../Objects/Tiles/tile.rsi/shuttlepurple.png | Bin 0 -> 286 bytes .../Objects/Tiles/tile.rsi/shuttlered.png | Bin 0 -> 200 bytes .../Objects/Tiles/tile.rsi/shuttlewhite.png | Bin 0 -> 218 bytes Resources/Textures/Tiles/arcadeblue.png | Bin 0 -> 491 bytes Resources/Textures/Tiles/arcadered.png | Bin 0 -> 534 bytes Resources/Textures/Tiles/copyright.txt | 6 + Resources/Textures/Tiles/eighties.png | Bin 0 -> 475 bytes Resources/Textures/Tiles/grassjungle.png | Bin 0 -> 297 bytes Resources/Textures/Tiles/ironsand1.png | Bin 0 -> 442 bytes Resources/Textures/Tiles/ironsand2.png | Bin 0 -> 469 bytes Resources/Textures/Tiles/ironsand3.png | Bin 0 -> 512 bytes Resources/Textures/Tiles/ironsand4.png | Bin 0 -> 549 bytes Resources/Textures/Tiles/shuttleblue.png | Bin 0 -> 252 bytes Resources/Textures/Tiles/shuttleorange.png | Bin 0 -> 253 bytes Resources/Textures/Tiles/shuttlepurple.png | Bin 0 -> 253 bytes Resources/Textures/Tiles/shuttlered.png | Bin 0 -> 237 bytes Resources/Textures/Tiles/shuttlewhite.png | Bin 0 -> 226 bytes 27 files changed, 413 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/arcadeblue.png create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/arcadered.png create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/eighties.png create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/grassjungle.png create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/shuttleblue.png create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/shuttleorange.png create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/shuttlepurple.png create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/shuttlered.png create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/shuttlewhite.png create mode 100644 Resources/Textures/Tiles/arcadeblue.png create mode 100644 Resources/Textures/Tiles/arcadered.png create mode 100644 Resources/Textures/Tiles/eighties.png create mode 100644 Resources/Textures/Tiles/grassjungle.png create mode 100644 Resources/Textures/Tiles/ironsand1.png create mode 100644 Resources/Textures/Tiles/ironsand2.png create mode 100644 Resources/Textures/Tiles/ironsand3.png create mode 100644 Resources/Textures/Tiles/ironsand4.png create mode 100644 Resources/Textures/Tiles/shuttleblue.png create mode 100644 Resources/Textures/Tiles/shuttleorange.png create mode 100644 Resources/Textures/Tiles/shuttlepurple.png create mode 100644 Resources/Textures/Tiles/shuttlered.png create mode 100644 Resources/Textures/Tiles/shuttlewhite.png diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml index ace334c5ba..8bc856ccf5 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml @@ -329,6 +329,136 @@ - plating - floor_laundry +# Carpets +- type: entity + name: blue arcade floor + parent: FloorTileItemBase + id: FloorTileItemArcadeBlue + components: + - type: Sprite + state: arcadeblue + - type: Item + HeldPrefix: arcadeblue + - type: FloorTile + outputs: + - plating + - FloorArcadeBlue + - type: Stack + stackType: FloorTileStackArcadeBlue + +- type: entity + name: red arcade floor + parent: FloorTileItemBase + id: FloorTileItemArcadeRed + components: + - type: Sprite + state: arcadered + - type: Item + HeldPrefix: arcadered + - type: FloorTile + outputs: + - plating + - FloorArcadeRed + - type: Stack + stackType: FloorTileStackArcadeRed + +- type: entity + name: eighties floor + parent: FloorTileItemBase + id: FloorTileItemEighties + components: + - type: Sprite + state: eighties + - type: Item + HeldPrefix: eighties + - type: FloorTile + outputs: + - plating + - FloorEighties + - type: Stack + stackType: FloorTileStackEighties + +# Shuttles +- type: entity + name: white shuttle floor + parent: FloorTileItemBase + id: FloorTileItemShuttleWhite + components: + - type: Sprite + state: shuttlewhite + - type: Item + HeldPrefix: shuttlewhite + - type: FloorTile + outputs: + - plating + - FloorShuttleWhite + - type: Stack + stackType: FloorTileStackShuttleWhite + +- type: entity + name: blue shuttle floor + parent: FloorTileItemBase + id: FloorTileItemShuttleBlue + components: + - type: Sprite + state: shuttleblue + - type: Item + HeldPrefix: shuttleblue + - type: FloorTile + outputs: + - plating + - FloorShuttleBlue + - type: Stack + stackType: FloorTileStackShuttleBlue + +- type: entity + name: orange shuttle floor + parent: FloorTileItemBase + id: FloorTileItemShuttleOrange + components: + - type: Sprite + state: shuttleorange + - type: Item + HeldPrefix: shuttleorange + - type: FloorTile + outputs: + - plating + - FloorShuttleOrange + - type: Stack + stackType: FloorTileStackShuttleOrange + +- type: entity + name: purple shuttle floor + parent: FloorTileItemBase + id: FloorTileItemShuttlePurple + components: + - type: Sprite + state: shuttlepurple + - type: Item + HeldPrefix: shuttlepurple + - type: FloorTile + outputs: + - plating + - FloorShuttlePurple + - type: Stack + stackType: FloorTileStackShuttlePurple + +- type: entity + name: red shuttle floor + parent: FloorTileItemBase + id: FloorTileItemShuttleRed + components: + - type: Sprite + state: shuttlered + - type: Item + HeldPrefix: shuttlered + - type: FloorTile + outputs: + - plating + - FloorShuttleRed + - type: Stack + stackType: FloorTileStackShuttleRed + # Materials - type: entity name: gold floor @@ -403,6 +533,20 @@ outputs: - plating - floor_grass + +- type: entity + name: jungle grass tile + parent: FloorTileItemBase + id: FloorTileItemGrassJungle + components: + - type: Sprite + state: grassjungle + - type: Item + HeldPrefix: grassjungle + - type: FloorTile + outputs: + - plating + - FloorGrassJungle - type: entity name: snow tile diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml index ff5e68a980..53ba8a4529 100644 --- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml +++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml @@ -67,3 +67,43 @@ id: FloorTileDirty name: dirty tile spawn: FloorTileItemDirty + +- type: stack + id: FloorTileStackShuttleWhite + name: white shuttle tile + spawn: FloorTileItemShuttleWhite + +- type: stack + id: FloorTileStackShuttleBlue + name: blue shuttle tile + spawn: FloorTileItemShuttleBlue + +- type: stack + id: FloorTileStackShuttleOrange + name: orange shuttle tile + spawn: FloorTileItemShuttleOrange + +- type: stack + id: FloorTileStackShuttlePurple + name: purple shuttle tile + spawn: FloorTileItemShuttlePurple + +- type: stack + id: FloorTileStackShuttleRed + name: red shuttle tile + spawn: FloorTileItemShuttleRed + +- type: stack + id: FloorTileStackEighties + name: eighties floor tile + spawn: FloorTileItemEighties + +- type: stack + id: FloorTileStackArcadeBlue + name: blue arcade tile + spawn: FloorTileItemArcadeBlue + +- type: stack + id: FloorTileStackArcadeRed + name: red arcade tile + spawn: FloorTileItemArcadeRed \ No newline at end of file diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 18e94d23a2..0a4c777a64 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -298,6 +298,129 @@ item_drop: FloorTileItemLaundry thermalConductivity: 0.04 heatCapacity: 10000 + +# Carpets (non smoothing) +- type: tile + id: FloorArcadeBlue + name: blue arcade floor + texture: arcadeblue + base_turfs: + - plating + is_subfloor: false + can_crowbar: true + footstep_sounds: + collection: footstep_floor + friction: 0.40 + item_drop: FloorTileItemArcadeBlue + thermalConductivity: 0.04 + heatCapacity: 10000 + +- type: tile + id: FloorArcadeRed + name: red arcade floor + texture: arcadered + base_turfs: + - plating + is_subfloor: false + can_crowbar: true + footstep_sounds: + collection: footstep_floor + friction: 0.40 + item_drop: FloorTileItemArcadeRed + thermalConductivity: 0.04 + heatCapacity: 10000 + +- type: tile + id: FloorEighties + name: eighties floor + texture: eighties + base_turfs: + - plating + is_subfloor: false + can_crowbar: true + footstep_sounds: + collection: footstep_floor + friction: 0.40 + item_drop: FloorTileItemEighties + thermalConductivity: 0.04 + heatCapacity: 10000 + +# Shuttle +- type: tile + id: FloorShuttleWhite + name: white shuttle floor + texture: shuttlewhite + base_turfs: + - plating + is_subfloor: false + can_crowbar: true + footstep_sounds: + collection: footstep_floor + friction: 0.30 + item_drop: FloorTileItemShuttleWhite + thermalConductivity: 0.04 + heatCapacity: 10000 + +- type: tile + id: FloorShuttleBlue + name: blue shuttle floor + texture: shuttleblue + base_turfs: + - plating + is_subfloor: false + can_crowbar: true + footstep_sounds: + collection: footstep_floor + friction: 0.30 + item_drop: FloorTileItemShuttleBlue + thermalConductivity: 0.04 + heatCapacity: 10000 + +- type: tile + id: FloorShuttleOrange + name: orange shuttle floor + texture: shuttleorange + base_turfs: + - plating + is_subfloor: false + can_crowbar: true + footstep_sounds: + collection: footstep_floor + friction: 0.30 + item_drop: FloorTileItemShuttleOrange + thermalConductivity: 0.04 + heatCapacity: 10000 + +- type: tile + id: FloorShuttlePurple + name: purple shuttle floor + texture: shuttlepurple + base_turfs: + - plating + is_subfloor: false + can_crowbar: true + footstep_sounds: + collection: footstep_floor + friction: 0.30 + item_drop: FloorTileItemShuttlePurple + thermalConductivity: 0.04 + heatCapacity: 10000 + +- type: tile + id: FloorShuttleRed + name: red shuttle floor + texture: shuttlered + base_turfs: + - plating + is_subfloor: false + can_crowbar: true + footstep_sounds: + collection: footstep_floor + friction: 0.30 + item_drop: FloorTileItemShuttleRed + thermalConductivity: 0.04 + heatCapacity: 10000 + # Materials - type: tile @@ -421,6 +544,21 @@ item_drop: FloorTileItemGrass thermalConductivity: 0.04 heatCapacity: 10000 + +- type: tile + id: FloorGrassJungle + name: jungle grass floor + texture: grassjungle + base_turfs: + - plating + is_subfloor: false + can_crowbar: true + footstep_sounds: + collection: footstep_floor + friction: 0.30 + item_drop: FloorTileItemGrassJungle + thermalConductivity: 0.04 + heatCapacity: 10000 # Asteroid - type: tile @@ -506,3 +644,60 @@ friction: 0.30 thermalConductivity: 0.04 heatCapacity: 10000 + +- type: tile + id: FloorAsteroidIronsand1 + name: asteroid ironsand + texture: ironsand1 + base_turfs: + - space + is_subfloor: false + can_crowbar: false + footstep_sounds: + collection: footstep_asteroid + friction: 0.30 + thermalConductivity: 0.04 + heatCapacity: 10000 + +- type: tile + id: FloorAsteroidIronsand2 + name: asteroid ironsand pebbles + texture: ironsand2 + base_turfs: + - space + is_subfloor: false + can_crowbar: false + footstep_sounds: + collection: footstep_asteroid + friction: 0.30 + thermalConductivity: 0.04 + heatCapacity: 10000 + +- type: tile + id: FloorAsteroidIronsand3 + name: asteroid ironsand pebbles 2 + texture: ironsand3 + base_turfs: + - space + is_subfloor: false + can_crowbar: false + footstep_sounds: + collection: footstep_asteroid + friction: 0.30 + thermalConductivity: 0.04 + heatCapacity: 10000 + +- type: tile + id: FloorAsteroidIronsand4 + name: asteroid ironsand rock + texture: ironsand4 + base_turfs: + - space + is_subfloor: false + can_crowbar: false + footstep_sounds: + collection: footstep_asteroid + friction: 0.30 + thermalConductivity: 0.04 + heatCapacity: 10000 + diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/arcadeblue.png b/Resources/Textures/Objects/Tiles/tile.rsi/arcadeblue.png new file mode 100644 index 0000000000000000000000000000000000000000..b45699698b1afb674209e972e2bb3d96efb4afc4 GIT binary patch literal 359 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^TcxArY;~ z2@6Og@AVD*m4U%4!Pvqmc(X8j&FN!G!D z_eaKtKlKN%w}zhuim)lx7P4*QOqW!t`?~mqpciw9cT2zAyu=BU%^d}AFTQ?4!Qi=a wt&rlbryw8dO@GDtO8UdA3Xz_sKm#rYFIj)zIsO`Jfg#7>>FVdQ&MBb@06Jxbw*UYD literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/arcadered.png b/Resources/Textures/Objects/Tiles/tile.rsi/arcadered.png new file mode 100644 index 0000000000000000000000000000000000000000..22ee34b073ccefee35d23915f397bd0f98879e5d GIT binary patch literal 396 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T|B1xCzdsBeKhIo|xzqh?aN7#aNjxC%)cR4!CGQK2F41zI zr!)e=!@HfvAW;b`TQR|<{aJh$`d6kTRB$Zp+&V{veamvYW18Xnl>0zR6ORjJPSQzF z00PA&2@mz7+s^TYx24|}DqN*_H7LcwfW^u>M)Jy)D-vq+C#c>Q>XP~J<70B$fdwm5 zB=3EdDBp6B;b4tdo+JZv%PFQ+Pnn7iJ}5s>`tCW8nWIz0Qwe94hi{&K>X-N>{4el6 z~-lZwf0!ZVRQ7siVDK_{y85}Sb4q9e0FYm!jQ{`u literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/eighties.png b/Resources/Textures/Objects/Tiles/tile.rsi/eighties.png new file mode 100644 index 0000000000000000000000000000000000000000..b6bf9597d2638d00f651ea9a2f71b334d5ed2b2a GIT binary patch literal 424 zcmV;Z0ayNsP)Px$Vo5|nR9J=WmCI_vKoo}mlvG4Qf*@p26csTG_kASSeIDP-MO>tzVwgZ^$sk3n zFkMX=bMcIqo%vQ1_%r9{+y-c9Xn1xE9g%BKBo{tr>h zyq^@f_C!(|z8YZmzQ_J2&AxR_kOrib5&)PprKFWm241KOm@_>K9 ztNQaaIQ!N?s|T!(lhqdhj;8}!W*hz97*P_Ig0kf<)7;$y#U@mNRFhSqGQpfFX~3im z6a(kGy^d=dmfi!~U+FI9wT7xpap8m69)Jgoq0SztBVKQS;p=^4s8Dq+lAn@%U@m;f zA?;nufYotIbv>RA;Awy;3BiSb7QE|?vJy}{W)%w`#@0aB8U>Jth{S6Hb&&?mU`kIl< S`tP9t0000EX>4Tx04R}tkv&MmKpe$iQ>8^K4t5ZA$WWcEh>AFB6^c+H)C#RSm|Q=hNkfw2 z;wZQl9Q;_UI=DFN>fkB}f*&AmZcd6WQsV!TLW>v=j{EWM-sA2aAk@oDH9N)uRkMs_ zJSL_yt7704-57*`F$861>T{BmfamzShmWs!QJ&>}?$6Pa&6y1FiNv!^H!R`};^|FG z=e$oGW<@zmd`>)S&;^MfxvseU#<}3Iz%#=}DmhOaCKd~Ath6yJ8Y=M=aU`p1lrN-R z&T`)3td^^+c~AbrP)=J}<~q$G#IcAaND!f*iW17O5T#Wk#YB?!V;=qi$1jmfAy)~E z91EyGh3xpj|KNAGW`1(QO$x<;&KKMM7zP5nK%-{c-^aGyI05|6z?IhWSL(pbC+W48 z7C8cXw}Ff6mZt0hmpefJlP(*wBl&3x`8@D`M&FbH`fh=)HMh6sK29Hi6m^xj0S*p< zkpg9}d%Qc?-rK)tn*IF%SL$+{pbS1H0003&Nkl+4Bg24mKXUwnM?x!4Kh1XU^BNq&g`Ss&9$Uy7>R4J4rwyk@)Z2 zg%TFKP0wTFEV`yuV|p&K8~|{7J_f(*Xp++-E3+ z*WF^b>5a2PEN2+Q<@`2(1vn&1CO8yR?dAK~2DFAF6GfH}f)tl^rJD8;ECD@}m=p<> z+a9x%>gyj&G9BR&Z5Zj(F)zH32FOraWY3S zFO$so@!%Vry5S^zra!$eg7@|Q>Cp2TX-1~RLOURlNc;)D05oR4WC|uurT_o{07*qo IM6N<$f**Nk%>V!Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json index f3d4330013..45e8ab4d88 100644 --- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json +++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, additional copyrights see tiles folder.", "size": { "x": 32, "y": 32 @@ -28,6 +28,9 @@ { "name": "grass" }, + { + "name": "grassjungle" + }, { "name": "kitchen" }, @@ -103,6 +106,30 @@ { "name": "wood" }, + { + "name": "arcadeblue" + }, + { + "name": "arcadered" + }, + { + "name": "eighties" + }, + { + "name": "shuttlewhite" + }, + { + "name": "shuttleblue" + }, + { + "name": "shuttleorange" + }, + { + "name": "shuttlepurple" + }, + { + "name": "shuttlered" + }, { "name": "bcircuit-inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/shuttleblue.png b/Resources/Textures/Objects/Tiles/tile.rsi/shuttleblue.png new file mode 100644 index 0000000000000000000000000000000000000000..8fc34f39126984e530eac3ad0167899d449f0bd7 GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}r#xL8Ln2z= zPTk0R$Uwj~o@s0Pg2mf5F=;PJWK2t9lnOh+C0J^8-eG==QiHO{PZ{nfP1RGET3g=# zKVNTw#;N_mM@&MW7qVnDYF+pqneX3P@!#y(Pb9}!!BWAUAwOFGTmg@Z!TR!Z1}+_EBgWEBB zY1O2LPY;5lcC$ZwG?}$Q{?OKHg|;`&E2zopr0D56;IsgCw literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/shuttleorange.png b/Resources/Textures/Objects/Tiles/tile.rsi/shuttleorange.png new file mode 100644 index 0000000000000000000000000000000000000000..517da853365a652d642a03ea9fe3f3130a27daa0 GIT binary patch literal 284 zcmV+%0ptFOP)Px#)=5M`R9J=WmCX&pFbsts5$XvkT$!Na%mNI+I30s=7=Q(Ot||t|l}J4ylyD%B zQnhsw@ly$ZCri(bpWW607>4GnTXJD-yi^octg3s)h#y z*2~wV3WPp5wo)we-_5iBJom-x5;Rf^j%TwAE3#jZ+8_{g;MBP@AATJSw~(LN%X{ES z7$ cK&5O9wo191(ws#f0{zI~>FVdQ&MBb@0OvPp>;M1& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/shuttlered.png b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlered.png new file mode 100644 index 0000000000000000000000000000000000000000..e4f073d6dc2a7346b02d1090e007dd763143d8e3 GIT binary patch literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}O`a}}ArY-_ zr#f;q81S&Te{^>IGpYZRw^HRKxi1eKXGMsxl>0Tdz1=3w!J+uiZ*rzo;#$G^Lce04 zefqaTe1ZO#dFRCsoCzz}pOvA^oG<*3;m!J;s}|oo&U3|Wf}>yyTiWK?llY}2?yNp) x{LHlFzPwWa%X_y8QODE5w)QRd)o2l5kWN{tnz*C-U_8(@44$rjF6*2UngB&YO3MHM literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/shuttlewhite.png b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlewhite.png new file mode 100644 index 0000000000000000000000000000000000000000..fcc482b34b2e996af030465ee5c650dba62a37e7 GIT binary patch literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Q#@T9Ln2z= zPTk0RK!JzFKCsL&NwsWYg7|so^v=vle6AukULrd?)-yBLy?n?hbNr|E?Nf`c-Qr|e z)g_TUUtDm>lwTEV+67+x{GIh#{mGn{aas?u`L;QP#`nf^@2Iw_ipgGD+P0JR8Pf~n z$ekyRy)-Y&ec?NE&+;^*;6kRex(4D8EEDn?cQ!12|07du15bg>amEI2)7YTrd%fL# QfbL`PboFyt=akR{0E&N7J^%m! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Tiles/arcadeblue.png b/Resources/Textures/Tiles/arcadeblue.png new file mode 100644 index 0000000000000000000000000000000000000000..760ab5e6500e52b85288f88f38654d6ee7442a11 GIT binary patch literal 491 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|>H>U1TuWtT z3#Fubm6i8aGVPtg^yX^y`Hg1pCr$bZ1j|JKG%;vsH9QJs5EGATYHFH4fBw;iP155op^<_{_SJ9qB<4^j>S zJAN@Zx@@#}Tw-H4MbDtl#H^3E!XM-;t&$+WV4yPmfZ;#G4zP-AeaUq|T~9q-978O6 z&rUkX*Q~(P=BZ&dx2agTa7M*Lh4=rPR=cr^-pM?vkiq%(`ZxBZ{X9v>FDwypJ0=mO zBH_j;v|-v&j*2-9tZDo$CCn-eQ#K{@zSJ!hO|X$oW;xdI=+o{KIqy6oem~jtCe3MI zHskHjr3T3p6%|(;^D&5da#Zdizw?e2E@Hjz>>pPgIT~6J6nbceMkBXR;u+1n%UkM% z literal 0 HcmV?d00001 diff --git a/Resources/Textures/Tiles/arcadered.png b/Resources/Textures/Tiles/arcadered.png new file mode 100644 index 0000000000000000000000000000000000000000..9efe7e680b3fa28ee44977a653ddb463375ec9f3 GIT binary patch literal 534 zcmV+x0_pvUP)*)qBseHt&*>`T6*lnsr(GO8|4b+Zd_)bgZ!dOnHUxbe7OXOa3;?hv1Mp-I!Q%$a0001NdQ@0+ zL}hbha%pgMX>V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0* zI5Sc+(=$pSoZ^zil2jm52`rYGT3nQxqQu3Sl37#?6gA}HOe;#vO@*+P6fpUW&42FXQol?Qt6>YKb{%_fox?&aVw##`YntUXG z0AQc2NEzo?2qDOWWEDp&5tzsk=y!=61zQoSACH%aoQri2)mIfepn6{92tpvIXE{a9 znn8jvljHR(>t3`&~>_%S%T7Z zL@PISFHQRss6<`VwC~f~td>!Jg3T`ea-;rD_&$fXGz-EoUSjt78uT~D#&6?gT%Bqs zV@QJ?Vyd6gwdpa=xn8M{1plZLbr2n9#cfZ-i Y9mmiNB7*Gvu>b%707*qoM6N<$g22V-_5c6? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Tiles/copyright.txt b/Resources/Textures/Tiles/copyright.txt index 6cf1c4fc0c..7e9c6643c2 100644 --- a/Resources/Textures/Tiles/copyright.txt +++ b/Resources/Textures/Tiles/copyright.txt @@ -6,3 +6,9 @@ bar.png, laundry.png, mime.png, clown.png and kitchen.png are under CC-BY-SA-3.0 snow.png taken from TG at commit 67a5373b4649937dd63dd94153e05e8506f40a5d grass.png taken from TG at commit 73a638214c94da9b8c485f1c75f615cb79770883 reinforced.png taken from /tg/ at commit https://github.com/tgstation/tgstation/commit/4e2a36fe7e56fad93495adf01c697f4b5de04e90, licensed under CC-BY-SA-3.0 + + + +ironsand1-4, junglegrass, eightiesred and eighties taken from TG station at https://github.com/tgstation/tgstation/commit/8abb19545828230d92ba18827feeb42a67a55d49 +arcadeblue edited by Peptide90 based on eightiestred from TG. +shuttleblue, orange, purple, red and white taken from ParadiseSS13 at https://github.com/ParadiseSS13/Paradise/commit/69c831afcd9aef25a2889b507e4f36a3a5fc6def \ No newline at end of file diff --git a/Resources/Textures/Tiles/eighties.png b/Resources/Textures/Tiles/eighties.png new file mode 100644 index 0000000000000000000000000000000000000000..89c23385950fae16f4d3745e1b10cd877ec3fc7e GIT binary patch literal 475 zcmV<10VMv3P)*|X@@+}=0001KdQ@0+L}hbha%pgMX>V=-0C=2JR&a84 z_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm52`rYG zTCBvynUYyl3=}ft;!G<_%uR)`l@(n5T)-v+0Gi_)T~xi{Q2+n|2}wjjR49=}P`hr# zAP^idh8Cx}mL@%slHNLTJ&NMqU0PDz?`L+`B*ZAAuP;a@cIA+FnM Rp@aYc002ovPDHLkV1nl2&iViV literal 0 HcmV?d00001 diff --git a/Resources/Textures/Tiles/grassjungle.png b/Resources/Textures/Tiles/grassjungle.png new file mode 100644 index 0000000000000000000000000000000000000000..31e75cd6742a0c9492510ddd3f91835ff7c5324d GIT binary patch literal 297 zcmV+^0oMMBP)Fk1vzu{(-yDV&n6NAEoidRB`%_BeifS_?beC{p3rih|sa=$v_4G-GWGgKtP{GTQWs z52nmC5x!WIfetN;(qT*3Lud9zgbib(cJTFN*Jgky9qb-3m0&6b#XXxhd>@-2oS;2z z+P8wN)}jTJ`OIA_-jC|`$Qk)Tg}Ec{*D$}R!ZWL88ZNyOe+Qz@(s({KVTt&9RExG7 v(@P0NxcK9S18ZXBguzusb5v&gquu@i!?kH<95s6r00000NkvXXu0mjfr7n52 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Tiles/ironsand1.png b/Resources/Textures/Tiles/ironsand1.png new file mode 100644 index 0000000000000000000000000000000000000000..a161c640282637696c1526835743bfd9d3c20acc GIT binary patch literal 442 zcmV;r0Y(0aP)F_%s?nou^0MliBeppO6m0Bw3ySad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1 zFB_WQ*uAg-008PqL_t(2k!4ZaZNo4O zJk#;NkqHhe@=vr22<-wwgYLgdkEE0)s0>>aP2Ph7aGGHQH<+H6b?UWBvobrnDRz)} zswR5vGdmE7z}*2qmGZ&Bx%#UA>&?hfB;OuHJpdxZf08hI069w=yopKci0;Op2;w+E z&t@~nc*2>xZz)3z`n2SxNG~Y$LSVW{&wJMH(;)1CiGCjs`@&D(V7a4D&KM*Ty;b2(F)oTlL*#up|kc>xMpTxk>?%A1y@zZUtxF_%s?nou^0Mlf?qH;-OLY(_KnwmtR$003=zR9JLGWpiV4X>fFDZ*Bkpc$`yK zaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+ zvnW5WI5989Oo@v#C9|j)C}zmTnO2mTn+jnoE4cc(fQ<$Kx856{lyeYI0002|NklQ~j`sCa{r9u$9;=~5b_<~q1cB&3 zOYjjyrsWORsT4GEy6g3GEmntG9De%V4gSC**W7GL8&u%ZQ(Gx|K)EM_<}^8T%icBz zgsc$CH@}b11ckpe`_e)B%QP(JfQWw7ObNHB28lGnJWS2orZe{_j_-m~ox5h z-O#H{TBL!%y{9SQc}g-~ys+>Y12YuVRY1pyd8Tnc2d+J-)+q4{h+-KN99Y+R00000 LNkvXXu0mjfE~Leg literal 0 HcmV?d00001 diff --git a/Resources/Textures/Tiles/ironsand3.png b/Resources/Textures/Tiles/ironsand3.png new file mode 100644 index 0000000000000000000000000000000000000000..f00107a225649b79af1652209f1a7afeeb2eb2be GIT binary patch literal 512 zcmV+b0{{JqP)F_%s?nou@?LMx?JI&U~8g+(xPN;io{FnvKSk6uM=MlC9|j)C}_yVnO2mTn+jnoE4cc(fXxN~ z(Z(CiaaMMb0003ONkl@Z`3f9?B27w* zGf=EZfs_+)7EZ&P8Jmx=W$*0l%=^p&=tZ!Ct{{B>JUu_jv}UG56~^}mRs5>njZY_E zncaA{jdK0Lin9T)pDeWZ=i>y~a*xu8Aeg3TNfbkpyqObKv^>#&lF+IPGEHr;f!ZC^ zy9d2^ut^S!W)Y)=ADmcAGw&jo3V%azD@m_{B1+WVq~|VbyEI6M0wI0Z7EQ_t3Xe4E zN~HS4r*-#18Tz=;t79^%1k&BXoOQF_%s?nou^0MlgXxE`UNSol!TfSv_w!CWS>XeL*dyRXTG@H;-OLY(_I;^Qt}o z003=zR9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;Zh zDainGjE%TBGg33tGfE(w;*!LYR3K9+vnW5WI5989Qi+Q*C9|j)C}zmTnO2mTn+jno zE4cc(fQ<$KxJMhJ(YS*30003rNklX3ra!#%olt5&c2@(#0zfRKL@Ck8p>4S?X9py>ajnlEtAeY(aZpYL`q2u2uPs= z0Qj*OkHJ^aQ=n-e_;sbvYX57Fov7)?w4z-&Tt~B$J*5##V_k<-n-z}C%$FW@2EX&d zkH@7#EWLA+XQxaw%TvPRzAsixz@8p$SuHDi7fqtrQxqSB%)$3{D|%T>8C`LT1WsZ{ z*~$SY(CXh%usT^3Hrxz^IL>Z}0BRdV9PeuuDDrfXfx3ZpIDVAaV|jIJ4A+%rqj!V5 z7nC#ySX~0!#%eS!4Uh9sjw>1MCpxPv`_)B6hj>*nhv)D``v!AxV%2ER8Ab)%_de(^ nRl~`~nRhy}{}R5wfAq*NTzdxR8?`@u00000NkvXXu0mjfDc|W1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Tiles/shuttleblue.png b/Resources/Textures/Tiles/shuttleblue.png new file mode 100644 index 0000000000000000000000000000000000000000..da848dec986ce1f39e0086e6d4daa89c869f7a54 GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@o&cW^SL2!g8D{=B4E-Cm^JCIi zj+sF5%&L%x5|`BC)e_1!5cyiE*d|0 zq;uX!^CUx2Pwx&3;~?Y9#$F0@9!)wjDMTSyQ&-)7zei`cvFhd(5+}@`Jo3@@I^)~A zVXA1%-4V{Na>!c_WcL6)XdYxF+^f&azaXz1KVwXfsTZhHb(_9%^mAP0~mx7 x8)km~uODLA!f2u_lEybnBt~5K%)++)4F2Lp`R~%XoPj1Vc)I$ztaD0e0su;lTZsSw literal 0 HcmV?d00001 diff --git a/Resources/Textures/Tiles/shuttleorange.png b/Resources/Textures/Tiles/shuttleorange.png new file mode 100644 index 0000000000000000000000000000000000000000..46f562b506c59e65606df9ce5b0d3afcca415968 GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@o&cW^*AEAn{?BB%Uc&bO3`0<^ z{8pfNR#iwuiA!p6a#3bMNoIZ?14G4};IM+C((hk_3qF2*qUEitb?(gh;0>V$7mXi0 z(mC&=d6J>1r+0^iaggz4V=sj{k0u?N6rvEUsjF_k|Aa?px3TKx6%rZ=Cyvexn=)fI zSE9D|j$b<)&ayHDJ(r4?s5%x3wAIYh#W6%;YH~tKlLOmre}RsKmNrKPG0h$8LIW6t y5*ucI{;wZm*urR{ERx1IOC&~I_sqh!{S5x%Mfva2xtxI}FnGH9xvX)e_1!5cyiE*d|0 zq;uX!^CUx2Pwx&3;~?Y9#$F0@9!)wjDMTSyQ&-)7|A~;!Ze!KWD)e_1!5cyiE*d|0q;uX! z^CUx2Pwx&3;~?Y9#$F0@9!)wjDMTSyQ&-)7{|T4QZe!KWDFVdQ&MBb@0HXL#9{>OV literal 0 HcmV?d00001 diff --git a/Resources/Textures/Tiles/shuttlewhite.png b/Resources/Textures/Tiles/shuttlewhite.png new file mode 100644 index 0000000000000000000000000000000000000000..1e2dd5d0d5eac1d6495763feeefadfccc07b9ade GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@&H$ef*PAzQu3x{tuCC5|>Mc{C zU{+N~M2SmkadJ^+K}lwQ9s@(goZzs6qSEhQf(t%=eWK;9t99jJaWn(XeIgchCnG~WBtf{MRzyCx;XScEH<`ohe2`7%u44X1zHdmsy z_KsgW8_u#a1anCxtUA0<9B8YYr;B5V#MI=3lqLr@AGZt%mZXVI#$k?(cBalZWf+VW WC<>m+xfK9Z$>8bg=d#Wzp$PymLr@O@ literal 0 HcmV?d00001