]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Adds bullet collision to station lights (#34070)
authorSpaceRox1244 <138547931+SpaceRox1244@users.noreply.github.com>
Sun, 5 Jan 2025 22:11:01 +0000 (17:11 -0500)
committerGitHub <noreply@github.com>
Sun, 5 Jan 2025 22:11:01 +0000 (23:11 +0100)
Adds collision with bullets to lights

Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml
Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml

index c079975e8bab1afb33528421806bd911f6981377..7c430227b779c369c34688a28d30081af78f35c3 100644 (file)
     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:
       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
index 2bcbf0918823de6c56f64936908a0eb643a19e0c..222ea5c8142057069ea13ed101be43e39090935e 100644 (file)
@@ -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
index 1a99ab6f1017b76b99a500d80b137cb042a03130..297a0a7abdf464907eb39e59df1025f64046ecf9 100644 (file)
     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