Secborg Module Overhaul

Resources/Prototypes/Research/arsenal.yml

@@ -60,6 +60,7 @@
   - MagazineBoxRifleRubber
   - MagazineBoxSpecialRubber
   # End of modified code
+  - BorgModuleSecurityChase # DeltaV SecBorg research
 
 - type: technology
   id: UraniumMunitions

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

@@ -51,7 +51,9 @@
     items:
     - StunbatonSelfCharging
     - FlashRecharging
-    - BorgHypoPax
+    - FlashlightSecliteRecharging
+    - SecurityWhistle
+    - WeaponLauncherFlashbangBorg
 
 - type: entity
   id: BorgModuleSecurityEscalate
@@ -67,9 +69,11 @@
     items:
     - Truncheon # Anti-Fauna option to stop them being relied on the Seclite (which will be removed when the Laws menu is fixed)
     - FlashRecharging
+    - WeaponLauncherCrowdControlBorg
+    - SecurityWhistle
 
 - type: entity
-  id: BorgModuleSecurityChase # Research Locked - EnergyGunsAdvanced
+  id: BorgModuleSecurityChase # Research Locked - NonLethalAmmunition
   parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ]
   name: chase cyborg module
   components:
@@ -79,7 +83,9 @@
     - state: icon-chase
   - type: ItemBorgModule
     items:
-    - WeaponEnergyGunMiniRecharging
+    - WeaponDisablerSelfCharge
+    - FlashlightSecliteRecharging
+    - SecurityWhistle
 
 # Syndicate modules
 - type: entity

Resources/Prototypes/_DV/Entities/Objects/Specific/Security/security.yml

@@ -63,16 +63,6 @@
       guides:
       - Security
 
-- type: entity
-  parent: WeaponEnergyGunMini
-  id: WeaponEnergyGunMiniRecharging
-  suffix: Recharging, Do Not Map
-  categories: [ HideSpawnMenu ]
-  components:
-    - type: BatterySelfRecharger
-      autoRecharge: true
-      autoRechargeRate: 12
-
 - type: entity
   parent: HoloprojectorSecurity
   id: HoloprojectorSecurityRecharging

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

@@ -285,7 +285,7 @@
   - type: HitscanBatteryAmmoProvider
     proto: ColdLaser
     fireCost: 100
-    
+
 - type: entity
   parent: [ BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband ]
   id: WeaponBeamCannon
@@ -353,3 +353,13 @@
   - type: Tag
     tags:
     - PowerCage
+
+- type: entity
+  parent: WeaponDisabler
+  id: WeaponDisablerSelfCharge
+  name: disabler
+  description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. This one recharges
+  components:
+  - type: BatterySelfRecharger
+    autoRecharge: true
+    autoRechargeRate: 50

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml

@@ -1,30 +1,110 @@
-- type: entity
+- type: entity
   name: china lake
   parent: [BaseWeaponLauncher, BaseGunWieldable]
   suffix: Robot, energy based
   id: WeaponLauncherChinaLakeBorg
   description: PLOOP! Contains a built in replicator to slowly make more ammo.
   components:
-    - type: Sprite
-      sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi
-      layers:
-        - state: icon
-          map: ["enum.GunVisualLayers.Base"]
-    - type: Clothing
-      sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi
-    - type: Gun
-      fireRate: 1
-      selectedMode: SemiAuto
-      availableModes:
-        - SemiAuto
-      soundGunshot:
-        path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg
-    - type: Battery
-      maxCharge: 600
-      startingCharge: 300
-    - type: ProjectileBatteryAmmoProvider
-      proto: GrenadeFrag
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi
+    layers:
+      - state: icon
+        map: ["enum.GunVisualLayers.Base"]
+  - type: Clothing
+    sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi
+  - type: Gun
+    fireRate: 1
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg
+  - type: Battery
+    maxCharge: 600
+    startingCharge: 300
+  - type: ProjectileBatteryAmmoProvider
+    proto: GrenadeFrag
+    fireCost: 300
+  - type: BatterySelfRecharger
+    autoRecharge: true
+    autoRechargeRate: 2
+
+- type: entity
+  name: Flashbang Launcher
+  parent: BaseWeaponLauncher
+  suffix: Robot, energy based
+  id: WeaponLauncherFlashbangBorg
+  description: A Cyborg Mounted Grenade Launcher, designed to fire flashbangs. Refills its own ammo
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi
+    layers:
+      - state: icon
+        map: ["enum.GunVisualLayers.Base"]
+  - type: Clothing
+    sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi
+  - type: Gun
+    minAngle: 1
+    maxAngle: 2
+    fireRate: 1
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg
+  - type: Battery
+    maxCharge: 600
+    startingCharge: 200
+  - type: ProjectileBatteryAmmoProvider
+    proto: GrenadeFlash
+    fireCost: 200
+  - type: BatterySelfRecharger
+    autoRecharge: true
+    autoRechargeRate: 6
+  - type: GunWieldBonus
+    wieldBonusExamineMessage: null
+    minAngle: 0
+    maxAngle: 0
+  - type: UseDelay
+    delay: 0 # You can't dual wield this as a borg so no need for a delay
+  - type: AmmoCounter
+
+- type: entity
+  name: Crowd Control Launcher
+  parent: BaseWeaponLauncher
+  suffix: Robot, energy based
+  id: WeaponLauncherCrowdControlBorg
+  description: A hybrid stinger and teargas grenade launcher
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi
+    layers:
+      - state: icon
+        map: ["enum.GunVisualLayers.Base"]
+  - type: Clothing
+    sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi
+  - type: ProjectileBatteryAmmoProvider
+    proto: TearGasGrenade
+    fireCost: 300
+  - type: Battery
+    maxCharge: 600
+    startingCharge: 300
+  - type: BatteryWeaponFireModes
+    fireModes:
+    - proto: TearGasGrenade
+      fireCost: 300
+    - proto: GrenadeStinger
       fireCost: 300
-    - type: BatterySelfRecharger
-      autoRecharge: true
-      autoRechargeRate: 2
+  - type: BatterySelfRecharger
+    autoRecharge: true
+    autoRechargeRate: 3
+  - 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
+  - type: AmmoCounter

Resources/Prototypes/_DV/Research/arsenal.yml

@@ -26,7 +26,6 @@
   recipeUnlocks:
   - WeaponEnergyGun
   - WeaponEnergyGunMini
-  - BorgModuleSecurityChase # DeltaV SecBorg research
 
 - type: technology
   id: EnergyGunsAdvanced