Two New .25 Caseless Guns

Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs

@@ -19,7 +19,17 @@ private void OnExamine(EntityUid uid, GunComponent component, ExaminedEvent args
             args.PushMarkup(Loc.GetString("gun-selected-mode-examine", ("color", ModeExamineColor),
                 ("mode", GetLocSelector(component.SelectedMode))));
             args.PushMarkup(Loc.GetString("gun-fire-rate-examine", ("color", FireRateExamineColor),
-                ("fireRate", $"{component.FireRateModified:0.0}")));
+                ("fireRate", $"{(int) (component.FireRate * 60)}")));
+
+            if (!component.AvailableModes.HasFlag(SelectiveFire.Burst))
+                return;
+
+            if (component.FireRate != component.BurstFireRate)
+                args.PushMarkup(Loc.GetString("gun-burst-fire-rate-examine", ("color", FireRateExamineColor),
+                    ("fireRate", $"{(int) (component.BurstFireRate * 60)}")));
+
+            args.PushMarkup(Loc.GetString("gun-burst-fire-burst-count", ("color", FireRateExamineColor),
+                ("burstcount", $"{component.ShotsPerBurst}")));
         }
     }
 

Resources/Audio/_EE/Weapons/Guns/Gunshots/attributions.yml

@@ -0,0 +1,4 @@
+- files: ["fpa-90-suppressed-gunshot"]
+  license: "CC-BY-4.0"
+  copyright: "Taken from https://freesound.org/people/Astronaut77890/sounds/714332/ and modified by VMSolidus"
+  source: "https://freesound.org/people/Astronaut77890/sounds/714332/"

Resources/Locale/en-US/store/uplink-catalog.ftl

@@ -85,12 +85,33 @@ uplink-shrapnel-grenade-desc = Launches a spray of sharp fragments dealing great
 uplink-pistol-magazine-name = Pistol Magazine (.35 auto)
 uplink-pistol-magazine-desc = Pistol magazine with 10 catridges. Compatible with the Viper.
 
+uplink-pistol-magazine-rubber-name = Pistol Magazine (.35 auto, rubber)
+uplink-pistol-magazine-rubber-desc = Pistol magazine with 10 cartridges. For when you need to take someone alive.
+
+uplink-pistol-magazine-incendiary-name = Pistol Magazine (.35 auto, incendiary)
+uplink-pistol-magazine-incendiary-desc = A premium magazine for putting burning holes in both your wallet, and your victims.
+
 uplink-pistol-magazine-c20r-name = SMG magazine (.35 auto)
 uplink-pistol-magazine-c20r-desc = Rifle magazine with 30 catridges. Compatible with C-20r.
 
+uplink-pistol-magazine-c20r-rubber-name = SMG magazine (.35 auto, rubber)
+uplink-pistol-magazine-c20r-rubber-desc = Rifle magazine with 30 catridges. For when you need to take many hostages.
+
+uplink-pistol-magazine-c20r-incendiary-name = SMG magazine (.35 auto, incendiary)
+uplink-pistol-magazine-c20r-incendiary-desc = WAKE THE FUCK UP SAMURAI, WE GOT A STATION TO BURN!
+
 uplink-pistol-magazine-caseless-name = Pistol Magazine (.25 caseless)
 uplink-pistol-magazine-caseless-desc = Pistol magazine with 10 catridges. Compatible with the Cobra.
 
+uplink-pistol-magazine-caseless-rubber-name = Pistol Magazine (.25 caseless, rubber)
+uplink-pistol-magazine-caseless-rubber-desc = Pistol magazine with 10 catridges. For when you need to (quietly) take someone alive.
+
+uplink-magazine-caseless-name = SMG magazine (.25 caseless)
+uplink-magazine-caseless-desc = Rifle magazine with 30 cartridges. Compatible with the FPA-90.
+
+uplink-magazine-caseless-rubber-name = SMG magazine (.25 caseless, rubber)
+uplink-magazine-caseless-rubber-desc = Rifle magazine with 30 cartridges. For when you need to (quietly) take many hostages.
+
 uplink-speedloader-magnum-name = Speedloader (.45 magnum AP)
 uplink-speedloader-magnu-desc = Revolver speedloader with 6 armor-piercing catridges, capable of ignoring armor entirely. Compatible with the Python.
 
