Merge branch 'master' into vulpkanin

AdventureTimeSS14 · Jul 14, 2024 · f0dd24a · f0dd24a
2 parents 85d0008 + c4d9f3a
commit f0dd24a
Show file tree

Hide file tree

Showing 234 changed files with 54 additions and 178 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,4 +1,5 @@
 {
     "omnisharp.analyzeOpenDocumentsOnly": true,
-    "dotnet.defaultSolution": "SpaceStation14.sln"
+    "dotnet.defaultSolution": "SpaceStation14.sln",
+    "dotnet.preferCSharpExtension": true
 }
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
@@ -1672,10 +1672,10 @@ public static readonly CVarDef<int>
             CVarDef.Create("viewport.minimum_width", 15, CVar.REPLICATED | CVar.SERVER);
 
         public static readonly CVarDef<int> ViewportMaximumWidth =
-            CVarDef.Create("viewport.maximum_width", 21, CVar.REPLICATED | CVar.SERVER);
+            CVarDef.Create("viewport.maximum_width", 29, CVar.REPLICATED | CVar.SERVER); //ADT 16:9
 
         public static readonly CVarDef<int> ViewportWidth =
-            CVarDef.Create("viewport.width", 21, CVar.CLIENTONLY | CVar.ARCHIVE);
+            CVarDef.Create("viewport.width", 29, CVar.CLIENTONLY | CVar.ARCHIVE); //ADT 16:9
 
         public static readonly CVarDef<bool> ViewportVerticalFit =
             CVarDef.Create("viewport.vertical_fit", true, CVar.CLIENTONLY | CVar.ARCHIVE);

