Merge 7657ee12fe 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/datasets/names/spider-operative.ftl

@@ -0,0 +1,46 @@
+names-spider-operative-dataset-1=Operator Zilla
+names-spider-operative-dataset-2=Operator Thrasha
+names-spider-operative-dataset-3=Operator King Gohma
+names-spider-operative-dataset-4=Operator Queen Gohma
+names-spider-operative-dataset-5=Operator MechaZilla
+names-spider-operative-dataset-6=Operator Maneater
+names-spider-operative-dataset-7=Operator OrbWeaver
+names-spider-operative-dataset-8=Operator Archne
+names-spider-operative-dataset-9=Operator Dokugu
+names-spider-operative-dataset-10=Operator Prybar
+names-spider-operative-dataset-11=Operator WebHead
+names-spider-operative-dataset-12=Operator RadiactiveRed
+names-spider-operative-dataset-13=Operator Wolf
+names-spider-operative-dataset-14=Operator WidowMaker
+names-spider-operative-dataset-15=Operator TrapDoor
+names-spider-operative-dataset-16=Operator Spinner
+names-spider-operative-dataset-17=Operator Durathread
+names-spider-operative-dataset-18=Operator WeaverCleaver
+names-spider-operative-dataset-19=Operator NetBall
+names-spider-operative-dataset-20=Operator Tsuchigumo
+names-spider-operative-dataset-21=Operator RedWreckless
+names-spider-operative-dataset-22=Operator Quelaag
+names-spider-operative-dataset-23=Operator ChaosWitch
+names-spider-operative-dataset-24=Operator FireKeeper
+names-spider-operative-dataset-25=Operator SilkSong
+names-spider-operative-dataset-26=Operator PaleHornet
+names-spider-operative-dataset-27=Operator DeepNest
+names-spider-operative-dataset-28=Operator GraveMaker
+names-spider-operative-dataset-29=Operator RedBack
+names-spider-operative-dataset-30=Operator Wanderer
+names-spider-operative-dataset-31=Operator EggSac
+names-spider-operative-dataset-32=Operator FennelWeb
+names-spider-operative-dataset-33=Operator CrewEater
+names-spider-operative-dataset-34=Operator Arachnophobia
+names-spider-operative-dataset-35=Operator RogueWeb
+names-spider-operative-dataset-36=Operator Spectacular
+names-spider-operative-dataset-37=Operator Amazing
+names-spider-operative-dataset-38=Operator Ultimate
+names-spider-operative-dataset-39=Operator Parker
+names-spider-operative-dataset-40=Operator Morales
+names-spider-operative-dataset-41=Operator Stacy
+names-spider-operative-dataset-42=Operator Penny
+names-spider-operative-dataset-43=Operator Noir
+names-spider-operative-dataset-44=Operator Ham
+names-spider-operative-dataset-45=Operator Brown
+names-spider-operative-dataset-46=Operator Hobo

Resources/Locale/en-US/_DV/ghost/roles/nukie-spider.ftl

@@ -0,0 +1,5 @@
+ghost-role-information-nukie-spider-name = Nuclear Operative Spider
+ghost-role-information-nukie-spider-description = A Nuclear Operative reinforcement for the Syndicate.
+ghost-role-information-nukie-spider-rules = Normal syndicate antagonist rules apply. Work with whoever called you in, and don't harm them.
+                                           The crew is allowed to kill you without warning.
+                                           You are allowed to attack the crew and destroy the station without provocation.

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/store/uplink/allies.ftl

@@ -1,5 +1,8 @@
 uplink-reinforcement-radio-nukie-mouse-name = Mouse Operative Reinforcement Teleporter
 uplink-reinforcement-radio-nukie-mouse-desc = Calls in a specially trained mouse operative to assist you.
 
+uplink-reinforcement-radio-nukie-spider-name = Spider Operative Reinforcement Teleporter
+uplink-reinforcement-radio-nukie-spider-desc = Calls in a specially trained arachnid operative to assist you.
+
 uplink-reinforcement-radio-cyborg-saboteur-name = Saboteur Cyborg Reinforcement Teleporter
 uplink-reinforcement-radio-cyborg-saboteur-desc = Calls in a lightly armored cyborg specializing in sabotage and assassinations.

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/Uplink/allies.yml

@@ -12,6 +12,20 @@
   categories:
   - UplinkAllies
 
+- type: listing
+  id: SpiderOperativeReinforcement
+  name: uplink-reinforcement-radio-nukie-spider-name
+  description: uplink-reinforcement-radio-nukie-spider-desc
+  productEntity: ReinforcementRadioSyndicateNukieSpider
+  icon: { sprite: _DV/Mobs/Animals/nukiespider.rsi, state: syndicate-spider-egg }
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 6
+  cost:
+    Telecrystal: 8
+  categories:
+    - UplinkAllies
+
 - type: listing
   id: UplinkMobCatC4
   name: uplink-mobcat-C4-name

Resources/Prototypes/_DV/Damage/modifier_sets.yml

@@ -173,3 +173,15 @@
     Slash: 40
     Piercing: 15
     Heat: 10
+
+- type: damageModifierSet
+  id: NukieSpider
+  coefficients:
+    # A stock bloodred hardsuit, but made for a giant spider.
+    Blunt: 0.5
+    Slash: 0.5
+    Piercing: 0.5
+    Heat: 0.5
+    Radiation: 0.5
+    Caustic: 0.5
+    Cold: 0.8 # DeltaV - Cold res

