early merge of rebalanced salv weapon researching

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

@@ -22,7 +22,6 @@ research-technology-portable-fission = Portable Fission
 research-technology-space-scanning = Space Scanning
 research-technology-excavation = Mass Excavation
 
-research-technology-salvage-weapons = Salvage Weapons
 research-technology-draconic-munitions = Draconic Munitions
 research-technology-uranium-munitions = Uranium Munitions
 research-technology-explosive-technology = Explosive Technology
@@ -32,6 +31,7 @@ research-technology-nonlethal-ammunition = Nonlethal Ammunition
 research-technology-practice-ammunition = Practice Ammunition
 research-technology-concentrated-laser-weaponry = Concentrated Laser Weaponry
 research-technology-wave-particle-harnessing = Wave Particle Harnessing
+research-technology-experimental-salvage-weaponry = Experimental Salvage Weaponry
 research-technology-advanced-riot-control = Advanced Riot Control
 research-technology-portable-microfusion-weaponry = Portable Microfusion Weaponry
 research-technology-experimental-battery-ammo = Experimental Battery Ammo

Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml

@@ -219,7 +219,6 @@
   - type: ItemBorgModule
     items:
     - MiningDrill
-    - Shovel
     - MineralScannerUnpowered
     - OreBag
     - Crowbar
@@ -243,6 +242,23 @@
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: grappling-module }
 
+- type: entity
+  parent: [ BaseBorgModuleCargo, BaseProviderBorgModule ]
+  id: BorgModuleFauna
+  name: fauna protection module
+  description: A borg module for protection from deadly space fauna.
+  components:
+  - type: Sprite
+    layers:
+    - state: cargo
+    - state: icon-carp
+  - type: ItemBorgModule
+    items:
+    - WeaponProtoKineticAcceleratorOneHanded
+    - WeaponCrusherDagger
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: fauna-module }
+
 # engineering modules
 - type: entity
   id: BorgModuleAdvancedTool

Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml

@@ -13,3 +13,19 @@
       map: [ "empty-icon" ]
   # todo: add itemcomponent with inhandVisuals states using unused texture and animation assets in kinetic_accelerator.rsi
   # todo: add clothingcomponent with clothingVisuals states using unused texture and animations assets in kinetic_accelerator.rsi
+
+- type: entity
+  parent: WeaponProtoKineticAccelerator
+  id: WeaponProtoKineticAcceleratorOneHanded
+  suffix: One-Handed, DO NOT MAP
+  description: Fires low-damage kinetic bolts at a short range. This kind has a gyroscope to keep a cyborg's aim steady.
+  components:
+  - type: GunWieldBonus
+    wieldBonusExamineMessage: null
+    minAngle: 0
+    maxAngle: 0
+  - type: Gun
+    minAngle: 1
+    maxAngle: 2
+  - type: UseDelay
+    delay: 0 # You can't dual wield this as a borg so no need for a delay

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

@@ -230,6 +230,7 @@
       - RiotShield
       - SpeedLoaderMagnum
       - SpeedLoaderMagnumEmpty
+      - WeaponProtoKineticAccelerator
       # DeltaV - .38 special ammo - Add .38 special lethals to emagged autolathe
       - SpeedLoaderSpecial
       - SpeedLoaderSpecialEmpty
@@ -348,7 +349,6 @@
       - SyringeBluespace
       #- WeaponForceGun # DeltaV
       - WeaponLaserSvalinn
-      - WeaponProtoKineticAccelerator
       - WeaponGrapplingGun
       #- WeaponTetherGun # DeltaV
       - ClothingBackpackHolding
@@ -374,6 +374,7 @@
       # End DeltaV additions
   - type: EmagLatheRecipes
     emagDynamicRecipes:
+      - BorgModuleFauna
       - BoxBeanbag
       - BoxShotgunIncendiary
       - BoxShotgunUranium
@@ -413,6 +414,9 @@
       - WeaponLaserCannon
       - WeaponLaserCarbine
       - WeaponXrayCannon
+      - WeaponCrusher
+      - WeaponCrusherDagger
+      - WeaponCrusherGlaive
       # Begin DeltaV additions
       - BoxShellSoulbreaker # Nyanotrasen - Shotgun shell to get rid of psionics
       - WeaponEnergyGun       # Energy Gun
@@ -849,6 +853,7 @@
       - TargetSyndicate
       - WeaponDisablerPractice
       - WeaponLaserCarbinePractice
+      - WeaponProtoKineticAccelerator
       - Zipties
       # Begin DeltaV additions
       - ClothingNeckShockCollar # Nyanotrasen - Shock Collar recipe
@@ -863,6 +868,7 @@
       # End DeltaV additions
     dynamicRecipes:
       - EncryptionKeySyndie # Nyano
+      - BorgModuleFauna
       - BoxBeanbag
       - BoxShotgunIncendiary
       - BoxShotgunUranium
@@ -913,6 +919,9 @@
       - WeaponLaserCarbine
       - WeaponXrayCannon
       - ClothingBackpackElectropack
+      - WeaponCrusher
+      - WeaponCrusherDagger
+      - WeaponCrusherGlaive
       # Begin DeltaV additions
       - BoxShellSoulbreaker # Nyanotrasen - Shotgun shell to get rid of psionics
       - ClothingHeadHelmetInsulated # Nyanotrasen - Insulative headgear