@@ -116,7 +137,7 @@ uplink-chest-rig-name = Chest Rig
 uplink-chest-rig-desc = Explosion-resistant tactical webbing used for holding traitor goods.
 
 # DeltaV - Correct Emag name, Emag no longer breaks doors
-uplink-emag-name = Cryptographic Sequencer 
+uplink-emag-name = Cryptographic Sequencer
 uplink-emag-desc = The business card of the Syndicate, this sequencer is able to tamper with a variety of station devices. Rendered obsolete against airlocks.
 
 uplink-agent-id-card-name = Agent ID Card
@@ -244,6 +265,9 @@ uplink-surplus-bundle-desc = Contains 50 telecrystals worth of completely random
 uplink-super-surplus-bundle-name = Super Surplus Crate
 uplink-super-surplus-bundle-desc = Contains 125 telecrystals worth of completely random Syndicate items.
 
+uplink-fpa-90-bundle-name = FPA-90 Bundle
+uplink-fpa-90-bundle-desc = A cheap integrally suppressed SMG. Comes bundled with three .25 caseless magazines.
+
 # Tools
 uplink-toolbox-name = Toolbox
 uplink-toolbox-desc = A full compliment of tools for the mechanically inclined traitor. Includes a pair of insulated combat gloves, syndicate gas mask and a utility belt.
@@ -321,8 +345,14 @@ uplink-eva-syndie-desc = A simple EVA suit that offers no protection other than
 uplink-hardsuit-carp-name = Carp Hardsuit
 uplink-hardsuit-carp-desc = Looks like an ordinary carp suit, except fully spaceproof and tricks space carp into thinking you are one of them.
 
-uplink-hardsuit-syndie-name = Syndicate Hardsuit
-uplink-hardsuit-syndie-desc = The Syndicate's well known armored blood red hardsuit, capable of space walks and bullet resistant.
+uplink-hardsuit-syndie-name = Blood-red Tacsuit
+uplink-hardsuit-syndie-desc = The calling card of pirates, outlaws, mercenaries, and deserters. The "Blood Red" Shanlin Tacsuit is an iconic piece of equipment employed by the Syndicate.
+
+uplink-hardsuit-syndie-medic-name = Blood-red Medic Tacsuit
+uplink-hardsuit-syndie-medic-desc = A variant of the "Blood-red" tacsuit that includes medical markings.
+
+uplink-hardsuit-syndie-commander-name = Blood-red "Commander" Tacsuit
+uplink-hardsuit-syndie-commander-desc = An up-armored variant of the iconic "Blood-red" tacsuit.
 
 uplink-hardsuit-syndieelite-name = Syndicate Elite Hardsuit
 uplink-hardsuit-syndieelite-desc = An elite version of the blood-red hardsuit, with improved mobility and fireproofing. Property of Gorlex Marauders.

Resources/Locale/en-US/weapons/extenddescriptions/descriptions.ftl

@@ -1 +1,2 @@
 gun-legality-salvage = This weapon is licensed for use in planetary expeditions. It is unlawful to brandish this weapon aboard NanoTrasen stations, and may be confiscated by Security if removed from the station's Salvage Department.
+gun-suppressed = This weapon comes with a built-in suppressor. It will be impossible to hear at a distance.

Resources/Locale/en-US/weapons/ranged/gun.ftl

@@ -1,6 +1,8 @@
 
 gun-selected-mode-examine = Current selected fire mode is [color={$color}]{$mode}[/color].
-gun-fire-rate-examine = Fire rate is [color={$color}]{$fireRate}[/color] per second.
+gun-fire-rate-examine = Fire rate is [color={$color}]{$fireRate}[/color] rounds per minute.
+gun-burst-fire-rate-examine = Burst fire rate is [color={$color}]{$fireRate}[/color] rounds per minute.
+gun-burst-fire-burst-count = It can be set to fire in [color={$color}]{$burstcount}[/color] round bursts.
 gun-selector-verb = Change to {$mode}
 gun-selected-mode = Selected {$mode}
 gun-disabled = You can't use guns!

Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml

@@ -429,3 +429,15 @@
         amount: 2
       - id: SyndieTrickyBomb
         amount: 2
+
+- type: entity
+  parent: ClothingBackpackDuffelSyndicateBundle
+  id: ClothingBackpackDuffelSyndicateFilledFPA90
+  name: FPA-90 bundle
+  description: "A cheap integrally suppressed SMG. Comes bundled with three magazines."
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponSubMachineGunFPA90
+      - id: MagazineCaselessRifle
+        amount: 2

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -215,6 +215,20 @@
   categories:
   - UplinkWeaponry
 
