From f7c69d7b9a5b10cb6a58c70e17cffeeff8fa770b Mon Sep 17 00:00:00 2001 From: DrSmugleaf Date: Sun, 11 Oct 2020 15:21:33 +0200 Subject: [PATCH] Replace Physics with Collidable in YAML prototypes (#2229) * Replace Physics with Collidable in YAML prototypes * Revert "Replace Physics with Collidable in YAML prototypes" This reverts commit d8dd4b609979314c42742da01e1c0fba4d08192e. * Replace Physics with Collidable in YAML prototypes --- .../Constructible/Furniture/pilot_chair.yml | 1 - .../Constructible/Power/chem_master.yml | 10 ++-- .../Constructible/Power/cloning_machine.yml | 5 +- .../Entities/Constructible/Power/lathe.yml | 5 +- .../Constructible/Power/medical_scanner.yml | 5 +- .../Power/reagent_dispenser_base.yml | 5 +- .../Entities/Constructible/Power/research.yml | 5 +- .../Constructible/Power/vending_machines.yml | 3 +- .../Constructible/Storage/Closets/closet.yml | 5 +- .../Storage/StorageTanks/base_tank.yml | 5 +- .../Constructible/Storage/crate_base.yml | 6 +-- .../Entities/Constructible/Walls/mirror.yml | 5 +- .../Prototypes/Entities/Mobs/NPCs/animals.yml | 52 +++++-------------- .../Prototypes/Entities/Mobs/NPCs/carp.yml | 11 ++-- .../Prototypes/Entities/Mobs/NPCs/mimic.yml | 3 +- .../Prototypes/Entities/Mobs/NPCs/pets.yml | 19 ++----- .../Prototypes/Entities/Mobs/NPCs/xeno.yml | 4 +- .../Entities/Mobs/Player/observer.yml | 3 +- .../Entities/Mobs/Species/human.yml | 8 +-- .../Entities/Objects/Power/powercells.yml | 9 ++-- .../Entities/Objects/Specific/janitor.yml | 11 ++-- .../Weapons/Guns/Projectiles/projectiles.yml | 7 +-- Resources/Prototypes/Entities/item_base.yml | 3 +- 23 files changed, 59 insertions(+), 131 deletions(-) diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/pilot_chair.yml b/Resources/Prototypes/Entities/Constructible/Furniture/pilot_chair.yml index 9ab11d0402..32aceaaf65 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/pilot_chair.yml +++ b/Resources/Prototypes/Entities/Constructible/Furniture/pilot_chair.yml @@ -12,7 +12,6 @@ - type: Destructible deadThreshold: 100 resistances: metallicResistances - - type: Physics - type: ShuttleController - type: Strap position: Stand diff --git a/Resources/Prototypes/Entities/Constructible/Power/chem_master.yml b/Resources/Prototypes/Entities/Constructible/Power/chem_master.yml index eb6a4e6ac3..b53d5a508e 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/chem_master.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/chem_master.yml @@ -18,6 +18,8 @@ - type: InteractionOutline - type: Anchorable - type: Collidable + mass: 25 + anchored: true shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.25,0.4,0.25" @@ -26,9 +28,6 @@ - Impassable - MobImpassable - VaultImpassable - - type: Physics - mass: 25 - anchored: true - type: SnapGrid offset: Center - type: Destructible @@ -58,6 +57,8 @@ - type: InteractionOutline - type: Anchorable - type: Collidable + mass: 25 + anchored: true shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.25,0.4,0.25" @@ -66,9 +67,6 @@ - Impassable - MobImpassable - VaultImpassable - - type: Physics - mass: 25 - anchored: true - type: SnapGrid offset: Center - type: Destructible diff --git a/Resources/Prototypes/Entities/Constructible/Power/cloning_machine.yml b/Resources/Prototypes/Entities/Constructible/Power/cloning_machine.yml index 21a6d90854..9ad7904465 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/cloning_machine.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/cloning_machine.yml @@ -15,6 +15,8 @@ - type: Clickable - type: InteractionOutline - type: Collidable + mass: 25 + anchored: true shapes: - !type:PhysShapeAabb bounds: "-0.5,-0.25,0.5,0.25" @@ -23,9 +25,6 @@ - Impassable - MobImpassable - VaultImpassable - - type: Physics - mass: 25 - anchored: true - type: SnapGrid offset: Center - type: CloningPod diff --git a/Resources/Prototypes/Entities/Constructible/Power/lathe.yml b/Resources/Prototypes/Entities/Constructible/Power/lathe.yml index c4f3f78934..79164d201a 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/lathe.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/lathe.yml @@ -6,6 +6,8 @@ - type: Clickable - type: InteractionOutline - type: Collidable + mass: 25 + anchored: true shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.25,0.4,0.25" @@ -14,9 +16,6 @@ - Impassable - MobImpassable - VaultImpassable - - type: Physics - mass: 25 - anchored: true - type: SnapGrid offset: Center - type: Lathe diff --git a/Resources/Prototypes/Entities/Constructible/Power/medical_scanner.yml b/Resources/Prototypes/Entities/Constructible/Power/medical_scanner.yml index 6c348d0578..0b4967c6bb 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/medical_scanner.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/medical_scanner.yml @@ -17,6 +17,8 @@ - type: Clickable - type: InteractionOutline - type: Collidable + mass: 25 + anchored: true shapes: - !type:PhysShapeAabb bounds: "-0.5,0,0.5,1" @@ -25,9 +27,6 @@ - Impassable - MobImpassable - VaultImpassable - - type: Physics - mass: 25 - anchored: true - type: SnapGrid offset: Center - type: MedicalScanner diff --git a/Resources/Prototypes/Entities/Constructible/Power/reagent_dispenser_base.yml b/Resources/Prototypes/Entities/Constructible/Power/reagent_dispenser_base.yml index 600da7b70e..b9cab507b8 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/reagent_dispenser_base.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/reagent_dispenser_base.yml @@ -6,6 +6,8 @@ - type: InteractionOutline - type: Anchorable - type: Collidable + mass: 25 + anchored: true shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.25,0.4,0.25" @@ -14,9 +16,6 @@ - Impassable - MobImpassable - VaultImpassable - - type: Physics - mass: 25 - anchored: true - type: SnapGrid offset: Center - type: ReagentDispenser diff --git a/Resources/Prototypes/Entities/Constructible/Power/research.yml b/Resources/Prototypes/Entities/Constructible/Power/research.yml index 60d0a1657f..8ff60e1d2a 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/research.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/research.yml @@ -34,6 +34,8 @@ - type: Clickable - type: InteractionOutline - type: Collidable + mass: 25 + anchored: true shapes: - !type:PhysShapeAabb layer: @@ -56,6 +58,3 @@ - type: PowerDeviceVisualizer - type: PowerReceiver - type: Anchorable - - type: Physics - mass: 25 - anchored: true diff --git a/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml b/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml index 2fc5f56df0..59e68d8ec8 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml @@ -3,14 +3,13 @@ name: vending machine abstract: true components: - - type: Physics - anchored: true - type: Clickable - type: InteractionOutline - type: Sprite sprite: Constructible/Power/VendingMachines/empty.rsi netsync: false - type: Collidable + anchored: true shapes: - !type:PhysShapeAabb bounds: "-0.5,-0.25,0.5,0.25" diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml index d86f2e2f2c..6e6f7f615c 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml @@ -20,6 +20,8 @@ soundHit: /Audio/Effects/bang.ogg - type: InteractionOutline - type: Collidable + mass: 25 + anchored: false shapes: - !type:PhysShapeAabb bounds: "-0.5,-0.25,0.5,0.25" @@ -33,9 +35,6 @@ - MobImpassable - VaultImpassable - SmallImpassable - - type: Physics - mass: 25 - anchored: false - type: EntityStorage - type: PlaceableSurface - type: Destructible diff --git a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/base_tank.yml b/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/base_tank.yml index cb1c7974dc..872df4514a 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/base_tank.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/base_tank.yml @@ -7,6 +7,8 @@ - type: Clickable - type: InteractionOutline - type: Collidable + mass: 15 + anchored: false shapes: - !type:PhysShapeAabb bounds: "-0.5,-0.5,0.5,0.5" @@ -21,9 +23,6 @@ - MobImpassable - VaultImpassable - SmallImpassable - - type: Physics - mass: 15 - Anchored: false - type: Destructible deadThreshold: 10 resistances: metallicResistances diff --git a/Resources/Prototypes/Entities/Constructible/Storage/crate_base.yml b/Resources/Prototypes/Entities/Constructible/Storage/crate_base.yml index 844c18ebd0..fa53797212 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/crate_base.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/crate_base.yml @@ -10,10 +10,11 @@ - state: crate - state: crate_door map: ["enum.StorageVisualLayers.Door"] - - type: Clickable - type: InteractionOutline - type: Collidable + mass: 25 + anchored: false shapes: - !type:PhysShapeAabb bounds: "-0.4, -0.4, 0.4, 0.4" @@ -26,9 +27,6 @@ - Opaque - MobImpassable - SmallImpassable - - type: Physics - mass: 25 - anchored: false - type: EntityStorage capacity: 60 CanWeldShut: false diff --git a/Resources/Prototypes/Entities/Constructible/Walls/mirror.yml b/Resources/Prototypes/Entities/Constructible/Walls/mirror.yml index 2e2bd2dadc..00f9af663b 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/mirror.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/mirror.yml @@ -7,14 +7,13 @@ sprite: Constructible/Misc/mirror.rsi state: mirror - type: Collidable + mass: 25 + anchored: true shapes: - !type:PhysShapeAabb layer: [Clickable] - type: Clickable - type: InteractionOutline - - type: Physics - mass: 25 - anchored: true - type: SnapGrid offset: Center - type: MagicMirror diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index ad0cfa3eb2..c1af0f9c44 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -24,11 +24,9 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: monkey sprite: Mobs/Animals/monkey.rsi - - type: Clickable - - type: Physics - mass: 50 - type: Collidable + mass: 50 shapes: - !type:PhysShapeAabb bounds: "-0.30,-0.25,0.40,0.25" @@ -78,10 +76,8 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: crawling sprite: Mobs/Animals/gorilla.rsi - - - type: Physics - mass: 90 - type: Collidable + mass: 90 shapes: - !type:PhysShapeAabb bounds: "-0.90,-0.50,0.05,0.50" @@ -114,10 +110,8 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: chicken-0 sprite: Mobs/Animals/chicken.rsi - - - type: Physics - mass: 20 - type: Collidable + mass: 20 shapes: - !type:PhysShapeAabb bounds: "-0.45,-0.20,0.10,0.20" @@ -153,10 +147,8 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: butterfly sprite: Mobs/Animals/butterfly.rsi - - - type: Physics - mass: 5 - type: Collidable + mass: 5 shapes: - !type:PhysShapeAabb bounds: "-0.20,-0.20,0.20,0.20" @@ -202,10 +194,8 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: bat sprite: Mobs/Animals/bat.rsi - - - type: Physics - mass: 5 - type: Collidable + mass: 5 shapes: - !type:PhysShapeAabb bounds: "-0.20,-0.20,0.20,0.20" @@ -242,10 +232,8 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: 0 sprite: Mobs/Animals/bee.rsi - - - type: Physics - mass: 5 - type: Collidable + mass: 5 shapes: - !type:PhysShapeAabb bounds: "-0.10,-0.10,0.10,0.10" @@ -278,10 +266,8 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: goat sprite: Mobs/Animals/goat.rsi - - - type: Physics - mass: 20 - type: Collidable + mass: 20 shapes: - !type:PhysShapeAabb bounds: "-0.60,-0.50,0.05,0.50" @@ -315,10 +301,8 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: goose sprite: Mobs/Animals/goose.rsi - - - type: Physics - mass: 20 - type: Collidable + mass: 20 shapes: - !type:PhysShapeAabb bounds: "-0.45,-0.35,0.45,0.35" @@ -355,10 +339,8 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: parrot sprite: Mobs/Animals/parrot.rsi - - - type: Physics - mass: 20 - type: Collidable + mass: 20 shapes: - !type:PhysShapeAabb bounds: "-0.30,-0.35,0.35,0.35" @@ -391,10 +373,8 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: snake sprite: Mobs/Animals/snake.rsi - - - type: Physics - mass: 10 - type: Collidable + mass: 10 shapes: - !type:PhysShapeAabb bounds: "-0.30,-0.30,0.25,0.30" @@ -430,10 +410,8 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: tarantula sprite: Mobs/Animals/spider.rsi - - - type: Physics - mass: 10 - type: Collidable + mass: 10 shapes: - !type:PhysShapeAabb bounds: "-0.30,-0.40,0.45,0.40" @@ -466,10 +444,8 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: crab sprite: Mobs/Animals/crab.rsi - - - type: Physics - mass: 10 - type: Collidable + mass: 10 shapes: - !type:PhysShapeAabb bounds: "-0.40,-0.35,0.20,0.35" @@ -502,10 +478,8 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: penguin sprite: Mobs/Animals/penguin.rsi - - - type: Physics - mass: 10 - type: Collidable + mass: 10 shapes: - !type:PhysShapeAabb bounds: "-0.50,-0.30,0.35,0.30" diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml index 23fdb0dd73..7dee6ee26a 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml @@ -19,11 +19,8 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: carp sprite: Mobs/Aliens/Carps/carp_space.rsi - - - type: Clickable - - type: Physics - mass: 50 - type: Collidable + mass: 50 shapes: - !type:PhysShapeAabb bounds: "-0.35,-0.35,0.35,0.35" @@ -70,8 +67,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: magicarp sprite: Mobs/Aliens/Carps/carp_magic.rsi - - - type: Physics + - type: Collidable mass: 60 - type: Appearance visuals: @@ -94,8 +90,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: holocarp sprite: Mobs/Aliens/Carps/carp_holo.rsi - - - type: Physics + - type: Collidable mass: 5 - type: Appearance visuals: diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml index 6e3ed9bee7..8d577a302d 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml @@ -23,9 +23,8 @@ - type: Icon sprite: Constructible/Power/VendingMachines/cola.rsi state: normal - - type: Physics - mass: 85 - type: Collidable + mass: 85 shapes: - !type:PhysShapeAabb bounds: "-0.35,-0.35,0.35,0.35" diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index 771d56d894..cf8633e9ab 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -20,9 +20,8 @@ baseSprintSpeed : 5 - type: InteractionOutline - type: Clickable - - type: Physics - mass: 50 - type: Collidable + mass: 50 shapes: - !type:PhysShapeAabb bounds: "-0.30,-0.35,0.45,0.35" @@ -70,10 +69,8 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: corgi - - - type: Physics - mass: 10 - type: Collidable + mass: 10 shapes: - !type:PhysShapeAabb bounds: "-0.50,-0.25,0.30,0.25" @@ -106,10 +103,8 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: ian - - - type: Physics - mass: 10 - type: Collidable + mass: 10 shapes: - !type:PhysShapeAabb bounds: "-0.50,-0.25,0.30,0.25" @@ -142,10 +137,8 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: cat - - - type: Physics - mass: 10 - type: Collidable + mass: 10 shapes: - !type:PhysShapeAabb bounds: "-0.45,-0.20,0.30,0.20" @@ -215,10 +208,8 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: sloth - - - type: Physics - mass: 10 - type: Collidable + mass: 10 shapes: - !type:PhysShapeAabb bounds: "-0.45,-0.35,0.15,0.35" diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml index 8924d0f9c6..0b74501460 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml @@ -21,11 +21,9 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: running sprite: Mobs/Aliens/Xenos/xeno_hunter.rsi - - type: Clickable - - type: Physics - mass: 85 - type: Collidable + mass: 85 shapes: - !type:PhysShapeAabb bounds: "-0.35,-0.35,0.35,0.35" diff --git a/Resources/Prototypes/Entities/Mobs/Player/observer.yml b/Resources/Prototypes/Entities/Mobs/Player/observer.yml index 6fb36573fb..943d8edad3 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/observer.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/observer.yml @@ -6,9 +6,8 @@ description: Boo! components: - type: Mind - - type: Physics - mass: 5 - type: Collidable + mass: 5 shapes: - !type:PhysShapeAabb bounds: "-0.35,-0.35,0.35,0.35" diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml index 31478ee875..c9b334d4f9 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml @@ -115,10 +115,8 @@ sprite: Mobs/Customization/human_hair.rsi - map: [ "enum.Slots.MASK" ] - map: [ "enum.Slots.HEAD" ] - - - type: Physics - mass: 85 - type: Collidable + mass: 85 shapes: - !type:PhysShapeAabb bounds: "-0.50,-0.30,0.40,0.30" @@ -280,10 +278,8 @@ - map: ["enum.Slots.HEAD"] - map: ["hand-left"] - map: ["hand-right"] - - - type: Physics - mass: 85 - type: Collidable + mass: 85 shapes: - !type:PhysShapeAabb bounds: "-0.35,-0.35,0.35,0.35" diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml index 370acf56ac..ff6019da45 100644 --- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml @@ -103,11 +103,10 @@ visuals: - type: PowerChargerVisualizer - type: Anchorable - - type: Physics - mass: 5 - type: Clickable - type: InteractionOutline - type: Collidable + mass: 5 shapes: - !type:PhysShapeAabb bounds: "-0.25,-0.25,0.25,0.25" @@ -132,11 +131,10 @@ visuals: - type: PowerChargerVisualizer - type: Anchorable - - type: Physics - mass: 5 - type: Clickable - type: InteractionOutline - type: Collidable + mass: 5 shapes: - !type:PhysShapeAabb bounds: "-0.25,-0.25,0.25,0.25" @@ -160,11 +158,10 @@ - type: Appearance visuals: - type: PowerChargerVisualizer - - type: Physics - mass: 5 - type: Clickable - type: InteractionOutline - type: Collidable + mass: 5 shapes: - !type:PhysShapeAabb bounds: "-0.25,-0.25,0.25,0.25" diff --git a/Resources/Prototypes/Entities/Objects/Specific/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/janitor.yml index e7fe78d9ec..cd295be16b 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/janitor.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/janitor.yml @@ -35,6 +35,8 @@ maxVol: 500 caps: AddTo, RemoveFrom - type: Collidable + mass: 5 + anchored: false shapes: - !type:PhysShapeAabb bounds: "-0.40,-0.25,0.25,0.25" @@ -43,9 +45,6 @@ - Opaque layer: - Opaque - - type: Physics - mass: 5 - anchored: false - type: Spillable - type: Pullable @@ -68,14 +67,13 @@ maxVol: 500 caps: AddTo, RemoveFrom - type: Collidable + mass: 5 + anchored: false shapes: - !type:PhysShapeAabb bounds: "-0.25,-0.25,0.25,0.25" mask: - Impassable - - type: Physics - mass: 5 - anchored: false - type: Spillable - type: entity @@ -177,7 +175,6 @@ layers: - state: chempuff map: [ "enum.VaporVisualLayers.Base" ] - - type: Physics - type: Collidable hard: false shapes: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index d7af84094c..515832b3b8 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -11,8 +11,8 @@ directional: false sprite: Objects/Weapons/Guns/Projectiles/bullet.rsi state: bullet - - type: Collidable + edgeslide: false hard: false shapes: - !type:PhysShapeAabb @@ -21,8 +21,6 @@ mask: - Impassable - MobImpassable - - type: Physics - edgeslide: false - type: Projectile soundHit: /Audio/Weapons/Guns/Hits/bullet_hit.ogg damages: @@ -98,14 +96,13 @@ - state: spark shader: unshaded - type: Collidable + edgeslide: false hard: false shapes: - !type:PhysShapeAabb bounds: "-0.2,-0.2,0.2,0.2" layer: 32 mask: 30 - - type: Physics - edgeslide: false # Launcher projectiles (grenade / rocket) - type: entity diff --git a/Resources/Prototypes/Entities/item_base.yml b/Resources/Prototypes/Entities/item_base.yml index f1ddad9d3c..fbb981b721 100644 --- a/Resources/Prototypes/Entities/item_base.yml +++ b/Resources/Prototypes/Entities/item_base.yml @@ -10,13 +10,12 @@ - type: MovedByPressure - type: DamageOnHighSpeedImpact - type: Collidable + mass: 5 shapes: - !type:PhysShapeAabb bounds: "-0.25,-0.25,0.25,0.25" layer: - Clickable - - type: Physics - mass: 5 - type: Sprite drawdepth: Items - type: Pullable