Merge ecf6a5202e into c3c6a6abd9

Everything

Resources/Changelog/DeltaVChangelog.yml

@@ -1,18 +1,4 @@
 Entries:
-- author: turtlemutt
-  changes:
-  - message: Add a new snack to the game, spicy pickle moffs!
-    type: Add
-  id: 1777
-  time: '2025-11-02T05:28:33.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/4425
-- author: SirWarock
-  changes:
-  - message: Rollerbed sprites now don't stack when a patient is buckled to it!
-    type: Add
-  id: 1778
-  time: '2025-11-02T05:44:53.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/4521
 - author: HTMLSystem
   changes:
   - message: Added arachnid and moth sprites for the night vision and thermal goggles
@@ -4418,4 +4404,21 @@
   id: 2277
   time: '2026-05-09T22:19:48.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/5738
+- author: Cepelinas1
+  changes:
+  - message: "In an effort to save money on tear gas grenade production, Security\
+      \ can now choose up to 4 items for their secbelt in the character loadout under\
+      \ the \u201CUtility\u201D section! Remember to actually choose what you want,\
+      \ unless you want to go in with just a baton and cuffs."
+    type: Add
+  id: 2278
+  time: '2026-05-09T23:04:26.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/5701
+- author: Stxcking
+  changes:
+  - message: Added Water Wall Dispenser
+    type: Add
+  id: 2279
+  time: '2026-05-10T11:35:15.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/5792
 Order: 1

Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl

@@ -140,6 +140,7 @@ loadout-group-all-gun = Security Sidearm
 loadout-group-security-gun-ammo = Ammunition
 loadout-group-revolver-ammo = Ammunition
 loadout-group-all-ammo = Ammunition
+security-utility = Utility
 
 # Justice
 loadout-group-chiefjustice-head = Chief Justice head

Resources/Locale/en-US/_DV/tools/Hos-Briefcase.ftl

@@ -3,3 +3,6 @@ energy-magnum-bundle-description = A heavy duty, slow recharging, energy revolve
 
 x01-bundle-name = X-01
 x01-bundle-description = A fast firing, high capacity, compact, energy gun perfect for dishing out consistent quick damage.
+
+grav-gauntlet-bundle-name = Grav Gauntlet
+grav-gauntlet-bundle-description = A strong, slow hitting, gauntlet that can pull targets hit in and has a taser just in case.

Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml

@@ -86,12 +86,12 @@
 - type: loadout
   id: SecurityBelt
   equipment:
-    belt: ClothingBeltSecurityFilled
+    belt: ClothingBeltSecurityBeltCustom # DeltaV - loadouts
 
 - type: loadout
   id: SecurityWebbing
   equipment:
-    belt: ClothingBeltSecurityWebbingFilled
+    belt: ClothingBeltSecurityWebbingCustom # DeltaV - loadouts
 
 # Outerclothing
 - type: loadout

Resources/Prototypes/Loadouts/role_loadouts.yml

@@ -413,6 +413,7 @@
   - GroupSpeciesBreathToolSecurity
   - SecurityAllFirearm # DeltaV - loadouts
   - SecurityAllAmmo # DeltaV - loadouts
+  - SecurityUtility # DeltaV - loadouts
 
 - type: roleLoadout
   id: JobWarden
@@ -432,6 +433,7 @@
   - GroupSpeciesBreathToolSecurity
   - SecurityAllFirearm # DeltaV - loadouts
   - SecurityAllAmmo # DeltaV - loadouts
+  - SecurityUtility # DeltaV - loadouts
 
 - type: roleLoadout
   id: JobSecurityOfficer
@@ -452,6 +454,7 @@
   - GroupSpeciesBreathToolSecurity
   - SecurityFirearm # DeltaV - loadouts
   - SecurityFirearmAmmo # DeltaV - loadouts
+  - SecurityUtility # DeltaV - loadouts
 
 - type: roleLoadout
   id: JobDetective

Resources/Prototypes/Nyanotrasen/Loadouts/role_loadouts.yml

@@ -44,6 +44,7 @@
   - GroupSpeciesBreathToolSecurity
   - SecurityFirearm # DeltaV - loadouts
   - SecurityFirearmAmmo # DeltaV - loadouts
+  - SecurityUtility
 
 # Wildcards
 - type: roleLoadout

Resources/Prototypes/_DV/Catalog/Fills/Items/Belts/belts.yml

@@ -25,6 +25,30 @@
         - id: SyringeEphedrine
         - id: EmergencyMedipen
 
+- type: entity
+  id: ClothingBeltSecurityBeltCustom
+  parent: ClothingBeltSecurity
+  suffix: Filled
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:AllSelector
+        children:
+        - id: Stunbaton
+        - id: Handcuffs
+
+- type: entity
+  id: ClothingBeltSecurityWebbingCustom
+  parent: ClothingBeltSecurityWebbing
+  suffix: Filled
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:AllSelector
+        children:
+        - id: Stunbaton
+        - id: Handcuffs
+
 - type: entity
   id: ClothingBeltFoamSheathFilled
   parent: ClothingBeltFoamSheath

Resources/Prototypes/_DV/Catalog/HoS_Briefcase_catalog.yml

@@ -21,3 +21,15 @@
   - WeaponEnergyGunMultiphase
   - SyndicateWhistle
   - BookSpaceLaw
+
+- type: thiefBackpackSet
+  id: GravGauntletBundle
+  name: grav-gauntlet-bundle-name
+  description: grav-gauntlet-bundle-description
+  sprite:
+    sprite: _DV/Objects/Weapons/Melee/grav_gauntlet.rsi
+    state: icon
+  content:
+  - GravGauntlet
+  - BedsheetUSA
+  - RockGuitarInstrument

