Universal buff and price increase, IK-30 buff (#5592)

* rof -> 2 price -> 12.5k

* ik-30 fireable 1 handed, rof -> 2

* ik-30 semi only

* moved laser mags to adv energy gun research

* ok ik-30 killed, replaced by battery ik-60, ert ik-60 -> ik-60-m, no more magfed ik for sec i gotta redo some sprites

* worlds most basic sprite edits

* ok we go back to the magfed

* minor attribution nickpick

tiny cleaning

---------

Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>

Resources/Prototypes/_DV/Catalog/Cargo/cargo_armory.yml

@@ -14,7 +14,7 @@
     sprite: Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi
     state: icon
   product: CrateArmoryUniversal
-  cost: 10500
+  cost: 12500
   category: Armory
   group: market
 

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

@@ -233,9 +233,9 @@
     price: 750
 
 - type: entity
-  parent: BaseWeaponBattery
+  parent: [BaseWeaponBattery, BaseGunWieldable]
   id: WeaponGunLaserCarbineAutomatic
-  name: IK-60 energy carbine
+  name: IK-60
   description: "A 30 round hybrid-fire energy carbine."
   components:
   - type: Sprite
@@ -258,6 +258,13 @@
     availableModes:
       - SemiAuto
       - FullAuto
+    minAngle: 21
+    maxAngle: 32
+  - type: GunWieldBonus
+    minAngle: -20
+    maxAngle: -20
+    angleIncrease: 3
+    angleDecay: 12
   - type: Battery
     maxCharge: 3000
     startingCharge: 3000

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml

@@ -282,7 +282,7 @@
   - type: Clothing
     sprite: _DV/Objects/Weapons/Guns/Pistols/universal.rsi
   - type: Gun
-    fireRate: 1.5
+    fireRate: 2
     availableModes:
     - SemiAuto
     soundGunshot:

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml

@@ -284,18 +284,16 @@
     sprite: _DV/Objects/Weapons/Guns/Rifles/lasercarbine.rsi
   - type: ChamberMagazineAmmoProvider
     boltClosed: null
-  - type: GunRequiresWield
   - type: GunWieldBonus
-    minAngle: 0
-    maxAngle: 0
+    minAngle: -20
+    maxAngle: -20
   - type: Gun
-    fireRate: 1.5
-    minAngle: 1
-    maxAngle: 4
+    fireRate: 2
+    minAngle: 21
+    maxAngle: 32
     selectedMode: SemiAuto
     availableModes:
     - SemiAuto
-    - FullAuto
     soundGunshot:
       path: /Audio/_DV/Weapons/Guns/Gunshots/laser.ogg
     soundEmpty:
@@ -314,7 +312,6 @@
         whitelistFailPopup: gun-magazine-whitelist-fail
       gun_chamber:
         name: Chamber
-        startingItem: CartridgeLaser
         priority: 1
         whitelist:
           tags:
@@ -329,8 +326,8 @@
 - type: entity
   parent: WeaponRifleLaser
   id: WeaponRifleLaserERT
-  name: IK-60
-  description: A short, compact carbine like rifle, relying more on battery cartridges rather than a built in power cell. Utilized by the Nanotrasen Navy for combat operations.
+  name: IK-60-M
+  description: A short, compact carbine, utilizing battery catridges rather than a built in power cell. Utilized by the Nanotrasen Navy for combat operations.
   components:
   - type: Sprite
     sprite: _DV/Objects/Weapons/Guns/Rifles/lasercarbineert.rsi

Resources/Prototypes/_DV/Recipes/Lathes/Packs/security.yml

@@ -32,7 +32,6 @@
   - BoxBeanbag
   - BoxShellTranquilizer
   - MagazineShotgunBeanbag
-  - MagazineLaser
   - MagazinePistolHighCapacity
 
 - type: latheRecipePack
@@ -77,6 +76,7 @@
   - MagazineBoxSpecialMindbreaker
   - MagazinePistolHighCapacityUranium
   - MagazinePistolHighCapacityIncendiary
+  - MagazineLaser
 
 - type: latheRecipePack
   parent: SecurityHardsuits

Resources/Prototypes/_DV/Research/arsenal.yml

@@ -126,6 +126,7 @@
   recipeUnlocks:
   - WeaponEnergyGunPistol
   - WeaponRifleLaser
+  - MagazineLaser
 
 - type: technology
   id: IncendiaryLaserWeapons

Resources/Textures/_DV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/meta.json

@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/pull/15894/commits/199daf90ee25f4285a1a90696d152493abf6ca65",
+    "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/pull/15894/commits/199daf90ee25f4285a1a90696d152493abf6ca65, wielded sprites by Verybigman311, modified by keke38",
     "size": {
         "x": 32,
         "y": 32
@@ -43,6 +43,14 @@
         {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
         }
     ]
 }