NT-88 Peregrine Rework + Resprite

Content.Shared/PowerCell/SharedPowerCellSystem.cs

@@ -57,13 +57,13 @@ private void OnCellInsertAttempt(EntityUid uid, PowerCellSlotComponent component
         }
 
         // Special-case the NT-88 Peregrine magazine so it cannot be treated as a generic power cell.
-        var magazineRailgunTag = "MagazineRailgunTag";
-        if (_tag.HasTag(args.EntityUid, magazineRailgunTag) &&
-            (!_itemSlots.TryGetSlot(uid, component.CellSlotId, out var itemSlot) ||
-             !_whitelist.IsWhitelistPass(itemSlot.Whitelist, args.EntityUid)))
-        {
-            args.Cancel();
-        }
+//        var magazineRailgunTag = "MagazineRailgunTag";
+//        if (_tag.HasTag(args.EntityUid, magazineRailgunTag) &&
+//            (!_itemSlots.TryGetSlot(uid, component.CellSlotId, out var itemSlot) ||
+//             !_whitelist.IsWhitelistPass(itemSlot.Whitelist, args.EntityUid)))
+//        {
+//            args.Cancel();
+//        }
     }
 
     private void OnCellInserted(EntityUid uid, PowerCellSlotComponent component, EntInsertedIntoContainerMessage args)

Resources/Locale/en-US/_HL/recipes/misc.ftl

@@ -1,5 +1,5 @@
 # Random Hardlight additions that done need localizin'
-improvised-railgun-mag-desc = Making a railgun takes a research team five years and multiple doctorates. Making the ammunition for one, on the other hand, takes a minute or two.
+improvised-railgun-sabot-desc = A hastily constructed sabot for use with the NT-88 Peregrine that is little more than a rod encased in plasteel.
 construction-graph-component-gaslock-circuit-board = a portable gaslock circuit board
 storage-port-construction-desc = A gas storage port, holds gas canisters without leaking gas!
 improvised-scrap-ring-lv-desc = a ring made out of welded LV cable

Resources/Locale/en-US/_HL/store/SecurityVending.ftl

@@ -27,5 +27,5 @@ uplink-security-hardsuit-command-desc = A heavily armored Colsec suit. Space pro
 uplink-security-Weapons-BigL-name = Big Leady
 uplink-security-Weapons-BigL-desc = An old yet faithful design, and a favorite among irregular forces on many worlds.
 
-uplink-security-Weapons-railgun-name = NT-88 Peregrine
-uplink-security-Weapons-railgun-desc = From NanoTrasen Skunkworks, entrusted to ColComm for field testing.
+uplink-security-Weapons-railgun-name = NT-88 Marksman's Kit
+uplink-security-Weapons-railgun-desc = A marksman's kit for the NT-88 peregrine, designed by NanoTrasen and entrusted to ColComm for field testing. Contains the railgun, two magazines, and a box of spare ammo.

Resources/Prototypes/Entities/Structures/Power/chargers.yml

@@ -141,7 +141,6 @@
         whitelist:
           tags:
           - PowerCage
-          - MagazineRailgunTag
   - type: Machine
     board: PowerCageRechargerCircuitboard
   - type: StaticPrice

Resources/Prototypes/Research/arsenal.yml

@@ -226,7 +226,7 @@
   - 40mmGrenadeThermobaric
   - 40mmGrenadeEMP #Frontier
   - PowerCageHigh #frontier
-  - MagRailgun # HL
+  - MagazineRailgunPeregrine # HL
   #  - ShuttleGunSvalinnMachineGunCircuitboard # Frontier
   #  - ShuttleGunPerforatorCircuitboard # Frontier
   #  - ShuttleGunFriendshipCircuitboard # Frontier

Resources/Prototypes/_HL/Admeme/AdminCharacterBundles/cyn182_colcomm.yml

@@ -160,7 +160,7 @@
 - type: entity
   id: JetpackBlackLiquidNitrogen
   parent: JetpackBlack
-  name: Jetpack 
+  name: Jetpack
   suffix: CYN182, Admin
   categories: [ HideSpawnMenu ]
   components:
@@ -302,7 +302,7 @@
         - NFMagazineHiCaPistol35
         - NFMagazineSuMaGunPistol35
         - MagazineAMR
-        - MagazineRailgunTag
+        - MagazineRailgunPeregrine
         - Magazine75Bolt
         - MagazineRiotGun
         - MagazineEsar550Tag