Resources/Prototypes/_DV/Datasets/Names/nukie_spider.yml

@@ -0,0 +1,5 @@
+- type: localizedDataset
+  id: NamesNukieSpider
+  values:
+    prefix: names-spider-operative-dataset-
+    count: 46

Resources/Prototypes/_DV/Entities/Mobs/NPCs/nukiespider.yml

@@ -0,0 +1,95 @@
+# Nuclear spider for Delta-V because critters are neat.
+# Used nukie mouse as a starting point, added/removed/modified properties as necessary
+- type: entity
+  name: nuclear operative tarantula
+  parent: MobGiantSpiderAngry
+  id: MobNukieSpider
+  description: A spider? A NUKIE SPIDER?!
+  suffix: syndicate
+  components:
+  - type: GhostRole
+    makeSentient: true
+    allowSpeech: true
+    allowMovement: true
+    name: ghost-role-information-nukie-spider-name
+    description: ghost-role-information-nukie-spider-description
+    rules: ghost-role-information-nukie-spider-rules
+    mindRoles:
+    - MindRoleGhostRoleTeamAntagonist
+  - type: GhostTakeoverAvailable
+  - type: RandomMetadata
+    nameSegments: [NamesNukieSpider]
+  - type: NpcFactionMember
+    factions:
+      - Syndicate
+  - type: PointLight
+    radius: 3
+    energy: 2.3
+    offset: 0, -2
+    color: green
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: _DV/Mobs/Animals/nukiespider.rsi
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base", "movement"]
+      state: syndicate-spider
+  - type: SpriteMovement
+    movementLayers:
+      movement:
+        state: syndicate-spider-moving
+    noMovementLayers:
+      movement:
+        state: syndicate-spider
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      90: Critical
+      150: Dead
+  - type: MovementSpeedModifier
+    baseWalkSpeed : 3
+    baseSprintSpeed : 4.9
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: syndicate-spider
+      Critical:
+        Base: syndicate-spider-dead
+      Dead:
+        Base: syndicate-spider-dead
+  - type: Tag
+    tags:
+    - FootstepSound
+    - DoorBumpOpener
+    - Radio
+  - type: Respirator #It just works?
+    minSaturation: 5.0
+  - type: TemperatureDamage
+    heatDamageThreshold: 423
+    coldDamageThreshold: 0
+  - type: PressureImmunity
+  - type: Insulated
+  - type: MeleeWeapon
+    soundHit:
+        path: /Audio/Effects/bite.ogg
+    angle: 0
+    animation: WeaponArcBite
+    damage:
+      types:
+        Piercing: 6
+        Structural: 15
+  - type: MobPrice
+    price: 250 # Their suits, while tiny, go for quite a bit on the market
+  - type: IntrinsicRadioReceiver
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Syndicate
+  - type: ActiveRadio
+    channels:
+    - Syndicate
+  - type: Access
+    tags:
+    - NuclearOperative
+    - SyndicateAgent
+  - type: Damageable
+    damageContainer: Biological
+    damageModifierSet: NukieSpider

Resources/Prototypes/_DV/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml

@@ -19,6 +19,27 @@
   - type: UseDelay
     delay: 300
 
+- type: entity
+  parent: ReinforcementRadio
+  id: ReinforcementRadioSyndicateNukieSpider
+  name: inexplicably menacing egg
+  description: You're not sure if that's a radio transciever or an eye blinking at you. Might attract an odd spider.
+  components:
+    - type: Sprite
+      sprite: _DV/Mobs/Animals/nukiespider.rsi
+      layers:
+        - state: syndicate-spider-egg
+    - type: GhostRole
+      name: ghost-role-information-nukie-spider-name
+      description: ghost-role-information-nukie-spider-description
+      rules: ghost-role-information-nukie-spider-rules
+    - type: GhostRoleMobSpawner
+      prototype: MobNukieSpider
+    - type: EmitSoundOnUse
+      sound: /Audio/Animals/snake_hiss.ogg
+    - type: UseDelay
+      delay: 300
+
 - type: entity
   parent: ReinforcementRadio
   id: ReinforcementRadioSyndicateHostageWarden

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/ServerInfo/Guidebook/_DV/Rules/GameRules/2_Metagaming.xml

@@ -25,7 +25,7 @@
   For entities lacking crew-level intellect (e.g. a tarantula), the understanding of station functions and how they may be sabotaged is shielded.
 
   The revealing condition for this shield is any of the following:
-   - being a Mouse Operative, Syndicat, or Ancestor Reinforcement
+   - being a Syndicate reinforcement creature, including but not limited to Mouse Operative, Syndicat, or Ancestor Reinforcement.
    - being uplifted by the power of Cognizine (i.e. “awakened”)
 
   ## High-Risk Items

Resources/Textures/_DV/Mobs/Animals/nukiespider.rsi/meta.json

@@ -0,0 +1,50 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Edited from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b and Nimfar11 (github) by Sal_DragonsNOA for SS14. Gameplay implementation by RoboBozu.",
+    "states": [
+        {
+            "name": "syndicate-spider",
+            "directions": 4
+        },
+        {
+            "name": "syndicate-spider-egg"
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "syndicate-spider-dead"
+        },
+        {
+            "name": "syndicate-spider-moving",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        }
+    ]
+}

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"
+        }
+    ]
+}