Resources/Prototypes/_DV/Entities/Objects/Specific/HoS_Briefcase.yml

@@ -14,6 +14,7 @@
     possibleSets:
     - X01bundle
     - EnergyMagnumBundle
+    - GravGauntletBundle
   - type: Tag # DeltaV - can't go in storage implants
     tags:
     - HighRiskItem

Resources/Prototypes/_DV/Entities/Objects/Weapons/Melee/grav_gauntlet.yml

@@ -0,0 +1,54 @@
+- type: entity
+  parent: BaseItem
+  id: GravGauntlet
+  name: Grav Gauntlet MK-00c
+  description: A developmental prototype of NanoTrasen's Melee Arms Department. When striking an enemy, a gravitational wave pulses and sweeps them in for a follow-up.
+  components:
+  - type: Sprite
+    sprite: _DV/Objects/Weapons/Melee/grav_gauntlet.rsi
+    state: icon
+  - type: MeleeWeapon
+    size: large
+    range: 1.2 # so you can actually use the pull
+    attackRate: 0.70 # heavy friggin fists bro
+    angle: 0
+    animation: WeaponArcFist
+    wideAnimationRotation: 145
+    damage:
+      types:
+        Slash: 2
+        Blunt: 33
+        Structural: 35
+  - type: Wieldable
+    unweieldOnUse: false
+  - type: GunRequiresWield #gotta steady your arm to aim duhhh
+  - type: AmmoCounter
+  - type: UseDelayOnShoot
+  - type: UseDelay
+    delay: 2
+  - type: Gun #apersos was here
+    projectileSpeed: 6
+    soundGunshot: /Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg
+    fireRate: 1
+    useKey: false
+  - type: RechargeBasicEntityAmmo
+    rechargeCooldown: 55
+  - type: BasicEntityAmmoProvider
+    proto: BulletTaser # most balanced kinda, better than a stun shotgun
+    capacity: 1
+    count: 1
+  - type: MeleeThrowOnHit
+    speed: 5.75
+    distance: -.75
+  - type: Clothing
+    sprite: _DV/Objects/Weapons/grav_gauntlet.rsi
+    quickEquip: false
+    slots:
+    - belt
+    - suitStorage
+  - type: Tag
+    tags:
+    - HighRiskItem
+    - Sidearm
+  - type: StealTarget
+    stealGroup: HoSSidearm

Resources/Prototypes/_DV/Entities/Structures/Wallmounts/Storage/wall_dispensers.yml

@@ -0,0 +1,23 @@
+- type: entity
+  parent: BaseDispenser
+  id: WaterDispenser
+  name: water dispenser
+  description: Wallmount water dispenser.
+  components:
+  - type: Sprite
+    sprite: _DV/Structures/Wallmounts/walldispenser.rsi
+    layers:
+    - state: waterdispenser
+    - state: fill-1
+      map: ["enum.SolutionContainerLayers.Fill"]
+      visible: false
+  - type: SolutionContainerVisuals
+    maxFillLevels: 5
+    fillBaseName: fill-
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        maxVol: 5000
+        reagents:
+        - ReagentId: Water
+          Quantity: 5000

Resources/Prototypes/_DV/Loadouts/Jobs/Security/security_officer.yml

@@ -145,3 +145,47 @@
   id: SecurityClothingHandsGlovesFingerless
   equipment:
     gloves: ClothingHandsGlovesFingerless
+
+# SecBelt utility
+
+- type: loadout
+  id: FlashBangLoadout
+  storage:
+    belt:
+    - GrenadeFlashBang
+
+- type: loadout
+  id: TearGasLoadout
+  storage:
+    belt:
+    - TearGasGrenade
+
+- type: loadout
+  id: SecHoloProjectorLoadout
+  storage:
+    belt:
+    - HoloprojectorSecurity
+
+- type: loadout
+  id: StingerGrenadeLoadout
+  storage:
+    belt:
+    - GrenadeStinger
+
+- type: loadout
+  id: RadioHandheldSecurityLoadout
+  storage:
+    belt:
+    - RadioHandheldSecurity
+
+- type: loadout
+  id: HandcuffsLoadout
+  storage:
+    belt:
+    - Handcuffs
+
+- type: loadout
+  id: SecLiteLoadout
+  storage:
+    belt:
+    - FlashlightSeclite

Resources/Prototypes/_DV/Loadouts/loadout_groups.yml

@@ -414,6 +414,21 @@
   - SecurityFirearmSpeedLoaderSpecialRubber
   - SecurityFirearmSpeedLoaderSpecial
 
+## Security utility
+- type: loadoutGroup
+  id: SecurityUtility
+  name: security-utility
+  minLimit: 0
+  maxLimit: 4
+  loadouts:
+  - FlashBangLoadout
+  - TearGasLoadout
+  - StingerGrenadeLoadout
+  - RadioHandheldSecurityLoadout
+  - SecHoloProjectorLoadout
+  - HandcuffsLoadout
+  - SecLiteLoadout
+
 ## Security Gloves
 - type: loadoutGroup
   id: SecurityGloves

Resources/Textures/_DV/Objects/Weapons/Melee/grav_gauntlet.rsi/meta.json

@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "created by coll1079",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_DV/Structures/Wallmounts/walldispenser.rsi/meta.json

@@ -0,0 +1,29 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modifications made by [scrivoy], Dispenser originally taken from paradise at https://github.com/ParadiseSS13/Paradise/commit/846ce475b2258a4336d8895f07f2c0f4053963bc, waterdispenser by @Stxcking (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "waterdispenser"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}