]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix the temperature gun not reflecting and going through windows (#37581)
authorYoungThug <ramialanbagy@gmail.com>
Wed, 8 Oct 2025 14:59:36 +0000 (07:59 -0700)
committerGitHub <noreply@github.com>
Wed, 8 Oct 2025 14:59:36 +0000 (14:59 +0000)
* Fix Temp Gun

* Fix mask, muzzle flash

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

index d3e07c2e1b75edf0af61b994c889588af8fac04a..a853282d0bfc37db28a7aaee49d61f5dc06be277 100644 (file)
     - state: omnilaser
       shader: unshaded
   - type: Ammo
-    muzzleFlash: null
+    muzzleFlash: MuzzleFlashEffectOmnilaser
   - type: Physics
   - type: Fixtures
     fixtures:
           bounds: "-0.2,-0.2,0.2,0.2"
         hard: false
         mask:
-        - Opaque
+        - Impassable
+        - BulletImpassable
       fly-by: *flybyfixture
   - type: Projectile
     #   soundHit:  Waiting on serv3
   parent: WatcherBolt
   categories: [ HideSpawnMenu ]
   components:
+  - type: Reflective
+    reflective:
+    - Energy
   - type: Projectile
     #   soundHit:  Waiting on serv3
     impactEffect: BulletImpactEffectDisabler
 - type: entity
   name: magmawing watcher bolt
   id: WatcherBoltMagmawing
-  parent: BaseBullet
+  parent: WatcherBolt
   categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     - state: omnilaser_greyscale
       shader: unshaded
       color: orangered
+  - type: Ammo
+    muzzleFlash: MuzzleFlashEffectHeavyLaser
   - type: Projectile
     #   soundHit:  Waiting on serv3
     impactEffect: BulletImpactEffectOrangeDisabler
   parent: WatcherBoltMagmawing
   categories: [ HideSpawnMenu ]
   components:
+  - type: Reflective
+    reflective:
+    - Energy
   - type: Projectile
     #   soundHit:  Waiting on serv3
     impactEffect: BulletImpactEffectOrangeDisabler