From bd52f377b9e50fcad68cb31efac7a0473ddfe5a4 Mon Sep 17 00:00:00 2001
From: eddiedoesGIT <Stepanyan7803@gmail.com>
Date: Tue, 12 Mar 2024 00:29:06 +0300
Subject: [PATCH 01/15] =?UTF-8?q?=D0=91=D0=B0=D0=B7=D0=B0=20=D0=B4=D0=BB?=
 =?UTF-8?q?=D1=8F=20=D0=BC=D0=B0=D0=BD=D0=B5=D0=BA=D0=B5=D0=BD=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Манекен с текстурами человека
- Можно надевать одежду
- Можно закрепить, тащить, поворачивать

Co-Authored-By: Schrodinger71 <132720404+Schrodinger71@users.noreply.github.com>
---
 .../ADT/Entities/Mobs/SecurityCyborg/base.yml | 128 +++++------
 .../Structures/Mannequin/mannequin.yml        | 214 ++++++++++++++++++
 .../Structures/Mannequin.rsi/full_human.png   | Bin 0 -> 2368 bytes
 .../ADT/Structures/Mannequin.rsi/meta.json    |  16 ++
 4 files changed, 294 insertions(+), 64 deletions(-)
 create mode 100644 Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin.yml
 create mode 100644 Resources/Textures/ADT/Structures/Mannequin.rsi/full_human.png
 create mode 100644 Resources/Textures/ADT/Structures/Mannequin.rsi/meta.json

diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/base.yml b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/base.yml
index 225262cd82b..a3205d987ef 100644
--- a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/base.yml
+++ b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/base.yml
@@ -128,70 +128,70 @@
             damage: 500
           behaviors:
             - !type:GibBehavior {}
-    - type: Icon
-      sprite: ADT/Mobs/Silicon/Cyborg/parts.rsi  ##########################3
-      state: full
-    - type: MindContainer
-      showExamineInfo: true
-    - type: Sprite
-      noRot: true
-      drawdepth: Mobs
-      layers:
-        - map: ["enum.DamageStateVisualLayers.Base"]
-          sprite: ADT/Mobs/Silicon/Cyborg/parts.rsi
-          state: full
-        - map: ["enum.HumanoidVisualLayers.Chest"]
-        - map: ["enum.HumanoidVisualLayers.Head"]
-        - map: ["enum.HumanoidVisualLayers.Snout"]
-        - map: ["enum.HumanoidVisualLayers.Eyes"]
-        - map: ["enum.HumanoidVisualLayers.RArm"]
-        - map: ["enum.HumanoidVisualLayers.LArm"]
-        - map: ["enum.HumanoidVisualLayers.RLeg"]
-        - map: ["enum.HumanoidVisualLayers.LLeg"]
-        - shader: StencilClear
-          sprite: Mobs/Species/Human/parts.rsi
-          state: l_leg
-        - shader: StencilMask
-          map: ["enum.HumanoidVisualLayers.StencilMask"]
-          sprite: Mobs/Customization/masking_helpers.rsi
-          state: female_full
-          visible: false
-        - map: ["enum.HumanoidVisualLayers.LFoot"]
-        - map: ["enum.HumanoidVisualLayers.RFoot"]
-        - map: ["socks"]
-        - map: ["underpants"]
-        - map: ["undershirt"]
-        - map: ["jumpsuit"]
-        - map: ["enum.HumanoidVisualLayers.LHand"]
-        - map: ["enum.HumanoidVisualLayers.RHand"]
-        - map: ["enum.HumanoidVisualLayers.Handcuffs"]
-          color: "#ffffff"
-          sprite: Objects/Misc/handcuffs.rsi
-          state: body-overlay-2
-          visible: false
-        - map: ["id"]
-        - map: ["gloves"]
-        - map: ["shoes"]
-        - map: ["ears"]
-        - map: ["outerClothing"]
-        - map: ["eyes"]
-        - map: ["belt"]
-        - map: ["neck"]
-        - map: ["back"]
-        - map: ["enum.HumanoidVisualLayers.FacialHair"]
-        - map: ["enum.HumanoidVisualLayers.Hair"]
-        - map: ["enum.HumanoidVisualLayers.HeadSide"]
-        - map: ["enum.HumanoidVisualLayers.HeadTop"]
-        - map: ["mask"]
-        - map: ["head"]
-        - map: ["pocket1"]
-        - map: ["pocket2"]
-        - map: ["enum.HumanoidVisualLayers.Tail"]
-        #- map: ["enum.HumanoidVisualLayers.Wings"]
-        - map: ["clownedon"] # Dynamically generated
-          sprite: "Effects/creampie.rsi"
-          state: "creampie_human"
-          visible: false
+  - type: Icon
+    sprite: ADT/Mobs/Silicon/Cyborg/parts.rsi  ##########################3
+    state: full
+  - type: MindContainer
+    showExamineInfo: true
+  - type: Sprite
+    noRot: true
+    drawdepth: Mobs
+    layers:
+      - map: ["enum.DamageStateVisualLayers.Base"]
+        sprite: ADT/Mobs/Silicon/Cyborg/parts.rsi
+        state: full
+      - map: ["enum.HumanoidVisualLayers.Chest"]
+      - map: ["enum.HumanoidVisualLayers.Head"]
+      - map: ["enum.HumanoidVisualLayers.Snout"]
+      - map: ["enum.HumanoidVisualLayers.Eyes"]
+      - map: ["enum.HumanoidVisualLayers.RArm"]
+      - map: ["enum.HumanoidVisualLayers.LArm"]
+      - map: ["enum.HumanoidVisualLayers.RLeg"]
+      - map: ["enum.HumanoidVisualLayers.LLeg"]
+      - shader: StencilClear
+        sprite: Mobs/Species/Human/parts.rsi
+        state: l_leg
+      - shader: StencilMask
+        map: ["enum.HumanoidVisualLayers.StencilMask"]
+        sprite: Mobs/Customization/masking_helpers.rsi
+        state: female_full
+        visible: false
+      - map: ["enum.HumanoidVisualLayers.LFoot"]
+      - map: ["enum.HumanoidVisualLayers.RFoot"]
+      - map: ["socks"]
+      - map: ["underpants"]
+      - map: ["undershirt"]
+      - map: ["jumpsuit"]
+      - map: ["enum.HumanoidVisualLayers.LHand"]
+      - map: ["enum.HumanoidVisualLayers.RHand"]
+      - map: ["enum.HumanoidVisualLayers.Handcuffs"]
+        color: "#ffffff"
+        sprite: Objects/Misc/handcuffs.rsi
+        state: body-overlay-2
+        visible: false
+      - map: ["id"]
+      - map: ["gloves"]
+      - map: ["shoes"]
+      - map: ["ears"]
+      - map: ["outerClothing"]
+      - map: ["eyes"]
+      - map: ["belt"]
+      - map: ["neck"]
+      - map: ["back"]
+      - map: ["enum.HumanoidVisualLayers.FacialHair"]
+      - map: ["enum.HumanoidVisualLayers.Hair"]
+      - map: ["enum.HumanoidVisualLayers.HeadSide"]
+      - map: ["enum.HumanoidVisualLayers.HeadTop"]
+      - map: ["mask"]
+      - map: ["head"]
+      - map: ["pocket1"]
+      - map: ["pocket2"]
+      - map: ["enum.HumanoidVisualLayers.Tail"]
+      #- map: ["enum.HumanoidVisualLayers.Wings"]
+      - map: ["clownedon"] # Dynamically generated
+        sprite: "Effects/creampie.rsi"
+        state: "creampie_human"
+        visible: false
     - type: Repairable
       #fuelcost: 60
       doAfterDelay: 10 # was 18
