diff --git a/.vscode/settings.json b/.vscode/settings.json index 0e0d3ae890c..f641dcf9c86 100644 --- 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 index a0e9157e922..df276a3e504 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -1672,10 +1672,10 @@ public static readonly CVarDef CVarDef.Create("viewport.minimum_width", 15, CVar.REPLICATED | CVar.SERVER); public static readonly CVarDef 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 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 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 index e5d79e13c1f..ce23bd69f24 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/meta.json index 45b0035e786..9e5e2d9e143 100644 --- 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/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/off-equipped-HELMET.png index 10d94a0bfce..c1ee06aa347 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/on-equipped-HELMET.png index 4d944c9c79c..ddc7213fa0a 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING.png index 767e302b93f..2891087c6d6 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/icon.png index 53b29f4d2de..92a2382f8b3 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json index f8f2fba961f..469e71fc7c4 100644 --- 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/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/closed.png index 0b18a29cdad..ac4d8298da2 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/closed.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/closed.png differ 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 index 892cbe9a318..028df17d625 100644 --- 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/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/open.png index 482f53e0d62..c43d2f45c63 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/open.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/open.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/trash.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/trash.png index 601d8927fbd..33357e10824 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/trash.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/closed.png index 21a07b90c88..d6ecec81a9e 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/closed.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/closed.png differ 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 index 892cbe9a318..028df17d625 100644 --- 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/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/open.png index 60c7f9975de..6931b2de8a6 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/open.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/open.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/trash.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/trash.png index a80b8ec8608..927dbf0e087 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/trash.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/closed.png index fa5fa930c10..6aaeb2a766a 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/closed.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/closed.png differ 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 index 892cbe9a318..028df17d625 100644 --- 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/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/open.png index 463e51db962..3a96c167d10 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/open.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/open.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/trash.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/trash.png index 65470ecb3f4..9ad04951b32 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/trash.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/closed.png index 992b30b7aa2..869281a0d3d 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/closed.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/closed.png differ 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 index 892cbe9a318..028df17d625 100644 --- 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/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/open.png index 5f076005e32..61b72bd222c 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/open.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/open.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/trash.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/trash.png index 874c15245b1..1d020196992 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/trash.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/closed.png index 6faf9c05676..60254b8807b 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/closed.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/closed.png differ 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 index 892cbe9a318..028df17d625 100644 --- 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 index 977b9bb1f97..53c7f2e6437 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/open.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/open.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/trash.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/trash.png index d3ded3558d0..47de04e75d5 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/trash.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/closed.png index 2b2cb8acf7f..8e8763ac054 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/closed.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/closed.png differ 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 index bd6e6c3748e..028df17d625 100644 --- 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/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/open.png index be3d3778075..c8a5dc4a51b 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/open.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/open.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/trash.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/trash.png index 89222ad9b2a..138086b5f9b 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/trash.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/trash.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass.png index 9e4c57c4722..24369091270 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_2.png index 42dd5b78c5c..f196f4ce170 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_2.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_3.png index 319212cb1bf..07e74ae23b3 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_3.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass.png index 46c54b70997..16bf38e5778 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_2.png index 0527d35073d..bc8b2079716 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_2.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_3.png index a2e98302a99..438b8829223 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_3.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass.png index 604143baa94..d82196550c4 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass_2.png index 91828137c61..d82196550c4 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass_2.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass_3.png index fcfe607e0c8..ebc44d849e7 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass_3.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass.png index 58d874f7502..d0179cc68f8 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_2.png index fe0847de488..6d4f87b6fba 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_2.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_3.png index c5662a6bf1e..607611a01a1 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_3.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass.png index 37ce0bd4558..11d397fb5b7 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_2.png index a3f937dcdc7..57ca4132261 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_2.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_3.png index ebcf9408d0a..f067155453b 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_3.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass.png index 4fcd72b5c80..24cf1edd108 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass_2.png index 0775ecfcc89..0f20b48b6d6 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass_2.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass_3.png index dd8c9f55d11..382e3912f19 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass_3.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass.png index c3e391285fc..cbba2a4bcec 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass_2.png index 35599f906dd..b334aee3e28 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass_2.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass_3.png index c97d695c551..4ad7406e86c 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass_3.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass.png index a8e5aa4a9af..85e1c4a1c2b 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass_2.png index 06bd5ff1214..b15d2be72b1 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass_2.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass_3.png index c5a2dc15723..ce785507646 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass_3.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass.png index aa63620f249..f75cf7d91cb 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass.png and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass_2.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass_2.png index 65be22f71a8..e3cf502d344 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass_2.png and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass_3.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass_3.png index 262094c05ae..4d3ad520478 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass_3.png and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel.png index e7d3efcfa03..f56af9501bc 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel.png and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_2.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_2.png index 83bfb1c35d0..d3ebf1bac7e 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_2.png and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_3.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_3.png index 705e5bc7849..e1ffec547ca 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_3.png and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium.png index 3471bfae235..4fdfab0d299 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium.png and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium_2.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium_2.png index 4f49bf95a54..28cfa4d0bc8 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium_2.png and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium_3.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium_3.png index d4ac3c60715..e4031591278 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium_3.png and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel.png index 2933c269bdd..3c0f4b03a06 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel.png and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_2.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_2.png index ae32ff2a299..3b697571bed 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_2.png and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_3.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_3.png index b98e55106e8..6dddeaf18e6 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_3.png and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium.png index c5abe3cf604..cbba2a4bcec 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium.png and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium_2.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium_2.png index 1c18406f688..b334aee3e28 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium_2.png and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium_3.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium_3.png index 6d8116a9a4f..4ad7406e86c 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium_3.png and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/meta.json b/Resources/Textures/Objects/Materials/Sheets/other.rsi/meta.json index 33eae42527e..b733c1053bb 100644 --- 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 index b36df0f0055..9f80c3a135f 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma.png and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_2.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_2.png index d4834ef28ae..2b076648d61 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_2.png and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_3.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_3.png index ee05fa2cc99..616ab5e51fe 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_3.png and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic.png index 9e7b52fdf7a..05d70726d29 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic.png and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_2.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_2.png index 1512881de42..fda02e06844 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_2.png and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_3.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_3.png index ab2e41e38ba..0c186d07217 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_3.png and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium.png index ebd96a9b364..ce6eef9c123 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium.png and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium_2.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium_2.png index 3647e43e448..b5d5d7fe5a0 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium_2.png and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium_3.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium_3.png index f17d81859d3..7e866a0a5e1 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium_3.png and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium_3.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/alpha.png b/Resources/Textures/Objects/Materials/ingots.rsi/alpha.png index b21f768cf0a..e900af4d390 100644 Binary files a/Resources/Textures/Objects/Materials/ingots.rsi/alpha.png and b/Resources/Textures/Objects/Materials/ingots.rsi/alpha.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/alpha_2.png b/Resources/Textures/Objects/Materials/ingots.rsi/alpha_2.png index 4f02918bb6e..41a93d865ff 100644 Binary files a/Resources/Textures/Objects/Materials/ingots.rsi/alpha_2.png and b/Resources/Textures/Objects/Materials/ingots.rsi/alpha_2.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/alpha_3.png b/Resources/Textures/Objects/Materials/ingots.rsi/alpha_3.png index 7fe5dfb5143..41a93d865ff 100644 Binary files a/Resources/Textures/Objects/Materials/ingots.rsi/alpha_3.png and b/Resources/Textures/Objects/Materials/ingots.rsi/alpha_3.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/gold.png b/Resources/Textures/Objects/Materials/ingots.rsi/gold.png index fca33d19006..f715a627356 100644 Binary files a/Resources/Textures/Objects/Materials/ingots.rsi/gold.png and b/Resources/Textures/Objects/Materials/ingots.rsi/gold.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/gold_2.png b/Resources/Textures/Objects/Materials/ingots.rsi/gold_2.png index 44d579ae17d..2bd66a1d891 100644 Binary files a/Resources/Textures/Objects/Materials/ingots.rsi/gold_2.png and b/Resources/Textures/Objects/Materials/ingots.rsi/gold_2.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/gold_3.png b/Resources/Textures/Objects/Materials/ingots.rsi/gold_3.png index f4c088b762d..1177e0bf655 100644 Binary files a/Resources/Textures/Objects/Materials/ingots.rsi/gold_3.png and b/Resources/Textures/Objects/Materials/ingots.rsi/gold_3.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/silver.png b/Resources/Textures/Objects/Materials/ingots.rsi/silver.png index bff6acfa4fd..e900af4d390 100644 Binary files a/Resources/Textures/Objects/Materials/ingots.rsi/silver.png and b/Resources/Textures/Objects/Materials/ingots.rsi/silver.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/silver_2.png b/Resources/Textures/Objects/Materials/ingots.rsi/silver_2.png index 880370e663f..41a93d865ff 100644 Binary files a/Resources/Textures/Objects/Materials/ingots.rsi/silver_2.png and b/Resources/Textures/Objects/Materials/ingots.rsi/silver_2.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/silver_3.png b/Resources/Textures/Objects/Materials/ingots.rsi/silver_3.png index d5160c6ed26..2c522ab1135 100644 Binary files a/Resources/Textures/Objects/Materials/ingots.rsi/silver_3.png and b/Resources/Textures/Objects/Materials/ingots.rsi/silver_3.png differ diff --git a/Resources/Textures/Objects/Materials/ore.rsi/bananium.png b/Resources/Textures/Objects/Materials/ore.rsi/bananium.png index ec4e716e10b..2d24edc90cd 100644 Binary files a/Resources/Textures/Objects/Materials/ore.rsi/bananium.png and b/Resources/Textures/Objects/Materials/ore.rsi/bananium.png differ diff --git a/Resources/Textures/Objects/Materials/ore.rsi/gold.png b/Resources/Textures/Objects/Materials/ore.rsi/gold.png index 2999fb0722b..9337b3209c8 100644 Binary files a/Resources/Textures/Objects/Materials/ore.rsi/gold.png and b/Resources/Textures/Objects/Materials/ore.rsi/gold.png differ diff --git a/Resources/Textures/Objects/Materials/ore.rsi/iron.png b/Resources/Textures/Objects/Materials/ore.rsi/iron.png index ec2a56e5bb8..a4729a0c9c4 100644 Binary files a/Resources/Textures/Objects/Materials/ore.rsi/iron.png and b/Resources/Textures/Objects/Materials/ore.rsi/iron.png differ diff --git a/Resources/Textures/Objects/Materials/ore.rsi/meta.json b/Resources/Textures/Objects/Materials/ore.rsi/meta.json index 98a10750bf7..e100ad5c28a 100644 --- 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 index f9f77e64fc8..47d932ca34d 100644 Binary files a/Resources/Textures/Objects/Materials/ore.rsi/plasma.png and b/Resources/Textures/Objects/Materials/ore.rsi/plasma.png differ diff --git a/Resources/Textures/Objects/Materials/ore.rsi/uranium.png b/Resources/Textures/Objects/Materials/ore.rsi/uranium.png index 4cab8569267..08908618780 100644 Binary files a/Resources/Textures/Objects/Materials/ore.rsi/uranium.png and b/Resources/Textures/Objects/Materials/ore.rsi/uranium.png differ diff --git a/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight.png b/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight.png index 6841c443c8b..8993a20b70c 100644 Binary files a/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight.png and b/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight.png differ diff --git a/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight_broken.png b/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight_broken.png index d6399dfcd3f..cfddbf05866 100644 Binary files a/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight_broken.png and b/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight_broken.png differ diff --git a/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight_burned.png b/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight_burned.png index 8158212e225..8c23d5e158d 100644 Binary files a/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight_burned.png and b/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight_burned.png differ diff --git a/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight_on.png b/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight_on.png index 6868f886a36..0f0dfc81b90 100644 Binary files a/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight_on.png and b/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight_on.png differ diff --git a/Resources/Textures/Objects/Misc/Lights/lights.rsi/meta.json b/Resources/Textures/Objects/Misc/Lights/lights.rsi/meta.json index 24f21a17d46..943743e4b4b 100644 --- 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 index 7c99615ffec..314723554da 100644 Binary files a/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/fire_extinguisher_closed.png and b/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/fire_extinguisher_closed.png differ 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 index 7909d14f269..018e9e03416 100644 Binary files a/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/fire_extinguisher_open.png and b/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/fire_extinguisher_open.png differ diff --git a/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/inhand-left.png index fb697da3566..1184aa7fc62 100644 Binary files a/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/inhand-left.png and b/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/inhand-right.png index e06a534c249..d98de014044 100644 Binary files a/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/inhand-right.png and b/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/meta.json b/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/meta.json index 990bbf93567..8717f102e72 100644 --- 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 index f9383a51adb..d90144abb65 100644 Binary files a/Resources/Textures/Objects/Power/light_bulb.rsi/broken.png and b/Resources/Textures/Objects/Power/light_bulb.rsi/broken.png differ diff --git a/Resources/Textures/Objects/Power/light_bulb.rsi/burned.png b/Resources/Textures/Objects/Power/light_bulb.rsi/burned.png index 7f193b60116..5a53d32c6ba 100644 Binary files a/Resources/Textures/Objects/Power/light_bulb.rsi/burned.png and b/Resources/Textures/Objects/Power/light_bulb.rsi/burned.png differ diff --git a/Resources/Textures/Objects/Power/light_bulb.rsi/meta.json b/Resources/Textures/Objects/Power/light_bulb.rsi/meta.json index 2334a9ca37e..464c590a1ad 100644 --- 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 index 71a2ea3721a..5700e634ad3 100644 Binary files a/Resources/Textures/Objects/Power/light_bulb.rsi/normal.png and b/Resources/Textures/Objects/Power/light_bulb.rsi/normal.png differ diff --git a/Resources/Textures/Objects/Power/light_tube.rsi/broken.png b/Resources/Textures/Objects/Power/light_tube.rsi/broken.png index 5df9e7166eb..583bf785b06 100644 Binary files a/Resources/Textures/Objects/Power/light_tube.rsi/broken.png and b/Resources/Textures/Objects/Power/light_tube.rsi/broken.png differ diff --git a/Resources/Textures/Objects/Power/light_tube.rsi/burned.png b/Resources/Textures/Objects/Power/light_tube.rsi/burned.png index d79b43f72f1..a8aa1b425d1 100644 Binary files a/Resources/Textures/Objects/Power/light_tube.rsi/burned.png and b/Resources/Textures/Objects/Power/light_tube.rsi/burned.png differ diff --git a/Resources/Textures/Objects/Power/light_tube.rsi/meta.json b/Resources/Textures/Objects/Power/light_tube.rsi/meta.json index 2334a9ca37e..464c590a1ad 100644 --- 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 index 981a4037833..2a888c72d09 100644 Binary files a/Resources/Textures/Objects/Power/light_tube.rsi/normal.png and b/Resources/Textures/Objects/Power/light_tube.rsi/normal.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..14e6296f422 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 at commit https://github.com/tgstation/tgstation/commit/c045d79fcabda92ea29214eda93863e746fd404c", "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..2f12aa1487a 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 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 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..d3c2d9b8efa 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 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 index b9de04b6b81..408d447cb4c 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 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 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..192c223eee8 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 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 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 diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/clarke.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/clarke.png index f5fd8b1a226..82562899b47 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/clarke.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/clarke.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax-broken.png index 9b39c48b3b3..ad3c2043431 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax-broken.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax-broken.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax-open.png index eadf7ffd93b..327c3904f46 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax-open.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax-open.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax.png index 6a65735f3f2..54efec64db9 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley-broken.png index 879ceef9c45..fe7e7ff68a9 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley-broken.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley-broken.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley-open.png index 7db78ab187d..42688e67793 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley-open.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley-open.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley.png index f8f544ba227..3b928217a4e 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand-broken.png index e65af10f1d4..eaf6322fd94 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand-broken.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand-broken.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand-open.png index 7a186b06513..b53173d958a 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand-open.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand-open.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand.png index 8f1424bb24c..53dd3bdebb5 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/firefighter-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/firefighter-open.png index a3c1ad56459..f5623c4f248 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/firefighter-open.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/firefighter-open.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/firefighter.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/firefighter.png index 2e45633ee28..64b8a370f90 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/firefighter.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/firefighter.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax-broken.png index ab4f2ae3167..a3c6f33ebbe 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax-broken.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax-broken.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax-open.png index 044eaa62df6..40bfa7d5dad 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax-open.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax-open.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax.png index ab355dada50..857fa45ea46 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder-broken.png index b926a6b2dad..a6323d71846 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder-broken.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder-broken.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder-open.png index 594eaa993e1..959e21b2ed1 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder-open.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder-open.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder.png index 8f51c76b20c..937e283eccd 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler-broken.png index b024f6d9b44..c1f055b580a 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler-broken.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler-broken.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler-open.png index 70252e39ba0..5285a0f0960 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler-open.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler-open.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler.png index fe3c934016b..f898709140a 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meta.json b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meta.json index b8f723250ee..f0eedac17f1 100644 --- a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meta.json @@ -1,5 +1,5 @@ { - "copyright" : "Taken from https://github.com/tgstation/tgstation at at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, hamtr made by brainfood1183 (github)", + "copyright" : "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/82f92cb983e3cdedb52cbb35122760e835dfd6d0, hamtr made by brainfood1183 (github)", "license" : "CC-BY-SA-3.0", "version": 1, "size": { @@ -146,81 +146,7 @@ }, { "name": "mauler", - "directions": 4, - "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, - 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, - 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, - 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, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] + "directions": 4 }, { "name": "mauler-open", @@ -284,20 +210,7 @@ "directions": 4 }, { - "name": "darkgygax-open", - "delays": [ - [ - 0.1, - 0.05, - 0.05, - 0.05, - 0.1, - 0.05, - 0.05, - 0.05, - 0.1 - ] - ] + "name": "darkgygax-open" }, { "name": "darkgygax-broken", @@ -486,6 +399,16 @@ { "name": "vim-broken", "directions": 4 + }, + { + "name": "paddy", + "directions": 4 + }, + { + "name": "paddy-open" + }, + { + "name": "paddy-broken" } ] } diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/odysseus-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/odysseus-broken.png index 12a01c8a66b..1b5c1a98da6 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/odysseus-broken.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/odysseus-broken.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/odysseus-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/odysseus-open.png index cdc13c60b99..e2d9830531f 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/odysseus-open.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/odysseus-open.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/odysseus.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/odysseus.png index 0daa691044f..2bb122c5992 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/odysseus.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/odysseus.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/paddy-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/paddy-broken.png new file mode 100644 index 00000000000..d24b7f67337 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/paddy-broken.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/paddy-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/paddy-open.png new file mode 100644 index 00000000000..c07d74ccca6 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/paddy-open.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/paddy.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/paddy.png new file mode 100644 index 00000000000..95bb269e58e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/paddy.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/phazon-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/phazon-broken.png index cde4774f088..3d039ca2d18 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/phazon-broken.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/phazon-broken.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/phazon-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/phazon-open.png index 804bd8a9109..37b30c6b115 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/phazon-open.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/phazon-open.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/phazon.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/phazon.png index 558d23c2241..ec2cf878a46 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/phazon.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/phazon.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-broken.png index 1e0357f6773..73d4e2f4025 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-broken.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-broken.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-empty.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-empty.png index d66dd5b51cf..198e094b817 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-empty.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-empty.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-open.png index 530553d4133..aff5e4ff1ac 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-open.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-open.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley.png index 221b21c44f7..bc0caab4ed3 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripleymkii-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripleymkii-broken.png index 1e0357f6773..61c972babdc 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripleymkii-broken.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripleymkii-broken.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripleymkii-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripleymkii-open.png index 85e7a8518fa..4ed6ecdc03d 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripleymkii-open.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripleymkii-open.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripleymkii.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripleymkii.png index 33e77e3a23a..dfcef0f397a 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripleymkii.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripleymkii.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph-broken.png index 4fc3f797763..b6d607e796b 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph-broken.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph-broken.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph-open.png index b5abfd86cb5..2a795bea1c0 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph-open.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph-open.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph.png index 798e49c8dfd..0b17e9eb2ed 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/advkit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/advkit.png index 83e91597166..f240cc78258 100644 Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/advkit.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/advkit.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/blackkit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/blackkit.png index cfa19a007aa..5b6bd4dcfa9 100644 Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/blackkit.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/blackkit.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/brutekit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/brutekit.png index 7456850c08f..0132cad32dc 100644 Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/brutekit.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/brutekit.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/burnkit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/burnkit.png index 796eaf83b05..9d3c6ea0646 100644 Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/burnkit.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/burnkit.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/firstaid.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/firstaid.png index 3fe117f2ac6..093d51716d9 100644 Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/firstaid.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/firstaid.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/meta.json index 244e4e2b5b9..b022d88167d 100644 --- a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/firstaidkits.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/tree/727eb0a445bccbdc2d472e158e96b87fc0e997a1. Rad, toxin, o2, fire and adv by peptide", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/928c107d71826242335b41a8d88a91dd8abfbacb. Rad by Ratyyy", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/o2kit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/o2kit.png index 59919b85855..7bdf1e72614 100644 Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/o2kit.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/o2kit.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit.png index 778a319a016..174b31c829f 100644 Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/radkit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/radkit.png index 0bab485fa95..8794c804e04 100644 Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/radkit.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/radkit.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/toxinkit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/toxinkit.png index e0e563022ab..b8c2e4643fe 100644 Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/toxinkit.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/toxinkit.png differ diff --git a/Resources/Textures/Objects/Tools/drill.rsi/drill_bolt.png b/Resources/Textures/Objects/Tools/drill.rsi/drill_bolt.png index c99774bfad1..2d3415efa36 100644 Binary files a/Resources/Textures/Objects/Tools/drill.rsi/drill_bolt.png and b/Resources/Textures/Objects/Tools/drill.rsi/drill_bolt.png differ diff --git a/Resources/Textures/Objects/Tools/drill.rsi/drill_screw.png b/Resources/Textures/Objects/Tools/drill.rsi/drill_screw.png index d27dee1427d..76691ea7848 100644 Binary files a/Resources/Textures/Objects/Tools/drill.rsi/drill_screw.png and b/Resources/Textures/Objects/Tools/drill.rsi/drill_screw.png differ diff --git a/Resources/Textures/Objects/Tools/drill.rsi/meta.json b/Resources/Textures/Objects/Tools/drill.rsi/meta.json index 4bcf0563213..fb861bdfc2b 100644 --- a/Resources/Textures/Objects/Tools/drill.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/drill.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/commit/31156a1fcd48d67a717e7b63c11513172b28eeb1", + "copyright": "Taken from skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/commit/31156a1fcd48d67a717e7b63c11513172b28eeb1 & TGstation at https://github.com/tgstation/tgstation/commit/650492a26d71ba668e89bf97bd97b91a515745be", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_cutter.png b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_cutter.png index 32dd8ae6521..bbbb5d95219 100644 Binary files a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_cutter.png and b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_cutter.png differ diff --git a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_pry.png b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_pry.png index ccfecf3dbd1..4192c85ca95 100644 Binary files a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_pry.png and b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_pry.png differ diff --git a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_pry.png b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_pry.png index 5b77cad939e..547bd14971c 100644 Binary files a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_pry.png and b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_pry.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/equipped-BACKPACK.png index 511e89fdf46..10a83825eb8 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/icon.png index c594138d95d..59eab8ec639 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-left.png index 339d96b14c8..9df5c1bcf95 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-right.png index 77311514584..1f5db4d8bdd 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json index d558b8b07ec..34b24f432bb 100644 --- a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", + "copyright": "Taken from TGstation at commit https://github.com/tgstation/tgstation/commit/b5fa92d6918b2e4ea0bc0eef05fdcf2f8fb082a5, edited by ratyyy", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-left.png index 31c8bec2411..cb08772e152 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-right.png index 27f6733f76a..1c58c73c971 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/base.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/base.png index ababfbfe92d..19e948ab442 100644 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/base.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/base.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/broken.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/broken.png index b44e814ffaa..c99bebe89b7 100644 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/broken.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/burned.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/burned.png index 1ba972629ab..32f3017748c 100644 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/burned.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/burned.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/empty.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/empty.png index eb871576c2c..b758a2a3f47 100644 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/empty.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/empty.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/glow.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/glow.png index 0bfe0a7ddb6..9a6bce3491e 100644 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/glow.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/glow.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/meta.json index 09378e1ebd4..bd317561eab 100644 --- a/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/lighting.dmi", "states": [{"name": "broken", "directions": 4}, {"name": "burned", "directions": 4}, {"name": "empty", "directions": 4}, {"name": "base", "directions": 4}, {"name": "glow", "directions": 4}]} +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "taken from TGstation at commit https://github.com/tgstation/tgstation/commit/b5654d720384bbd044077b746012d12401e9cf07", "states": [{"name": "broken", "directions": 4}, {"name": "burned", "directions": 4}, {"name": "empty", "directions": 4}, {"name": "base", "directions": 4}, {"name": "glow", "directions": 4}]} diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png index 0a2e1ae76b9..8f22be64b5a 100644 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png index 1565cdc86d7..28edc64f892 100644 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png index 7e14e2c2b39..52b9e93ebe7 100644 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png index 5ead53beb0e..e758fbe8860 100644 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png index edffdfe50c2..d04265ba990 100644 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json index 07444979e60..c396e5e0aea 100644 --- a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/lighting.dmi", + "copyright": "taken from TGstation at commit https://github.com/tgstation/tgstation/commit/b5654d720384bbd044077b746012d12401e9cf07", "size": { "x": 32, "y": 32