From: SpaceRox1244 <138547931+SpaceRox1244@users.noreply.github.com> Date: Sun, 5 Jan 2025 22:11:01 +0000 (-0500) Subject: Adds bullet collision to station lights (#34070) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=6b674e73d68a299b7f154d75e5b457af74137a78;p=space-station-14.git Adds bullet collision to station lights (#34070) Adds collision with bullets to lights --- diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml index c079975e8b..7c430227b7 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml @@ -44,6 +44,19 @@ cost: 4 delay: 2 fx: EffectRCDDeconstruct2 + - type: Physics + bodyType: Static + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.4,0.5,0.4,0.35" + density: 190 + mask: + - TabletopMachineMask + layer: + - TabletopMachineLayer - type: Destructible thresholds: - trigger: @@ -253,6 +266,19 @@ radius: 6 softness: 1.1 enabled: true + - type: Physics + bodyType: Static + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.2,0.5,0.2,0.35" + density: 190 + mask: + - TabletopMachineMask + layer: + - TabletopMachineLayer - type: Damageable damageContainer: Inorganic - type: Destructible diff --git a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml index 2bcbf09188..222ea5c814 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml @@ -29,6 +29,7 @@ layer: - MidImpassable - LowImpassable + - BulletImpassable - type: PointLight radius: 10 energy: 2.5 @@ -64,6 +65,7 @@ collection: MetalGlassBreak - type: StaticPrice price: 75 + - type: RequireProjectileTarget - type: entity id: PoweredLightPostSmallEmpty diff --git a/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml index 1a99ab6f10..297a0a7abd 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml @@ -38,6 +38,19 @@ softness: 1 offset: "0, 0.35" - type: RotatingLight + - type: Physics + bodyType: Static + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.2,0.5,0.2,0.35" + density: 190 + mask: + - TabletopMachineMask + layer: + - TabletopMachineLayer - type: Damageable damageContainer: Inorganic damageModifierSet: Metallic