DeltaV-Station · Avalon-Proto · Oct 27, 2024 · Oct 28, 2024 · Nov 15, 2024 · Dec 25, 2024
@@ -162,7 +162,7 @@
   - PowerCageMedium
   - MagazineGrenadeEmpty
   - GrenadeFlash
-  - GrenadeBlast 
+  - GrenadeBlast
   - ShuttleGunSvalinnMachineGunCircuitboard
   - ShuttleGunPerforatorCircuitboard
   - ShuttleGunFriendshipCircuitboard

@@ -23,10 +23,11 @@
   - type: ItemBorgModule
     items:
     - FlashlightSecliteRecharging
+    - HoloprojectorSecurityRecharging
     - SecurityWhistle
 
 - type: entity
-  id: BorgModuleSecurityBastion # Peacekeeper Set, Available on Round Start
+  id: BorgModuleSecurityBastion # Research Locked - AdvancedRiotControl
   parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ]
   name: bastion cyborg module
   components:
@@ -36,7 +37,9 @@
     - state: icon-hold
   - type: ItemBorgModule
     items:
-    - HoloprojectorSecurityRecharging
+    - FlashRecharging
+    - WeaponLauncherNonLethal
+    - SecurityWhistle
 
 - type: entity
   id: BorgModuleSecurityDeescalate # Research Locked - AdvancedRiotControl
@@ -51,7 +54,8 @@
     items:
     - StunbatonSelfCharging
     - FlashRecharging
-    - BorgHypoPax
+    - FlashlightSecliteRecharging
+    - SecurityWhistle
 
 - type: entity
   id: BorgModuleSecurityEscalate
@@ -66,10 +70,12 @@
   - type: ItemBorgModule
     items:
     - Truncheon # Anti-Fauna option to stop them being relied on the Seclite (which will be removed when the Laws menu is fixed)
-    - FlashRecharging
+    - CombatKnife # Anti-fauna for blunt resistant slimes
+    - WeaponRiotShotgunBorg
+    - SecurityWhistle
 
 - type: entity
-  id: BorgModuleSecurityChase # Research Locked - EnergyGunsAdvanced
+  id: BorgModuleSecurityChase # Research Locked - NonLethalAmmunition
   parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ]
   name: chase cyborg module
   components:
@@ -79,7 +85,9 @@
     - state: icon-chase
   - type: ItemBorgModule
     items:
-    - WeaponEnergyGunMiniRecharging
+    - WeaponDisablerSelfCharge
+    - FlashlightSecliteRecharging
+    - SecurityWhistle
 
 # Syndicate modules
 - type: entity

@@ -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
@@ -85,32 +75,3 @@
           name: power-cell-slot-component-slot-name-default
           startingItem: PowerCellMicroreactor
           disableEject: true
-
-#######################################
-####### PEACEKEEPING MODULES ##########
-#######################################
-
-- type: entity
-  parent: BorgHypo
-  id: BorgHypoPax
-  name: Borg Pax Injector
-  description: A sterile injector for rapid administration of Pax to the unruly.
-  components:
-  - type: SolutionContainerManager
-    solutions:
-      hypospray:
-        maxVol: 5 # After testing, lowered to 5u maximum capacity.
-                  # 10u of Pax would pacify someone for 40 seconds. A *very* long time, and given this can pierce hardsuits...
-                  # Now can only pacify for 20 seconds, which lets you recharge 1u of Pax in the meantime (which pacifies for 4 seconds)
-  - type: Hypospray
-    injectOnly: true # Pax regenerates, this does handicap Antag Borgs but worth seeing.
-    onlyAffectsMobs: false
-  - type: SolutionRegeneration
-    solution: hypospray
-    duration: 20 # After testing, raised to 20 seconds to recharge.
-                 # Refer to https://discord.com/channels/968983104247185448/1206353544186171482/1267039694068387893
-                 # Worth thinking more on this later, needs a careful balance to not wipe out Antags!
-    generated:
-      reagents:
-      - ReagentId: Pax
-        Quantity: 1
@@ -286,7 +286,7 @@
   - type: HitscanBatteryAmmoProvider
     proto: ColdLaser
     fireCost: 100
-    
+
 - type: entity
   parent: [ BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband ]
   id: WeaponBeamCannon