diff --git a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin.yml b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin.yml
new file mode 100644
index 00000000000..c22cbc15421
--- /dev/null
+++ b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin.yml
@@ -0,0 +1,214 @@
+- type: entity
+  name: chair
+  id: ADTMannequinBase
+  abstract: true
+  description: A base of a mannequin
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Physics
+    bodyType: Dynamic
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.2
+        density: 100
+        mask:
+        - TableMask
+  - type: Inventory
+    templateId: human
+  - type: InventorySlots
+  - type: Hands
+  - type: ContainerContainer
+  - type: Stripping
+  - type: Strippable
+  - type: UserInterface
+    interfaces:
+      - key: enum.HumanoidMarkingModifierKey.Key
+        type: HumanoidMarkingModifierBoundUserInterface
+      - key: enum.StrippingUiKey.Key
+        type: StrippableBoundUserInterface
+      - key: enum.StoreUiKey.Key
+        type: StoreBoundUserInterface
+  - type: Pullable
+  - type: Rotatable
+    rotateWhileAnchored: true
+  - type: Damageable
+  - type: Transform
+    anchored: true
+  - type: Anchorable
+    damageContainer: Inorganic
+    damageModifierSet: Metallic
+  # - type: Sprite
+  #   noRot: true
+  #   drawdepth: Mobs
+  #   layers:
+  #     - map: ["enum.DamageStateVisualLayers.Base"]
+  #       sprite: ADT/Structures/Mannequin.rsi
+  #       state: full_human
+  #   - map: [ "enum.HumanoidVisualLayers.Chest" ]
+  #   - map: [ "enum.HumanoidVisualLayers.Head" ]
+  #   - map: [ "enum.HumanoidVisualLayers.Snout" ]
+  #   - map: [ "enum.HumanoidVisualLayers.Eyes" ]
+  #   - map: [ "enum.HumanoidVisualLayers.RArm" ]
+  #   - map: [ "enum.HumanoidVisualLayers.LArm" ]
+  #   - map: [ "enum.HumanoidVisualLayers.RLeg" ]
+  #   - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+  #   - shader: StencilClear
+  #     sprite: ADT/Structures/Mannequin.rsi
+  #     state: full_human
+  #   - shader: StencilMask
+  #     map: ["enum.HumanoidVisualLayers.StencilMask"]
+  #     sprite: Mobs/Customization/masking_helpers.rsi
+  #     state: unisex_full
+  #     visible: false
+  #   - map: [ "underwearb" ] #Sirena
+  #   - map: [ "underweart" ] #Sirena
+  #   - map: ["enum.HumanoidVisualLayers.LFoot"]
+  #   - map: ["enum.HumanoidVisualLayers.RFoot"]
+  #   - map: [ "socks" ] #Sirena
+  #   - map: ["jumpsuit"]
+  #   - map: ["enum.HumanoidVisualLayers.LHand"]
+  #   - map: ["enum.HumanoidVisualLayers.RHand"]
+  #   - map: ["enum.HumanoidVisualLayers.Handcuffs"]
+  #     color: "#ffffff"
+  #     sprite: Objects/Misc/handcuffs.rsi
+  #     state: body-overlay-2
+  #     visible: false
+  #   - map: [ "gloves" ]
+  #   - map: [ "shoes" ]
+  #   - map: [ "ears" ]
+  #   - map: [ "outerClothing" ]
+  #   - map: [ "eyes" ]
+  #   - map: [ "belt" ]
+  #   - map: [ "id" ]
+  #   - map: [ "neck" ]
+  #   - map: [ "back" ]
+  #   - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
+  #   - map: [ "enum.HumanoidVisualLayers.Hair" ]
+  #   - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
+  #   - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
+  #   - map: [ "enum.HumanoidVisualLayers.Tail" ]
+  #   - map: [ "mask" ]
+  #   - map: [ "head" ]
+  #   - map: [ "pocket1" ]
+  #   - map: [ "pocket2" ]
+  - type: Icon
+    sprite: ADT/Structures/Mannequin.rsi  ##########################3
+    state: full_human
+  - type: Sprite
+    noRot: true
+    drawdepth: Mobs
+    layers:
+      - map: ["enum.DamageStateVisualLayers.Base"]
+        sprite: ADT/Structures/Mannequin.rsi
+        state: full_human
+      - map: ["enum.HumanoidVisualLayers.Chest"]
+      - map: ["enum.HumanoidVisualLayers.Head"]
+      - map: ["enum.HumanoidVisualLayers.Snout"]
+      - map: ["enum.HumanoidVisualLayers.Eyes"]
+      - map: ["enum.HumanoidVisualLayers.RArm"]
+      - map: ["enum.HumanoidVisualLayers.LArm"]
+      - map: ["enum.HumanoidVisualLayers.RLeg"]
+      - map: ["enum.HumanoidVisualLayers.LLeg"]
+      - shader: StencilClear
+        sprite: Mobs/Species/Human/parts.rsi
+        state: l_leg
+      - shader: StencilMask
+        map: ["enum.HumanoidVisualLayers.StencilMask"]
+        sprite: Mobs/Customization/masking_helpers.rsi
+        state: female_full
+        visible: false
+      - map: [ "underwearb" ] #Sirena
+      - map: [ "underweart" ] #Sirena
+      - map: ["enum.HumanoidVisualLayers.LFoot"]
+      - map: ["enum.HumanoidVisualLayers.RFoot"]
+      - map: ["socks"]
+      - map: ["underpants"]
+      - map: ["undershirt"]
+      - map: ["jumpsuit"]
+      - map: ["enum.HumanoidVisualLayers.LHand"]
+      - map: ["enum.HumanoidVisualLayers.RHand"]
+      - map: ["enum.HumanoidVisualLayers.Handcuffs"]
+        color: "#ffffff"
+        sprite: Objects/Misc/handcuffs.rsi
+        state: body-overlay-2
+        visible: false
+      - map: ["id"]
+      - map: ["gloves"]
+      - map: ["shoes"]
+      - map: ["ears"]
+      - map: ["outerClothing"]
+      - map: ["eyes"]
+      - map: ["belt"]
+      - map: ["neck"]
+      - map: ["back"]
+      - map: ["enum.HumanoidVisualLayers.FacialHair"]
+      - map: ["enum.HumanoidVisualLayers.Hair"]
+      - map: ["enum.HumanoidVisualLayers.HeadSide"]
+      - map: ["enum.HumanoidVisualLayers.HeadTop"]
+      - map: ["mask"]
+      - map: ["head"]
+      - map: ["pocket1"]
+      - map: ["pocket2"]
+      - map: ["enum.HumanoidVisualLayers.Tail"]
+      - map: ["enum.HumanoidVisualLayers.Wings"]
+      - map: ["clownedon"] # Dynamically generated
+        sprite: "Effects/creampie.rsi"
+        state: "creampie_human"
+        visible: false
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+  - type: StaticPrice
+    price: 10
+    
+    
+  
+- type: entity
+  name: Mannequin
+  description: A doll for your clothes
+  id: ADTMannequin
+  parent: ADTMannequinBase
+  components:
+  - type: Damageable
+    damageModifierSet: Wood
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 25
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroy
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialWoodPlank:
+            min: 1
+            max: 1
+  - type: Tag
+    tags:
+    - Wooden
+  - type: StaticPrice
+    price: 75
\ No newline at end of file
diff --git a/Resources/Textures/ADT/Structures/Mannequin.rsi/full_human.png b/Resources/Textures/ADT/Structures/Mannequin.rsi/full_human.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f29e55e6ddde3f23af8073b87dfe18524a311ae
GIT binary patch
literal 2368
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/ADT/Structures/Mannequin.rsi/meta.json b/Resources/Textures/ADT/Structures/Mannequin.rsi/meta.json
new file mode 100644
index 00000000000..8e146788c08
--- /dev/null
+++ b/Resources/Textures/ADT/Structures/Mannequin.rsi/meta.json
@@ -0,0 +1,16 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+    {
+        "name": "full_human",
+        "directions": 4
+    }
+    ]
+  }
+  
\ No newline at end of file

From defd49dbfb61bd12d89f746ea1d8eaa990e47989 Mon Sep 17 00:00:00 2001
From: Schrodinger71 <132720404+Schrodinger71@users.noreply.github.com>
Date: Tue, 12 Mar 2024 00:36:10 +0300
Subject: [PATCH 02/15] Update base.yml

---
 .../ADT/Entities/Mobs/SecurityCyborg/base.yml | 128 +++++++++---------
 1 file changed, 64 insertions(+), 64 deletions(-)

diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/base.yml b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/base.yml
index a3205d987ef..225262cd82b 100644
--- a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/base.yml
+++ b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/base.yml
@@ -128,70 +128,70 @@
             damage: 500
           behaviors:
             - !type:GibBehavior {}