+- type: listing
+  id: UplinkFPA90Bundle
+  name: uplink-fpa-90-bundle-name
+  description: uplink-fpa-90-bundle-desc
+  icon: { sprite: /Textures/_EE/Objects/Weapons/Guns/SMGs/FPA90.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateFilledFPA90
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 40
+  cost:
+    Telecrystal: 80
+  categories:
+  - UplinkWeaponry
+
 # Explosives
 
 - type: listing
@@ -478,7 +492,7 @@
   id: UplinkPistol9mmMagazineRubber
   name: uplink-pistol-magazine-rubber-name
   description: uplink-pistol-magazine-rubber-desc
-  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi, state: red-icon }
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi, state: rubber }
   productEntity: MagazinePistolRubber
   cost:
     Telecrystal: 5
@@ -489,7 +503,7 @@
   id: UplinkPistol9mmMagazineIncendiary
   name: uplink-pistol-magazine-incendiary-name
   description: uplink-pistol-magazine-incendiary-desc
-  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi, state: red-icon }
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi, state: practice }
   productEntity: MagazinePistolIncendiary
   cost:
     Telecrystal: 8
@@ -512,7 +526,7 @@
   id: UplinkMagazinePistolSubMachineGunRubber
   name: uplink-pistol-magazine-c20r-rubber-name
   description: uplink-pistol-magazine-c20r-rubber-desc
-  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi, state: red-icon }
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi, state: rubber }
   productEntity: MagazinePistolSubMachineGunRubber
   cost:
     Telecrystal: 10
@@ -523,14 +537,14 @@
   id: UplinkMagazinePistolSubMachineGunIncendiary
   name: uplink-pistol-magazine-c20r-incendiary-name
   description: uplink-pistol-magazine-c20r-incendiary-desc
-  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi, state: red-icon }
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi, state: practice }
   productEntity: MagazinePistolSubMachineGunIncendiary
   cost:
     Telecrystal: 14
   categories:
   - UplinkAmmo
 
-# For the Cobra
+# .25 Caseless Rifle, for the Cobra and FPA-90
 - type: listing
   id: UplinkMagazinePistolCaselessRifle
   name: uplink-pistol-magazine-caseless-name
@@ -542,6 +556,39 @@
   categories:
   - UplinkAmmo
 
+- type: listing
+  id: UplinkMagazinePistolCaselessRifleRubber
+  name: uplink-pistol-magazine-caseless-rubber-name
+  description: uplink-pistol-magazine-caseless-rubber-desc
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi, state: rubber }
+  productEntity: MagazinePistolCaselessRifleRubber
+  cost:
+    Telecrystal: 5
+  categories:
+  - UplinkAmmo
+
+- type: listing
+  id: UplinkMagazineCaselessRifle
+  name: uplink-magazine-caseless-name
+  description: uplink-magazine-caseless-desc
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi, state: red }
+  productEntity: MagazineCaselessRifle
+  cost:
+    Telecrystal: 10
+  categories:
+  - UplinkAmmo
+
+- type: listing
+  id: UplinkMagazineCaselessRifleRubber
+  name: uplink-magazine-caseless-rubber-name
+  description: uplink-magazine-caseless-rubber-desc
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi, state: rubber }
+  productEntity: MagazineCaselessRifleRubber
+  cost:
+    Telecrystal: 10
+  categories:
+  - UplinkAmmo
+
 # For the Python
 - type: listing
   id: UplinkSpeedLoaderMagnumAP

Resources/Prototypes/CharacterItemGroups/Jobs/Security/headOfSecurity.yml

@@ -37,6 +37,8 @@
       id: LoadoutCommandHoSEnergySword
     - type: loadout
       id: LoadoutCommandHoSEnergyGun
+    - type: loadout
+      id: LoadoutCommandHoSBRDIR25
 
 #- type: characterItemGroup
 #  id: LoadoutHeadOfSecurityEyes

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -241,8 +241,22 @@
     - RiotShield
     - SpeedLoaderMagnum
     - SpeedLoaderMagnumEmpty
