Energy gun sprites + Minor bug fixes (#811)

* New Pistol Sprites * Carbine Sprites Fix * Kill and Lethal Consistency fix
DeltaV-Station · Feb 10, 2024 · ae2790b · ae2790b
1 parent e1337f7
commit ae2790b
Show file tree

Hide file tree

Showing 15 changed files with 9 additions and 5 deletions.
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
@@ -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/...DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/equipped-BACKPACK.png b/...DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/equipped-BACKPACK.png
diff --git a/...tures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/inhand-left.png b/...tures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/inhand-left.png
diff --git a/...ures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/inhand-right.png b/...ures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/inhand-right.png
diff --git a/...eltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/lethal-inhand-left.png b/...eltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/lethal-inhand-left.png
diff --git a/...ltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/lethal-inhand-right.png b/...ltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/lethal-inhand-right.png
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
@@ -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/...ltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/disabler-inhand-left.png b/...ltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/disabler-inhand-left.png
diff --git a/...taV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/disabler-inhand-right.png b/...taV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/disabler-inhand-right.png
diff --git a/...DeltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/lethal-inhand-left.png b/...DeltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/lethal-inhand-left.png
diff --git a/...eltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/lethal-inhand-right.png b/...eltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/lethal-inhand-right.png
diff --git a/...DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi/disabler-inhand-left.png b/...DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi/disabler-inhand-left.png
diff --git a/...eltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi/disabler-inhand-right.png b/...eltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi/disabler-inhand-right.png
diff --git a/...s/DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi/lethal-inhand-left.png b/...s/DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi/lethal-inhand-left.png
diff --git a/.../DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi/lethal-inhand-right.png b/.../DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi/lethal-inhand-right.png