-  - type: Icon
-    sprite: ADT/Mobs/Silicon/Cyborg/parts.rsi  ##########################3
-    state: full
-  - type: MindContainer
-    showExamineInfo: true
-  - type: Sprite
-    noRot: true
-    drawdepth: Mobs
-    layers:
-      - map: ["enum.DamageStateVisualLayers.Base"]
-        sprite: ADT/Mobs/Silicon/Cyborg/parts.rsi
-        state: full
-      - map: ["enum.HumanoidVisualLayers.Chest"]
-      - map: ["enum.HumanoidVisualLayers.Head"]
-      - map: ["enum.HumanoidVisualLayers.Snout"]
-      - map: ["enum.HumanoidVisualLayers.Eyes"]
-      - map: ["enum.HumanoidVisualLayers.RArm"]
-      - map: ["enum.HumanoidVisualLayers.LArm"]
-      - map: ["enum.HumanoidVisualLayers.RLeg"]
-      - map: ["enum.HumanoidVisualLayers.LLeg"]
-      - shader: StencilClear
-        sprite: Mobs/Species/Human/parts.rsi
-        state: l_leg
-      - shader: StencilMask
-        map: ["enum.HumanoidVisualLayers.StencilMask"]
-        sprite: Mobs/Customization/masking_helpers.rsi
-        state: female_full
-        visible: false
-      - map: ["enum.HumanoidVisualLayers.LFoot"]
-      - map: ["enum.HumanoidVisualLayers.RFoot"]
-      - map: ["socks"]
-      - map: ["underpants"]
-      - map: ["undershirt"]
-      - map: ["jumpsuit"]
-      - map: ["enum.HumanoidVisualLayers.LHand"]
-      - map: ["enum.HumanoidVisualLayers.RHand"]
-      - map: ["enum.HumanoidVisualLayers.Handcuffs"]
-        color: "#ffffff"
-        sprite: Objects/Misc/handcuffs.rsi
-        state: body-overlay-2
-        visible: false
-      - map: ["id"]
-      - map: ["gloves"]
-      - map: ["shoes"]
-      - map: ["ears"]
-      - map: ["outerClothing"]
-      - map: ["eyes"]
-      - map: ["belt"]
-      - map: ["neck"]
-      - map: ["back"]
-      - map: ["enum.HumanoidVisualLayers.FacialHair"]
-      - map: ["enum.HumanoidVisualLayers.Hair"]
-      - map: ["enum.HumanoidVisualLayers.HeadSide"]
-      - map: ["enum.HumanoidVisualLayers.HeadTop"]
-      - map: ["mask"]
-      - map: ["head"]
-      - map: ["pocket1"]
-      - map: ["pocket2"]
-      - map: ["enum.HumanoidVisualLayers.Tail"]
-      #- map: ["enum.HumanoidVisualLayers.Wings"]
-      - map: ["clownedon"] # Dynamically generated
-        sprite: "Effects/creampie.rsi"
-        state: "creampie_human"
-        visible: false
+    - type: Icon
+      sprite: ADT/Mobs/Silicon/Cyborg/parts.rsi  ##########################3
+      state: full
+    - type: MindContainer
+      showExamineInfo: true
+    - type: Sprite
+      noRot: true
+      drawdepth: Mobs
+      layers:
+        - map: ["enum.DamageStateVisualLayers.Base"]
+          sprite: ADT/Mobs/Silicon/Cyborg/parts.rsi
+          state: full
+        - map: ["enum.HumanoidVisualLayers.Chest"]
+        - map: ["enum.HumanoidVisualLayers.Head"]
+        - map: ["enum.HumanoidVisualLayers.Snout"]
+        - map: ["enum.HumanoidVisualLayers.Eyes"]
+        - map: ["enum.HumanoidVisualLayers.RArm"]
+        - map: ["enum.HumanoidVisualLayers.LArm"]
+        - map: ["enum.HumanoidVisualLayers.RLeg"]
+        - map: ["enum.HumanoidVisualLayers.LLeg"]
+        - shader: StencilClear
+          sprite: Mobs/Species/Human/parts.rsi
+          state: l_leg
+        - shader: StencilMask
+          map: ["enum.HumanoidVisualLayers.StencilMask"]
+          sprite: Mobs/Customization/masking_helpers.rsi
+          state: female_full
+          visible: false
+        - map: ["enum.HumanoidVisualLayers.LFoot"]
+        - map: ["enum.HumanoidVisualLayers.RFoot"]
+        - map: ["socks"]
+        - map: ["underpants"]
+        - map: ["undershirt"]
+        - map: ["jumpsuit"]
+        - map: ["enum.HumanoidVisualLayers.LHand"]
+        - map: ["enum.HumanoidVisualLayers.RHand"]
+        - map: ["enum.HumanoidVisualLayers.Handcuffs"]
+          color: "#ffffff"
+          sprite: Objects/Misc/handcuffs.rsi
+          state: body-overlay-2
+          visible: false
+        - map: ["id"]
+        - map: ["gloves"]
+        - map: ["shoes"]
+        - map: ["ears"]
+        - map: ["outerClothing"]
+        - map: ["eyes"]
+        - map: ["belt"]
+        - map: ["neck"]
+        - map: ["back"]
+        - map: ["enum.HumanoidVisualLayers.FacialHair"]
+        - map: ["enum.HumanoidVisualLayers.Hair"]
+        - map: ["enum.HumanoidVisualLayers.HeadSide"]
+        - map: ["enum.HumanoidVisualLayers.HeadTop"]
+        - map: ["mask"]
+        - map: ["head"]
+        - map: ["pocket1"]
+        - map: ["pocket2"]
+        - map: ["enum.HumanoidVisualLayers.Tail"]
+        #- map: ["enum.HumanoidVisualLayers.Wings"]
+        - map: ["clownedon"] # Dynamically generated
+          sprite: "Effects/creampie.rsi"
+          state: "creampie_human"
+          visible: false
     - type: Repairable
       #fuelcost: 60
       doAfterDelay: 10 # was 18

From 0f07cb81133686864448f8ffbf1bba928240f81e Mon Sep 17 00:00:00 2001
From: Schrodinger71 <132720404+Schrodinger71@users.noreply.github.com>
Date: Tue, 12 Mar 2024 00:59:33 +0300
Subject: [PATCH 03/15] Fix YAML validator

---
 .../ADT/Entities/Structures/Mannequin/mannequin.yml           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin.yml b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin.yml
index c22cbc15421..6e19b84f504 100644
--- a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin.yml
+++ b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin.yml
@@ -156,7 +156,7 @@
       - map: ["pocket1"]
       - map: ["pocket2"]
       - map: ["enum.HumanoidVisualLayers.Tail"]
-      - map: ["enum.HumanoidVisualLayers.Wings"]
+      # - map: ["enum.HumanoidVisualLayers.Wings"]
       - map: ["clownedon"] # Dynamically generated
         sprite: "Effects/creampie.rsi"
         state: "creampie_human"
@@ -211,4 +211,4 @@
     tags:
     - Wooden
   - type: StaticPrice
-    price: 75
\ No newline at end of file
+    price: 75

From 69c4cebea5cd4158b54139869998c08f003ff3b0 Mon Sep 17 00:00:00 2001
From: eddiedoesGIT <Stepanyan7803@gmail.com>
Date: Wed, 13 Mar 2024 03:13:18 +0300
Subject: [PATCH 04/15] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BA=D0=B0=20=D0=BC=D0=B0=D0=BD=D0=B5=D0=BA=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Locale/en-US/research/technologies.ftl    |   2 +
 .../Locale/ru-RU/research/technologies.ftl    |   2 +
 .../{mannequin.yml => mannequin-base.yml}     | 181 ++++++------------
 .../Structures/Mannequin/mannequin-female.yml |  70 +++++++
 .../Structures/Mannequin/mannequin-male.yml   |  71 +++++++
 .../Entities/Structures/Machines/lathe.yml    |   2 +
 Resources/Prototypes/Recipes/Lathes/misc.yml  |  13 ++
 .../Prototypes/Research/civilianservices.yml  |  13 ++
 .../Structures/Mannequin.rsi/full_human.png   | Bin 2368 -> 0 bytes
 .../ADT/Structures/Mannequin.rsi/meta.json    |  16 --
 .../full_mannequin_female.png                 | Bin 0 -> 1336 bytes
 .../Mannequin/MannequinFemale.rsi/meta.json   |  16 ++
 .../MannequinLogo.rsi/mannequin_front.png     | Bin 0 -> 557 bytes
 .../Mannequin/MannequinLogo.rsi/meta.json     |  16 ++
 .../MannequinMale.rsi/full_mannequin_male.png | Bin 0 -> 1355 bytes
 .../Mannequin/MannequinMale.rsi/meta.json     |  16 ++
 16 files changed, 284 insertions(+), 134 deletions(-)
 rename Resources/Prototypes/ADT/Entities/Structures/Mannequin/{mannequin.yml => mannequin-base.yml} (54%)
 create mode 100644 Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-female.yml
 create mode 100644 Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-male.yml
 delete mode 100644 Resources/Textures/ADT/Structures/Mannequin.rsi/full_human.png
 delete mode 100644 Resources/Textures/ADT/Structures/Mannequin.rsi/meta.json
 create mode 100644 Resources/Textures/ADT/Structures/Mannequin/MannequinFemale.rsi/full_mannequin_female.png
 create mode 100644 Resources/Textures/ADT/Structures/Mannequin/MannequinFemale.rsi/meta.json
 create mode 100644 Resources/Textures/ADT/Structures/Mannequin/MannequinLogo.rsi/mannequin_front.png
 create mode 100644 Resources/Textures/ADT/Structures/Mannequin/MannequinLogo.rsi/meta.json
 create mode 100644 Resources/Textures/ADT/Structures/Mannequin/MannequinMale.rsi/full_mannequin_male.png
 create mode 100644 Resources/Textures/ADT/Structures/Mannequin/MannequinMale.rsi/meta.json

diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl
index 3cf5fdd5bb1..dfdee11f3db 100644
--- a/Resources/Locale/en-US/research/technologies.ftl
+++ b/Resources/Locale/en-US/research/technologies.ftl
@@ -69,6 +69,8 @@ research-technology-advanced-spray = Advanced Spray
 research-technology-bluespace-cargo-transport = Bluespace Cargo Transport
 research-technology-quantum-fiber-weaving = Quantum Fiber Weaving
 
+ADT-research-technology-doll-house = Doll House
+
 # Frontier - languages mechanic
 research-technology-basic-translation = Basic Translation
 research-technology-advanced-translation = Advanced Translation
diff --git a/Resources/Locale/ru-RU/research/technologies.ftl b/Resources/Locale/ru-RU/research/technologies.ftl
index 0115a8bc8c5..945b47435b3 100644
--- a/Resources/Locale/ru-RU/research/technologies.ftl
+++ b/Resources/Locale/ru-RU/research/technologies.ftl
@@ -78,3 +78,5 @@ research-technology-faux-astro-tiles = Исскуственная печать 
 research-technology-quantum-fiber-weaving = Квантовые волокна
 research-technology-advanced-anomaly-research = Продвинутые исследования аномалий
 research-technology-portable-fission = Эксперементальные батареи
