From 068e8949c296d5884858498ea7899c63a4185b84 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Tue, 26 Mar 2019 09:35:27 +0100 Subject: [PATCH] Fancy tables from Eris. --- Resources/Prototypes/Entities/table.yml | 19 ++++++++++++------ .../Buildings/table_solid.rsi/meta.json | 1 + .../Buildings/table_solid.rsi/solid_0.png | Bin 0 -> 596 bytes .../Buildings/table_solid.rsi/solid_1.png | Bin 0 -> 709 bytes .../Buildings/table_solid.rsi/solid_2.png | Bin 0 -> 596 bytes .../Buildings/table_solid.rsi/solid_3.png | Bin 0 -> 709 bytes .../Buildings/table_solid.rsi/solid_4.png | Bin 0 -> 697 bytes .../Buildings/table_solid.rsi/solid_5.png | Bin 0 -> 698 bytes .../Buildings/table_solid.rsi/solid_6.png | Bin 0 -> 697 bytes .../Buildings/table_solid.rsi/solid_7.png | Bin 0 -> 767 bytes 10 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 Resources/Textures/Buildings/table_solid.rsi/meta.json create mode 100644 Resources/Textures/Buildings/table_solid.rsi/solid_0.png create mode 100644 Resources/Textures/Buildings/table_solid.rsi/solid_1.png create mode 100644 Resources/Textures/Buildings/table_solid.rsi/solid_2.png create mode 100644 Resources/Textures/Buildings/table_solid.rsi/solid_3.png create mode 100644 Resources/Textures/Buildings/table_solid.rsi/solid_4.png create mode 100644 Resources/Textures/Buildings/table_solid.rsi/solid_5.png create mode 100644 Resources/Textures/Buildings/table_solid.rsi/solid_6.png create mode 100644 Resources/Textures/Buildings/table_solid.rsi/solid_7.png diff --git a/Resources/Prototypes/Entities/table.yml b/Resources/Prototypes/Entities/table.yml index 2885b7119f..060504d6fe 100644 --- a/Resources/Prototypes/Entities/table.yml +++ b/Resources/Prototypes/Entities/table.yml @@ -1,16 +1,23 @@ - type: entity id: table - name: "[engine] worktop" + name: "worktop" components: - type: Clickable - type: Sprite - texture: Objects/worktop_single.png + netsync: false + sprite: Buildings/table_solid.rsi + state: plain_preview - type: Icon - texture: Objects/worktop_single.png + sprite: Buildings/table_solid.rsi + state: plain_preview - type: BoundingBox - aabb: "-0.45,-1,0.95,1" - DebugColor: "#0000FF" - - type: Collidable + + - type: SnapGrid + offset: Center + + - type: IconSmooth + key: tables + base: solid_ diff --git a/Resources/Textures/Buildings/table_solid.rsi/meta.json b/Resources/Textures/Buildings/table_solid.rsi/meta.json new file mode 100644 index 0000000000..447dced093 --- /dev/null +++ b/Resources/Textures/Buildings/table_solid.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi", "states": [{"name": "plain_preview", "directions": 1, "delays": [[1.0]]}, {"name": "solid_0", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "solid_1", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "solid_2", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "solid_3", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "solid_4", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "solid_5", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "solid_6", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "solid_7", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Buildings/table_solid.rsi/solid_0.png b/Resources/Textures/Buildings/table_solid.rsi/solid_0.png new file mode 100644 index 0000000000000000000000000000000000000000..55c7c54235858b6f3816cd61e4834d0823e7ec6e GIT binary patch literal 596 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Buildings/table_solid.rsi/solid_6.png b/Resources/Textures/Buildings/table_solid.rsi/solid_6.png new file mode 100644 index 0000000000000000000000000000000000000000..adcf8d2fec0cda48c8752be8be2284255a79face GIT binary patch literal 697 zcmV;q0!ICbP)zCN8!Zt7l3sPZ1SJhAg3gz@T}LsiKW#RE&!MG#Ewf@gJ}V14B&DB304sUxT_TA1&BmTpbH@h zRwDrL+YLS<2u4czKLBLk_3?Q8I}~+Yqw6}fZHwFOR;DL!vMLuSfw%zFH%pqX6ygG; z`MXrGDutK;G-07v>xc-z6)x9;hyZkMUYig_XMv9rfUDkcWh`rC3qY5rX}AN zO84;Qu$Cf=TR>G+v*t}#jGJ(QSI_Oxnt=r?5J`pSc5b;kp%woJgknHsNo2RSa?G}X zsns8MzOTeFw_L2;F2Is$F-@N(T}fSlm^uT0r$z4HBJ_Qc_Qme>CR2wgxE&|@9jR?ehJ()tD*+L9IZQ3UsKd2Zb6Na^Z~-_5AR3RX7D75iFW~~nQRH=hHnOtQTL>WGB~Hf! zRi{v)>>ay0CXk?1w;UAsq4M}m_Cc5SAq<&r47+yWdG zGqMAX1Bh&YpdI6^5OOupRlvF@9iUEkXRs8w1YQeJ^eSqU-x!pcW8O-}eHK1Fo*`dx2$z zqw4!!AOb|z_r1XD0-DwJeJ|nvf&RY0s4bD#|NZv`G}3XN%`7wwVH>wv}5z#{uC2j7*+G x-O-7YZT14p?5K_PEb7ErxBzE1KC{<(`36?jK&^QF7~TK?002ovPDHLkV1la#Y4HF6 literal 0 HcmV?d00001