Resources/Prototypes/_HL/Catalog/uplink_catalog.yml

@@ -45,10 +45,10 @@
   id: UplinkSecurityRailgun
   name:  uplink-security-Weapons-railgun-name
   description: uplink-security-Weapons-railgun-desc
-  productEntity: WeaponRailgunPeregrine
+  productEntity: WeaponCaseLongRailgunPeregrine
   icon: { sprite: _HL/Objects/Weapons/Guns/Rifles/peregrine.rsi, state: icon }
   cost:
-    FrontierUplinkCoin: 10
+    FrontierUplinkCoin: 15
   categories:
     - UplinkSecurityWeapons
   conditions:
@@ -69,7 +69,7 @@
     Telecrystal: 8
   categories:
     - UplinkWeaponry
-    
+
 - type: listing
   id: UplinkSyndieOmniHandRight
   name: uplink-syndie-omnihand-right-name
@@ -82,7 +82,7 @@
     Telecrystal: 6
   categories:
   - UplinkCybernetics
-  
+
 - type: listing
   id: UplinkSyndieOmniHandLeft
   name: uplink-syndie-omnihand-left-name

Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Boxes/railgun.yml

@@ -0,0 +1,45 @@
+- type: entity
+  abstract: true
+  parent: [BaseItem, RecyclableItemCardboard]
+  id: BaseAmmoBox15mmSabot
+  components:
+  - type: BallisticAmmoProvider
+    mayTransfer: true
+    whitelist:
+      tags:
+        - Cartridge15mmSabot
+    proto: Cartridge15mmSabot
+    capacity: 15
+  - type: Item
+    size: Normal
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+  - type: Sprite
+    sprite: _HL/Objects/Weapons/Guns/Ammunition/Boxes/15mm_sabot.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: MagazineVisuals
+    magState: mag
+    steps: 4
+    zeroVisible: false
+  - type: Appearance
+
+- type: entity
+  parent: BaseAmmoBox15mmSabot
+  id: AmmoBox15mmSabot
+  name: ammunition box (15mm Sabot)
+  components:
+  - type: BallisticAmmoProvider
+    capacity: 15
+    proto: Cartridge15mmSabot
+  - type: Sprite
+    sprite: _HL/Objects/Weapons/Guns/Ammunition/Boxes/15mm_sabot.rsi
+  - type: MagazineVisuals
+    magState: mag
+    steps: 4
+    zeroVisible: false
+  - type: Appearance

Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/railgun.yml

@@ -0,0 +1,45 @@
+- type: entity
+  id: BaseCartridge15mmSabot
+  name: sabot (15mm)
+  parent: [BaseCartridge, BaseC3ContrabandNoValue]
+  abstract: true
+  components:
+  - type: Tag
+    tags:
+      - Cartridge
+      - Cartridge15mmSabot
+  - type: CartridgeAmmo
+    proto: Bullet15mmSabot
+    muzzleFlash: MuzzleFlashEffectEnergyStun
+    deleteOnSpawn: true
+  - type: Sprite
+    sprite: _HL/Objects/Weapons/Guns/Ammunition/Casings/15mm_casing.rsi
+    layers:
+    - state: base
+      map: ["enum.AmmoVisualLayers.Base"]
+  - type: StaticPrice
+    price: 20
+
+- type: entity
+  id: Cartridge15mmSabot
+  name: sabot (15mm)
+  parent: BaseCartridge15mmSabot
+  components:
+  - type: CartridgeAmmo
+    proto: Bullet15mmSabot
+
+- type: entity
+  id: Cartridge15mmSabotImprovised
+  name: improvised sabot (15mm)
+  parent: BaseCartridge15mmSabot
+  components:
+  - type: CartridgeAmmo
+    proto: Bullet15mmSabotImprovised
+  - type: Sprite
+    sprite: _HL/Objects/Weapons/Guns/Ammunition/Casings/15mm_casing.rsi
+    layers:
+    - state: improvised
+      map: ["enum.AmmoVisualLayers.Base"]
+  - type: Construction
+    graph: SabotRailgunImprovisedCraftingGraph
+    node: sabot

Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Magazines/Railgun/railgun.yml

@@ -1,36 +1,90 @@
-# Empty mags
 - type: entity
