Merge branch 'space-syndicate:master' into Parallax-Pack-2

space-syndicate · Nov 28, 2024 · e4aae7e · e4aae7e
2 parents fd3c739 + 932bade
commit e4aae7e
Show file tree

Hide file tree

Showing 3 changed files with 43,648 additions and 49,762 deletions.
diff --git a/Resources/Changelog/ChangelogSyndie.yml b/Resources/Changelog/ChangelogSyndie.yml
@@ -1,20 +1,4 @@
 Entries:
-- author: Morty
-  changes:
-  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u043E\u0441\
-      \u043B\u0435\u0434\u043D\u0438\u0435 \u043E\u0431\u043D\u043E\u0432\u043B\u0435\
-      \u043D\u0438\u044F"
-    type: Add
-  id: 216
-  time: '2022-08-13T00:45:18.0000000+00:00'
-- author: Morty
-  changes:
-  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u043E\u0441\
-      \u043B\u0435\u0434\u043D\u0438\u0435 \u043E\u0431\u043D\u043E\u0432\u043B\u0435\
-      \u043D\u0438\u044F"
-    type: Add
-  id: 217
-  time: '2022-08-15T21:35:15.0000000+00:00'
 - author: Morty
   changes:
   - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u043E\u0441\
@@ -4541,3 +4525,18 @@
   id: 715
   time: '2024-11-25T01:31:16.0000000+00:00'
   url: https://github.com/space-syndicate/space-station-14/pull/2800
+- author: RatIRL
+  changes:
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D Avrite."
+    type: Tweak
+  id: 716
+  time: '2024-11-26T16:09:32.0000000+00:00'
+  url: https://github.com/space-syndicate/space-station-14/pull/2806
+- author: tabupetko
+  changes:
+  - message: "\u041E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0430 \u043A\u0430\u0440\
+      \u0442\u0430 Awesome."
+    type: Tweak
+  id: 717
+  time: '2024-11-28T06:03:25.0000000+00:00'
+  url: https://github.com/space-syndicate/space-station-14/pull/2811
diff --git a/Resources/Maps/corvax_avrite.yml b/Resources/Maps/corvax_avrite.yml
@@ -160479,16 +160479,6 @@ entities:
     - type: Transform
       pos: 1.3744736,0.22704315
       parent: 56354
-- proto: ClothingNeckTieDet
-  entities:
-  - uid: 30572
-    components:
-    - type: MetaData
-      desc: Иногда может быть использовал для удушения.
-      name: галстук АВД
-    - type: Transform
-      pos: -0.65950525,61.16825
-      parent: 2
 - proto: ClothingOuterAerostaticBomberJacket
   entities:
   - uid: 21945
@@ -161713,6 +161703,26 @@ entities:
     - type: Transform
       pos: -40.501865,-56.44255
       parent: 2
+- proto: ClothingShoesCentcomBlack
+  entities:
+  - uid: 19170
+    components:
+    - type: MetaData
+      desc: Чертовски тяжелая обувь из вольфрамового сплава. Кому вообще могла прийти идея создать их?
+      name: чертовски тяжелая обувь
+    - type: Transform
+      pos: -89.48056,23.553356
+      parent: 2
+    - type: Clothing
+      unequipDelay: 10
+    - type: ClothingSpeedModifier
+      sprintModifier: 0.4
+      walkModifier: 0.4
+    - type: FootstepModifier
+      footstepSoundCollection: !type:SoundPathSpecifier
+        params:
+          variation: 0.14
+        path: /Audio/Effects/Footsteps/largethud.ogg
 - proto: ClothingShoesColorBlack
   entities:
   - uid: 6509
@@ -209457,11 +209467,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -57.5,18.5
       parent: 2
-  - uid: 32066
-    components:
-    - type: Transform
-      pos: -19.5,-9.5
-      parent: 2
   - uid: 32081
     components:
     - type: Transform
@@ -211988,11 +211993,6 @@ entities:
     - type: Transform
       pos: 24.5,-10.5
       parent: 2
-  - uid: 58195
-    components:
-    - type: Transform
-      pos: -18.5,-9.5
-      parent: 2
   - uid: 58196
     components:
     - type: Transform
@@ -212368,11 +212368,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 33.5,-20.5
       parent: 2
-  - uid: 58299
-    components:
-    - type: Transform
-      pos: -20.5,-9.5
-      parent: 2
   - uid: 58300
     components:
     - type: Transform
@@ -212421,11 +212416,6 @@ entities:
     - type: Transform
       pos: -19.5,-6.5
       parent: 2
-  - uid: 58309
-    components:
-    - type: Transform
-      pos: -21.5,-9.5
-      parent: 2
   - uid: 58310
     components:
     - type: Transform
@@ -294470,9 +294460,14 @@ entities:
       parent: 2
   - uid: 15822
     components:
+    - type: MetaData
+      desc: Выглядит не очень здоровым...
+      name: комнатное растение
     - type: Transform
       pos: 27.5,-56.5
       parent: 2
+    missingComponents:
+    - StealTarget
   - uid: 23688
     components:
     - type: MetaData