СПАТЬ на унитазе (#764)

## Описание PR **Добавлены функции сна для:** Стульев, диванов, кресел, унитазов. ## Почему / Баланс Заказ из дс: https://discord.com/channels/901772674865455115/1303321747239473192 ## Медиа ![медиа_туалет_спатки2](https://github.com/user-attachments/assets/1b683d36-dae3-4912-a3c5-4df0ddd5e521) ![медиа_туалет_спатки](https://github.com/user-attachments/assets/31fc8ecf-b540-46ad-9b24-deeae0540e84) ## Требования - [ДА] Я прочитал(а) и следую [Руководство по созданию пулл реквестов](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html). Я понимаю, что в противном случае мой ПР может быть закрыт по усмотрению мейнтейнера. - [ДА] Я добавил скриншоты/видео к этому пулл реквесту, демонстрирующие его изменения в игре, **или** этот пулл реквест не требует демонстрации в игре **Чейнджлог** :cl: Kasey [Adnoda] Bitboxxer - add: Теперь можно спать на стульях, диванах, креслах, унитазах
AdventureTimeSS14 · Nov 8, 2024 · 3804582 · 3804582
1 parent 9441d1f
commit 3804582
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 10 deletions.
diff --git a/Resources/Prototypes/ADT/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/ADT/Entities/Structures/Furniture/chairs.yml
@@ -2,21 +2,37 @@
 - type: entity
   name: adt chair base
   id: ADTChairBase
-  parent: SeatBase
+  parent: [SeatBase, BaseStructure] # BaseStructure -- sleep
   description: It looks comfy.
   abstract: true
   components:
   - type: Transform
     anchored: true
-  - type: Physics
-    bodyType: Static
   - type: Anchorable
   - type: Rotatable
+  - type: Physics # sleep edit start
+    bodyType: Static
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+        density: 190
+        mask:
+        - TableMask
+  - type: HealOnBuckle
+    damage:
+      types:
+        Poison: -0.1
+        Blunt: -0.1
+  - type: Strap
+    position: Down
+    rotation: 0 # sleep edit end
 
 - type: entity
   name: pizzeria chair
   id: ADTChairPizzeria
-  parent: SeatBase
+  parent: ADTChairBase
   description: It looks spooky.
   components:
   - type: Sprite
@@ -29,7 +45,7 @@
 - type: entity
   name: red chair
   id: ADTChairRed
-  parent: SeatBase
+  parent: ADTChairBase
   components:
   - type: Sprite
     sprite: ADT/Structures/Furniture/Chairs/chairs.rsi #спрайт от Овая
@@ -41,7 +57,7 @@
 - type: entity
   name: white chair
   id: ADTChairWhite
-  parent: SeatBase
+  parent: ADTChairBase
   components:
   - type: Sprite
     sprite: ADT/Structures/Furniture/Chairs/chairs.rsi #спрайт от Овая
@@ -55,7 +71,7 @@
 - type: entity
   name: oktoberfest chair
   id: ADTChairOktoberfest
-  parent: SeatBase
+  parent: ADTChairBase
   suffix: Oktoberfest
   components:
   - type: Sprite
@@ -202,7 +218,7 @@
 - type: entity
   name: spider stool
   id: ADTSpiderStool
-  parent: SeatBase
+  parent: ADTChairBase
   description: It looks spooky.
   suffix: Halloween
   components:

diff --git a/Resources/Prototypes/ADT/Entities/Structures/Furniture/sofas.yml b/Resources/Prototypes/ADT/Entities/Structures/Furniture/sofas.yml
@@ -2,7 +2,7 @@
 - type: entity
   name: adt base sofa
   id: ADTSofaBase
-  parent: SeatBase
+  parent: [SeatBase, BaseStructure] # sleep --- BaseStructure
   description: It looks comfy.
   abstract: true
   components:
@@ -12,6 +12,22 @@
     bodyType: Static
   - type: Anchorable
   - type: Rotatable
+  - type: Fixtures # sleep start
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+        density: 190
+        mask:
+        - TableMask
+  - type: HealOnBuckle
+    damage:
+      types:
+        Poison: -0.1
+        Blunt: -0.1
+  - type: Strap
+    position: Down
+    rotation: 0 # sleep end
 
 - type: entity
   name: sofa left side

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
@@ -53,11 +53,29 @@
 - type: entity
   name: chair
   id: UnanchoredChairBase
-  parent: SeatBase
+  parent: [SeatBase, BaseStructure] # ADT CHANGE sleep
   abstract: true
   components:
   - type: Anchorable
   - type: Rotatable
+  - type: Physics # ADT CHANGE START sleep
+    bodyType: Static
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+        density: 190
+        mask:
+        - TableMask
+  - type: HealOnBuckle
+    damage:
+      types:
+        Poison: -0.1
+        Blunt: -0.1
+  - type: Strap
+    position: Down
+    rotation: 0 # ADT CHANGE END sleep
 
 #Start anchored, cannot be rotated while anchored
 - type: entity

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
@@ -28,6 +28,8 @@
   - type: Transform
     noRot: false
   - type: Strap
+    position: Down # ADT CHANGE sleep
+    rotation: 0 # ADT CHANGE sleep
     whitelist:
       components:
       - HumanoidAppearance
@@ -106,6 +108,11 @@
         ToolOpenableVisualState.StashOpen:
           Open: { state: disposal-open }
           Closed: { state: disposal-closed }
+  - type: Anchorable # ADT CHANGE sleep START
+  - type: HealOnBuckle
+    damage:
+      types:
+        Poison: 0 # ADT CHANGE sleep END
 
 - type: entity
   name: toilet