chinese pistol and little changes

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -722,3 +722,42 @@
             - Impassable
             - HighImpassable
     - type: GrapplingProjectile
+
+- type: entity
+  name : plasma
+  id: BulletPlasma
+  parent: BaseBullet
+  noSpawn: true
+  components:
+  - type: FlyBySound
+    sound:
+      collection: EnergyMiss
+      params:
+        volume: 5
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/magic.rsi
+    layers:
+    - state: declone
+      shader: unshaded
+  - type: Physics
+  - type: Fixtures
+    fixtures:
+      projectile:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.15,-0.3,0.15,0.3"
+        hard: false
+        mask:
+        - Impassable
+        - BulletImpassable
+      fly-by: *flybyfixture
+  - type: Ammo
+  - type: Projectile
+    impactEffect: BulletImpactEffect
+    damage:
+      types:
+        Heat: 12
+        Radiation: 10
+    soundHit:
+      path: "/Audio/Weapons/Guns/Hits/energy_meat1.ogg"
+    soundForce: true

Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Battery/Battery.yml

@@ -0,0 +1,107 @@
+- type: entity
+  name: microfusion cell
+  description: A small energy container the size of a palm, commonly used has ammo for any kind of laser weapon.
+  id: N14BasePowerCell
+  abstract: true
+  parent: BaseItem
+  components:
+  - type: Battery
+    pricePerJoule: 0.15
+  - type: Explosive
+    explosionType: Default
+    maxIntensity: 200
+    intensitySlope: 1.5
+  - type: Tag
+    tags:
+      - N14PowerCellHigh
+  - type: Sprite
+    sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Battery/microfusion.rsi
+  - type: SolutionContainerManager
+    solutions:
+      battery:
+        maxVol: 5
+  - type: InjectableSolution
+    solution: battery
+  - type: DrawableSolution
+    solution: battery
+  - type: Extractable
+    juiceSolution:
+      reagents:
+        - ReagentId: Zinc
+          Quantity: 5
+  - type: Appearance
+  - type: PowerCellVisuals
+  - type: Riggable
+  - type: HitscanBatteryAmmoProvider
+    proto: RedLightLaser
+    fireCost: 50
+
+- type: entity
+  name: microfusion cell
+  description: A small energy container the size of a palm, commonly used has ammo for any kind of laser weapon.
+  id: N14PowerCellHigh
+  suffix: Full
+  parent: N14BasePowerCell
+  components:
+  - type: Sprite
+    sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Battery/microfusion.rsi
+    layers:
+    - map: [ "enum.PowerCellVisualLayers.Base" ]
+      state: icon
+  - type: Battery
+    maxCharge: 1000
+    startingCharge: 1000
+
+- type: entity
+  name: plasma cartridge
+  description: A small green glowing cartridge, commonly used has ammo for any kind of plasma weapon.
+  id: N14BasePlasmaCell
+  abstract: true
+  parent: BaseItem
+  components:
+  - type: Battery
+    pricePerJoule: 0.15
+  - type: Explosive
+    explosionType: Default
+    maxIntensity: 200
+    intensitySlope: 1.5
+  - type: Sprite
+    sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Battery/plasma.rsi
+  - type: Tag
+    tags:
+      - N14PlasmaCartridge
+  - type: SolutionContainerManager
+    solutions:
+      battery:
+        maxVol: 5
+  - type: InjectableSolution
+    solution: battery
+  - type: DrawableSolution
+    solution: battery
+  - type: Extractable
+    juiceSolution:
+      reagents:
+        - ReagentId: Zinc
+          Quantity: 5
+  - type: Appearance
+  - type: PowerCellVisuals
+  - type: Riggable
+  - type: ProjectileBatteryAmmoProvider
+    proto: BulletPlasma
+    fireCost: 50
+
+- type: entity
+  name: plasma cartridge
+  description: A small green glowing cartridge, commonly used has ammo for any kind of plasma weapon.
+  id: N14PlasmaCartridge
+  suffix: Full
+  parent: N14BasePlasmaCell
+  components:
+  - type: Sprite
+    sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Battery/plasma.rsi
+    layers:
+    - map: [ "enum.PowerCellVisualLayers.Base" ]
+      state: icon
+  - type: Battery
+    maxCharge: 500
+    startingCharge: 500

Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/12.7.yml

@@ -81,3 +81,47 @@
   components:
   - type: BallisticAmmoProvider
     proto: N14CartridgePistol12.7
+
+- type: entity
+  id: N14BaseTopMag12.7SubMachineGun
+  name: SMG top magazine (12.7mm)
+  parent: BaseItem
+  abstract: true
+  components:
+  - type: Tag
+    tags:
+      - N14MagazineSMG12mm
+  - type: BallisticAmmoProvider
+    mayTransfer: true
+    whitelist:
+      tags:
+        - N14CartridgePistol12.7
+    capacity: 40
+  - type: Item
+    size: 10
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+  - type: Sprite
+    netsync: false
+    sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/topmag.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: MagazineVisuals
+    magState: mag
+    steps: 5
+    zeroVisible: false
+  - type: Appearance
+
+- type: entity
+  id: N14TopMagazineSMG12mm
+  name: top mounted SMG magazine (12.7mm)
+  parent: N14BaseTopMag12.7SubMachineGun
+  components:
+  - type: BallisticAmmoProvider
+    proto: N14CartridgePistol12.7
+
+