-  parent: BasePowerCell
-  id: MagazineRailgun
-  name: Peregrine Magazine
-  description: A magazine built to fuel the NT-88 Peregrine. The warranty is still in effect.
+  parent: [BaseItem, BaseC3ContrabandNoValue, RecyclableItemSteelTiny]
+  id: MagazineRailgunPeregrine
+  name: peregrine magazine (15mm sabot)
+  description: A magazine specially designed for the NT-88 Peregrine. Uses 15mm sabot ammo.
   components:
   - type: Tag
     tags:
-      - MagazineRailgunTag
+      - MagazineRailgunPeregrine
   - type: Item
     size: Small
-  - type: Battery
-    maxCharge: 5000 # DV did this I'm doing too monke see monke do
-    startingCharge: 5000
+  - type: BallisticAmmoProvider
+    mayTransfer: true
+    whitelist:
+      tags:
+        - Cartridge15mmSabot
+    proto: Cartridge15mmSabot
+    capacity: 5
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
   - type: Sprite
-    sprite: _HL/Objects/Weapons/Guns/Ammunition/Magazine/Railgun/railgun_mag.rsi
+    sprite: _HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi
     layers:
-    - map: ["enum.GunVisualLayers.Base"]
-      state: base
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: mag-unshaded-1
+      map: ["enum.GunVisualLayers.MagUnshaded"]
+      shader: unshaded
+  - type: MagazineVisuals
+    magState: mag
+    steps: 6
+    zeroVisible: false
+  - type: Appearance
 
 - type: entity
-  parent: MagazineRailgun
-  id: MagazineRailgunImprovised
-  name: Improvised Peregrine Magazine
-  description: A magazine cobbled together from found materials. Putting this in your NT-88 Peregrine will void the warranty, but chances are, you're not in a situation to care.
+  parent: [MagazineRailgunPeregrine]
+  id: MagazineRailgunPeregrineEmpty
+  name: peregrine magazine (15mm Sabot)
+  suffix: empty
+  components:
+  - type: BallisticAmmoProvider
+    proto: null
+
+- type: entity
+  parent: MagazineRailgunPeregrine
+  id: MagazineRailgunPeregrineImprovised
+  name: improvised peregrine magazine (15mm Sabot)
+  description: An improvized magazine meant to be used with the NT-88 Peregrine. Uses 15mm sabot ammo.
   components:
   - type: Tag
     tags:
-      - MagazineRailgunTag
+      - MagazineRailgunPeregrine
+  - type: BallisticAmmoProvider
+    mayTransfer: true
+    whitelist:
+      tags:
+        - Cartridge15mmSabot
+    proto: Cartridge15mmSabot
+    capacity: 3
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+  - type: Sprite
+    sprite: _HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag_improvised.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: MagazineVisuals
+    magState: mag
+    steps: 4
+    zeroVisible: false
+  - type: Appearance
+
+- type: entity
+  parent: MagazineRailgunPeregrineImprovised
+  id: MagazineRailgunPeregrineImprovisedEmpty
+  name: improvised peregrine magazine (15mm sabot)
+  suffix: empty
+  components:
   - type: Construction
     graph: MagazineRailgunImprovisedCraftingGraph
     node: mag
-  - type: Battery
-    maxCharge: 2500 # way more than a highcap but we'll cross that bridge
-    startingCharge: 2500
+  - type: BallisticAmmoProvider
+    mayTransfer: true
+    proto: null

Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/railgun.yml

@@ -0,0 +1,41 @@
+- type: entity
+  categories: [ HideSpawnMenu ]
+  parent: BaseBullet
+  id: Bullet15mmSabot
+  name: bullet (15mm Sabot)
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Piercing: 65
+        Structural: 50
+    penetrationThreshold: 300
+    penetrationDamageTypeRequirement:
+      - Structural
+  - type: Sprite
+    noRot: false
+    sprite: _HL/Objects/Weapons/Guns/Projectiles/railgunprojectiles.rsi
+    layers:
+    - state: dart
+      shader: unshaded
+
+- type: entity
+  categories: [ HideSpawnMenu ]
+  parent: BaseBullet
+  id: Bullet15mmSabotImprovised
+  name: bullet (15mm Sabot)
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Piercing: 45
+        Structural: 50
+    penetrationThreshold: 300
+    penetrationDamageTypeRequirement:
+      - Structural
+  - type: Sprite
+    noRot: false
+    sprite: _HL/Objects/Weapons/Guns/Projectiles/railgunprojectiles.rsi
+    layers:
+    - state: dart
+      shader: unshaded