@@ -354,3 +354,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
@@ -1,30 +1,78 @@
-- type: entity
-  name: china lake
+- type: entity
   parent: [BaseWeaponLauncher, BaseGunWieldable]
-  suffix: Robot, energy based
   id: WeaponLauncherChinaLakeBorg
+  name: china lake
+  suffix: Robot, energy based
   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
-      fireCost: 300
-    - type: BatterySelfRecharger
-      autoRecharge: true
-      autoRechargeRate: 2
+  - 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
+  parent: BaseWeaponLauncher
+  id: WeaponLauncherNonLethal
+  name: Nonlethal Launcher
+  suffix: Robot, energy based
+  description: A Cyborg Mounted Grenade Launcher, designed to fire flashbangs, or expend all of its energy to fire an EMP. Refills its own ammo
+  components:
+  - type: Sprite
+    sprite: _DV\Objects\Weapons\Guns\Launchers\nonlethal_launcher.rsi
+    layers:
+    - state: icon
+      map: ["enum.GunVisualLayers.Base"]
+  - type: Item
+    sprite: _DV\Objects\Weapons\Guns\Launchers\nonlethal_launcher.rsi
+    size: Huge
+  - 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: BatteryWeaponFireModes
+    fireModes:
+    - proto: GrenadeFlash
+      fireCost: 200
+    - proto: GrenadeEMP
+      fireCost: 600
+
@@ -44,3 +44,32 @@
   - type: BallisticAmmoProvider
     capacity: 4
     proto: ShellShotgunBeanbag
+
+- type: entity
+  parent: WeaponLightMachineGunL6Borg
+  id: WeaponRiotShotgunBorg
+  name: borg riot shotgun
+  description: A heavily modified shotgun for borgs, firing off beanbag rounds. Ammo repplicates over time.
+  components:
+  - type: Gun
+    minAngle: 0
+    maxAngle: 10
+    angleIncrease: 1
+    angleDecay: 16
+    fireRate: 1.5
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg
+    soundEmpty:
+      path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg
+  - type: Battery
+    maxCharge: 400
+    startingCharge: 200
+  - type: ProjectileBatteryAmmoProvider
+    proto: PelletShotgunBeanbag
+    fireCost: 100
+  - type: BatterySelfRecharger
+    autoRecharge: true
+    autoRechargeRate: 20
@@ -111,6 +111,7 @@
   - AdvancedTruncheon
   - TelescopicShield
   - BorgModuleSecurityEscalate
+  - BorgModuleSecurtiyBastion
 
 # Tier 3
 

@@ -6,17 +6,17 @@
   dummyPrototype: BorgChassisSecurity
 
   # Functional
-  extraModuleCount: 3
+  extraModuleCount: 2
   moduleWhitelist:
     tags:
     - BorgModuleGeneric
     - BorgModuleSecurity
 
   # TODO: change these when reworking secborg modules to have the equivalent of roundstart gear
   defaultModules:
+  - BorgModuleTool
   - BorgModuleSecurityDeescalate
   - BorgModuleSecurityPatrol
-  - BorgModuleSecurityBastion
 
   lawset: SiliconPolice
 

@@ -1,4 +1,4 @@
-# Generic borg
+# Generic borg
 - type: borgType
   id: generic
 
@@ -86,6 +86,7 @@
     - BorgModuleCargo
 
   defaultModules:
+  - BorgModuleTool # DeltaV - Added Tool Module to default
   - BorgModuleGrapplingGun
   - BorgModuleMining
   - BorgModuleAppraisal
@@ -127,6 +128,7 @@
     - BorgModuleJanitor
 
   defaultModules:
+  - BorgModuleTool # DeltaV - Added Tool Module to default
   - BorgModuleLightReplacer
   - BorgModuleCleaning
 
@@ -168,6 +170,7 @@
     - BorgModuleMedical
 
   defaultModules:
+  - BorgModuleTool # DeltaV - Added Tool Module to default
   - BorgModuleTreatment
   - BorgModuleSurgery # DeltaV
 
@@ -227,6 +230,7 @@
     - BorgModuleService
 
   defaultModules:
+  - BorgModuleTool # DeltaV - Added Tool Module to default
   - BorgModuleMusique
   - BorgModuleService
   - BorgModuleClowning

@@ -0,0 +1,20 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Made by JustAnOrange from discord",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon",
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        }
+    ]
+}