diff --git a/Content.Client/ADT/license.txt b/Content.Client/ADT/license.txt new file mode 100644 index 00000000000..79f9846ed4e --- /dev/null +++ b/Content.Client/ADT/license.txt @@ -0,0 +1,19 @@ +Copyright (c) 2024 Adventure Station + +1. The provided software code in this and nested directories (hereinafter referred to as the "Adventure Station" project code) is intended solely for use within the "Adventure Station" project. + +2. Any use, copying, distribution, or modification of the "Adventure Station" project code outside of "Adventure Station" project is prohibited. + +3. This license does not grant any rights to own, use, or distribute the "Adventure Station" project code outside of the "Adventure Station" project. + +4. This license is valid indefinitely, or until a decision is made by the copyright holder of the "Adventure Station" project to revoke/modify it. + +Copyright (c) 2024 Adventure Station + +1. Представленный программный код в данном и вложенных директориях (далее - код проекта "Adventure Station") предназначен исключительно для использования в рамках проекта "Adventure Station" + +2. Любое использование, копирование, распространение и изменение кода проекта "Adventure Station" за пределами данного проекта запрещены. + +3. Настоящая лицензия не предоставляет никаких прав на владение, использование или распространение кода проекта "Adventure Station" вне проекта "Adventure Station". + +4. Настоящая лицензия действительна бессрочно, или до решения об упразднении/изменении правообладателем проекта "Adventure Station". \ No newline at end of file diff --git a/Content.Server/ADT/license.txt b/Content.Server/ADT/license.txt new file mode 100644 index 00000000000..79f9846ed4e --- /dev/null +++ b/Content.Server/ADT/license.txt @@ -0,0 +1,19 @@ +Copyright (c) 2024 Adventure Station + +1. The provided software code in this and nested directories (hereinafter referred to as the "Adventure Station" project code) is intended solely for use within the "Adventure Station" project. + +2. Any use, copying, distribution, or modification of the "Adventure Station" project code outside of "Adventure Station" project is prohibited. + +3. This license does not grant any rights to own, use, or distribute the "Adventure Station" project code outside of the "Adventure Station" project. + +4. This license is valid indefinitely, or until a decision is made by the copyright holder of the "Adventure Station" project to revoke/modify it. + +Copyright (c) 2024 Adventure Station + +1. Представленный программный код в данном и вложенных директориях (далее - код проекта "Adventure Station") предназначен исключительно для использования в рамках проекта "Adventure Station" + +2. Любое использование, копирование, распространение и изменение кода проекта "Adventure Station" за пределами данного проекта запрещены. + +3. Настоящая лицензия не предоставляет никаких прав на владение, использование или распространение кода проекта "Adventure Station" вне проекта "Adventure Station". + +4. Настоящая лицензия действительна бессрочно, или до решения об упразднении/изменении правообладателем проекта "Adventure Station". \ No newline at end of file diff --git a/Content.Shared/ADT/license.txt b/Content.Shared/ADT/license.txt new file mode 100644 index 00000000000..79f9846ed4e --- /dev/null +++ b/Content.Shared/ADT/license.txt @@ -0,0 +1,19 @@ +Copyright (c) 2024 Adventure Station + +1. The provided software code in this and nested directories (hereinafter referred to as the "Adventure Station" project code) is intended solely for use within the "Adventure Station" project. + +2. Any use, copying, distribution, or modification of the "Adventure Station" project code outside of "Adventure Station" project is prohibited. + +3. This license does not grant any rights to own, use, or distribute the "Adventure Station" project code outside of the "Adventure Station" project. + +4. This license is valid indefinitely, or until a decision is made by the copyright holder of the "Adventure Station" project to revoke/modify it. + +Copyright (c) 2024 Adventure Station + +1. Представленный программный код в данном и вложенных директориях (далее - код проекта "Adventure Station") предназначен исключительно для использования в рамках проекта "Adventure Station" + +2. Любое использование, копирование, распространение и изменение кода проекта "Adventure Station" за пределами данного проекта запрещены. + +3. Настоящая лицензия не предоставляет никаких прав на владение, использование или распространение кода проекта "Adventure Station" вне проекта "Adventure Station". + +4. Настоящая лицензия действительна бессрочно, или до решения об упразднении/изменении правообладателем проекта "Adventure Station". \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Mobs/nukiecarp.yml b/Resources/Prototypes/ADT/Entities/Mobs/nukiecarp.yml index ffa46eddf8f..18f69d01cc5 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/nukiecarp.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/nukiecarp.yml @@ -1,5 +1,5 @@ - type: entity - name: Carpkat + name: Karpkat parent: BaseMobCarp id: MobCarpNukie description: This poor carp is homestucked. @@ -7,6 +7,12 @@ - type: NpcFactionMember factions: - Syndicate + - type: Sprite + drawdepth: Mobs + sprite: ADT/Mobs/Aliens/CarpCat.rsi + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: alive - type: entity name: CarpCat Spawner diff --git a/Resources/Prototypes/ADT/license.txt b/Resources/Prototypes/ADT/license.txt new file mode 100644 index 00000000000..79f9846ed4e --- /dev/null +++ b/Resources/Prototypes/ADT/license.txt @@ -0,0 +1,19 @@ +Copyright (c) 2024 Adventure Station + +1. The provided software code in this and nested directories (hereinafter referred to as the "Adventure Station" project code) is intended solely for use within the "Adventure Station" project. + +2. Any use, copying, distribution, or modification of the "Adventure Station" project code outside of "Adventure Station" project is prohibited. + +3. This license does not grant any rights to own, use, or distribute the "Adventure Station" project code outside of the "Adventure Station" project. + +4. This license is valid indefinitely, or until a decision is made by the copyright holder of the "Adventure Station" project to revoke/modify it. + +Copyright (c) 2024 Adventure Station + +1. Представленный программный код в данном и вложенных директориях (далее - код проекта "Adventure Station") предназначен исключительно для использования в рамках проекта "Adventure Station" + +2. Любое использование, копирование, распространение и изменение кода проекта "Adventure Station" за пределами данного проекта запрещены. + +3. Настоящая лицензия не предоставляет никаких прав на владение, использование или распространение кода проекта "Adventure Station" вне проекта "Adventure Station". + +4. Настоящая лицензия действительна бессрочно, или до решения об упразднении/изменении правообладателем проекта "Adventure Station". \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index 2e88b04d744..b17efb2061e 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml @@ -501,7 +501,7 @@ - PillCanister - type: Storage grid: - - 0,0,4,1 + - 0,0,5,1 quickInsert: true areaInsert: true areaInsertRadius: 1 diff --git a/Resources/Textures/ADT/Clothing/Shoes/Boots/magboots-ert.rsi/icon-on.png b/Resources/Textures/ADT/Clothing/Shoes/Boots/magboots-ert.rsi/icon-on.png index 3662f3e44f0..20ba4824e1e 100644 Binary files a/Resources/Textures/ADT/Clothing/Shoes/Boots/magboots-ert.rsi/icon-on.png and b/Resources/Textures/ADT/Clothing/Shoes/Boots/magboots-ert.rsi/icon-on.png differ diff --git a/Resources/Textures/ADT/Clothing/Shoes/Boots/magboots-ert.rsi/icon.png b/Resources/Textures/ADT/Clothing/Shoes/Boots/magboots-ert.rsi/icon.png index c2e74f6159b..306a5054fb5 100644 Binary files a/Resources/Textures/ADT/Clothing/Shoes/Boots/magboots-ert.rsi/icon.png and b/Resources/Textures/ADT/Clothing/Shoes/Boots/magboots-ert.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/alive.png b/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/alive.png new file mode 100644 index 00000000000..d7c9249bb89 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/alive.png differ diff --git a/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/dead.png b/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/dead.png new file mode 100644 index 00000000000..faf6d1be605 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/dead.png differ diff --git a/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/dead_mouth.png b/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/dead_mouth.png new file mode 100644 index 00000000000..bccea47b3a3 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/dead_mouth.png differ diff --git a/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/gib.png b/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/gib.png new file mode 100644 index 00000000000..f5d2c96041d Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/gib.png differ diff --git a/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/icon.png b/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/icon.png new file mode 100644 index 00000000000..c8d59df6e60 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/meta.json b/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/meta.json new file mode 100644 index 00000000000..68851e549fb --- /dev/null +++ b/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/meta.json @@ -0,0 +1,89 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/master/icons/mob/animal.dmi, edited 'dead' to create 'crit' and 'dead' states", + "states": [ + { + "name": "icon" + }, + { + "name": "mouth", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "dead_mouth" + }, + { + "name": "dead" + }, + { + "name": "alive", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "gib", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/mouth.png b/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/mouth.png new file mode 100644 index 00000000000..8e504f91aed Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/mouth.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/ammo-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/ammo-equipped-BACKPACK.png index 361fa4f269a..229dbd4e179 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/ammo-equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/ammo-equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/equipped-BACKPACK.png index 65b710d4d8f..80bd75d732e 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-ammo.png b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-ammo.png index 85e5a428b09..e624652de0c 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-ammo.png and b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-ammo.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-med.png b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-med.png index f6a9b00982d..82bc724fc05 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-med.png and b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-med.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon.png index f778bc213bc..7772f2a86c9 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/med-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/med-equipped-BACKPACK.png index 1d5e8f399fa..52435e97128 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/med-equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/med-equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/meta.json index ca735290b77..72b0f3d276d 100644 --- a/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1, and modified for Adventure Time by prazat911 (Discord)", + "copyright": "Created by discord:prazat911", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon.png index b97674fdfbf..09c80ceb7dd 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json index 92b00ebc3bb..6a1bf46b055 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by discord:IAmRasputin#5242", + "copyright": "Created by discord:prazat911", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET.png index 32759d3244c..b6925cb6da4 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-left.png index ad32ce8f280..9791f4330c9 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-right.png index a0cd6c22b75..b1f405d0de4 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET.png index f7f4fc15701..bc35566b67d 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-left.png index e40883d3190..bc9b6fbb011 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-right.png index 2b7a0306d4b..2d89269a760 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon.png index 972df70f3b2..e5e784f7a88 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json index fa9e18b1b51..54bc583adcc 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by discord:IAmRasputin#5242", + "copyright": "Created by discord:prazat911", "size": { "x": 32, diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-vulp.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-vulp.png index c9618bf4029..1e9197ed985 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-vulp.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-vulp.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET.png index 7b2870ea45f..b1b5b9e51d5 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-left.png index ed24b26b91a..b1d83b09092 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-right.png index e92b71a40ce..cc6572c45df 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET.png index a14b45c2c6b..4b2b42ff10c 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-left.png index 97d938f79da..78a8714f6a8 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-right.png index 92a54785a58..3cbdae5b4e4 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon.png index a7298ff039f..e4001fec724 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json index fa9e18b1b51..54bc583adcc 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by discord:IAmRasputin#5242", + "copyright": "Created by discord:prazat911", "size": { "x": 32, diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/icon-flash.png index 6d63fa871b4..65f21a12d85 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/icon.png index 6b2df0e84fd..2acdc002d86 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET.png index 37d8a092d9c..6d493498a97 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET.png index 44443b7755b..569ea675476 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png index 7f16c61a2a5..97c33370b28 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/icon.png index d94dd3bc294..4fa5557c458 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-left.png index 268fde26b14..7e5bbfd7fa7 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-right.png index 29b67726d88..a411dbdae21 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json index e216d7371a1..abf765c8ff8 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.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/fb2d71495bfe81446159ef528534193d09dd8d34, equipped-OUTERCLOTHING-monkey made by Dutch-VanDerLinde", + "copyright": "Created by discord:prazat911", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING.png index b7b52f0c416..05a13b7c1d1 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/icon.png index 871fcbd074a..0e86097652e 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-left.png index a27d75760ad..8a89970d3d7 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-right.png index 11f4011e6ee..999ca0620bc 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING.png index 24970c7ac6b..29ef6a1b90d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/icon.png index 0ba07b9c382..3e5a4b602e9 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-left.png index 3ffcc52ad0c..bbf631f85a5 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-right.png index a5ae29e3665..29249a81b0f 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json index 196eabc09c5..b9aa6cfda63 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by discord:IAmRasputin#5242", + "copyright": "Created by discord:prazat911", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING.png index 1ae4bd3036f..c4238aea036 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/icon.png index ef1d5c5721b..5ac8179f992 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/inhand-left.png index b3240d55147..c5b656feefb 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/inhand-right.png index 4fc74ac8c52..58fe117b75c 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json index df5525bfa84..e63b0a406cb 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Hqlle (github)", + "copyright": "Created by discord:prazat911", "size": { "x": 32, diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNESW.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNESW.png index 60007ce20da..ce547fd1f9b 100644 Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNESW.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNESW.png differ diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNWSE.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNWSE.png index 71f3570ceb2..bca6b10de13 100644 Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNWSE.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNWSE.png differ diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/fulltile_overlay.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/fulltile_overlay.png index 67dbb69de44..6831f4a62bf 100644 Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/fulltile_overlay.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/fulltile_overlay.png differ diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay.png index b67f78c741f..0107fa81c2a 100644 Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay.png differ diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png index af1f727641b..2895fbdb3ec 100644 Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png differ diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png index 4224c17bed5..3fb96eb7483 100644 Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png differ diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png index 941dd97110c..e5f9586b6cb 100644 Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png differ diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay.png index 90d5d74f069..8f7f7249194 100644 Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay.png differ diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png index ac1f00b56df..7c0b089b492 100644 Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png differ diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png index da651e95a6f..25da267426a 100644 Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png differ diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_90.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_90.png index b58aa7f8dfa..20e2e2aedd7 100644 Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_90.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_90.png differ diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png index 4cf4fab39af..16de9313daf 100644 Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png differ diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_180.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_180.png index 35b5ce4dbcc..d7467c03a11 100644 Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_180.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_180.png differ diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_270.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_270.png index aa21e477f51..533111755d0 100644 Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_270.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_270.png differ diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png index 3c644d5af47..c79912c836c 100644 Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker.png index f97ff00c3d1..ef300635607 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker1.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker1.png index ceb623570e7..da25f0d1d8d 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker1.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker1.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker2.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker2.png index 40209c2f669..96339835bf6 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker2.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker2.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker3.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker3.png index 62c4528ae1e..a3c848d076d 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker3.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker3.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker4.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker4.png index 489b48b78a0..fc72c373c9d 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker4.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker4.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker5.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker5.png index ca719e883af..c4bb0acecf5 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker5.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker5.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker6.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker6.png index 581a50d15f0..205245bd713 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker6.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker6.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json index 11326a10936..f5892c48de0 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93", + "copyright": "Taken from TGstation", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/beakerbluespace.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/beakerbluespace.png index f52a739ad34..48c6908bc9c 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/beakerbluespace.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/beakerbluespace.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json index 54a2e31b016..cbbbe2b3580 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93", + "copyright": "Taken from tgstation", "size": { "x": 32, "y": 32 @@ -11,8 +11,11 @@ "name": "beakerbluespace", "delays": [ [ - 0.1, - 0.1 + 1.5, + 1.5, + 1.5, + 1.5, + 1.5 ] ] } diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge.png index 4e0fb0fc061..d26317aee00 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge1.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge1.png index 5ecf243047e..28c04e26b51 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge1.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge1.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge2.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge2.png index 05e647f1103..6ad07e2b450 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge2.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge2.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge3.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge3.png index 0a464113d71..3738e533202 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge3.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge3.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge4.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge4.png index c16054a21ac..8b3e347060d 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge4.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge4.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge5.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge5.png index 363e3a1bfc0..de8ca3a5087 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge5.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge5.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge6.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge6.png index 64126589dae..e087337f9d8 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge6.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge6.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json index 9c3c7d203de..5a128f3b2a3 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi", + "copyright": "Taken from TGstation", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json index b9de04b6b81..014b89a66a1 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi", + "copyright": "Taken from TGstation", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill.png index 4fd8b2d0790..05410e39dcb 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill.png and b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill1.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill1.png index 4fd8b2d0790..05410e39dcb 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill1.png and b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill1.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill10.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill10.png index ed6257887c2..7e9b1f63f48 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill10.png and b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill10.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill11.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill11.png index 9af8513972c..3e982cf0cd2 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill11.png and b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill11.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill12.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill12.png index 6f92615dbc6..20a9ae9b359 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill12.png and b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill12.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill13.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill13.png index b21473b0f80..2d23d19359e 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill13.png and b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill13.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill14.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill14.png index 60db35224d1..bf52472bca4 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill14.png and b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill14.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill15.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill15.png index d1c570080e3..513678a86ce 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill15.png and b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill15.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill16.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill16.png index bf9e74d2310..7b7c4287b80 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill16.png and b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill16.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill17.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill17.png index b8b86cb130a..98eed4c1300 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill17.png and b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill17.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill18.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill18.png index 15b910be397..da3ee941ca2 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill18.png and b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill18.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill19.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill19.png index 54395bb7fb8..33f4ffcb938 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill19.png and b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill19.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill2.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill2.png index 632379ff126..dddbb7bacd0 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill2.png and b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill2.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill20.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill20.png index 151a91f64ad..f2eb5117b63 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill20.png and b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill20.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill21.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill21.png index 92951d34769..2ffc9a0f365 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill21.png and b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill21.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill3.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill3.png index b935e952a19..139d7f6c1f0 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill3.png and b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill3.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill4.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill4.png index 193cb2161dc..7c661b8ce5c 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill4.png and b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill4.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill5.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill5.png index 75106cd3d38..dc2de41d6da 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill5.png and b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill5.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill6.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill6.png index 58eb10c8ff3..913a945bbe6 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill6.png and b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill6.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill7.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill7.png index 5190da4be4b..5bfb87b6fec 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill7.png and b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill7.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill8.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill8.png index 628bcbed8c8..c3a60283aaa 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill8.png and b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill8.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill9.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill9.png index 7164a824d42..62cef6c0d8e 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill9.png and b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill9.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/meta.json index 99b915f2b1e..d32f3d548a4 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi", + "copyright": "Taken from TGstation", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_canister.png b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_canister.png index 8b00bb5040b..e06a92dca34 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_canister.png and b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_canister.png differ