Resources/Prototypes/Recipes/Lathes/devices.yml

@@ -205,16 +205,6 @@
     Glass: 100
     Uranium: 100
 
-- type: latheRecipe
-  id: WeaponProtoKineticAccelerator
-  result: WeaponProtoKineticAccelerator
-  category: Weapons
-  completetime: 5
-  materials:
-    Steel: 1000
-    Glass: 500
-    Silver: 100
-
 #- type: latheRecipe #DeltaV - LRP
 #  id: WeaponTetherGun
 #  result: WeaponTetherGun

Resources/Prototypes/Recipes/Lathes/robotics.yml

@@ -321,6 +321,11 @@
   id: BorgModuleGrapplingGun
   result: BorgModuleGrapplingGun
 
+- type: latheRecipe
+  parent: BaseGoldBorgModuleRecipe
+  id: BorgModuleFauna
+  result: BorgModuleFauna
+
 # Engineering Modules
 
 - type: latheRecipe

Resources/Prototypes/Recipes/Lathes/security.yml

@@ -106,6 +106,44 @@
     Plastic: 250
     Gold: 100
 
+- type: latheRecipe
+  parent: BaseWeaponRecipeLong
+  id: WeaponProtoKineticAccelerator
+  result: WeaponProtoKineticAccelerator
+  materials:
+    Steel: 1000
+    Glass: 500
+    Gold: 100
+
+- type: latheRecipe
+  parent: BaseWeaponRecipeLong
+  id: WeaponCrusher
+  result: WeaponCrusher
+  materials:
+    Steel: 1500
+    Glass: 500
+    Plastic: 250
+    Gold: 100
+
+- type: latheRecipe
+  parent: BaseWeaponRecipe
+  id: WeaponCrusherDagger
+  result: WeaponCrusherDagger
+  materials:
+    Steel: 750
+    Glass: 300
+    Gold: 200
+
+- type: latheRecipe
+  parent: BaseWeaponRecipeLong
+  id: WeaponCrusherGlaive
+  result: WeaponCrusherGlaive
+  materials:
+    Steel: 2000
+    Glass: 500
+    Silver: 250
+    Gold: 250
+
 - type: latheRecipe
   id: ClothingBackpackElectropack
   result: ClothingBackpackElectropack

Resources/Prototypes/Research/arsenal.yml

@@ -1,19 +1,5 @@
 # Tier 1
 
-- type: technology
-  id: SalvageWeapons
-  name: research-technology-salvage-weapons
-  icon:
-    sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi
-    state: icon
-  discipline: Arsenal
-  tier: 1
-  cost: 5000
-  recipeUnlocks:
-  - WeaponProtoKineticAccelerator
-  - ShuttleGunKineticCircuitboard
-  # These are roundstart but not replenishable for salvage
-
 - type: technology
   id: DraconicMunitions
   name: research-technology-draconic-munitions
@@ -175,6 +161,22 @@
 #  recipeUnlocks:
 #  - WeaponXrayCannon
 
+- type: technology
+  id: ExperimentalSalvageWeaponry
+  name: research-technology-experimental-salvage-weaponry
+  icon:
+    sprite: Objects/Weapons/Melee/crusher_glaive.rsi
+    state: icon
+  discipline: Arsenal
+  tier: 2
+  cost: 10000
+  recipeUnlocks:
+  - WeaponCrusher
+  - WeaponCrusherDagger
+  - WeaponCrusherGlaive
+  - BorgModuleFauna
+  - ShuttleGunKineticCircuitboard
+
 - type: technology
   id: BasicShuttleArmament
   name: research-technology-basic-shuttle-armament
@@ -194,8 +196,7 @@
   - ShuttleGunSvalinnMachineGunCircuitboard
   - ShuttleGunPerforatorCircuitboard
   - ShuttleGunFriendshipCircuitboard
-  technologyPrerequisites:
-  - SalvageWeapons
+  technologyPrerequisites: # DeltaV: added prerequesite
   - ExplosiveTechnology
 
 # Tier 3

Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json

@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/cdbcb1e858b11f083994a7a269ed67ef5b452ce9",
+    "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/cdbcb1e858b11f083994a7a269ed67ef5b452ce9. fauna-module.png created by deltanedas (github) for SS14.",
     "size": {
         "x": 32,
         "y": 32
@@ -102,6 +102,9 @@
         },
         {
             "name":"syndicate-martyr-module"
+        },
+        {
+            "name": "fauna-module"
         }
     ]
 }

Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC0-1.0",
-  "copyright": "Created by EmoGarbage404 (github) for Space Station 14. icon-construction.png created by deltanedas (github). syndicateborgbomb.png created by Mangohydra (github).",
+  "copyright": "Created by EmoGarbage404 (github) for Space Station 14. icon-construction.png and icon-carp.png created by deltanedas (github). syndicateborgbomb.png created by Mangohydra (github).",
   "size": {
     "x": 32,
     "y": 32
@@ -28,6 +28,9 @@
     {
       "name": "icon-cables"
     },
+    {
+      "name": "icon-carp"
+    },
     {
       "name": "icon-chemist"
     },