Balance Part 2 the Impining

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

@@ -6,62 +6,62 @@
   license: "CC0-1.0"
   copyright: "Made by Carlfnf on Freesound"
   source: "https://freesound.org/s/690099/"
-  
+
 - files: ["autodisabler"]
   license: "CC-BY-3.0"
   copyright: "Made by flyingsaucerinvasion on Freesound and edited by DVD Player"
   source: "https://freesound.org/people/flyingsaucerinvasion/sounds/615811/"
-  
+
 - files: ["blastercannon"]
   license: "CC-BY-SA-3.0"
   copyright: "Made by Q009 on opengameart and edited by DVD Player"
   source: "https://opengameart.org/content/q009s-weapon-sounds"
-  
+
 - files: ["blasterpist"]
   license: "CC0-1.0"
   copyright: "Made by SuperPhat on freesound and edited by DVD Player"
   source: "https://freesound.org/people/SuperPhat/sounds/531861/"
-  
+
 - files: ["blasterrunner"]
   license: "CC-BY-4.0"
   copyright: "Made by jerry.berumen on freesound"
   source: "https://freesound.org/people/jerry.berumen/sounds/584366/"
-  
+
 - files: ["blasterweak"]
   license: "CC-BY-4.0"
   copyright: "Made by Universfield on Freesound"
   source: "https://freesound.org/people/Universfield/sounds/750234/"
- 
+
 - files: ["daito"]
   license: "CC0-1.0"
   copyright: "Made by SuperPhat on Freesound"
   source: "https://freesound.org/people/SuperPhat/sounds/404561/"
-  
+
 - files: ["eshotgun"]
   license: "CC-BY-SA-3.0"
   copyright: "Made by Q009 on opengameart and edited by DVD Player"
   source: "https://opengameart.org/content/q009s-weapon-sounds"
- 
+
 - files: ["goldlaser"]
   license: "CC0-1.0"
   copyright: "Made by JakeAMT on Freesound"
   source: "https://freesound.org/people/JakeAMT/sounds/681960/"
-  
+
 - files: ["lasermil"]
   license: "CC-BY-4.0"
   copyright: "Made by 211redman112 on freesound and edited by DVD Player"
   source: "https://freesound.org/people/211redman112/sounds/234083/"
-  
+
 - files: ["light-pistol"]
   license: "CC-BY-SA-3.0"
   copyright: "Made by Michael Klier on opengameart"
   source: "https://opengameart.org/content/futuristic-weapons-assault-rifle"
-  
+
 - files: ["light-pistol2"]
   license: "CC-BY-SA-3.0"
   copyright: "Made by Q009 on opengameart"
   source: "https://opengameart.org/content/q009s-weapon-sounds"
-  
+
 - files: ["nemesis"]
   license: "CC-BY-4.0"
   copyright: "Made by keybal on Freesound and edited by DVD Player"
@@ -76,7 +76,7 @@
   license: "CC-BY-4.0"
   copyright: "Made by Lubini on Freesound"
   source: "https://freesound.org/people/Lubini/sounds/338045/"
-  
+
 - files: ["pistolsturm"]
   license: "CC-BY-4.0"
   copyright: "Made by KuraiWolf on opengameart"

Resources/Locale/en-US/_Impstation/research/technologies.ftl

@@ -0,0 +1,2 @@
+research-technology-advanced-sidearms = Advanced Sidearms
+research-technology-advanced-munitions = Advanced Munitions

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

@@ -0,0 +1,8 @@
+uplink-zipper-ap-name = Zipper .22
+uplink-zipper-ap-desc = A regretful purchase from a liquidation sale. Comes loaded with armor-piercing rounds. Uses .22 Auto.
+
+uplink-nemesis-br-name = Nemesis-11 Bundle
+uplink-nemesis-br-desc = Precise and Deadly: the stylish Nemesis-11 Battle Rifle, bundled with 3 magazines.
+
+uplink-rifle-magazine-nemesis-name = Rifle Magazine (.25 Caseless)
+uplink-rifle-magazine-nemesis-desc = Rifle magazine with 24 cartridges. Compatible with the Nemesis-11.

Resources/Locale/en-US/research/technologies.ftl

@@ -55,8 +55,8 @@ research-technology-excavation = Mass Excavation
 research-technology-atmospherics-exotech = Atmospherics Exotech
 
 research-technology-basic-weapons = Basic Weapons
-research-technology-draconic-munitions = Draconic Munitions
-research-technology-uranium-munitions = Uranium Munitions
+# research-technology-draconic-munitions = Draconic Munitions
+# research-technology-uranium-munitions = Uranium Munitions
 research-technology-explosive-technology = Explosive Technology
 research-technology-practice-ammunition = Practice Ammunition
 research-technology-shrapnel-munitions = Shrapnel Munitions

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