-    - MagazinePistolCaselessRifle # Goobstation
-    - MagazineBoxCaselessRifle # Goobstation
+    # .35 Caseless Pistol
+    - MagazinePistolCaselessRiflePractice # EE
+    - MagazinePistolCaselessRifle # EE
+    - MagazinePistolCaselessRifleRubber # EE
+    # .35 Caseless (Civilian) Rifle
+    - MagazineCaselessRifleShortPractice # EE
+    - MagazineCaselessRifleShort # EE
+    - MagazineCaselessRifleShortRubber # EE
+    # .35 Caseless (Military) Rifle
+    - MagazineCaselessRiflePractice # EE
+    - MagazineCaselessRifle # EE
+    - MagazineCaselessRifleRubber # EE
+    # .35 Caseless (Box Mag) Rifle
+    - MagazineBoxCaselessRiflePractice # EE
+    - MagazineBoxCaselessRifle # EE
+    - MagazineBoxCaselessRifleRubber # EE
     - MagazineMagnumEmpty # Goobstation
     - MagazineMagnum # Goobstation
     - MagazineMagnumLeverRifleEmpty # Goobstation
@@ -904,6 +918,22 @@
       - MagazinePistolSubMachineGunEmpty
       - MagazinePistolSubMachineGunTopMounted
       - MagazinePistolSubMachineGunTopMountedEmpty
+      # .35 Caseless Pistol
+      - MagazinePistolCaselessRiflePractice # EE
+      - MagazinePistolCaselessRifle # EE
+      - MagazinePistolCaselessRifleRubber # EE
+      # .35 Caseless (Civilian) Rifle
+      - MagazineCaselessRifleShortPractice # EE
+      - MagazineCaselessRifleShort # EE
+      - MagazineCaselessRifleShortRubber # EE
+      # .35 Caseless (Military) Rifle
+      - MagazineCaselessRiflePractice # EE
+      - MagazineCaselessRifle # EE
+      - MagazineCaselessRifleRubber # EE
+      # .35 Caseless (Box Mag) Rifle
+      - MagazineBoxCaselessRiflePractice # EE
+      - MagazineBoxCaselessRifle # EE
+      - MagazineBoxCaselessRifleRubber # EE
       - MagazineMagnum
       - MagazineMagnumEmpty
       - MagazineRifle
@@ -1068,6 +1098,8 @@
       - EnergySword
       - EnergySwordDouble
       - EnergyCutlass
+      - WeaponSubMachineGunFPA90
+      - WeaponSubMachineGunBRDIR25
   - type: MaterialStorage
     whitelist:
       tags:
@@ -1129,6 +1161,22 @@
         - SpeedLoaderRifleHeavyEmpty
         - CartridgeSpecial
         - MagazineBoxSpecial
+        # .35 Caseless Pistol
+        - MagazinePistolCaselessRiflePractice # EE
+        - MagazinePistolCaselessRifle # EE
+        - MagazinePistolCaselessRifleRubber # EE
+        # .35 Caseless (Civilian) Rifle
+        - MagazineCaselessRifleShortPractice # EE
+        - MagazineCaselessRifleShort # EE
+        - MagazineCaselessRifleShortRubber # EE
+        # .35 Caseless (Military) Rifle
+        - MagazineCaselessRiflePractice # EE
+        - MagazineCaselessRifle # EE
+        - MagazineCaselessRifleRubber # EE
+        # .35 Caseless (Box Mag) Rifle
+        - MagazineBoxCaselessRiflePractice # EE
+        - MagazineBoxCaselessRifle # EE
+        - MagazineBoxCaselessRifleRubber # EE
     - type: MaterialStorage
       whitelist:
         tags:

Resources/Prototypes/Loadouts/Jobs/Security/headOfSecurity.yml

@@ -118,6 +118,22 @@
   items:
     - WeaponEnergyGunMultiphase
 
+- type: loadout
+  id: LoadoutCommandHoSBRDIR25
+  category: JobsSecurityHeadOfSecurity
+  cost: 0
+  canBeHeirloom: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutHeadOfSecurityWeapon
+    - !type:CharacterJobRequirement
+      jobs:
+        - HeadOfSecurity
+    - !type:CharacterAgeRequirement
+      min: 21
+  items:
+    - WeaponSubMachineGunBRDIR25HoS
+
 # Eyes
 
 # Gloves
@@ -406,4 +422,4 @@
       jobs:
         - HeadOfSecurity
   items:
-    - CigarRobustCase
+    - CigarRobustCase