diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/beds.yml b/Resources/Prototypes/Entities/Constructible/Furniture/beds.yml index 5622aae3f7..b313528a1a 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/beds.yml +++ b/Resources/Prototypes/Entities/Constructible/Furniture/beds.yml @@ -6,6 +6,21 @@ - type: Clickable - type: InteractionOutline - type: Physics + mass: 25 + anchored: true + shapes: + - !type:PhysShapeAabb + bounds: "-0.5, -0.5, 0.3, 0.5" + mask: + - Impassable + - MobImpassable + - VaultImpassable + - SmallImpassable + layer: + - Opaque + - MobImpassable + - VaultImpassable + - SmallImpassable - type: Sprite sprite: Constructible/Misc/furniture.rsi state: bed diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/carpets.yml b/Resources/Prototypes/Entities/Constructible/Furniture/carpets.yml index 25917bf253..7aeb2549f6 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/carpets.yml +++ b/Resources/Prototypes/Entities/Constructible/Furniture/carpets.yml @@ -7,7 +7,7 @@ components: - type: Clickable - type: Sprite - drawdepth: FloorTiles + drawdepth: BelowFloor - type: Icon state: full - type: SnapGrid diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/potted_plants.yml b/Resources/Prototypes/Entities/Constructible/Furniture/potted_plants.yml index fb8cc8c42a..1efad5174f 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/potted_plants.yml +++ b/Resources/Prototypes/Entities/Constructible/Furniture/potted_plants.yml @@ -5,9 +5,25 @@ - type: Clickable - type: InteractionOutline - type: Physics + mass: 25 + anchored: true + shapes: + - !type:PhysShapeAabb + bounds: "-0.5, -0.2, 0.5, 0.2" + mask: + - Impassable + - MobImpassable + - VaultImpassable + - SmallImpassable + layer: + - Opaque + - MobImpassable + - VaultImpassable + - SmallImpassable - type: Sprite sprite: Constructible/Misc/potted_plants.rsi - type: PottedPlantHide + - type: Anchorable - type: Pullable - type: entity diff --git a/Resources/Prototypes/Entities/Constructible/Power/power_base.yml b/Resources/Prototypes/Entities/Constructible/Power/power_base.yml index 0e16728252..84e49d015c 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/power_base.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/power_base.yml @@ -9,10 +9,21 @@ - type: Clickable - type: InteractionOutline - type: Physics + mass: 25 + anchored: false shapes: - !type:PhysShapeAabb - bounds: "-0.5, -0.5, 0.3, 0.5" - layer: [MobMask, Opaque] + bounds: "-0.5, -0.4, 0.3, 0.4" + mask: + - Impassable + - MobImpassable + - VaultImpassable + - SmallImpassable + layer: + - Opaque + - MobImpassable + - VaultImpassable + - SmallImpassable - type: SnapGrid offset: Center - type: Sprite @@ -25,6 +36,7 @@ - type: PowerSupplier supplyRate: 3000 - type: Anchorable + - type: Pullable - type: entity id: BaseSmes @@ -37,10 +49,20 @@ - type: Clickable - type: InteractionOutline - type: Physics + mass: 25 + anchored: true shapes: - !type:PhysShapeAabb - bounds: "-0.5, -0.5, 0.5, 0.5" - layer: [MobMask, Opaque] + mask: + - Impassable + - MobImpassable + - VaultImpassable + - SmallImpassable + layer: + - Opaque + - MobImpassable + - VaultImpassable + - SmallImpassable - type: SnapGrid offset: Center - type: Sprite @@ -68,6 +90,7 @@ - type: BatteryDischarger activeSupplyRate: 1000 - type: Anchorable + - type: Pullable - type: entity id: BaseSubstation @@ -80,10 +103,20 @@ - type: Clickable - type: InteractionOutline - type: Physics + mass: 25 + anchored: true shapes: - !type:PhysShapeAabb - bounds: "-0.5, -0.5, 0.5, 0.5" - layer: [MobMask, Opaque] + mask: + - Impassable + - MobImpassable + - VaultImpassable + - SmallImpassable + layer: + - Opaque + - MobImpassable + - VaultImpassable + - SmallImpassable - type: SnapGrid offset: Center - type: Sprite @@ -106,6 +139,7 @@ - type: BatteryDischarger activeSupplyRate: 1000 - type: Anchorable + - type: Pullable - type: entity id: BaseApc @@ -163,9 +197,20 @@ - type: Clickable - type: InteractionOutline - type: Physics + mass: 25 + anchored: false shapes: - !type:PhysShapeAabb - layer: [MobMask, Opaque] + mask: + - Impassable + - MobImpassable + - VaultImpassable + - SmallImpassable + layer: + - Opaque + - MobImpassable + - VaultImpassable + - SmallImpassable - type: Sprite sprite: Constructible/Power/solar_panel.rsi state: normal @@ -181,3 +226,5 @@ - type: Breakable deadThreshold: 100 resistances: metallicResistances + - type: Anchorable + - type: Pullable diff --git a/Resources/Prototypes/Entities/Constructible/Power/research.yml b/Resources/Prototypes/Entities/Constructible/Power/research.yml index 6aa401816e..f83b5f4c2b 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/research.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/research.yml @@ -9,6 +9,20 @@ - type: Clickable - type: InteractionOutline - type: Physics + mass: 25 + anchored: true + shapes: + - !type:PhysShapeAabb + mask: + - Impassable + - MobImpassable + - VaultImpassable + - SmallImpassable + layer: + - Opaque + - MobImpassable + - VaultImpassable + - SmallImpassable - type: SnapGrid offset: Center - type: ResearchServer @@ -16,6 +30,8 @@ - type: PowerReceiver powerLoad: 200 priority: Low + - type: Pullable + - type: Anchorable - type: entity id: BaseResearchAndDevelopmentPointSource @@ -36,9 +52,13 @@ anchored: true shapes: - !type:PhysShapeAabb + mask: + - Impassable + - MobImpassable + - VaultImpassable + - SmallImpassable layer: - Opaque - - Impassable - MobImpassable - VaultImpassable - SmallImpassable @@ -55,4 +75,5 @@ visuals: - type: PowerDeviceVisualizer - type: PowerReceiver + - type: Pullable - type: Anchorable diff --git a/Resources/Prototypes/Entities/Constructible/Power/booze_dispenser.yml b/Resources/Prototypes/Entities/Constructible/Specific/booze_dispenser.yml similarity index 100% rename from Resources/Prototypes/Entities/Constructible/Power/booze_dispenser.yml rename to Resources/Prototypes/Entities/Constructible/Specific/booze_dispenser.yml diff --git a/Resources/Prototypes/Entities/Constructible/Power/chem_dispenser.yml b/Resources/Prototypes/Entities/Constructible/Specific/chem_dispenser.yml similarity index 100% rename from Resources/Prototypes/Entities/Constructible/Power/chem_dispenser.yml rename to Resources/Prototypes/Entities/Constructible/Specific/chem_dispenser.yml diff --git a/Resources/Prototypes/Entities/Constructible/Power/chem_master.yml b/Resources/Prototypes/Entities/Constructible/Specific/chem_master.yml similarity index 100% rename from Resources/Prototypes/Entities/Constructible/Power/chem_master.yml rename to Resources/Prototypes/Entities/Constructible/Specific/chem_master.yml diff --git a/Resources/Prototypes/Entities/Constructible/conveyor.yml b/Resources/Prototypes/Entities/Constructible/Specific/conveyor.yml similarity index 100% rename from Resources/Prototypes/Entities/Constructible/conveyor.yml rename to Resources/Prototypes/Entities/Constructible/Specific/conveyor.yml diff --git a/Resources/Prototypes/Entities/Constructible/disposal.yml b/Resources/Prototypes/Entities/Constructible/Specific/disposal.yml similarity index 100% rename from Resources/Prototypes/Entities/Constructible/disposal.yml rename to Resources/Prototypes/Entities/Constructible/Specific/disposal.yml diff --git a/Resources/Prototypes/Entities/Constructible/Power/gravity_generator.yml b/Resources/Prototypes/Entities/Constructible/Specific/gravity_generator.yml similarity index 100% rename from Resources/Prototypes/Entities/Constructible/Power/gravity_generator.yml rename to Resources/Prototypes/Entities/Constructible/Specific/gravity_generator.yml diff --git a/Resources/Prototypes/Entities/Constructible/hydroponics.yml b/Resources/Prototypes/Entities/Constructible/Specific/hydroponics.yml similarity index 73% rename from Resources/Prototypes/Entities/Constructible/hydroponics.yml rename to Resources/Prototypes/Entities/Constructible/Specific/hydroponics.yml index c462eb9610..d0468f07db 100644 --- a/Resources/Prototypes/Entities/Constructible/hydroponics.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/hydroponics.yml @@ -7,14 +7,22 @@ - type: Clickable - type: InteractionOutline - type: Physics + mass: 25 anchored: true hard: false shapes: - - !type:PhysShapeAabb - mask: - - Impassable - - MobImpassable - - VaultImpassable + - !type:PhysShapeAabb + bounds: "-0.5, -0.5, 0.1, 0.5" + mask: + - Impassable + - MobImpassable + - VaultImpassable + - SmallImpassable + layer: + - Opaque + - MobImpassable + - VaultImpassable + - SmallImpassable - type: Destructible deadThreshold: 50 resistances: metallicResistances @@ -38,6 +46,9 @@ parent: hydroponicsSoil id: hydroponicsTray components: + - type: Physics + mass: 25 + hard: true - type: Anchorable snap: true - type: Sprite diff --git a/Resources/Prototypes/Entities/Constructible/recycler.yml b/Resources/Prototypes/Entities/Constructible/Specific/recycler.yml similarity index 100% rename from Resources/Prototypes/Entities/Constructible/recycler.yml rename to Resources/Prototypes/Entities/Constructible/Specific/recycler.yml diff --git a/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml b/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml index 1171aa19af..78337186da 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml @@ -25,7 +25,6 @@ drawdepth: WallTops sprite: Constructible/Misc/sylphs.rsi state: sylph - - type: PowerReceiver - type: BarSign @@ -44,3 +43,5 @@ components: - type: BarSign current: CyberSylph + - type: Sprite + drawdepth: Ghosts diff --git a/Resources/Prototypes/Entities/Constructible/Walls/girder.yml b/Resources/Prototypes/Entities/Constructible/Walls/girder.yml index 70dccaf301..3c54cb1186 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/girder.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/girder.yml @@ -13,9 +13,21 @@ sprite: Constructible/Structures/Walls/solid.rsi state: wall_girder - type: Physics + mass: 25 + anchored: true shapes: - !type:PhysShapeAabb - layer: [MobMask, Opaque] + mask: + - Impassable + - MobImpassable + - VaultImpassable + - SmallImpassable + layer: + - Opaque + - MobImpassable + - VaultImpassable + - SmallImpassable + - type: Pullable - type: Destructible deadThreshold: 50 resistances: metallicResistances diff --git a/Resources/Prototypes/Entities/Objects/tiles.yml b/Resources/Prototypes/Entities/Objects/tiles.yml index 5bd88b6541..5c2fa2e9a5 100644 --- a/Resources/Prototypes/Entities/Objects/tiles.yml +++ b/Resources/Prototypes/Entities/Objects/tiles.yml @@ -7,7 +7,6 @@ - type: Sprite sprite: Objects/Tiles/tile.rsi state: tile_steel - - type: FloorTile output: floor_steel - type: Stack @@ -24,23 +23,6 @@ sprite: Objects/Tiles/tile.rsi HeldPrefix: tile_steel -- type: entity - name: carpet floor tile - parent: FloorTileItemBase - id: FloorTileItemCarpet - components: - - type: Sprite - sprite: Objects/Tiles/tile.rsi - state: tile_carpet - - - type: Item - sprite: Objects/Tiles/tile.rsi - HeldPrefix: tile_carpet - - type: FloorTile - output: floor_carpet - - type: Stack - stacktype: FloorTileCarpet - - type: entity name: wood floor tile parent: FloorTileItemBase @@ -49,7 +31,6 @@ - type: Sprite sprite: Objects/Tiles/tile.rsi state: tile_wood - - type: Item sprite: Objects/Tiles/tile.rsi HeldPrefix: tile_wood @@ -68,7 +49,6 @@ - type: Sprite sprite: Objects/Tiles/tile.rsi state: tile_white - - type: Item sprite: Objects/Tiles/tile.rsi HeldPrefix: tile_white @@ -87,7 +67,6 @@ - type: Sprite sprite: Objects/Tiles/tile.rsi state: tile_dark - - type: Item sprite: Objects/Tiles/tile.rsi HeldPrefix: tile_dark @@ -106,7 +85,6 @@ - type: Sprite sprite: Objects/Tiles/tile.rsi state: tile_dark_techfloor_grid - - type: Item sprite: Objects/Tiles/tile.rsi HeldPrefix: tile_dark @@ -121,7 +99,6 @@ - type: Sprite sprite: Objects/Tiles/tile.rsi state: tile_showroom - - type: Item sprite: Objects/Tiles/tile.rsi HeldPrefix: tile_showroom @@ -136,7 +113,6 @@ - type: Sprite sprite: Objects/Tiles/tile.rsi state: tile_showroom - - type: Item sprite: Objects/Tiles/tile.rsi HeldPrefix: tile_showroom @@ -151,7 +127,6 @@ - type: Sprite sprite: Objects/Tiles/tile.rsi state: tile_snow - - type: Item sprite: Objects/Tiles/tile.rsi HeldPrefix: tile_silver @@ -166,7 +141,6 @@ - type: Sprite sprite: Objects/Tiles/tile.rsi state: tile_gcircuit - - type: Item sprite: Objects/Tiles/tile.rsi HeldPrefix: tile_silver @@ -181,7 +155,6 @@ - type: Sprite sprite: Objects/Tiles/tile.rsi state: tile_gold - - type: Item sprite: Objects/Tiles/tile.rsi HeldPrefix: tile_gold @@ -196,7 +169,6 @@ - type: Sprite sprite: Objects/Tiles/tile.rsi state: tile_reinforced - - type: Item sprite: Objects/Tiles/tile.rsi HeldPrefix: tile_reinforced @@ -211,7 +183,6 @@ - type: Sprite sprite: Objects/Tiles/tile.rsi state: tile_rockvault - - type: Item sprite: Objects/Tiles/tile.rsi HeldPrefix: tile_steel @@ -226,7 +197,6 @@ - type: Sprite sprite: Objects/Tiles/tile.rsi state: tile_white_monofloor - - type: Item sprite: Objects/Tiles/tile.rsi HeldPrefix: tile_steel @@ -241,7 +211,6 @@ - type: Sprite sprite: Objects/Tiles/tile.rsi state: tile_white_monofloor - - type: Item sprite: Objects/Tiles/tile.rsi HeldPrefix: tile_steel @@ -256,7 +225,6 @@ - type: Sprite sprite: Objects/Tiles/tile.rsi state: tile_white - - type: Item sprite: Objects/Tiles/tile.rsi HeldPrefix: tile_brown @@ -271,7 +239,6 @@ - type: Sprite sprite: Objects/Tiles/tile.rsi state: tile_hydro - - type: Item sprite: Objects/Tiles/tile.rsi HeldPrefix: tile_hydro @@ -286,7 +253,6 @@ - type: Sprite sprite: Objects/Tiles/tile.rsi state: tile_dirty - - type: Item sprite: Objects/Tiles/tile.rsi HeldPrefix: tile_brown