]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Bullet Type Visual Indicator (#21068)
authorMaloTV <70515562+MaloTV@users.noreply.github.com>
Sun, 7 Jan 2024 02:36:51 +0000 (03:36 +0100)
committerGitHub <noreply@github.com>
Sun, 7 Jan 2024 02:36:51 +0000 (21:36 -0500)
* Bullet Class indicators

* New Practice Sprite

* Removed re-specified values

* fixes up whitespace to get this merged

---------

Co-authored-by: deathride58 <deathride58@users.noreply.github.com>
Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/practice.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/rubber.png [new file with mode: 0644]

index 9ea27c6cbc75464339ecdaae66bbffe0e28499ed..8b36433acfc144bc3afeec390a669ac0da54a558 100644 (file)
   parent: BaseBullet
   noSpawn: true
   components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
+    layers:
+    - state: practice
   - type: Projectile
     damage:
       types:
   parent: BaseBullet
   noSpawn: true
   components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
+    layers:
+    - state: rubber
   - type: Projectile
     damage:
       types:
index 5c5a22fce1f44dd2e2b7dd63f7f47efb99c4ccea..f2543b0b6b9029834f6650043146d910aa1af6f6 100644 (file)
         ]
       ]
     },
+    {
+      "name": "rubber",
+      "delays": [
+        [
+          0.05,
+          0.05
+        ]
+      ]
+    },
+    {
+      "name": "practice",
+      "delays": [
+        [
+          0.05,
+          0.05
+        ]
+      ]
+    },
     {
       "name": "frag"
     },
diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/practice.png
new file mode 100644 (file)
index 0000000..1f01f62
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/practice.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/rubber.png
new file mode 100644 (file)
index 0000000..61a2036
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/rubber.png differ