Merge PR #76 from AserCreator

Респрайты и мелочи

Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml

@@ -27,6 +27,11 @@
     name: cyborg
   - type: Construction
     node: cyborg
+  - type: FootstepModifier
+    footstepSoundCollection:
+      path: /Audio/Stray/Mech/mech.ogg
+      params:
+        variation: 0.07
   - type: Speech
     speechVerb: Robotic
 

Resources/Prototypes/Parallaxes/default.yml

@@ -10,25 +10,23 @@
       slowness: 0.998046875
       scale: "1, 1"
     - texture:
-        !type:GeneratedParallaxTextureSource
-        id: "hq_wizard_stars"
-        configPath: "/Prototypes/Parallaxes/parallax_config_stars.toml"
-      slowness: 0.996625
+        !type:ImageParallaxTextureSource
+        path: "/Textures/Parallaxes/planet.png"
+      slowness: 0.999
+      tiled: false
+      scale: "1.5, 1.5"
     - texture:
-        !type:GeneratedParallaxTextureSource
-        id: "hq_wizard_stars_dim"
-        configPath: "/Prototypes/Parallaxes/parallax_config_stars_dim.toml"
-      slowness: 0.989375
+        !type:ImageParallaxTextureSource
+        path: "/Textures/Parallaxes/Asteroids.png"
+      slowness: 0.9969
     - texture:
-        !type:GeneratedParallaxTextureSource
-        id: "hq_wizard_stars_faster"
-        configPath: "/Prototypes/Parallaxes/parallax_config_stars-2.toml"
-      slowness: 0.987265625
+        !type:ImageParallaxTextureSource
+        path: "/Textures/Parallaxes/AsteroidsMedium.png"
+      slowness: 0.98
     - texture:
-        !type:GeneratedParallaxTextureSource
-        id: "hq_wizard_stars_dim_faster"
-        configPath: "/Prototypes/Parallaxes/parallax_config_stars_dim-2.toml"
-      slowness: 0.984352
+        !type:ImageParallaxTextureSource
+        path: "/Textures/Parallaxes/AsteroidsBig.png"
+      slowness: 0.8856
   layersLQ:
     - texture:
         !type:GeneratedParallaxTextureSource
@@ -43,9 +41,9 @@
   layers:
     - texture:
         !type:ImageParallaxTextureSource
-        path: "/Textures/Parallaxes/layer1.png"
+        path: "/Textures/Parallaxes/space_map2.png"
       slowness: 0.5
-      scale: "3, 3"
+      scale: "2, 2"
     - texture:
         !type:GeneratedParallaxTextureSource
         id: "hq_wizard_stars"

Resources/Prototypes/SoundCollections/announcements.yml

@@ -27,3 +27,7 @@
   - /Audio/Announcements/RoundEnd/this_drink.ogg
   - /Audio/Announcements/RoundEnd/truth_imagination.ogg
   - /Audio/Announcements/RoundEnd/oney.ogg
+  #Аська насрал саундов
+  - /Audio/Stray/RoundEnd/Goida.ogg
+  - /Audio/Stray/RoundEnd/Ponabirayt.ogg
+  - /Audio/Stray/RoundEnd/pyshnoy.ogg

Resources/Prototypes/Stray/Entities/Mobs/Cyborgs/borg_chassis.yml

@@ -51,5 +51,10 @@
       120: Critical # +20 to Crit Threshold
       200: Dead
   - type: NoSlip
+  - type: FootstepModifier
+    footstepSoundCollection:
+      path: /Audio/Stray/Mech/mech.ogg
+      params:
+        variation: 0.07
   - type: Speech
     speechVerb: Robotic

Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json

@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/faf6db214927874c19b8fa8585d26b5d40de1acc",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/faf6db214927874c19b8fa8585d26b5d40de1acc. Security and Robot textures taken from NES-Station",
   "states": [
     {
       "name": "clown",

Resources/Textures/Nyanotrasen/Clothing/Uniforms/Costume/swimsuit.rsi/meta.json

@@ -21,6 +21,10 @@
     {
       "name": "equipped-INNERCLOTHING",
       "directions": 4
-    }
+    },
+    {
+        "name": "equipped-INNERCLOTHING-shadowkin",
+        "directions": 4
+      }
   ]
 }

Resources/Textures/Objects/Weapons/Bombs/spidercharge.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/db2efd4f0df2b630a8bb9851f53f4922b669a5b3 and modified by Jackal298",
+	"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/db2efd4f0df2b630a8bb9851f53f4922b669a5b3",
     "size": {
         "x": 32,
         "y": 32

Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json

@@ -1,27 +1,27 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b13d244d761a07e200a9a41730bd446e776020d5",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/d91390a4474e511279b6ee7525c5982266b9a858",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "primed",
-      "delays": [
-        [
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "equipped-BELT",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "primed",
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        }
+    ]
 }

Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/meta.json

@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Taken from goonstation at https://github.com/goonstation/goonstation/pull/13630",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "primed"
+    }
+  ]
+}

Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json

@@ -1,27 +1,23 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b13d244d761a07e200a9a41730bd446e776020d5",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/d91390a4474e511279b6ee7525c5982266b9a858",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "primed",
-      "delays": [
-        [
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "equipped-BELT",
-      "directions": 4
-    }
-  ]
-}
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "primed"
+        },
+        {
+            "directions": 4,
+            "name": "equipped-BELT"
+        }
+    ]
+}      
+    
+

Resources/Textures/Objects/Weapons/Grenades/modular.rsi/meta.json

@@ -1,38 +1,38 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/29c0ed1b000619cb5398ef921000a8d4502ba0b6 and modified by Swept & ElectroSR",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-        "name": "empty",
-        "directions": 1
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d91390a4474e511279b6ee7525c5982266b9a858 & ElectroSR",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-        "name": "wired",
-        "directions": 1
-    },
-    {
-        "name": "no-payload",
-        "directions": 1
-    },
-    {
-        "name": "no-trigger",
-        "directions": 1
-    },
-    {
-        "name": "complete",
-        "directions": 1
-    },
-    {
-        "name": "primed",
-        "directions": 1,
-        "delays": [
-            [ 0.2, 0.2 ]
-        ]
-    }
-  ]
+    "states": [
+        {
+            "name": "empty",
+            "directions": 1
+        },
+        {
+            "name": "wired",
+            "directions": 1
+        },
+        {
+            "name": "no-payload",
+            "directions": 1
+        },
+        {
+            "name": "no-trigger",
+            "directions": 1
+        },
+        {
+            "name": "complete",
+            "directions": 1
+        },
+        {
+            "name": "primed",
+            "directions": 1,
+            "delays": [
+                [ 0.2, 0.2 ]
+            ]
+        }
+    ]
 }

Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/meta.json

@@ -1,23 +1,23 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/b13d244d761a07e200a9a41730bd446e776020d5",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation  https://github.com/tgstation/tgstation/commit/d91390a4474e511279b6ee7525c5982266b9a858 and modified by DanTheSynth ",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "primed",
-      "delays": [
-        [
-          0.1,
-          0.1
-        ]
-      ]
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "primed",
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        }
+    ]
 }

Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json

@@ -60,6 +60,12 @@
         },
         {
             "name": "depleted-uranium-spent"
+        },
+        {
+            "name": "tranquilizer"
+        },
+        {
+            "name": "tranquilizer-spent"
         }
     ]
 }