+
+ADT-research-technology-doll-house = Кукольный домик
diff --git a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin.yml b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
similarity index 54%
rename from Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin.yml
rename to Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
index 6e19b84f504..84e310514b1 100644
--- a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin.yml
+++ b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
@@ -7,9 +7,12 @@
     mode: SnapgridCenter
   components:
   - type: Clickable
+  
   - type: InteractionOutline
+  
   - type: Physics
     bodyType: Dynamic
+
   - type: Fixtures
     fixtures:
       fix1:
@@ -19,13 +22,20 @@
         density: 100
         mask:
         - TableMask
+
   - type: Inventory
     templateId: human
+
   - type: InventorySlots
+
   - type: Hands
+
   - type: ContainerContainer
+
   - type: Stripping
+
   - type: Strippable
+
   - type: UserInterface
     interfaces:
       - key: enum.HumanoidMarkingModifierKey.Key
@@ -34,16 +44,66 @@
         type: StrippableBoundUserInterface
       - key: enum.StoreUiKey.Key
         type: StoreBoundUserInterface
+
   - type: Pullable
+
   - type: Rotatable
     rotateWhileAnchored: true
-  - type: Damageable
+
   - type: Transform
     anchored: true
+
   - type: Anchorable
     damageContainer: Inorganic
     damageModifierSet: Metallic
-  # - type: Sprite
+
+  - type: Body
+    prototype: Human
+    requiredLegs: 2
+
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Metallic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+        - !type:DoActsBehavior
+          acts: ["Destruction"]
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetPlastic:
+            min: 3
+            max: 8
+  - type: Tag
+    tags:
+    - Plastic
+  - type: StaticPrice
+    price: 75
+
+  
+
+
+
+
+
+
+
+
+
+
+      # - type: Sprite
   #   noRot: true
   #   drawdepth: Mobs
   #   layers:
@@ -96,119 +156,4 @@
   #   - map: [ "mask" ]
   #   - map: [ "head" ]
   #   - map: [ "pocket1" ]
-  #   - map: [ "pocket2" ]
-  - type: Icon
-    sprite: ADT/Structures/Mannequin.rsi  ##########################3
-    state: full_human
-  - type: Sprite
-    noRot: true
-    drawdepth: Mobs
-    layers:
-      - map: ["enum.DamageStateVisualLayers.Base"]
-        sprite: ADT/Structures/Mannequin.rsi
-        state: full_human
-      - map: ["enum.HumanoidVisualLayers.Chest"]
-      - map: ["enum.HumanoidVisualLayers.Head"]
-      - map: ["enum.HumanoidVisualLayers.Snout"]
-      - map: ["enum.HumanoidVisualLayers.Eyes"]
-      - map: ["enum.HumanoidVisualLayers.RArm"]
-      - map: ["enum.HumanoidVisualLayers.LArm"]
-      - map: ["enum.HumanoidVisualLayers.RLeg"]
-      - map: ["enum.HumanoidVisualLayers.LLeg"]
-      - shader: StencilClear
-        sprite: Mobs/Species/Human/parts.rsi
-        state: l_leg
-      - shader: StencilMask
-        map: ["enum.HumanoidVisualLayers.StencilMask"]
-        sprite: Mobs/Customization/masking_helpers.rsi
-        state: female_full
-        visible: false
-      - map: [ "underwearb" ] #Sirena
-      - map: [ "underweart" ] #Sirena
-      - map: ["enum.HumanoidVisualLayers.LFoot"]
-      - map: ["enum.HumanoidVisualLayers.RFoot"]
-      - map: ["socks"]
-      - map: ["underpants"]
-      - map: ["undershirt"]
-      - map: ["jumpsuit"]
-      - map: ["enum.HumanoidVisualLayers.LHand"]
-      - map: ["enum.HumanoidVisualLayers.RHand"]
-      - map: ["enum.HumanoidVisualLayers.Handcuffs"]
-        color: "#ffffff"
-        sprite: Objects/Misc/handcuffs.rsi
-        state: body-overlay-2
-        visible: false
-      - map: ["id"]
-      - map: ["gloves"]
-      - map: ["shoes"]
-      - map: ["ears"]
-      - map: ["outerClothing"]
-      - map: ["eyes"]
-      - map: ["belt"]
-      - map: ["neck"]
-      - map: ["back"]
-      - map: ["enum.HumanoidVisualLayers.FacialHair"]
-      - map: ["enum.HumanoidVisualLayers.Hair"]
-      - map: ["enum.HumanoidVisualLayers.HeadSide"]
-      - map: ["enum.HumanoidVisualLayers.HeadTop"]
-      - map: ["mask"]
-      - map: ["head"]
-      - map: ["pocket1"]
-      - map: ["pocket2"]
-      - map: ["enum.HumanoidVisualLayers.Tail"]
-      # - map: ["enum.HumanoidVisualLayers.Wings"]
-      - map: ["clownedon"] # Dynamically generated
-        sprite: "Effects/creampie.rsi"
-        state: "creampie_human"
-        visible: false
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 100
-      behaviors:
-        - !type:DoActsBehavior
-          acts: [ "Destruction" ]
-    - trigger:
-        !type:DamageTrigger
-        damage: 50
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MetalBreak
-  - type: StaticPrice
-    price: 10
-    
-    
-  
-- type: entity
-  name: Mannequin
-  description: A doll for your clothes
-  id: ADTMannequin
-  parent: ADTMannequinBase
-  components:
-  - type: Damageable
-    damageModifierSet: Wood
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 25
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-      - !type:PlaySoundBehavior
-        sound:
-          collection: WoodDestroy
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          MaterialWoodPlank:
-            min: 1
-            max: 1
-  - type: Tag
-    tags:
-    - Wooden
-  - type: StaticPrice
-    price: 75
+  #   - map: [ "pocket2" ]
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-female.yml b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-female.yml
new file mode 100644
index 00000000000..e32ffc5e8e7
--- /dev/null
+++ b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-female.yml
@@ -0,0 +1,70 @@
+- type: entity
+  name: Female Mannequin
+  description: A female doll for your clothes.
+  id: ADTMannequinFemale
+  parent: ADTMannequinBase
+  components:
+  - type: Icon
+    sprite: ADT/Structures/Mannequin/MannequinFemale.rsi  ##########################3
+    state: full_mannequin_female
+  - type: Sprite
+    noRot: true
+    drawdepth: Mobs
+    layers:
+      - map: ["enum.DamageStateVisualLayers.Base"]
+        sprite: ADT/Structures/Mannequin/MannequinFemale.rsi
+        state: full_mannequin_female
+      - map: ["enum.HumanoidVisualLayers.Chest"]
+      - map: ["enum.HumanoidVisualLayers.Head"]
+      - map: ["enum.HumanoidVisualLayers.Snout"]
+      - map: ["enum.HumanoidVisualLayers.Eyes"]
+      - map: ["enum.HumanoidVisualLayers.RArm"]
+      - map: ["enum.HumanoidVisualLayers.LArm"]
+      - map: ["enum.HumanoidVisualLayers.RLeg"]
+      - map: ["enum.HumanoidVisualLayers.LLeg"]
+      - shader: StencilClear
+        sprite: Mobs/Species/Human/parts.rsi
+        state: l_leg
+      - shader: StencilMask
+        map: ["enum.HumanoidVisualLayers.StencilMask"]
+        sprite: Mobs/Customization/masking_helpers.rsi
+        state: unisex_full
+        visible: false
+      - map: [ "underwearb" ] #Sirena
+      - map: [ "underweart" ] #Sirena
+      - map: ["enum.HumanoidVisualLayers.LFoot"]
+      - map: ["enum.HumanoidVisualLayers.RFoot"]
+      - map: ["socks"]
+      - map: ["underpants"]
+      - map: ["undershirt"]
+      - map: ["jumpsuit"]
+      - map: ["enum.HumanoidVisualLayers.LHand"]
+      - map: ["enum.HumanoidVisualLayers.RHand"]
+      - map: ["enum.HumanoidVisualLayers.Handcuffs"]
+        color: "#ffffff"
+        sprite: Objects/Misc/handcuffs.rsi
+        state: body-overlay-2
+        visible: false
+      - map: ["id"]
+      - map: ["gloves"]
+      - map: ["shoes"]
+      - map: ["ears"]
+      - map: ["outerClothing"]
+      - map: ["eyes"]
+      - map: ["belt"]
+      - map: ["neck"]
+      - map: ["back"]
+      - map: ["enum.HumanoidVisualLayers.FacialHair"]
+      - map: ["enum.HumanoidVisualLayers.Hair"]
+      - map: ["enum.HumanoidVisualLayers.HeadSide"]
+      - map: ["enum.HumanoidVisualLayers.HeadTop"]
+      - map: ["mask"]
+      - map: ["head"]
+      - map: ["pocket1"]
+      - map: ["pocket2"]
+      - map: ["enum.HumanoidVisualLayers.Tail"]
+      # - map: ["enum.HumanoidVisualLayers.Wings"]
+      - map: ["clownedon"] # Dynamically generated
+        sprite: "Effects/creampie.rsi"
+        state: "creampie_human"
+        visible: false
diff --git a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-male.yml b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-male.yml
new file mode 100644
index 00000000000..77dda84094f
--- /dev/null
+++ b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-male.yml
@@ -0,0 +1,71 @@
+- type: entity
+  name: Male Mannequin
+  description: A male doll for your clothes.
+  id: ADTMannequinMale
+  parent: ADTMannequinBase
+  components:
+  - type: Icon
+    sprite: ADT/Structures/Mannequin/MannequinMale.rsi
+    state: full_mannequin_male
+  - type: Sprite
+    noRot: true
+    drawdepth: Mobs
+    layers:
+      - map: ["enum.DamageStateVisualLayers.Base"]
+        sprite: ADT/Structures/Mannequin/MannequinMale.rsi
+        state: full_mannequin_male
+      - map: ["enum.HumanoidVisualLayers.Chest"]
+      - map: ["enum.HumanoidVisualLayers.Head"]
+      - map: ["enum.HumanoidVisualLayers.Snout"]
+      - map: ["enum.HumanoidVisualLayers.Eyes"]
+      - map: ["enum.HumanoidVisualLayers.RArm"]
+      - map: ["enum.HumanoidVisualLayers.LArm"]
+      - map: ["enum.HumanoidVisualLayers.RLeg"]
+      - map: ["enum.HumanoidVisualLayers.LLeg"]
+      - shader: StencilClear
+        sprite: Mobs/Species/Human/parts.rsi
+        state: l_leg
+      - shader: StencilMask
+        map: ["enum.HumanoidVisualLayers.StencilMask"]
+        sprite: Mobs/Customization/masking_helpers.rsi
+        state: unisex_full
+        visible: false
+      - map: [ "underwearb" ] #Sirena
+      - map: [ "underweart" ] #Sirena
+      - map: ["enum.HumanoidVisualLayers.LFoot"]
+      - map: ["enum.HumanoidVisualLayers.RFoot"]
+      - map: ["socks"]
+      - map: ["underpants"]
+      - map: ["undershirt"]
+      - map: ["jumpsuit"]
+      - map: ["enum.HumanoidVisualLayers.LHand"]
+      - map: ["enum.HumanoidVisualLayers.RHand"]
+      - map: ["enum.HumanoidVisualLayers.Handcuffs"]
+        color: "#ffffff"
+        sprite: Objects/Misc/handcuffs.rsi
+        state: body-overlay-2
+        visible: false
+      - map: ["id"]
+      - map: ["gloves"]
+      - map: ["shoes"]
+      - map: ["ears"]
+      - map: ["outerClothing"]
+      - map: ["eyes"]
+      - map: ["belt"]
+      - map: ["neck"]
+      - map: ["back"]
+      - map: ["enum.HumanoidVisualLayers.FacialHair"]
+      - map: ["enum.HumanoidVisualLayers.Hair"]
+      - map: ["enum.HumanoidVisualLayers.HeadSide"]
+      - map: ["enum.HumanoidVisualLayers.HeadTop"]
+      - map: ["mask"]
+      - map: ["head"]
+      - map: ["pocket1"]
+      - map: ["pocket2"]
+      - map: ["enum.HumanoidVisualLayers.Tail"]
+      # - map: ["enum.HumanoidVisualLayers.Wings"]
+      - map: ["clownedon"] # Dynamically generated
+        sprite: "Effects/creampie.rsi"
+        state: "creampie_human"
+        visible: false
+
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 954125c1801..544f0aff940 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -374,6 +374,8 @@
       - FireTranslator
       - SikTajTranslator
       - CintaTajTranslator
