Merge branch 'EntitiesSort' of https://github.com/1Stepka1/space_stat…

…ion_14 into EntitiesSort
AdventureTimeSS14 · May 22, 2024 · e2cc24e · e2cc24e
2 parents 384ca8d + cfaec44
commit e2cc24e
Show file tree

Hide file tree

Showing 121 changed files with 183 additions and 15 deletions.
diff --git a/Content.Client/ADT/license.txt 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".
diff --git a/Content.Server/ADT/license.txt 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".
diff --git a/Content.Shared/ADT/license.txt 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".
diff --git a/Resources/Prototypes/ADT/license.txt 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".
diff --git 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
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
diff --git a/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/alive.png b/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/alive.png
diff --git a/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/dead.png b/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/dead.png
diff --git a/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/dead_mouth.png b/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/dead_mouth.png
diff --git a/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/gib.png b/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/gib.png
diff --git a/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/icon.png b/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/icon.png
diff --git a/Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi/meta.json 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
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
diff --git a/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/equipped-BACKPACK.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-ammo.png b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-ammo.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-med.png b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-med.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon.png
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
diff --git 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
diff --git 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
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
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
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
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
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
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon.png
diff --git 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/...xtures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-vulp.png b/...xtures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-vulp.png
diff --git a/...es/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET.png b/...es/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET.png
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
diff --git a/...urces/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-right.png b/...urces/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-right.png
diff --git a/...ces/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET.png b/...ces/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET.png
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
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
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon.png
diff --git 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
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/icon.png
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
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
diff --git a/...tures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png b/...tures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-right.png
diff --git 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/...Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING.png b/...Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/icon.png
diff --git a/...s/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-left.png b/...s/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-left.png
diff --git a/.../Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-right.png b/.../Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-right.png
diff --git a/...res/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING.png b/...res/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/icon.png
diff --git a/...urces/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-left.png b/...urces/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-left.png
diff --git a/...rces/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-right.png b/...rces/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-right.png
diff --git 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/...res/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING.png b/...res/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/icon.png
diff --git a/...urces/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/inhand-left.png b/...urces/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/inhand-left.png
diff --git a/...rces/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/inhand-right.png b/...rces/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/inhand-right.png
diff --git 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
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNWSE.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNWSE.png
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/fulltile_overlay.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/fulltile_overlay.png
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay.png
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay.png
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_90.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_90.png
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_180.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_180.png
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_270.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_270.png
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker1.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker1.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker2.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker2.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker3.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker3.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker4.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker4.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker5.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker5.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker6.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker6.png
diff --git 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/...es/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/beakerbluespace.png b/...es/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/beakerbluespace.png
diff --git 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
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge1.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge1.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge2.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge2.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge3.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge3.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge4.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge4.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge5.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge5.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge6.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge6.png
diff --git 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
@@ -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
diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill1.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill1.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill10.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill10.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill11.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill11.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill12.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill12.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill13.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill13.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill14.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill14.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill15.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill15.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill16.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill16.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill17.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill17.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill18.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill18.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill19.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill19.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill2.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill2.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill20.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill20.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill21.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill21.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill3.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill3.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill4.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill4.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill5.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill5.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill6.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill6.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill7.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill7.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill8.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill8.png
diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill9.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill9.png
diff --git 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