diff --git a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.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/2fea0a59470c476cf3f927833d3918d89cbe6af8. Vox states taken from paradise at https://github.com/ParadiseSS13/Paradise/blob/765461f14aa4dd4f1edc33242c667843134678b5/icons/mob/clothing/species/vox/head.dmi",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/pull/78007/commits/3e58e726d821118ecf098fe447ff9549d0ca7419. Vox states taken from paradise at https://github.com/ParadiseSS13/Paradise/blob/765461f14aa4dd4f1edc33242c667843134678b5/icons/mob/clothing/species/vox/head.dmi",
   "size": {
     "x": 32,
     "y": 32

diff --git a/...ces/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/off-equipped-HELMET.png b/...ces/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/off-equipped-HELMET.png
diff --git a/...rces/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/on-equipped-HELMET.png b/...rces/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/on-equipped-HELMET.png
diff --git a/...ures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING.png b/...ures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.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/2fea0a59470c476cf3f927833d3918d89cbe6af8, reptilian made by kuro(388673708753027083)",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/pull/78007/commits/3e58e726d821118ecf098fe447ff9549d0ca7419, edited by ratyyy, reptilian made by kuro(388673708753027083)",
   "size": {
     "x": 32,
     "y": 32

diff --git a/...es/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/closed.png b/...es/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/closed.png
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
+  "copyright": "Taken from TGstation at commit https://github.com/tgstation/tgstation/commit/35484728f1fd4217fba7f9c8a6fcf2283212e014",
   "size": {
     "x": 32,
     "y": 32

diff --git a/...rces/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/open.png b/...rces/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/open.png
diff --git a/...ces/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/trash.png b/...ces/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/trash.png
diff --git a/...ces/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/closed.png b/...ces/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/closed.png
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
+  "copyright": "Taken from TGstation at commit https://github.com/tgstation/tgstation/commit/35484728f1fd4217fba7f9c8a6fcf2283212e014",
   "size": {
     "x": 32,
     "y": 32

diff --git a/...urces/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/open.png b/...urces/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/open.png
diff --git a/...rces/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/trash.png b/...rces/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/trash.png
diff --git a/...es/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/closed.png b/...es/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/closed.png
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
+  "copyright": "Taken from TGstation at commit https://github.com/tgstation/tgstation/commit/35484728f1fd4217fba7f9c8a6fcf2283212e014",
   "size": {
     "x": 32,
     "y": 32

diff --git a/...rces/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/open.png b/...rces/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/open.png
diff --git a/...ces/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/trash.png b/...ces/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/trash.png
diff --git a/...es/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/closed.png b/...es/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/closed.png
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
+  "copyright": "Taken from TGstation at commit https://github.com/tgstation/tgstation/commit/35484728f1fd4217fba7f9c8a6fcf2283212e014",
   "size": {
     "x": 32,
     "y": 32

diff --git a/...rces/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/open.png b/...rces/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/open.png
diff --git a/...ces/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/trash.png b/...ces/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/trash.png
diff --git a/...rces/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/closed.png b/...rces/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/closed.png
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
+  "copyright": "Taken from TGstation at commit https://github.com/tgstation/tgstation/commit/35484728f1fd4217fba7f9c8a6fcf2283212e014",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/open.png
diff --git a/...urces/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/trash.png b/...urces/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/trash.png
diff --git a/...extures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/closed.png b/...extures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/closed.png
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/meta.json
@@ -1,7 +1,7 @@
-{
+{
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Modified from sprite taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
+  "copyright": "Taken from TGstation at commit https://github.com/tgstation/tgstation/commit/35484728f1fd4217fba7f9c8a6fcf2283212e014",
   "size": {
     "x": 32,
     "y": 32

diff --git a/.../Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/open.png b/.../Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/open.png
diff --git a/...Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/trash.png b/...Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/trash.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_2.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_3.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_2.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_3.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass_2.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass_3.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_2.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_3.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_2.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_3.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass_2.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass_3.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass_2.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass_3.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass_2.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass_3.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass_2.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass_2.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass_3.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass_3.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_2.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_2.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_3.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_3.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium_2.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium_2.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium_3.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium_3.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_2.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_2.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_3.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_3.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium_2.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium_2.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium_3.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium_3.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/meta.json b/Resources/Textures/Objects/Materials/Sheets/other.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  and skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/commit/72ef384db938dfef549413970258cda93d42dafb, plasma_2 & plasma_3 combined from plasma",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9ea07b7f120ba1a25856365fb044aec3bdfc24d6  and skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/commit/72ef384db938dfef549413970258cda93d42dafb, plasma_2 & plasma_3 combined from plasma",
   "size": {
     "x": 32,
     "y": 32
@@ -53,64 +53,13 @@
       "directions": 4
     },
     {
-      "name": "plasma",
-	  "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-		  0.1,
-          0.1,
-          0.1,
-          0.1,
-		  0.1
-        ]
-      ]
-    },
-    {
-      "name": "plasma_2",
-	  "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-		  0.1,
-          0.1,
-          0.1,
-          0.1,
-		  0.1
-        ]
-      ]
-    },
-    {
-      "name": "plasma_3",
-	  "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-		  0.1,
-          0.1,
-          0.1,
-          0.1,
-		  0.1
-        ]
-      ]
+      "name": "plasma"
+    },
+    {
+      "name": "plasma_2"
+    },
+    {
+      "name": "plasma_3"
     },
     {
       "name": "plasma-inhand-left",

diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_2.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_2.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_3.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_3.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_2.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_2.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_3.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_3.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium_2.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium_2.png
diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium_3.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium_3.png
diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/alpha.png b/Resources/Textures/Objects/Materials/ingots.rsi/alpha.png
diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/alpha_2.png b/Resources/Textures/Objects/Materials/ingots.rsi/alpha_2.png
diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/alpha_3.png b/Resources/Textures/Objects/Materials/ingots.rsi/alpha_3.png
diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/gold.png b/Resources/Textures/Objects/Materials/ingots.rsi/gold.png
diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/gold_2.png b/Resources/Textures/Objects/Materials/ingots.rsi/gold_2.png
diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/gold_3.png b/Resources/Textures/Objects/Materials/ingots.rsi/gold_3.png
diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/silver.png b/Resources/Textures/Objects/Materials/ingots.rsi/silver.png
diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/silver_2.png b/Resources/Textures/Objects/Materials/ingots.rsi/silver_2.png
diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/silver_3.png b/Resources/Textures/Objects/Materials/ingots.rsi/silver_3.png
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/bananium.png b/Resources/Textures/Objects/Materials/ore.rsi/bananium.png
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/gold.png b/Resources/Textures/Objects/Materials/ore.rsi/gold.png
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/iron.png b/Resources/Textures/Objects/Materials/ore.rsi/iron.png
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/meta.json b/Resources/Textures/Objects/Materials/ore.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-NC-SA-3.0",
-  "copyright": "silver, plasma taken from https://github.com/vgstation-coders/vgstation13 at commit f2ef221849675915a78fd92fe622c32ab740e085, spacequartz taken from https://github.com/goonstation/goonstation at commit b51daf824df46a3a1426475f982c09479818e522 and reshaded by Alekshhh, bananium; uranium; iron; gold; coal by Alekshhh",
+  "copyright": "silver taken from https://github.com/vgstation-coders/vgstation13 at commit f2ef221849675915a78fd92fe622c32ab740e085, spacequartz taken from https://github.com/goonstation/goonstation at commit b51daf824df46a3a1426475f982c09479818e522 and reshaded by Alekshhh, bananium; else taken from https://github.com/tgstation/tgstation/commit/002051a3d5e4a35af504e52c0990bf4e22a908dc",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Objects/Materials/ore.rsi/plasma.png b/Resources/Textures/Objects/Materials/ore.rsi/plasma.png
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/uranium.png b/Resources/Textures/Objects/Materials/ore.rsi/uranium.png
diff --git a/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight.png b/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight.png
diff --git a/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight_broken.png b/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight_broken.png
diff --git a/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight_burned.png b/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight_burned.png
diff --git a/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight_on.png b/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight_on.png
diff --git a/Resources/Textures/Objects/Misc/Lights/lights.rsi/meta.json b/Resources/Textures/Objects/Misc/Lights/lights.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/fb020482a6737372d5b8f2b603d58737b22b0270, directional sprites by SonicDC#9046",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b5654d720384bbd044077b746012d12401e9cf07, directional sprites by SonicDC#9046",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/fire_extinguisher_closed.png b/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/fire_extinguisher_closed.png
diff --git a/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/fire_extinguisher_open.png b/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/fire_extinguisher_open.png
diff --git a/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/inhand-left.png
diff --git a/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/inhand-right.png
diff --git a/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/meta.json b/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/tgstation/tgstation at commit 9bebd81ae0b0a7f952b59886a765c681205de31f",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/650492a26d71ba668e89bf97bd97b91a515745be, inhands made by tamioki",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Objects/Power/light_bulb.rsi/broken.png b/Resources/Textures/Objects/Power/light_bulb.rsi/broken.png
diff --git a/Resources/Textures/Objects/Power/light_bulb.rsi/burned.png b/Resources/Textures/Objects/Power/light_bulb.rsi/burned.png
diff --git a/Resources/Textures/Objects/Power/light_bulb.rsi/meta.json b/Resources/Textures/Objects/Power/light_bulb.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/ad7c8621e5567b1b3b2b609f699b3b80cca785f2",
+  "copyright": "Taken from TGstation at commit https://github.com/tgstation/tgstation/commit/b5654d720384bbd044077b746012d12401e9cf07",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Objects/Power/light_bulb.rsi/normal.png b/Resources/Textures/Objects/Power/light_bulb.rsi/normal.png
diff --git a/Resources/Textures/Objects/Power/light_tube.rsi/broken.png b/Resources/Textures/Objects/Power/light_tube.rsi/broken.png
diff --git a/Resources/Textures/Objects/Power/light_tube.rsi/burned.png b/Resources/Textures/Objects/Power/light_tube.rsi/burned.png
diff --git a/Resources/Textures/Objects/Power/light_tube.rsi/meta.json b/Resources/Textures/Objects/Power/light_tube.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/ad7c8621e5567b1b3b2b609f699b3b80cca785f2",
+  "copyright": "Taken from TGstation at commit https://github.com/tgstation/tgstation/commit/b5654d720384bbd044077b746012d12401e9cf07",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Objects/Power/light_tube.rsi/normal.png b/Resources/Textures/Objects/Power/light_tube.rsi/normal.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 at commit https://github.com/tgstation/tgstation/commit/c045d79fcabda92ea29214eda93863e746fd404c",
   "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 at commit https://github.com/tgstation/tgstation/commit/c045d79fcabda92ea29214eda93863e746fd404c",
   "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 at commit https://github.com/tgstation/tgstation/commit/c045d79fcabda92ea29214eda93863e746fd404c",
   "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 at commit https://github.com/tgstation/tgstation/commit/c045d79fcabda92ea29214eda93863e746fd404c",
   "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 at commit https://github.com/tgstation/tgstation/commit/c045d79fcabda92ea29214eda93863e746fd404cn",
   "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
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/clarke.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/clarke.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax-broken.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax-open.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley-broken.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley-open.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand-broken.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand-open.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/firefighter-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/firefighter-open.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/firefighter.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/firefighter.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax-broken.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax-open.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder-broken.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder-open.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler-broken.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler-open.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler.png