+      - ADTMannequinMale
+      - ADTMannequinFemale
   - type: EmagLatheRecipes
     emagDynamicRecipes:
       - ExplosivePayload
diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml
index 27197bb879f..cc2357ac00a 100644
--- a/Resources/Prototypes/Recipes/Lathes/misc.yml
+++ b/Resources/Prototypes/Recipes/Lathes/misc.yml
@@ -203,3 +203,16 @@
     Steel: 50
     Glass: 50
 
+- type: latheRecipe
+  id: ADTMannequinMale
+  result: ADTMannequinMale
+  completetime: 5
+  materials:
+    Plastic: 1000
+
+- type: latheRecipe
+  id: ADTMannequinFemale
+  result: ADTMannequinFemale
+  completetime: 5
+  materials:
+    Plastic: 1000
\ No newline at end of file
diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
index 44fffefca0a..b9ee9b290c3 100644
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -257,3 +257,16 @@
 #   recipeUnlocks:
 #   - BluespaceBeaker
 #   - SyringeBluespace
+
+- type: technology
+  id:  DollHouse
+  name: ADT-research-technology-doll-house
+  icon:
+    sprite: ADT/Structures/Mannequin/MannequinLogo.rsi
+    state: mannequin_front
+  discipline: CivilianServices
+  tier: 1
+  cost: 1000
+  recipeUnlocks:
+  - ADTMannequinMale
+  - ADTMannequinFemale
\ No newline at end of file
diff --git a/Resources/Textures/ADT/Structures/Mannequin.rsi/full_human.png b/Resources/Textures/ADT/Structures/Mannequin.rsi/full_human.png
deleted file mode 100644
index 6f29e55e6ddde3f23af8073b87dfe18524a311ae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2368
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

