diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 76704910a11..17bc14742f5 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -36,7 +36,7 @@ state: disabler - proto: BulletEnergyGunLaser fireCost: 200 - name: kill + name: lethal state: lethal - type: MagazineVisuals magState: mag @@ -151,7 +151,7 @@ state: disabler - proto: BulletEnergyGunLaser fireCost: 200 - name: kill + name: lethal state: lethal - type: MagazineVisuals magState: mag diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/equipped-BACKPACK.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..5ac3c6c8c48 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/inhand-left.png new file mode 100644 index 00000000000..f25d9fc664f Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/inhand-right.png new file mode 100644 index 00000000000..63454347e58 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/lethal-inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/lethal-inhand-left.png deleted file mode 100644 index 6b65b307752..00000000000 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/lethal-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/lethal-inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/lethal-inhand-right.png deleted file mode 100644 index 4040a1d8552..00000000000 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/lethal-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/meta.json index f0e887bcf2d..79adf10713d 100644 --- a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/meta.json @@ -29,12 +29,16 @@ "name": "mag-unshaded-4" }, { - "name": "lethal-inhand-left", + "name": "inhand-left", "directions": 4 }, { - "name": "lethal-inhand-right", + "name": "inhand-right", "directions": 4 - } + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } ] } diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/disabler-inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/disabler-inhand-left.png index 6b65b307752..2bcb74b1eb1 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/disabler-inhand-left.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/disabler-inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/disabler-inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/disabler-inhand-right.png index 4040a1d8552..2e4639f7947 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/disabler-inhand-right.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/disabler-inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/lethal-inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/lethal-inhand-left.png index 43f8ac1800a..9b05bceb311 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/lethal-inhand-left.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/lethal-inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/lethal-inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/lethal-inhand-right.png index 86a384f15b5..f9200bfef2e 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/lethal-inhand-right.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/lethal-inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi/disabler-inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi/disabler-inhand-left.png index 6b65b307752..09ffcf34515 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi/disabler-inhand-left.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi/disabler-inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi/disabler-inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi/disabler-inhand-right.png index 4040a1d8552..25bc79ca34a 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi/disabler-inhand-right.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi/disabler-inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi/lethal-inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi/lethal-inhand-left.png index 43f8ac1800a..6ed66005788 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi/lethal-inhand-left.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi/lethal-inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi/lethal-inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi/lethal-inhand-right.png index 86a384f15b5..42caf92772d 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi/lethal-inhand-right.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi/lethal-inhand-right.png differ