From 2d1fa7db18c03172caa0c0b14174ee0cc24b68df Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Wed, 23 Feb 2022 04:58:36 +0000 Subject: [PATCH] Furniture dragging and climbing (#6860) --- Resources/Prototypes/Entities/Structures/Furniture/beds.yml | 5 +++++ .../Prototypes/Entities/Structures/Furniture/bookshelf.yml | 6 ++++++ Resources/Prototypes/Entities/Structures/Power/chargers.yml | 3 +++ .../Prototypes/Entities/Structures/Storage/storage.yml | 6 ++++-- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Furniture/beds.yml b/Resources/Prototypes/Entities/Structures/Furniture/beds.yml index 828a571294..e3d651e9d5 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/beds.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/beds.yml @@ -45,6 +45,11 @@ SheetSteel1: min: 1 max: 2 + - type: Transform + anchored: true + - type: Anchorable + - type: Pullable + - type: entity parent: Bed diff --git a/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml b/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml index 9fcfa50b28..9eb08134c8 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml @@ -40,3 +40,9 @@ - type: Tag tags: - Wooden + - type: Transform + anchored: true + - type: Physics + bodyType: Static + - type: Anchorable + - type: Pullable diff --git a/Resources/Prototypes/Entities/Structures/Power/chargers.yml b/Resources/Prototypes/Entities/Structures/Power/chargers.yml index ad723b8594..1f58f4692f 100644 --- a/Resources/Prototypes/Entities/Structures/Power/chargers.yml +++ b/Resources/Prototypes/Entities/Structures/Power/chargers.yml @@ -24,8 +24,11 @@ visuals: - type: PowerChargerVisualizer - type: Anchorable + - type: Pullable - type: Clickable - type: InteractionOutline + - type: Physics + bodyType: Static - type: entity name: recharger diff --git a/Resources/Prototypes/Entities/Structures/Storage/storage.yml b/Resources/Prototypes/Entities/Structures/Storage/storage.yml index 3c57a23a4f..403458683b 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/storage.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/storage.yml @@ -21,9 +21,10 @@ bounds: "-0.3,-0.3,0.3,0.3" mass: 50 layer: - - MobImpassable - mask: - VaultImpassable + mask: + - Impassable + - SmallImpassable - type: Damageable damageContainer: Inorganic damageModifierSet: Metallic @@ -43,3 +44,4 @@ max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] + - type: Climbable