diff --git a/Resources/Textures/ADT/Structures/Mannequin.rsi/meta.json b/Resources/Textures/ADT/Structures/Mannequin.rsi/meta.json
deleted file mode 100644
index 8e146788c08..00000000000
--- a/Resources/Textures/ADT/Structures/Mannequin.rsi/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf",
-    "size": {
-      "x": 32,
-      "y": 32
-    },
-    "states": [
-    {
-        "name": "full_human",
-        "directions": 4
-    }
-    ]
-  }
-  
\ No newline at end of file
diff --git a/Resources/Textures/ADT/Structures/Mannequin/MannequinFemale.rsi/full_mannequin_female.png b/Resources/Textures/ADT/Structures/Mannequin/MannequinFemale.rsi/full_mannequin_female.png
new file mode 100644
index 0000000000000000000000000000000000000000..76c15df6b4ed33cc5b6d1d5640303be44e2c3afa
GIT binary patch
literal 1336
zcmV-81;_e{P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px(*hxe|RCr$PTP<%DK@{Eo0|H440!z{=1RhXW6b=muI23}U2?B+K1T+qXMFAdx
zY7;C1+62NsC^>}F9ByX!&AB@}P1CogFMYdv?wtEMckbI5&iJ))#@9cr3CLQ&msd}Y
z`0UmDPrDP@3O^+{z_+)zkGb35-yeFC0Q?K*&mH6c{PjDHZxav~Pbqqlz{PKFT{<S<
z@ZkH9CBY)#+uP?y0D|_fJ$yF2d2oBU`|{oJ`NiV_1VAg7?>w^J>9`>Afm0$NgKr5N
z1pxC9gc`^Q;1aO6_jTC1xcQfCUQo)xkHcYS=ZdWWivR$=-@SK40RRj^D8Q}V*Y^7y
z0wR7SAcLP0m?TgDu%7{U7ti}!;#&l0>cOIU!6JI3M8%ITkj1Yipp<$D+A1YYS%l&<
z05S&QIef<DW`imMrc%#XL~dCZl<=`wWFD<YNQ6VeN&=YoOJF69Q7f(L0<Ak#<0S(0
z`&#@e0-$B2AEX)0zmWh4!2296)R?}eKgys=VJc=iti_)sfTqVZ2SGssE(mnv=Jny@
zhfn|g58r8;oZ|{5e7>9Yht?qs%np7P0az^498wS$3IBr@2(0&js9G(ISpdx+B<s7e
zKwzu8X)1<{P)>~-tRw(H6oC0R1|Iq&g>VE|W&S062HseSX7H;BP%V$e0s4Qmj=3%n
ztxR2j<f;F=_$vuu00b}t%vc^~pmGDzlnYGZ>vL3q%30%rlLTnVNk3N$h=m9Upa$@F
zZi(Cje`OkE&_fW4)nL>d8P{i~e7xp6eHT8f0%96uuy*iQ5}-oHv_x}r(oW5y$L`Uc
zC{r=ha&|{*6TtLCZEKlYlXm71pbDUiaU;fUxf^s-1TZVWEi^UuAb<)`bEjKm@NEKO
z10*&`Tn#uD!NQ0Up9<(ofac}31&9k|ebBXl))si`T;RkAi2L$V7T}&>i8!znew783
z+F`o!D7C3ulCUIx6#=ZQqQ5c-mi)M7mv~A1DgvB9b=vM-6L8uz)>_`Q1?V9KglZY|
zY8KfFKSe-kTU^t8s99LeJuUHV0!k+|5PHrTea)hI&)6XizRxJZCO|hodPcx`fu&sm
z1aKySq-amjO}}XZ0ItVk*|WKf_VJANC87Cj3ocE7Hb{FcKDq!&h|SQ&Edao=H8n>A
zjs++-Es(ySZNS<VK!HmgTbF%z@rsSlY=>nRk9XJvF#n$9m>dKzjp}9U5sQG*mXv`o
z(~rwqfVRdsr=%ywPA0Mm&;>IPG9dLJK^G5Po<_xPbuGCm0u)%&VQ&I7`0Dw<Viphs
zA3$|*L66aEHQ?UI(;=M=qzsu_z_NhSj39gu$LF|uX93Ir=#XaSbf^gdz4igI7>ZM>
zixYqVguqAUIS-`82y(OIgN_RjUwe=`y97&g@huBb0YHQbGG|`5mITZy$5~<G>Orle
zfHVONIPrAW)j;jyS^PxeV*qsVEdm$>by#9<E$$Ey%WzJp>R^Uj7Fz`9W~4N(-ZKk~
zjm*0;*aSopGLbi<_4rIo$*$)4zF7oh%g+`B#KDX;0m<JitSum8j%t3rtH7yh(8>R^
zV!)b!e?MG|o!N{A=2{@0pJRoyVu02HEQppSVeC|>dlneeoLh*v7BDs|kll{|0rSW5
ujA3qIbN~PV4rN$LW=%~1DgXcg2mk;800000(o>TF0000<MNUMnLSTY0HBXZO

literal 0
HcmV?d00001

diff --git a/Resources/Textures/ADT/Structures/Mannequin/MannequinFemale.rsi/meta.json b/Resources/Textures/ADT/Structures/Mannequin/MannequinFemale.rsi/meta.json
new file mode 100644
index 00000000000..dbcb4fb9081
--- /dev/null
+++ b/Resources/Textures/ADT/Structures/Mannequin/MannequinFemale.rsi/meta.json
@@ -0,0 +1,16 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "done by discord: prazat911, a spriter from Adventure Time SS14 Server",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+    {
+        "name": "full_mannequin_female",
+        "directions": 4
+    }
+    ]
+  }
+  
\ No newline at end of file
diff --git a/Resources/Textures/ADT/Structures/Mannequin/MannequinLogo.rsi/mannequin_front.png b/Resources/Textures/ADT/Structures/Mannequin/MannequinLogo.rsi/mannequin_front.png
new file mode 100644
index 0000000000000000000000000000000000000000..6569fd6f0f8fc957741d6ff71d678694ee9fe3e9
GIT binary patch
literal 557
zcmV+|0@D47P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$=Sf6CR9HvlmmyCBK@f$f|A0W!g20ko6#@?^EDDE)1RM%M(gab3g9J1Vg+&1#
zf$Ak#1hff+e{keoc+F(lc4v;#3t>%@yS<%nXWpCLHl*g!s5!p;U4X~)qk`F6-aW3o
zkxCyTc$Q_u>g9PZRUzB}VQ^AZg>V5pU!4?h?;nEQuk3f_a&J?%&#vX+^iTjWH#;MX
zTL-Q+U6TobK+V>I4Eis_Ux58O0MdQa*(qA{%`zB+;<x`gkd4lTYeQJi{egyH{i_Cd
z18D0ZC<ii9)sp56AUM*_fwXgk&pnnj0Wdg(#{mIS1F`2;h$H}g51Z-cGwKYXGpv2V
z1b`IxdQZ}BFO{|%7o78u9ZMF*0x<Qo83F?WBTPG<AvlJ%X$rywfQ8|4^Z*1{TVMT_
zguC1O@)_p=)RKiH0P2p#xiEGY(*kPFegIHFT6ACn;NmPnOa~C3E&(7X0zd&`=h&eZ
zA{7rX0_b@^E&=;K0<iO?04PF!lR6)gHl*;dP}mJaC3465n~|RVdXWUs3xu|0x;?fF
zf!qKP7uzt(!r&05MRXGZ2rWlzP6dD$5$*Y@m*9VAptcg|{{wUZPP*{2;uWIFhOz5d
vOoaNnmO6$x*95@M7J678(Xn@_E{OM^zW=c>r!~wZ00000NkvXXu0mjf+o0`z

literal 0
HcmV?d00001

diff --git a/Resources/Textures/ADT/Structures/Mannequin/MannequinLogo.rsi/meta.json b/Resources/Textures/ADT/Structures/Mannequin/MannequinLogo.rsi/meta.json
new file mode 100644
index 00000000000..4ca2f4d4398
--- /dev/null
+++ b/Resources/Textures/ADT/Structures/Mannequin/MannequinLogo.rsi/meta.json
@@ -0,0 +1,16 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "done by discord: prazat911, a spriter from Adventure Time SS14 Server",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+    {
+        "name": "mannequin_front",
+        "directions": 4
+    }
+    ]
+  }
+  
\ No newline at end of file
diff --git a/Resources/Textures/ADT/Structures/Mannequin/MannequinMale.rsi/full_mannequin_male.png b/Resources/Textures/ADT/Structures/Mannequin/MannequinMale.rsi/full_mannequin_male.png
new file mode 100644
index 0000000000000000000000000000000000000000..a82b96501f71e8aab93fab24ad99872208c088b4
GIT binary patch
literal 1355
zcmV-R1+@B!P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px(>q$gGRCr$PTP<%CQ52p20|H440!y-02t1&$C>$CRa3};x6GRmb63{pl76o_&
zs+(XD&?XT6LCI-)HYb-iGxy#%^U9{Xs@Z)r=iYNa-+ixJ-8uhkopb%W4FOpX`1<<U
zF`vEu@Og70r@~JO4)DcdvEpvITy`x<0RE+m7gqSce*a11hY7ICQ;Jq3Q2FhhD=Pwy
z4u5o65<&!gfA``TK(PLe$NSyeM|ZpXuikfGUOw$W0IYKL-jmQfBOyq9;FJi+;D>~@
z0)Tl4LJMRBh!Svc@U7dqynRA8KQPMS&!cX4_gdHhAp!vSVei2)1pqJvp#XRG-h|&5
zA;98W0y6k1fk^@d0Q(v6sPbGtC4PtiEj>`0A9zHIlBoDL1hV*U0!pQapi`BkA&*de
zCP3yOJcqyWiB<y_0YjyyFC$Oc7nJa!EGm!oBP1e1!YBc(`z5fF#b}kO`U34c)Z!%q
z^mi}5ivU;|<p*U(>#rpM0&rc#3Le+j@<$oeC@jS+hhF?a0_b`ya}X3H;A0yRd<P-%
z(K1;R3MG8LoBfCOAxz8>d=~*w3}p`G2MXT0ee)lqefs$M<U6hdQC=(bc>vuX?^b*$
zh}hR~qw-t_89iYzN&tXV0D@bg0mgm+M0o`mbN>=P6R+(=Gx#n7s2oF}lm{693;_u4
zv4DpF#n%wvvl{<V{80j!00GPd(^rR?sG^BzC<KP^^*I_q<@AK$AOYHPGRCwL*hWN?
zAcU)Jkz3%8mO&;yBp2HaTFa4feP+nTJ-_L@@V6SkmO-1WJ^PbU0#ry_mgsJgvg1*@
zZ;kFmS$0{Lvpdo-0W3cR)TC6K^v1|h12Dw65#zQz+IOS~uqBVBu>}D%fVw-wB7+|$
zzz#s{fFx>xF{|4UJaYnA-?i!3c);n5&Qo_I7Po6{5@y?5lZ4kU1f~u_Hvx8EPHWp?
zMJ5q>ykahV7XhVln9Tumj>YE0cM-sD%vwsfsHNXLmi4Te6W>LEN62+uvmszzEjN|i
zX%Emt3J5c22Ut>eD*O}yrET%tO;Bl9s^4Yt!vvI0Xdp<<8GXc^`wnUFjtmK50(A4E
zvq9b$m^&0e0PiG_IGqW4h9F9KngF~+kHxZQa~bR78J$bQ@|+JeBR~hFEtDrwHU#Z3
zbanzDh#gJUSRmp7icJq>>}LnC;Sc~ItN=icqx4iJs!(P<TVut?-<kXqCV=(VUX#mO
zAWMKfp~5aS(~pD*C~ZlZ2z5@FQOf%a!%v5^nvA2{@h|~aVLdI5f_s&=O%RpG_dJbK
zLL#A%B0zz)9JVGvldql+%tnAcs^Sqihas6xEb0YX26;`7UXbYpLLN}MBZ!8C38+OP
zR3q3tkU1Tign*h>H0lAi71vv;vlGDjkIN5wA4r>#Y(4f6q5TKLPVX+^B1aTI<N+!G
z8zGJV?0sF2@>qkr%J#0Xo>5Y!*^*$X1GJ~JQ44sLw;iZ@Kut#&@&Lx4UY4ls#Uli8
zZRwaCzwx*}vLOl)P}&In4+PZ65GKHqkjcCmtJ`O6NzRtwDgv_Y=M)6!Xsl)*vLPU2
zjna-RQhG9&_L(#F00nO~4IUz(Mut=fYzR30$3;7tZ50OgY@oRZ*hYlz*?K#yxXsI8
zUm}ZiVVPvucUJ)K%3%KmQfT*#^B>qJ0000EWmrjOO-%qQ00008000000002eQ<DGy
N002ovPDHLkV1mc-OxOSb

literal 0
HcmV?d00001

diff --git a/Resources/Textures/ADT/Structures/Mannequin/MannequinMale.rsi/meta.json b/Resources/Textures/ADT/Structures/Mannequin/MannequinMale.rsi/meta.json
new file mode 100644
index 00000000000..5fc6ac2e3b8
--- /dev/null
+++ b/Resources/Textures/ADT/Structures/Mannequin/MannequinMale.rsi/meta.json
@@ -0,0 +1,16 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "done by discord: prazat911, a spriter from Adventure Time SS14 Server",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+    {
+        "name": "full_mannequin_male",
+        "directions": 4
+    }
+    ]
+  }
+  
\ No newline at end of file

From 4b688487ca33b8e042d0922470325f32c5da3be9 Mon Sep 17 00:00:00 2001
From: eddiedoesGIT <Stepanyan7803@gmail.com>
Date: Thu, 14 Mar 2024 22:30:09 +0300
Subject: [PATCH 05/15] =?UTF-8?q?=D0=9A=D0=BE=D0=BD=D0=B5=D1=86=20=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=82=D1=8B=20=D0=BD=D0=B0=D0=B4=20=D0=BC?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B5=D0=BA=D0=B5=D0=BD=D0=B0=D0=BC=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Resources/Locale/ru-RU/ADT/Mannequins.ftl     |   6 +++++
 .../Structures/Mannequin/mannequin-base.yml   |  22 ++++++++-------
 .../Prototypes/Research/civilianservices.yml  |  25 +++++++++---------
 .../{mannequin_front.png => icon_full.png}    | Bin 557 -> 583 bytes
 .../Mannequin/MannequinLogo.rsi/meta.json     |   4 +--
 5 files changed, 33 insertions(+), 24 deletions(-)
 create mode 100644 Resources/Locale/ru-RU/ADT/Mannequins.ftl
 rename Resources/Textures/ADT/Structures/Mannequin/MannequinLogo.rsi/{mannequin_front.png => icon_full.png} (91%)

diff --git a/Resources/Locale/ru-RU/ADT/Mannequins.ftl b/Resources/Locale/ru-RU/ADT/Mannequins.ftl
new file mode 100644
index 00000000000..33bc6b34ee4
--- /dev/null
+++ b/Resources/Locale/ru-RU/ADT/Mannequins.ftl
@@ -0,0 +1,6 @@
+ent-ADTMannequinMale = Манекен
+    .desc = Пластиковое изделение, имитирующее форму тела человека для показа одежды.
+    .suffix = Мужской
+ent-ADTMannequinFemale = Манекен
+    .desc = Пластиковое изделение, имитирующее форму тела человека для показа одежды.
+    .suffix = Женский
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
index 84e310514b1..5c86cc347d1 100644
--- a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
+++ b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
@@ -13,16 +13,6 @@
   - type: Physics
     bodyType: Dynamic
 
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeCircle
-          radius: 0.2
-        density: 100
-        mask:
-        - TableMask
-
   - type: Inventory
     templateId: human
 
@@ -61,6 +51,18 @@
     prototype: Human
     requiredLegs: 2
 
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.35
+        density: 200
+        mask:
+        - FullTileMask
+        layer:
+        - WallLayer
+
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic
diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
index b9ee9b290c3..a8fe7862964 100644
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -1,5 +1,18 @@
 # Tier 1
 
+- type: technology
+  id:  DollHouse
+  name: ADT-research-technology-doll-house
+  icon:
+    sprite: ADT/Structures/Mannequin/MannequinLogo.rsi
+    state: icon_full
+  discipline: CivilianServices
+  tier: 1
+  cost: 1000
+  recipeUnlocks:
+  - ADTMannequinMale
+  - ADTMannequinFemale
+
 - type: technology
   id:  ColorLightTech
   name: research-technology-light-tech
@@ -258,15 +271,3 @@
 #   - BluespaceBeaker
 #   - SyringeBluespace
 
-- type: technology
-  id:  DollHouse
-  name: ADT-research-technology-doll-house
-  icon:
-    sprite: ADT/Structures/Mannequin/MannequinLogo.rsi
-    state: mannequin_front
-  discipline: CivilianServices
-  tier: 1
-  cost: 1000
-  recipeUnlocks:
-  - ADTMannequinMale
-  - ADTMannequinFemale
\ No newline at end of file
diff --git a/Resources/Textures/ADT/Structures/Mannequin/MannequinLogo.rsi/mannequin_front.png b/Resources/Textures/ADT/Structures/Mannequin/MannequinLogo.rsi/icon_full.png
similarity index 91%
rename from Resources/Textures/ADT/Structures/Mannequin/MannequinLogo.rsi/mannequin_front.png
rename to Resources/Textures/ADT/Structures/Mannequin/MannequinLogo.rsi/icon_full.png
index 6569fd6f0f8fc957741d6ff71d678694ee9fe3e9..b0a0637466ff4cf52f572fad6b1c6cdd408df893 100644
GIT binary patch
delta 43
scmZ3>a-3y@3X?KlYJ_K+uP=iZ0|NsG5QD&_;K?A$)78&qol`;+0M9H5W&i*H

delta 17
YcmX@kvX*6o3KJ)Tr>mdKI;Vst051jwP5=M^

diff --git a/Resources/Textures/ADT/Structures/Mannequin/MannequinLogo.rsi/meta.json b/Resources/Textures/ADT/Structures/Mannequin/MannequinLogo.rsi/meta.json
index 4ca2f4d4398..7328204ccf4 100644
--- a/Resources/Textures/ADT/Structures/Mannequin/MannequinLogo.rsi/meta.json
+++ b/Resources/Textures/ADT/Structures/Mannequin/MannequinLogo.rsi/meta.json
@@ -8,8 +8,8 @@
     },
     "states": [
     {
-        "name": "mannequin_front",
-        "directions": 4
+        "name": "icon_full",
+        "directions": 1
     }
     ]
   }

From 483e0bc5430e03e721c46d5a04443a3213cd8839 Mon Sep 17 00:00:00 2001
From: FaDeOkno <143940725+FaDeOkno@users.noreply.github.com>
Date: Fri, 15 Mar 2024 02:06:40 +0400
Subject: [PATCH 06/15] =?UTF-8?q?=D0=97=D0=B0=D1=87=D0=B5=D0=BC=20=D0=B2?=
 =?UTF-8?q?=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD=D0=B5=D0=BD=D1=82=D0=B5?=
 =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=BA=D1=80=D1=83=D1=87=D0=B8=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=BC=D0=BE=D0=B4=D0=B8=D1=84=D0=B8=D0=BA?=
 =?UTF-8?q?=D0=B0=D1=82=D0=BE=D1=80=D1=8B=20=D1=83=D1=80=D0=BE=D0=BD=D0=B0?=
 =?UTF-8?q?=3F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ADT/Entities/Structures/Mannequin/mannequin-base.yml      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
index 5c86cc347d1..21082e27758 100644
--- a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
+++ b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
@@ -44,8 +44,6 @@
     anchored: true
 
   - type: Anchorable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
 
   - type: Body
     prototype: Human
@@ -158,4 +156,4 @@
   #   - map: [ "mask" ]
   #   - map: [ "head" ]
   #   - map: [ "pocket1" ]
-  #   - map: [ "pocket2" ]
\ No newline at end of file
+  #   - map: [ "pocket2" ]

From a77f577ee095ac2e54152fe5cbdba519e4774adb Mon Sep 17 00:00:00 2001
From: FaDeOkno <143940725+FaDeOkno@users.noreply.github.com>
Date: Fri, 15 Mar 2024 02:26:49 +0400
Subject: [PATCH 07/15] =?UTF-8?q?=D0=9F=D1=80=D0=B5=D0=B4=D0=BE=D1=82?=
 =?UTF-8?q?=D0=B2=D1=80=D0=B0=D1=89=D0=B0=D0=B5=D0=BC=20=D0=B4=D1=8E=D0=BF?=
 =?UTF-8?q?=20=D0=BF=D0=BB=D0=B0=D1=81=D1=82=D0=B8=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ADT/Entities/Structures/Mannequin/mannequin-base.yml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
index 21082e27758..4f1e53a5216 100644
--- a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
+++ b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
@@ -85,7 +85,7 @@
         spawn:
           SheetPlastic:
             min: 3
-            max: 8
+            max: 6
   - type: Tag
     tags:
     - Plastic

From beaca2d62fceafc8fea0187c4d75b064d96f02a0 Mon Sep 17 00:00:00 2001
From: Schrodinger71 <132720404+Schrodinger71@users.noreply.github.com>
Date: Mon, 18 Mar 2024 21:17:38 +0300
Subject: [PATCH 08/15] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=D0=B8=D0=BA?=
 =?UTF-8?q?=D0=B8=20=D0=B2=20mannequin-base.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Structures/Mannequin/mannequin-base.yml   | 20 ++-----------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
index 4f1e53a5216..238c68efa16 100644
--- a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
+++ b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
@@ -7,25 +7,16 @@
     mode: SnapgridCenter
   components:
   - type: Clickable
-  
   - type: InteractionOutline
-  
-  - type: Physics
+  - type: Physics # на эту хуйню ругаеться билдер тест
     bodyType: Dynamic
-
   - type: Inventory
     templateId: human
-
   - type: InventorySlots
-
   - type: Hands
-
-  - type: ContainerContainer
-
+  #- type: ContainerContainer  # на эту тоже поэтому закоменчу
   - type: Stripping
-
   - type: Strippable
-
   - type: UserInterface
     interfaces:
       - key: enum.HumanoidMarkingModifierKey.Key
@@ -34,21 +25,15 @@
         type: StrippableBoundUserInterface
       - key: enum.StoreUiKey.Key
         type: StoreBoundUserInterface
-
   - type: Pullable
-
   - type: Rotatable
     rotateWhileAnchored: true
-
   - type: Transform
     anchored: true
-
   - type: Anchorable
-
   - type: Body
     prototype: Human
     requiredLegs: 2
-
   - type: Fixtures
     fixtures:
       fix1:
@@ -60,7 +45,6 @@
         - FullTileMask
         layer:
         - WallLayer
-
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic

From ef485060fc9802fa04e27012cc1e1860b3ea3dbd Mon Sep 17 00:00:00 2001
From: Schrodinger71 <132720404+Schrodinger71@users.noreply.github.com>
Date: Mon, 18 Mar 2024 21:23:04 +0300
Subject: [PATCH 09/15] Update mannequin-base.yml

---
 .../ADT/Entities/Structures/Mannequin/mannequin-base.yml      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
index 238c68efa16..530e929d147 100644
--- a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
+++ b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
@@ -8,8 +8,8 @@
   components:
   - type: Clickable
   - type: InteractionOutline
-  - type: Physics # на эту хуйню ругаеться билдер тест
-    bodyType: Dynamic
+  - type: Physics 
+    bodyType: Static #меняем на статик, как у стульев
   - type: Inventory
     templateId: human
   - type: InventorySlots

From a416b886ac1cfa59de47bf800f53d3632f61c6b3 Mon Sep 17 00:00:00 2001
From: Schrodinger71 <132720404+Schrodinger71@users.noreply.github.com>
Date: Mon, 18 Mar 2024 21:27:46 +0300
Subject: [PATCH 10/15] =?UTF-8?q?Update=20mannequin-base.yml,=20=D1=84?=
 =?UTF-8?q?=D0=B8=D0=BA=D1=81=20ContainerContainer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ставим ему значения в поля, т.к. значения по умолчанию он не принимает
---
 .../ADT/Entities/Structures/Mannequin/mannequin-base.yml     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
index 530e929d147..63ecc0bf0f7 100644
--- a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
+++ b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
@@ -14,7 +14,10 @@
     templateId: human
   - type: InventorySlots
   - type: Hands
-  #- type: ContainerContainer  # на эту тоже поэтому закоменчу
+  - type: ContainerContainer
+    containers:
+      bodypart: !type:Container
+        ents: []
   - type: Stripping
   - type: Strippable
   - type: UserInterface

From f224d24552df98319cfe2010fdf954d80d2b5d6b Mon Sep 17 00:00:00 2001
From: eddiedoesGIT <Stepanyan7803@gmail.com>
Date: Mon, 18 Mar 2024 22:02:04 +0300
Subject: [PATCH 11/15] =?UTF-8?q?=D0=9F=D0=BE=D1=81=D0=BB=D0=B5=D0=B4?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B9=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=BC=D0=B0=D0=BD=D0=B5=D0=BA=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ADT/Entities/Structures/Mannequin/mannequin-base.yml     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
index 63ecc0bf0f7..e32b6dd3462 100644
--- a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
+++ b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
@@ -8,7 +8,7 @@
   components:
   - type: Clickable
   - type: InteractionOutline
-  - type: Physics 
+  - type: Physics
     bodyType: Static #меняем на статик, как у стульев
   - type: Inventory
     templateId: human
@@ -20,6 +20,7 @@
         ents: []
   - type: Stripping
   - type: Strippable
+  - type: BodyPart
   - type: UserInterface
     interfaces:
       - key: enum.HumanoidMarkingModifierKey.Key
@@ -79,7 +80,7 @@
   - type: StaticPrice
     price: 75
 
-  
+
 
 
 

From 3c8b652405e92a5d749d3cff0f0f8735c76795de Mon Sep 17 00:00:00 2001
From: Schrodinger71 <132720404+Schrodinger71@users.noreply.github.com>
Date: Mon, 18 Mar 2024 22:32:46 +0300
Subject: [PATCH 12/15] Update mannequin-base.yml

---
 .../ADT/Entities/Structures/Mannequin/mannequin-base.yml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
index e32b6dd3462..15313cffd3c 100644
--- a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
+++ b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
@@ -14,13 +14,13 @@
     templateId: human
   - type: InventorySlots
   - type: Hands
+  - type: BodyPart
   - type: ContainerContainer
     containers:
       bodypart: !type:Container
         ents: []
   - type: Stripping
   - type: Strippable
-  - type: BodyPart
   - type: UserInterface
     interfaces:
       - key: enum.HumanoidMarkingModifierKey.Key

From 24613a994f495278e35e4ab4b9ebdb9ff8de7c19 Mon Sep 17 00:00:00 2001
From: eddiedoesGIT <Stepanyan7803@gmail.com>
Date: Mon, 18 Mar 2024 22:42:09 +0300
Subject: [PATCH 13/15] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B1=D1=83=D0=B5?=
 =?UTF-8?q?=D0=BC=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D1=82=D1=8C?=
 =?UTF-8?q?=20ContainerContainer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Structures/Mannequin/mannequin-base.yml   | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
index e32b6dd3462..f097c32726e 100644
--- a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
+++ b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
@@ -17,7 +17,37 @@
   - type: ContainerContainer
     containers:
       bodypart: !type:Container
+        showEnts: False
+        occludes: True
         ents: []
+      shoes: !type:ContainerSlot
+        showEnts: False
+        occludes: False
+        ent: null
+      socks: !type:ContainerSlot
+        showEnts: False
+        occludes: False
+        ent: null
+      underwearb: !type:ContainerSlot
+        showEnts: False
+        occludes: False
+        ent: null
+      underweart: !type:ContainerSlot
+        showEnts: False
+        occludes: False
+        ent: null
+      jumpsuit: !type:ContainerSlot
+        showEnts: False
+        occludes: False
+        ent: null
+      outerClothing: !type:ContainerSlot
+        showEnts: False
+        occludes: False
+        ent: null
+      gloves: !type:ContainerSlot
+        showEnts: False
+        occludes: False
+        ent: null
   - type: Stripping
   - type: Strippable
   - type: BodyPart

From 91ba911b672b3a371116ba6bef070ce75dc86f1f Mon Sep 17 00:00:00 2001
From: FaDeOkno <143940725+FaDeOkno@users.noreply.github.com>
Date: Fri, 22 Mar 2024 10:35:15 +0400
Subject: [PATCH 14/15] =?UTF-8?q?=D0=9F=D1=8B=D1=82=D0=B0=D1=8E=D1=81?=
 =?UTF-8?q?=D1=8C=20=D0=BF=D0=BE=D1=87=D0=B8=D0=BD=D0=B8=D1=82=D1=8C=20?=
 =?UTF-8?q?=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Structures/Mannequin/mannequin-base.yml   | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
index d22cc1c7e3e..2bd452b9c16 100644
--- a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
+++ b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml
@@ -49,6 +49,54 @@
         showEnts: False
         occludes: False
         ent: null
+      neck: !type:ContainerSlot
+        showEnts: False
+        occludes: False
+        ent: null
+      mask: !type:ContainerSlot
+        showEnts: False
+        occludes: False
+        ent: null
+      eyes: !type:ContainerSlot
+        showEnts: False
+        occludes: False
+        ent: null
+      ears: !type:ContainerSlot
+        showEnts: False
+        occludes: False
+        ent: null
+      head: !type:ContainerSlot
+        showEnts: False
+        occludes: False
+        ent: null
+      pocket1: !type:ContainerSlot
+        showEnts: False
+        occludes: False
+        ent: null
+      pocket2: !type:ContainerSlot
+        showEnts: False
+        occludes: False
+        ent: null
+      suitstorage: !type:ContainerSlot
+        showEnts: False
+        occludes: False
+        ent: null
+      id: !type:ContainerSlot
+        showEnts: False
+        occludes: False
+        ent: null
+      belt: !type:ContainerSlot
+        showEnts: False
+        occludes: False
+        ent: null
+      back: !type:ContainerSlot
+        showEnts: False
+        occludes: False
+        ent: null
+      body_root_part: !type:ContainerSlot
+        showEnts: False
+        occludes: True
+        ent: null
   - type: Stripping
   - type: Strippable
   - type: UserInterface

From d1c7cb59310452b3461d4e8c05094f4e125321b2 Mon Sep 17 00:00:00 2001
From: FaDeOkno <143940725+FaDeOkno@users.noreply.github.com>
Date: Fri, 22 Mar 2024 10:58:26 +0400
Subject: [PATCH 15/15] =?UTF-8?q?=D0=9F=D1=8B=D1=82=D0=B0=D1=8E=D1=81?=
 =?UTF-8?q?=D1=8C=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D1=82=D1=8C?=
 =?UTF-8?q?=20=D1=82=D0=B5=D1=81=D1=82=D0=B5=D1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Resources/Prototypes/Catalog/Cargo/cargo_vending.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
index 34da3412963..4f9776ccf56 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -33,7 +33,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockClothesFilled
-  cost: 7500
+  cost: 10000
   category: Service
   group: market