Merge branch 'master' of https://github.com/Schrodinger71/Develop_ADT …

…into upstream1107

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "omnisharp.analyzeOpenDocumentsOnly": true,
+    "dotnet.defaultSolution": "SpaceStation14.sln",
+    "dotnet.preferCSharpExtension": true
+}

Content.Server/Speech/EntitySystems/MothAccentSystem.cs

@@ -21,38 +21,26 @@ private void OnAccent(EntityUid uid, MothAccentComponent component, AccentGetEve
     {
         var message = args.Message;
 
-        // buzzz
-        message = RegexLowerBuzz.Replace(message, "zzz");
-        // buZZZ
-        message = RegexUpperBuzz.Replace(message, "ZZZ");
-
-        // Corvax-Localization-Start
-        // ж => жжж
-        message = Regex.Replace(
-            message,
-            "ж+",
-            _random.Pick(new List<string>() { "жж", "жжж" })
-        );
-        // Ж => ЖЖЖ
-        message = Regex.Replace(
-            message,
-            "Ж+",
-            _random.Pick(new List<string>() { "ЖЖ", "ЖЖЖ" })
-        );
-        // з => ссс
-        message = Regex.Replace(
-            message,
-            "з+",
-            _random.Pick(new List<string>() { "зз", "ззз" })
-        );
-        // З => CCC
-        message = Regex.Replace(
-            message,
-            "З+",
-            _random.Pick(new List<string>() { "ЗЗ", "ЗЗЗ" })
-        );
-        // Corvax-Localization-End
+        // Changed By 1Stepka1 Moth_speech_ADT start
+
+        message = Regex.Replace(message, "з{1,3}", "ззз");
 
+        message = Regex.Replace(message, "с{1,3}", "зз");
+
+        message = Regex.Replace(message, "ц{1,3}", "зз");
+
+        message = Regex.Replace(message, "ж{1,3}", "жзж");
+
+        message = Regex.Replace(message, "З{1,3}", "ЗЗЗ");
+
+        message = Regex.Replace(message, "С{1,3}", "ЗЗ");
+
+        message = Regex.Replace(message, "Ц{1,3}", "ЗЗ");
+
+        message = Regex.Replace(message, "Ж{1,3}", "ЖЗЖ");
+
+        // Changed By 1Stepka1 Moth_speech_ADT end
+
         args.Message = message;
     }
 }

Content.Shared/CCVar/CCVars.cs

@@ -1630,10 +1630,10 @@ public static readonly CVarDef<int>
             CVarDef.Create("viewport.minimum_width", 15, CVar.REPLICATED | CVar.SERVER);
 
         public static readonly CVarDef<int> ViewportMaximumWidth =
-            CVarDef.Create("viewport.maximum_width", 21, CVar.REPLICATED | CVar.SERVER);
+            CVarDef.Create("viewport.maximum_width", 29, CVar.REPLICATED | CVar.SERVER); //ADT 16:9
 
         public static readonly CVarDef<int> ViewportWidth =
-            CVarDef.Create("viewport.width", 21, CVar.CLIENTONLY | CVar.ARCHIVE);
+            CVarDef.Create("viewport.width", 29, CVar.CLIENTONLY | CVar.ARCHIVE); //ADT 16:9
 
         public static readonly CVarDef<bool> ViewportVerticalFit =
             CVarDef.Create("viewport.vertical_fit", true, CVar.CLIENTONLY | CVar.ARCHIVE);

Resources/Locale/ru-RU/ADT/traits/neutral.ftl

@@ -1,2 +1,13 @@
+
+trait-tall-name = Высокий
+trait-tall-desc = Вы слегка выше других представителей своего вида.
+
+trait-short-name = Низкий
+trait-short-desc = Вы слегка ниже других представителей своего вида.
+
+trait-moth-accent-name = Жужжащий акцент
+trait-moth-accent-desc = Вам либо нравятся моли, либо вы ботаник
+
 trait-deutsch-accent-name = Немецкий акцент
 trait-deutsch-accent-desc = Неизвестно, как вы получили этот акцент. Может быть, вы пересмотрели слишком много фильмов о Второй мировой войне?
+

Resources/Prototypes/ADT/Traits/neutral.yml

@@ -1,6 +1,13 @@
+- type: trait
+  id: ADTMothAccent
+  name: trait-moth-accent-name
+  description: trait-moth-accent-desc
+  components:
+    - type: MothAccent
+
 - type: trait
   id: ADTGermanAccent
   name: trait-deutsch-accent-name
   description: trait-deutsch-accent-desc
   components:
-    - type: DeutschAccent
+    - type: DeutschAccent

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

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

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

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

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

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

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

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

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",

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

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

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

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

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

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

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
         ]
       ]
     }

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

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

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