@@ -134,6 +134,18 @@
       - id: WeaponSubMachineGunC20rEmpty
 #     - id: SMGSuppressor
 
+- type: entity
+  parent: ClothingBackpackDuffelSyndicateBundle
+  id: ClothingBackpackDuffelSyndicateFilledBR
+  name: Nemesis-11 bundle
+  description: "Precise and deadly, just as a professional should be. Bundled with three magazines."
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponRifleNemesis
+      - id: MagazineBR
+        amount: 2
+
 - type: entity
   parent: ClothingBackpackDuffelSyndicateBundle
   id: ClothingBackpackDuffelSyndicateFilledRevolver
@@ -205,6 +217,8 @@
         amount: 4
       - id: MagazineLightRifleBox
         amount: 2
+      - id: MagazineBR
+        amount: 2
       - id: MagazineHighCaliber # Goobstation - Burner Heavy Assault Rifle
         amount: 1
       - id: MagazineHighCaliberExplosive # Goobstation - Burner Heavy Assault Rifle

Resources/Prototypes/Catalog/Fills/Lockers/security.yml

@@ -315,14 +315,17 @@
 - type: entity
   parent: GunSafe
   id: GunSafeRifleLecter
-  name: lecter safe
+  name: rifle safe
   components:
   - type: StorageFill
     contents:
     - id: WeaponRifleLecter
       amount: 2
     - id: MagazineRifle
       amount: 4
+    - id: WeaponRifleDaito
+    - id: MagazineDMR
+      amount: 2
 
 - type: entity
   parent: GunSafe

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -265,7 +265,7 @@
   id: UplinkSniperBundle
   name: uplink-sniper-bundle-name
   description: uplink-sniper-bundle-desc
-  icon: { sprite: /Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi, state: base }
+  icon: { sprite: Objects/Weapons/Guns/Snipers/heavy_sniper.rsi, state: base } #imp
   productEntity: BriefcaseSyndieSniperBundleFilled
   discountCategory: usualDiscounts
   discountDownTo:
@@ -279,7 +279,7 @@
   id: UplinkC20RBundle
   name: uplink-c20r-bundle-name
   description: uplink-c20r-bundle-desc
-  icon: { sprite: /Textures/Objects/Weapons/Guns/SMGs/c20r.rsi, state: icon }
+  icon: { sprite: Objects/Weapons/Guns/SMGs/c20r.rsi, state: icon } #imp
   productEntity: ClothingBackpackDuffelSyndicateFilledSMG
   discountCategory: veryRareDiscounts
   discountDownTo:
@@ -293,7 +293,7 @@
   id: UplinkBulldogBundle
   name: uplink-buldog-bundle-name
   description: uplink-buldog-bundle-desc
-  icon: { sprite: /Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi, state: icon }
+  icon: { sprite: Objects/Weapons/Guns/Shotguns/bulldog.rsi, state: icon } #imp
   productEntity: ClothingBackpackDuffelSyndicateFilledShotgun
   discountCategory: veryRareDiscounts
   discountDownTo:
@@ -307,7 +307,7 @@
   id: UplinkGrenadeLauncherBundle
   name: uplink-grenade-launcher-bundle-name
   description: uplink-grenade-launcher-bundle-desc
-  icon: { sprite: /Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi, state: icon }
+  icon: { sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi, state: icon } #imp
   productEntity: ClothingBackpackDuffelSyndicateFilledGrenadeLauncher
   discountCategory: veryRareDiscounts
   discountDownTo:
@@ -321,7 +321,7 @@
   id: UplinkL6SawBundle
   name: uplink-l6-saw-bundle-name
   description: uplink-l6-saw-bundle-desc
-  icon: { sprite: /Textures/Objects/Weapons/Guns/LMGs/l6.rsi, state: icon }
+  icon: { sprite: Objects/Weapons/Guns/LMGs/l6.rsi, state: icon } #imp
   productEntity: ClothingBackpackDuffelSyndicateFilledLMG
   discountCategory: veryRareDiscounts
   discountDownTo:
@@ -597,7 +597,7 @@
   id: UplinkPistol9mmMagazine
   name: uplink-pistol-magazine-name
   description: uplink-pistol-magazine-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: red-icon } #imp
   productEntity: MagazinePistol
   cost:
     Telecrystal: 5
@@ -642,7 +642,7 @@
   id: UplinkMagazinePistolSubMachineGun
   name: uplink-pistol-magazine-c20r-name
   description: uplink-pistol-magazine-c20r-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: red-icon } #imp
   productEntity: MagazinePistolSubMachineGun
   cost:
     Telecrystal: 10
