From b85a9d76883aa7df022eccda76da9152ff5b8da0 Mon Sep 17 00:00:00 2001 From: MaloTV <70515562+MaloTV@users.noreply.github.com> Date: Sun, 7 Jan 2024 03:36:51 +0100 Subject: [PATCH] Bullet Type Visual Indicator (#21068) * Bullet Class indicators * New Practice Sprite * Removed re-specified values * fixes up whitespace to get this merged --------- Co-authored-by: deathride58 --- .../Weapons/Guns/Projectiles/projectiles.yml | 8 ++++++++ .../Projectiles/projectiles2.rsi/meta.json | 18 ++++++++++++++++++ .../Projectiles/projectiles2.rsi/practice.png | Bin 0 -> 338 bytes .../Projectiles/projectiles2.rsi/rubber.png | Bin 0 -> 386 bytes 4 files changed, 26 insertions(+) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/practice.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/rubber.png diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 9ea27c6cbc..8b36433acf 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -95,6 +95,10 @@ parent: BaseBullet noSpawn: true components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: practice - type: Projectile damage: types: @@ -106,6 +110,10 @@ parent: BaseBullet noSpawn: true components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: rubber - type: Projectile damage: types: diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json index 5c5a22fce1..f2543b0b6b 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json @@ -28,6 +28,24 @@ ] ] }, + { + "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 index 0000000000000000000000000000000000000000..1f01f62c417ec819282d5189615c43bf2a8f2a54 GIT binary patch literal 338 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQk(@Ik;M!Q+`=Ht$S`Y;1Oo#j zi>HfYNJit^8ID|s3`AV&y8^V#xR-V}?RckI#q@n|!|_RT4!Pz%aeA>XDr53{**OOq z&c6A4|H(vwj=<2HMOwQhnySPI+h z{<#eTVZqn8XisS3=Uk9yCn#UfnzSUgQKZJBVeO$^_VcTNiuOB;#qZkHuNDDh^K)jr z%}}>2Il*HlFBA|K9R8}vC2hmc2@Q{oFPY8n;^&-D>GCr|=z}8T$GrzwZ`3sZ;kery zC^&KUs>az9eoSciks&QO@zJlEzcwv09tZ4I>N_@YZ3?y3Xof$PbtU_L1XjRmlp5Wo8cfru9tEzFGtEHyBqi@}D>#8rs=$#B);3 z&ax+!@6N1$9kpg_VdS)PH6`pvd}oWj4`sTx<7kw$d2W<~?1YA8zTI)Y?Ijz2PH2ep z75Du&e*&MGywHJ|J^FSv+$%WVa{PGUy#0XEr94C1e6Z99iPGB>XP%n~QuaYc_PNq7 zC#xGZIqYZZ!jh+|UOM>9nMrN`{Vhj-KXPVz^1kKM#)=2dOux9lvVA$!&QkNv{sCjn zhx-kDZ#X*k+_B%JQ>^7M?@3&F`_|9rx6k;XX7PcA5#}3VmJRF)>KqCD2mAyM$TiH> ZK4cLc@bqh`Brs4JJYD@<);T3K0RTqTo>>3@ literal 0 HcmV?d00001