Merge branch 'space-syndicate:master' into master

space-syndicate · Nov 10, 2024 · 2b2ee49 · 2b2ee49
2 parents 3eeb970 + 1e0225a
commit 2b2ee49
Show file tree

Hide file tree

Showing 9 changed files with 84 additions and 25 deletions.
diff --git a/Resources/Changelog/ChangelogSyndie.yml b/Resources/Changelog/ChangelogSyndie.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: lapatison
-  changes:
-  - message: "\u041F\u0435\u0440\u0435\u0432\u0435\u0434\u0435\u043D\u044B \u0434\u0435\
-      \u0442\u0430\u043B\u0438 \u0432\u043D\u0435\u0448\u043D\u043E\u0441\u0442\u0438\
-      \ \u0432\u043E\u043A\u0441\u043E\u0432"
-    type: Add
-  id: 189
-  time: '2022-07-21T11:49:35.0000000+00:00'
 - author: Morty
   changes:
   - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u043E\u0441\
@@ -4499,3 +4491,13 @@
   id: 688
   time: '2024-11-09T21:05:46.0000000+00:00'
   url: https://github.com/space-syndicate/space-station-14/pull/2757
+- author: definitelynotspaghetti
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u043A\u043E\u043B\
+      \u043B\u0438\u0437\u0438\u044F \u0434\u043B\u044F \u043F\u0440\u0438\u043D\u0442\
+      \u0435\u0440\u0430 \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u043E\u0432\
+      ."
+    type: Fix
+  id: 689
+  time: '2024-11-10T10:54:45.0000000+00:00'
+  url: https://github.com/space-syndicate/space-station-14/pull/2750
diff --git a/Resources/Maps/corvax_astra.yml b/Resources/Maps/corvax_astra.yml
@@ -192112,7 +192112,7 @@ entities:
       pos: 3.5,-52.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -20075.307
+      secondsUntilStateChange: -20135.443
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -192123,7 +192123,7 @@ entities:
       pos: 2.5,-52.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -20076.041
+      secondsUntilStateChange: -20136.178
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -218127,6 +218127,13 @@ entities:
     - type: Transform
       pos: -22.5,-85.5
       parent: 2
+- proto: SpawnPointBrigmedic
+  entities:
+  - uid: 41038
+    components:
+    - type: Transform
+      pos: 63.5,-3.5
+      parent: 2
 - proto: SpawnPointCaptain
   entities:
   - uid: 2301

diff --git a/Resources/Maps/corvax_avrite.yml b/Resources/Maps/corvax_avrite.yml
@@ -154514,7 +154514,7 @@ entities:
       pos: -12.5,61.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -381728.56
+      secondsUntilStateChange: -381750.62
       state: Closing
 - proto: CurtainsPurple
   entities:
@@ -265567,6 +265567,10 @@ entities:
           showEnts: False
           occludes: True
           ent: 19293
+        item_slot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
   - uid: 8586
     components:
     - type: Transform
@@ -265582,6 +265586,10 @@ entities:
           showEnts: False
           occludes: True
           ent: 8587
+        item_slot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
   - uid: 28838
     components:
     - type: Transform
@@ -310143,7 +310151,7 @@ entities:
       pos: -61.5,-85.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -7153.7236
+      secondsUntilStateChange: -7175.7905
       state: Opening
 - proto: SpaceCash
   entities:
@@ -311444,6 +311452,13 @@ entities:
     - type: Transform
       pos: -31.5,59.5
       parent: 2
+- proto: SpawnPointBrigmedic
+  entities:
+  - uid: 55572
+    components:
+    - type: Transform
+      pos: -14.5,-20.5
+      parent: 2
 - proto: SpawnPointCaptain
   entities:
   - uid: 23841
@@ -390718,7 +390733,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -142798.73
+      secondsUntilStateChange: -142820.8
       state: Opening
   - uid: 21930
     components:

diff --git a/Resources/Maps/corvax_delta.yml b/Resources/Maps/corvax_delta.yml
@@ -230323,6 +230323,13 @@ entities:
     - type: Transform
       pos: 59.5,-20.5
       parent: 2
+- proto: SpawnPointBrigmedic
+  entities:
+  - uid: 40823
+    components:
+    - type: Transform
+      pos: 61.5,-3.5
+      parent: 2
 - proto: SpawnPointCaptain
   entities:
   - uid: 29960

diff --git a/Resources/Maps/corvax_maus.yml b/Resources/Maps/corvax_maus.yml
@@ -110043,6 +110043,13 @@ entities:
     - type: Transform
       pos: -75.5,-75.5
       parent: 2
+- proto: SpawnPointBrigmedic
+  entities:
+  - uid: 19220
+    components:
+    - type: Transform
+      pos: -6.5,2.5
+      parent: 2
 - proto: SpawnPointCaptain
   entities:
   - uid: 8349