@@ -687,7 +687,7 @@
   id: UplinkMagazinePistolCaselessRifle
   name: uplink-pistol-magazine-caseless-name
   description: uplink-pistol-magazine-caseless-desc
-  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi, state: red-icon }
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi, state: red-icon } #imp
   productEntity: MagazinePistolCaselessRifle
   cost:
     Telecrystal: 5
@@ -776,7 +776,7 @@
   id: UplinkSpeedLoaderMagnumAP
   name: uplink-speedloader-magnum-name
   description: uplink-speedloader-magnu-desc
-  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi, state: icon }
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi, state: icon } #imp
   productEntity: SpeedLoaderMagnumAP
   cost:
     Telecrystal: 15
@@ -788,7 +788,7 @@
   id: UplinkMosinAmmo
   name: uplink-mosin-ammo-name
   description: uplink-mosin-ammo-desc
-  productEntity: MagazineBoxLightRifle
+  productEntity: MagazineBoxRifle
   cost:
     Telecrystal: 5
   categories:

Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml

@@ -532,6 +532,8 @@
         id: WeaponFlareGun
       - !type:EntSelector
         id: BarberScissors
+      - !type:EntSelector
+        id: MagazineZipper
       - !type:GroupSelector
         children:
         - !type:EntSelector
@@ -622,6 +624,8 @@
         id: ClothingMaskGasSecurity
       - !type:EntSelector
         id: ShardGlass
+      - !type:EntSelector
+        id: WeaponPistolZipper
         weight: 2
       - !type:EntSelector
         id: Syringe

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml

@@ -29,7 +29,7 @@
       tags:
         - CartridgeLightRifle
     proto: CartridgeLightRifle
-    capacity: 30
+    capacity: 23
   - type: Item
     size: Small
   - type: ContainerContainer
@@ -51,14 +51,17 @@
 # Magazines
 - type: entity
   id: MagazineLightRifleBox
-  name: "belt box (.30 rifle)"
+  name: "L6 SAW magazine box (.20 rifle)"
   parent: BaseMagazineLightRifle
   components:
   - type: Tag
     tags:
       - MagazineLightRifleBox
   - type: BallisticAmmoProvider
-    proto: CartridgeLightRifle
+    whitelist:
+      tags:
+        - CartridgeRifle
+    proto: CartridgeRifle
     capacity: 100
   - type: Item
   - type: Sprite

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml

@@ -22,7 +22,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 17
+        Piercing: 21
 
 - type: entity
   id: BulletCaselessRiflePractice

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml

@@ -21,18 +21,18 @@
 
 - type: entity
   id: BulletLightRifle
-  name: bullet (.20 rifle)
+  name: bullet (.30 rifle)
   parent: BaseBullet
   categories: [ HideSpawnMenu ]
   components:
   - type: Projectile
     damage:
       types:
-        Piercing: 17
+        Piercing: 25
 
 - type: entity
   id: BulletLightRiflePractice
-  name: bullet (.20 rifle practice)
+  name: bullet (.30 rifle practice)
   parent: BaseBulletPractice
   categories: [ HideSpawnMenu ]
   components:
@@ -55,46 +55,23 @@
 - type: entity
   id: BulletLightRifleIncendiary
   parent: BaseBulletIncendiary
-  name: bullet (.20 rifle incendiary)
+  name: bullet (.30 rifle incendiary)
   categories: [ HideSpawnMenu ]
   components:
   - type: Projectile
     damage:
       types:
-        Blunt: 3
-        Heat: 14
+        Blunt: 6
+        Heat: 19
 
 - type: entity
   id: BulletLightRifleUranium
   parent: BaseBulletUranium
-  name: bullet (.20 rifle uranium)
+  name: bullet (.30 rifle uranium)
   categories: [ HideSpawnMenu ]
   components:
   - type: Projectile
     damage:
       types:
-        Radiation: 8
-        Piercing: 9
-
-- type: entity
-  id: BulletLightRifleShrapnel
-  name: bullet (.20 rifle shrapnel)
-  categories: [ HideSpawnMenu ]
-  parent: BaseBullet
-  components:
-  - type: Projectile
-    damage:
-      types:
-        Piercing: 5.525
-  - type: Sprite
-    scale: 0.5, 0.5
-
-- type: entity
-  id: BulletLightRifleShrapnelSpread
-  categories: [ HideSpawnMenu ]
-  parent: BulletLightRifleShrapnel
-  components:
-  - type: ProjectileSpread
-    proto: BulletLightRifleShrapnel
-    count: 4
-    spread: 15
+        Radiation: 12
+        Piercing: 13

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml

@@ -62,8 +62,8 @@
   - type: Projectile
     damage:
       types:
-        Blunt: 2
-        Heat: 15
+        Blunt: 3
+        Heat: 16
 
 - type: entity
   id: BulletRifleUranium