Laser Pistol

Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml

@@ -2,7 +2,7 @@
   id: AmmoVendInventory
   startingInventory:
     SurvivalKnife: 10
-    WeaponLaserGun: 10
+    WeaponLaserPistolNF: 10 # Frontier
     WeaponSniperMosin: 10
     WeaponSniperRepeater: 10
     MagazineBoxLightRifle: 10

Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml

@@ -211,7 +211,7 @@
     shoes: ClothingShoesBootsCombatFilled
     id: CBURNPDA
     pocket1: RadioHandheld
-    pocket2: WeaponLaserGun
+    pocket2: WeaponLaserPistolNF # Frontier
     suitstorage: OxygenTankFilled
     belt: ClothingBeltBandolier
 

Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_mercenaries.yml

@@ -241,7 +241,7 @@
     - id: SpaceCash1000
       prob: 0.2
     # Weapons
-    - id: WeaponLaserGun
+    - id: WeaponLaserPistolNF
       prob: 0.9
     - id: SawElectric
       prob: 0.7

Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml

@@ -22,7 +22,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: WeaponLaserGun
+      - id: WeaponLaserPistolNF
 
 # WeaponDisabler
 - type: entity

Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

@@ -102,3 +102,30 @@
     magState: charge-level
     steps: 6
     zeroVisible: true
+
+- type: entity
+  parent: WeaponLaserGun
+  id: WeaponLaserPistolNF
+  name: laser pistol
+  suffix: Frontier
+  description: Slightly outdated design of civilian-grade laser pistol.
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-unshaded-4
+      map: ["enum.GunVisualLayers.MagUnshaded"]
+      shader: unshaded
+  - type: Item
+    size: Small
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: inhand-left-unshaded
+        shader: unshaded
+      right:
+      - state: inhand-right
+      - state: inhand-right-unshaded
+        shader: unshaded

Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml

@@ -63,7 +63,7 @@
 
 # Energy
 - type: entity
-  parent: [ WeaponLaserGun, UnregisteredFirearmBase ]
+  parent: [ WeaponLaserPistolNF, UnregisteredFirearmBase ]
   noSpawn: true
   id: WeaponLaserGunExpedition
 

Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/meta.json

@@ -0,0 +1,84 @@
+{
+	"version": 1,
+	"license": "CC-BY-SA-3.0",
+	"copyright": "Icon taken from baystation at https://github.com/Baystation12/Baystation12/blob/dev/icons/obj/guns/ion_pistol.dmi | inhands sprites by erhardsteinhauer (discord/github)",
+	"size": {
+		"x": 32,
+		"y": 32
+	},
+	"states": [
+		{
+			"name": "icon"
+		},
+		{
+			"name": "base"
+		},
+		{
+			"name": "mag-unshaded-0",
+			"delays":
+			[
+			 [0.2, 0.2]
+			]
+		},
+		{
+			"name": "mag-unshaded-1"
+		},
+		{
+			"name": "mag-unshaded-2"
+		},
+		{
+			"name": "mag-unshaded-3"
+		},
+		{
+			"name": "mag-unshaded-4"
+		},
+		{
+			"name": "inhand-left-0",
+			"directions": 4
+		},
+		{
+			"name": "inhand-right-0",
+			"directions": 4
+		},
+		{
+			"name": "inhand-left-1",
+			"directions": 4
+		},
+		{
+			"name": "inhand-right-1",
+			"directions": 4
+		},
+		{
+			"name": "inhand-left-2",
+			"directions": 4
+		},
+		{
+			"name": "inhand-right-2",
+			"directions": 4
+		},
+		{
+			"name": "inhand-left-3",
+			"directions": 4
+		},
+		{
+			"name": "inhand-right-3",
+			"directions": 4
+		},
+		{
+			"name": "inhand-left",
+			"directions": 4
+		},
+		{
+			"name": "inhand-right",
+			"directions": 4
+		},
+		{
+			"name": "inhand-left-unshaded",
+			"directions": 4
+		},
+		{
+			"name": "inhand-right-unshaded",
+			"directions": 4
+		}
+	]
+}