diff --git a/Resources/Maps/corvax_paper.yml b/Resources/Maps/corvax_paper.yml
@@ -68621,7 +68621,7 @@ entities:
     - type: Label
       currentLabel: кофейный ликёр
     - type: PressurizedSolution
-      sprayFizzinessThresholdRoll: 0.50556636
+      sprayFizzinessThresholdRoll: 0.35452935
     - type: NameModifier
       baseName: бутылка кофейного ликёра
     - type: ContainerContainer
@@ -68903,7 +68903,7 @@ entities:
     - type: Label
       currentLabel: ром
     - type: PressurizedSolution
-      sprayFizzinessThresholdRoll: 0.5162235
+      sprayFizzinessThresholdRoll: 0.08876361
     - type: NameModifier
       baseName: кубинский пряный ром капитана Пита
     - type: ContainerContainer
@@ -68940,7 +68940,7 @@ entities:
     - type: Label
       currentLabel: текила
     - type: PressurizedSolution
-      sprayFizzinessThresholdRoll: 0.030043429
+      sprayFizzinessThresholdRoll: 0.39504492
     - type: NameModifier
       baseName: бутылка текилы Каккаво гарантированного качества
     - type: ContainerContainer
@@ -68981,7 +68981,7 @@ entities:
     - type: Label
       currentLabel: вермут
     - type: PressurizedSolution
-      sprayFizzinessThresholdRoll: 0.22483605
+      sprayFizzinessThresholdRoll: 0.04999871
     - type: NameModifier
       baseName: бутылка вермута Золотой глаз
     - type: ContainerContainer
@@ -69004,7 +69004,7 @@ entities:
     - type: Label
       currentLabel: водка
     - type: PressurizedSolution
-      sprayFizzinessThresholdRoll: 0.60066545
+      sprayFizzinessThresholdRoll: 0.044492036
     - type: NameModifier
       baseName: бутылка водки
     - type: ContainerContainer
@@ -69072,7 +69072,7 @@ entities:
     - type: Label
       currentLabel: вино
     - type: PressurizedSolution
-      sprayFizzinessThresholdRoll: 0.4686988
+      sprayFizzinessThresholdRoll: 0.7278546
     - type: NameModifier
       baseName: особое двухбородое бородатое вино
     - type: ContainerContainer
@@ -119886,6 +119886,13 @@ entities:
     - type: Transform
       pos: 39.5,54.5
       parent: 2
+- proto: SpawnPointBrigmedic
+  entities:
+  - uid: 22027
+    components:
+    - type: Transform
+      pos: 61.5,21.5
+      parent: 2
 - proto: SpawnPointCaptain
   entities:
   - uid: 13203

diff --git a/Resources/Maps/corvax_pearl.yml b/Resources/Maps/corvax_pearl.yml
@@ -69210,7 +69210,7 @@ entities:
       pos: 29.5,23.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -6069.1206
+      secondsUntilStateChange: -6095.2324
       state: Opening
 - proto: CurtainsBlueOpen
   entities:
@@ -69415,7 +69415,7 @@ entities:
       pos: 89.5,16.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -123332.85
+      secondsUntilStateChange: -123358.96
       state: Closing
   - uid: 4080
     components:
@@ -126427,6 +126427,13 @@ entities:
     - type: Transform
       pos: -6.5,7.5
       parent: 2
+- proto: SpawnPointBrigmedic
+  entities:
+  - uid: 15434
+    components:
+    - type: Transform
+      pos: -12.5,-34.5
+      parent: 2
 - proto: SpawnPointCaptain
   entities:
   - uid: 12347

diff --git a/Resources/Maps/corvax_pilgrim.yml b/Resources/Maps/corvax_pilgrim.yml
@@ -150309,7 +150309,7 @@ entities:
       pos: -18.5,-29.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -17154.996
+      secondsUntilStateChange: -17180.092
       state: Closing
   - uid: 9988
     components:
@@ -189617,6 +189617,13 @@ entities:
     - type: Transform
       pos: -9.5,9.5
       parent: 2
+- proto: SpawnPointBrigmedic
+  entities:
+  - uid: 31367
+    components:
+    - type: Transform
+      pos: -45.5,8.5
+      parent: 2
 - proto: SpawnPointCaptain
   entities:
   - uid: 16625

diff --git a/Resources/Prototypes/Corvax/Entities/Structures/Machines/printer.yml b/Resources/Prototypes/Corvax/Entities/Structures/Machines/printer.yml
@@ -96,12 +96,12 @@
       fix1:
         shape:
           !type:PhysShapeAabb
-          bounds: "-0.25,-0.25,0.25,0.25"
+          bounds: "-0.25,-0.4,0.25,0.4"
         density: 25
         mask:
-        - TabletopMachineMask
+        - MachineMask
         layer:
-        - TabletopMachineLayer
+        - MachineLayer
   - type: MaterialStorage
     whitelist:
       tags: