diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Decorations/wallmount.yml b/Resources/Prototypes/_CP14/Entities/Structures/Decorations/wallmount.yml index e8a2aeefc6..962b6e0215 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Decorations/wallmount.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Decorations/wallmount.yml @@ -3,13 +3,13 @@ parent: - BaseStructure - CP14BaseWooden #TODO: make BaseFlammable + - CP14BaseWallmount name: wooden boards description: Nailed to the wall. Why? I'm not quite sure. placement: mode: SnapgridCenter components: - type: Sprite - drawdepth: Mobs sprite: _CP14/Structures/Wallmount/wallmount_decor.rsi layers: - state: boards @@ -42,13 +42,13 @@ parent: - BaseStructure - CP14BaseWooden #TODO: make BaseFlammable + - CP14BaseWallmount name: web description: Cobwebs clinging to dark corners with tiny spiders in them. placement: mode: SnapgridCenter components: - type: Sprite - drawdepth: Mobs sprite: _CP14/Structures/Wallmount/wallmount_decor.rsi layers: - state: web @@ -81,13 +81,13 @@ parent: - BaseStructure - CP14BaseWooden #TODO: make BaseFlammable + - CP14BaseWallmount name: vines description: The timid shoots of weeds trying to climb the wall upward toward the light placement: mode: SnapgridCenter components: - type: Sprite - drawdepth: Mobs sprite: _CP14/Structures/Wallmount/wallmount_decor.rsi layers: - state: vines @@ -106,5 +106,4 @@ layer: - MidImpassable - LowImpassable - hard: false - \ No newline at end of file + hard: false \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/beds.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/beds.yml index a8ccdf5952..ff62a1191b 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/beds.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/beds.yml @@ -42,9 +42,9 @@ acts: ["Destruction"] - !type:SpawnEntitiesBehavior spawn: - MaterialWoodPlank: - min: 1 - max: 2 + CP14WoodenPlanks1: + min: 2 + max: 4 - type: Transform anchored: true noRot: true diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/dressers.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/dressers.yml index d791df5293..b422218901 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/dressers.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/dressers.yml @@ -30,7 +30,7 @@ fix1: shape: !type:PhysShapeAabb - bounds: "-0.45,-0.25,0.45,0.55" + bounds: "-0.45,-0.05,0.45,0.45" density: 155 mask: - MachineMask @@ -72,7 +72,7 @@ fix1: shape: !type:PhysShapeAabb - bounds: "-0.45,-0.48,0.45,0.28" + bounds: "-0.45,-0.05,0.45,0.45" density: 75 mask: - MachineMask @@ -121,7 +121,7 @@ spawn: CP14WoodenPlanks1: min: 3 - max: 3 + max: 6 - !type:DoActsBehavior acts: [ "Destruction" ] @@ -158,5 +158,5 @@ - !type:SpawnEntitiesBehavior spawn: CP14WoodenPlanks1: - min: 1 - max: 1 + min: 2 + max: 5 diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount.yml index bba5976986..1970c08299 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount.yml @@ -1,5 +1,5 @@ - type: entity - id: BaseWallmount + id: CP14BaseWallmount abstract: true placement: mode: SnapgridCenter @@ -14,7 +14,7 @@ - type: entity id: CP14WallmountTorch name: wallmount torch - parent: BaseWallmount + parent: CP14BaseWallmount description: A good, reliable light source. Too bad it doesn't last. components: - type: Sprite @@ -81,7 +81,7 @@ - type: entity id: CP14WallmountLamp name: eternal flame lamp - parent: BaseWallmount + parent: CP14BaseWallmount description: A fragile eternal blue fire as proof of the superiority of magic over nature. components: - type: Sprite @@ -112,7 +112,7 @@ id: CP14WallmountBarShelfA name: bar shelf suffix: 1 - parent: BaseWallmount + parent: CP14BaseWallmount description: buba. ##TODO components: - type: Appearance