Automatic changelog update

* Pacifier Launcher Complete

Didnt realize id have to save it as i went, oops, eerything is already done

* Deleted drawing files

Deleted the drawing files i used to save sprite progress since theyre all done

* Deleted Test enitities

Testing done, shoo shoo

* Deleted unused code

Cough

* Added newlines at file ends

It got upsetty

* Appeasing YML gods

Fixing some things

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Balancing!

Revert thermal hardsuit caustic resistance and replaces Goreicides radiation damage with heat.

* I thought i told you to get fixed, dumb code

Fixes an error that occurs

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

.github/ISSUE_TEMPLATE/issue_report.md

@@ -10,7 +10,7 @@ assignees: ''
 ## Description
 <!-- Explain your issue in detail. Issues without proper explanation are liable to be closed by maintainers. -->
 
-**Reproduction and/or round #**
+**Reproduction**
 <!-- Include the steps to reproduce if applicable. -->
 
 **Screenshots**

.github/ISSUE_TEMPLATE/toolshed-feature-request.md

@@ -2,8 +2,8 @@
 name: Toolshed feature request
 about: Suggest a feature for Toolshed (for game admins/developers)
 title: "[TOOLSHED REQUEST]"
-labels: ''
-assignees: ''
+labels: Toolshed
+assignees: moonheart08
 
 ---
 

Content.Client/_Funkystation/ContentWarning/ContentWarningPopup.xaml

@@ -0,0 +1,24 @@
+<controls:FancyWindow xmlns="https://spacestation14.io"
+                      xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+                      Title="{Loc 'content-warning-title'}"
+                      MinSize="700 750"
+                      MaxSize="750 800"> <!-- DeltaV - increased maximum size -->
+    <BoxContainer Orientation="Vertical" Margin="20">
+        <Label Name="TitleLabel"
+               StyleClasses="LabelBig"
+               HorizontalAlignment="Center"
+               Margin="0 0 0 5"
+               Text="{Loc 'content-warning-label'}"/>
+        <PanelContainer Margin="0 0 0 10">
+            <RichTextLabel Name="ContentWarningBody" HorizontalAlignment="Center"/>
+        </PanelContainer>
+        <BoxContainer Orientation="Vertical" VerticalAlignment="Bottom" Margin="0 10 0 0">
+            <Button Name="ContentWarningAccept"
+                    MinWidth="75"
+                    Text="{ Loc 'content-warning-accept' }"/>
+            <Button Name="ContentWarningReject"
+                    MinWidth="75"
+                    Text="{ Loc 'content-warning-reject' }"/>
+        </BoxContainer>
+    </BoxContainer>
+</controls:FancyWindow>

Content.Client/_Funkystation/ContentWarning/ContentWarningPopup.xaml.cs

@@ -0,0 +1,40 @@
+using Content.Client.UserInterface.Controls;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Console;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Configuration;
+using Robust.Shared.Timing;
+using Robust.Shared.Utility;
+
+namespace Content.Client._Funkystation.ContentWarning;
+
+[GenerateTypedNameReferences]
+public sealed partial class ContentWarningPopup : FancyWindow
+{
+
+    public event Action? OnContentWarningAccept;
+    public event Action? OnContentWarningReject;
+
+    public ContentWarningPopup()
+    {
+        IoCManager.InjectDependencies(this);
+        RobustXamlLoader.Load(this);
+
+        InitWindow();
+    }
+
+    private void InitWindow()
+    {
+        ContentWarningBody.SetMessage(FormattedMessage.FromMarkupOrThrow(Loc.GetString("content-warning-message")));
+
+        ContentWarningReject.OnPressed += _ =>
+        {
+            OnContentWarningReject?.Invoke();
+        };
+
+        ContentWarningAccept.OnPressed += obj =>
+        {
+            OnContentWarningAccept?.Invoke();
+        };
+    }
+}

Content.Client/_Funkystation/ContentWarning/ContentWarningUIController.cs

@@ -0,0 +1,60 @@
+using Content.Client.Gameplay;
+using Content.Client.Lobby;
+using Content.Shared._Funkystation.CCVars;
+using JetBrains.Annotations;
+using Robust.Client.Console;
+using Robust.Client.UserInterface.Controllers;
+using Robust.Shared.Configuration;
+
+namespace Content.Client._Funkystation.ContentWarning;
+
+[UsedImplicitly]
+public sealed class ContentWarningUIController : UIController, IOnStateEntered<LobbyState>, IOnStateEntered<GameplayState>
+{
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
+
+    private ContentWarningPopup? _window;
+
+    private void AttemptOpenContentWarningPopup()
+    {
+        if (!_cfg.GetCVar(CCVars_Funky.ContentWarningDisplay) || _cfg.GetCVar(CCVars_Funky.ContentWarningAcknowledged))
+            return;
+
+        OpenContentWarningPopup();
+    }
+
+    public void OnStateEntered(LobbyState _)
+    {
+        AttemptOpenContentWarningPopup();
+    }
+
+    public void OnStateEntered(GameplayState _)
+    {
+        AttemptOpenContentWarningPopup();
+    }
+
+    private void OpenContentWarningPopup()
+    {
+        if (_window != null)
+            return;
+
+        _window = new ContentWarningPopup();
+        _window.OpenCentered();
+        _window.OnContentWarningReject += () =>
+        {
+            _window.Close();
+            _window = null;
+
+            if (_cfg.GetCVar(CCVars_Funky.ContentWarningKickOnIgnore))
+                _consoleHost.ExecuteCommand("quit");
+        };
+        _window.OnContentWarningAccept += () =>
+        {
+            _window.Close();
+            _window = null;
+            _cfg.SetCVar(CCVars_Funky.ContentWarningAcknowledged, true);
+            _cfg.SaveToFile();
+        };
+    }
+}

Content.Shared/Nutrition/Components/HungerComponent.cs

@@ -34,7 +34,7 @@ public sealed partial class HungerComponent : Component
     /// </summary>
     /// <remarks>Any time this is modified, <see cref="HungerSystem.SetAuthoritativeHungerValue"/> should be called.</remarks>
     [DataField("baseDecayRate"), ViewVariables(VVAccess.ReadWrite)]
-    public float BaseDecayRate = 0.035f; // DeltaV: changed from 0.01666666666f
+    public float BaseDecayRate = 0.01666666666f;
 
     /// <summary>
     /// The actual amount at which <see cref="LastAuthoritativeHungerValue"/> decays.

Content.Shared/_Funkystation/CCVars/CCVars.Funky.cs

@@ -0,0 +1,33 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared._Funkystation.CCVars;
+
+[CVarDefs]
+public sealed class CCVars_Funky
+{
+    // imp start. Automatically disable content warnings in debug builds. // DeltaV - and tools, too
+#if DEBUG || TOOLS
+    private static bool _cwOnBuildType;
+#else
+    private static bool _cwOnBuildType = true;
+#endif
+    // imp end
+
+    /// <summary>
+    /// If the content warning should be displayed.
+    /// </summary>
+    public static readonly CVarDef<bool> ContentWarningDisplay =
+        CVarDef.Create("cw.display", _cwOnBuildType, CVar.SERVER | CVar.REPLICATED); // imp. Automatically disable content warnings in debug builds.
+
+    /// <summary>
+    /// If ignoring the content warning should kick you from the server.
+    /// </summary>
+    public static readonly CVarDef<bool> ContentWarningKickOnIgnore =
+        CVarDef.Create("cw.kick", true, CVar.SERVER | CVar.REPLICATED);
+
+    /// <summary>
+    /// If the content warning popup was acknowledged.
+    /// </summary>
+    public static readonly CVarDef<bool> ContentWarningAcknowledged =
+        CVarDef.Create("cw.acknowledged.deltav", false, CVar.CLIENTONLY | CVar.ARCHIVE);
+}

Resources/Changelog/DeltaVChangelog.yml

@@ -1,55 +1,4 @@
 Entries:
-- author: verybigman311
-  changes:
-  - message: Electropacks can no longer be removed by non-Security.
-    type: Tweak
-  - message: Shock collars work once more.
-    type: Fix
-  id: 2169
-  time: '2026-03-09T13:32:05.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5332
-- author: rebe83
-  changes:
-  - message: Makeshift crowbar-wrench now actually does wrenchy things.
-    type: Fix
-  id: 2170
-  time: '2026-03-09T13:31:50.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5388
-- author: jimbobby-the-FUCKING-first
-  changes:
-  - message: You can now saw off the forged shotgun.
-    type: Add
-  id: 2171
-  time: '2026-03-09T13:40:13.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5120
-- author: snowywinters
-  changes:
-  - message: Ammo fab can now make all types of ammo
-    type: Tweak
-  id: 2172
-  time: '2026-03-09T21:58:18.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5476
-- author: keekee38
-  changes:
-  - message: readded the elite suit to the traitor uplink!
-    type: Tweak
-  id: 2173
-  time: '2026-03-09T22:10:00.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5459
-- author: Coryler
-  changes:
-  - message: Toggleable Plant-Box Magnetism
-    type: Add
-  id: 2174
-  time: '2026-03-09T22:24:09.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5467
-- author: Velcroboy
-  changes:
-  - message: Fixed Smile the slime being uncraftable.
-    type: Fix
-  id: 2175
-  time: '2026-03-09T23:05:04.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5482
 - author: DisposableCrewmember42
   changes:
   - message: Glimmer events now happen during conspiracy shifts.
@@ -4449,4 +4398,59 @@
   id: 2669
   time: '2026-09-22T09:22:57.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/6522
+- author: Kashieru1987
+  changes:
+  - message: Ejecting from a security chest rig now prioritizes the handgun instead
+      of the radio, like the security belt!
+    type: Tweak
+  id: 2670
+  time: '2026-09-25T16:10:53.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6546
+- author: Stop-Signs , Gintoki23
+  changes:
+  - message: New lobby art courtesy of Gintoki23
+    type: Add
+  id: 2671
+  time: '2026-09-25T20:46:48.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6542
+- author: AftrLite
+  changes:
+  - message: The justice airlocks have been resprited!
+    type: Tweak
+  id: 2672
+  time: '2026-09-28T10:53:34.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6563
+- author: SirWarock
+  changes:
+  - message: Slashed Hunger Gain rate in half, back to normal values!
+    type: Tweak
+  id: 2673
+  time: '2026-09-29T14:16:59.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6548
+- author: kotobdev
+  changes:
+  - message: A content warning popup will now appear upon joining the game for the
+      first time.
+    type: Add
+  id: 2674
+  time: '2026-09-29T18:30:56.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/5953
+- author: Radezolid
+  changes:
+  - message: Added a justice techfab, it's mostly a bureaucracy fab really. Get the
+      circuit for it at the CJ's locker.
+    type: Add
+  id: 2675
+  time: '2026-09-30T22:57:02.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6572
+- author: PresumptuousSpacemans
+  changes:
+  - message: 'New grenade launcher to Nukie uplinks: The Pacifier. Fires cluster grenades
+      which create a huge caustic smoke screen.'
+    type: Add
+  - message: 'New Vestine based chemical: Goreicide.'
+    type: Add
+  id: 2676
+  time: '2026-10-01T02:47:26.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6530
 Order: 1

Resources/Changelog/Maps.yml

@@ -1101,4 +1101,20 @@
   id: 127
   time: '2026-09-17T03:01:35.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/6340
+- author: This_Is_Gray
+  changes:
+  - message: 'Anvil: Anvil Station is now recieving crew members. Bring a spray bottle!'
+    type: Add
+  - message: 'Anvil: The NTES Hammerhead is here to transport you from Anvil Station.'
+    type: Add
+  id: 128
+  time: '2026-09-25T18:24:42.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/4338
+- author: IAmNotGray
+  changes:
+  - message: 'Anvil: The Hammerhead has been met with a compulsory removal.'
+    type: Fix
+  id: 129
+  time: '2026-09-26T00:01:30.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6549
 Order: 3

Resources/Locale/en-US/_DV/objectives/conditions/steal-target-groups.ftl

@@ -13,6 +13,7 @@ steal-target-groups-bible-mystagogue = book of mysteries
 steal-target-groups-recruiter-pen = recruiter's pen
 steal-target-groups-captains-cloak = captain's cloak
 steal-target-groups-engineering-techfab-circuitboard = engineering techfab's circuitboard
+steal-target-groups-justice-techfab-circuitboard = justice techfab's circuitboard
 steal-target-groups-logistics-techfab-circuitboard = logistics techfab's circuitboard
 steal-target-groups-service-techfab-circuitboard = service techfab's circuitboard
 steal-target-groups-epistemics-techfab-circuitboard = epistemics techfab's circuitboard

Resources/Locale/en-US/_DV/reagents/meta/physical-desc.ftl

@@ -6,3 +6,4 @@ reagent-physical-desc-bittersweet = bittersweet
 reagent-physical-desc-pure = pure
 reagent-physical-desc-clarifying = elucidating
 reagent-physical-desc-repairing = repairing
+reagent-physical-desc-highcorrosive = highly corrosive

Resources/Locale/en-US/_DV/reagents/meta/toxins.ftl

@@ -2,3 +2,6 @@ reagent-desc-heartbreaker-toxin-deltav = A hallucinogenic compound derived from
 
 reagent-name-lernaea = Lernaea
 reagent-desc-lernaea = A vicious poison, speculated to originate from a river of death. It ravenously consumes noöspheric energies in the mind while it's present.
+
+reagent-name-goreicide = Goreicide
+reagent-desc-goreicide = Marketed as military grade pest control, Goreicide is an incredibly corrosive chemical created by Interdyne during the corperate war era. Able to melt through armor with ease and causes organs to dissolve if injested.

Resources/Locale/en-US/_DV/store/uplink/weaponry.ftl

@@ -23,3 +23,6 @@ uplink-leveraction-desc = A bundle containing a SKL93 lever action sniper loaded
 
 uplink-anaconda-name = Anaconda Bundle
 uplink-anaconda-desc = A inaccurate one handed SMG with a 100 bullet mag. Perfect for laying down supressive fire.
+
+uplink-pacifier-bundle-name = Pacifier Bundle
+uplink-pacifier-bundle-desc = A compact grenade launcher that fires cluster bombs which spreads corrosive smoke over large areas. Perfect support weapon for creating impassable smoke screens and clearing out foxholes. Comes with 11 acid grenades.

Resources/Locale/en-US/_Funkystation/content_warning.ftl

@@ -0,0 +1,24 @@
+content-warning-title = Content Warning
+content-warning-label = CONTENT WARNING: BEFORE YOU PLAY
+content-warning-accept = I understand.
+content-warning-reject = This is not the place for me.
+# imp edits: replace mentions of funky with imp # DeltaV - replace mentions of imp with deltav
+content-warning-message =
+    Space Station 14 is a game about surviving a disaster with incompetent and cruel people on a space station. The character you create will endure corporate terrorism, hostile interactions with shitty coworkers, and fates worse than death. 
+
+    On Delta V, we enjoy telling stories where horrible things happen to ordinary people. With this in mind, we also believe in fully sharing what we consider to be triggering scenarios that may occur in-game.
+
+    Be advised that the following situations may happen without warning at any point in a round:
+
+    - You losing control of your character
+    - Violent crime
+    - Interrogations
+    - Being a victim to violent crime
+    - Your own character dying
+    - Witnessing others dying
+    - Brainwashing
+    - Body horror
+    - You playing someone elses character, or parts of your characters appearance changing
+    - Being framed for a crime that you did not do
+
+    If any of these make you uncomfortable, Delta V may not be the server for you. If you choose to play here anyway, do so with the assumption that these things will happen. Do not make a character who is a stand-in for yourself. Take steps to ensure a healthy separation between what is in-character and what is out-of-character. Understand that if you fail to do this, you may be asked to step away from the game.

Resources/Prototypes/Entities/Clothing/Belt/belts.yml

@@ -159,6 +159,7 @@
     slots:
       holster:
         name: clothing-belt-sidearm
+        priority: 1 # DeltaV - Prioritize ejecting the side-arm over the radio
         whitelist:
           tags:
           - Sidearm

Resources/Prototypes/Maps/Pools/default.yml

@@ -4,6 +4,7 @@
 # DeltaV
   - Arena
   - Academy
+  - Anvil
   - Asterisk
   - Byoin
   - Chibi

Resources/Prototypes/Maps/anvil.yml

@@ -0,0 +1,77 @@
+- type: gameMap
+  id: Anvil
+  mapName: 'Anvil'
+  mapPath: /Maps/anvil.yml
+  minPlayers: 35
+  stations:
+    Anvil:
+      stationProto: StandardNanotrasenStation
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: '{0} Anvil Station {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: 'DV'
+        - type: StationEmergencyShuttle
+          emergencyShuttlePath: /Maps/_DV/Shuttles/Evac/ntes_dart.yml # Placeholder
+        - type: StationJobs
+          availableJobs:
+          #civilian
+            Passenger: [ -1, -1 ]
+          #command
+            Captain: [ 1, 1 ]
+            HeadOfPersonnel: [ 1, 1 ]
+            ChiefEngineer: [ 1, 1 ]
+            ChiefJustice: [ 1, 1 ]
+            ChiefMedicalOfficer: [ 1, 1 ]
+            HeadOfSecurity: [ 1, 1 ]
+            ResearchDirector: [ 1, 1 ]
+            Quartermaster: [ 1, 1 ]
+            StationAi: [ 1, 1 ]
+          #engineering
+            AtmosphericTechnician: [ 2, 2 ]
+            StationEngineer: [ 3, 5 ]
+            TechnicalAssistant: [ 2, 3 ]
+          #justice
+            Clerk: [ 1, 1 ]
+            Lawyer: [ 1, 1 ]
+            Prosecutor: [ 1, 1 ]
+          #medical
+            Chemist: [ 2, 2 ]
+            Paramedic: [ 1, 2 ]
+            MedicalDoctor: [ 3, 5 ]
+            MedicalIntern: [ 2, 3 ]
+            Psychologist: [ 1, 1 ]
+          # Surgeon: [ 1, 1 ] / Where were you when surgeon was kilL?
+          #security
+            Brigmedic: [ 1, 1 ]
+            Detective: [ 1, 1 ]
+            Prisoner: [ 3, 3 ]
+            PrisonGuard: [ 2, 3 ]
+            SecurityOfficer: [ 2, 5 ]
+            SecurityCadet: [ 2, 3 ]
+            Warden: [ 1, 1 ]
+          #service
+            Bartender: [ 2, 2 ]
+            Botanist: [ 2, 2 ]
+            Chef: [ 2, 2 ]
+            Clown: [ 1, 1 ]
+            Janitor: [ 2, 2 ]
+            Mime: [ 1, 1 ]
+            Musician: [ 2, 3 ]
+            Reporter: [ 1, 1 ]
+            ServiceWorker: [ 4, 5 ] 
+            Librarian: [ 1, 1 ]
+            MartialArtist: [ 2, 2 ]
+          #science
+            Chaplain: [ 1, 1 ]
+            ForensicMantis: [ 1, 1 ]
+            Scientist: [ 4, 6 ]
+            ResearchAssistant: [ 4, 6 ]
+            Roboticist: [ 1, 2 ]
+            Borg: [ 2, 3 ]
+          #supply
+            CargoTechnician: [ 2, 3 ]
+            CargoAssistant: [ 1, 2 ]
+            Courier: [ 2, 2 ]
+            SalvageSpecialist: [ 2, 3 ]

Resources/Prototypes/_DV/Catalog/Fills/Backpacks/duffelbag.yml

@@ -57,3 +57,19 @@
         - id: ClothingEyesGlassesSunglasses
         - id: ClothingHeadHatCommandSoft
         - id: ClothingHeadHatBeretCommand
+
+- type: entity
+  parent: ClothingBackpackDuffelSyndicateBundle
+  id: ClothingBackpackDuffelSyndicateFilledAcidGrenadeLauncher
+  name: Pacifier bundle
+  description: "A Pacifier grenade launcher and 11 chemical grenades. Handle with care."
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:AllSelector
+        children:
+        - id: WeaponLauncherPacifier
+        - id: 40mmacid
+          amount: 10
+        - id: ClothingMaskInterdyneChemistry
+        - id: ClothingHandsGlovesChemist

Resources/Prototypes/_DV/Catalog/Fills/Boxes/heads.yml

@@ -68,3 +68,4 @@
         children:
         - id: IDComputerCircuitboard
         - id: CargoRequestJusticeComputerCircuitboard
+        - id: JusticeTechFabCircuitboard

Resources/Prototypes/_DV/Catalog/Uplink/weaponry.yml

@@ -117,3 +117,19 @@
     Telecrystal: 20
   categories:
   - UplinkWeaponry
+
+- type: listing
+  id: UplinkPacifier
+  name: uplink-pacifier-bundle-name
+  description: uplink-pacifier-bundle-desc
+  icon: { sprite: /Textures/_DV/Objects/Weapons/Guns/Launchers/pacifier_acid_launcher.rsi, state: base }
+  productEntity: ClothingBackpackDuffelSyndicateFilledAcidGrenadeLauncher
+  cost:
+    Telecrystal: 30
+  categories:
+  - UplinkWeaponry
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - NukeOpsUplink #I sure do hope this also spawns in surplus crates!

Resources/Prototypes/_DV/Entities/Objects/Devices/CircuitBoards/Machine/production.yml

@@ -87,6 +87,19 @@
   - type: StealTarget
     stealGroup: EpistemicsTechFabCircuitboard
 
+- type: entity
+  parent: BaseTechFabCircuitboardDV
+  id: JusticeTechFabCircuitboard
+  name: justice techfab machine board
+  description: A machine printed circuit board for a justice techfab.
+  components:
+  - type: Sprite
+    state: security # TODO: Actually sprite a proper board color for Justice
+  - type: MachineBoard
+    prototype: JusticeTechFab
+  - type: StealTarget
+    stealGroup: JusticeTechFabCircuitboard
+
 # Kitchen Freezer
 - type: entity
   id: KitchenFreezerMachineCircuitBoard

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml

@@ -0,0 +1,20 @@
+- type: entity
+  parent: [BaseGrenade, BaseMajorContraband]
+  id: 40mmacid
+  name: acid grenade
+  description: Cluster grenade that releases five pellets of goreicide spreading smoke. Do NOT drop it!
+  components:
+  - type: CartridgeAmmo
+    proto: BulletGrenadeAcid
+  - type: Sprite
+    sprite: _DV/Objects/Weapons/Guns/Ammunition/Explosives/pacifier-grenade.rsi
+    layers:
+    - state: item
+      map: [ "enum.AmmoVisualLayers.Base" ]
+  - type: Appearance
+  - type: SpentAmmoVisuals
+    state: frag
+    suffix: false
+  - type: Tag
+    tags:
+    - Acid40mm

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

@@ -142,3 +142,45 @@
       fireCost: 375
     - proto: CannonBallGrapeshot
       fireCost: 250
+
+- type: entity
+  parent: [ BaseWeaponLauncher, WeaponFlareGun, BaseSyndicateContraband ]
+  id: WeaponLauncherPacifier
+  name: Pacifier
+  description: A purpose built break-action grenade launcher made for firing acid spreading cluster grenades. "One taste and you'll never go back, even if you wanted to!"
+  components:
+  - type: Sprite
+    sprite: _DV/Objects/Weapons/Guns/Launchers/pacifier_acid_launcher.rsi
+    layers:
+    - state: base
+      map: [ "enum.GunVisualLayers.Base" ]
+  - type: Clothing
+    sprite: _DV/Objects/Weapons/Guns/Launchers/pacifier_acid_launcher.rsi
+    slots:
+    - Back
+    - suitStorage
+  - type: Item
+    size: Huge
+    shape:
+    - 0,0,3,2
+    sprite: _DV/Objects/Weapons/Guns/Launchers/pacifier_acid_launcher.rsi
+  - type: GunRequiresWield
+  - type: ItemSlots
+    slots:
+      gun_chamber:
+        name: Chamber
+        startingItem: 40mmacid
+        priority: 1
+        whitelist:
+          tags:
+            - Acid40mm
+  - type: ContainerContainer
+    containers:
+      gun_chamber: !type:ContainerSlot
+  - type: ChamberMagazineAmmoProvider
+    autoCycle: false
+    boltClosed: false
+    canRack: false
+    soundBoltClosed: /Audio/Weapons/Guns/Bolt/rifle_bolt_closed.ogg
+    soundBoltOpened: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg
+    soundRack: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/grenade.yml

@@ -0,0 +1,44 @@
+- type: entity
+  parent: TimerGrenadeBase
+  id: ClusterAcid
+  categories: [ HideSpawnMenu ]
+  name: acid pellet
+  components:
+  - type: Sprite
+    sprite: _DV/Objects/Weapons/Guns/Ammunition/Explosives/pacifier-grenade.rsi
+    layers:
+    - state: munition
+      map: [ "enum.AmmoVisualLayers.Base" ]
+  - type: TriggerOnSpawn
+  - type: DeleteOnTrigger
+    keysIn:
+    - timer
+  - type: TimerTrigger
+    delay: 1.0 #less than one it just teleports, looks awful
+  - type: SmokeOnTrigger
+    keysIn:
+    - timer
+    duration: 12
+    spreadAmount: 11
+    smokePrototype: Smoke
+    solution:
+      reagents:
+      - ReagentId: Goreicide
+        Quantity: 80
+  - type: EmitSoundOnTrigger
+    sound: /Audio/Items/smoke_grenade_smoke.ogg
+    positional: true
+    keysIn:
+    - timer
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.2
+        density: 20
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
+  - type: TileFrictionModifier
+    modifier: 40 #ProjectileGrenade in the spreading projectile will yeet this at mach fuck. This modifier slows it down to a reasonable spread.

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -204,3 +204,47 @@
       color: lightgreen
   - type: TimedDespawn
     lifetime: 0.08
+
+- type: entity
+  parent: BaseBulletTrigger
+  id: BulletGrenadeAcid
+  name: goricide gas greanade
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: _DV/Objects/Weapons/Guns/Ammunition/Explosives/pacifier-grenade.rsi
+    layers:
+    - state: projectile
+  - type: SmokeOnTrigger
+    duration: 12
+    spreadAmount: 11
+    smokePrototype: Smoke
+    solution:
+      reagents:
+      - ReagentId: Goreicide
+        Quantity: 80
+  - type: EmitSoundOnTrigger
+    sound: /Audio/Effects/flash_bang.ogg
+    positional: true
+  - type: Projectile
+    damage:
+      types:
+        Structural: 90 #shot breaks reinforced directional windows
+  - type: StaminaDamageOnCollide
+    damage: 75
+  - type: ExplodeOnTrigger
+  - type: Explosive
+    explosionType: Default
+    totalIntensity: 0.01
+    intensitySlope: 1
+    maxIntensity: 0.01
+    tileBreakScale: 0.01
+  - type: ContainerContainer
+    containers:
+      cluster-payload: !type:Container
+  - type: ProjectileGrenade
+    triggerKey: trigger
+    fillPrototype: ClusterAcid
+    maxVelocity: 2
+    minVelocity: 1
+    capacity: 5

Resources/Prototypes/_DV/Entities/Structures/Doors/Airlocks/access.yml

@@ -712,6 +712,16 @@
     containers:
       board: [ DoorElectronicsSecurity ]
 
+- type: entity
+  parent: AirlockGlassShuttle
+  id: AirlockExternalSecurityShuttleLocked
+  suffix: External, Glass, Security, Docking, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSecurity ]
+
+
 # Station-Specific Airlocks
 - type: entity
   parent: HighSecDoor
@@ -723,13 +733,22 @@
       board: [ DoorElectronicsSecurity ]
 
 - type: entity
-  parent: HighSecDoor
-  id: HighSecEngineeringLocked
-  suffix: Engineering, Locked
+  parent: AirlockMiningGlass
+  id: AirlockMiningGlassSecurity
+  suffix: Security, Locked
   components:
   - type: ContainerFill
     containers:
-      board: [ DoorElectronicsEngineering ]
+      board: [ DoorElectronicsSecurity ]
+
+- type: entity
+  parent: AirlockMining
+  id: AirlockMiningSecurity
+  suffix: Security, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSecurity ]
 
 - type: entity
   parent: HighSecDoor
@@ -740,6 +759,15 @@
     containers:
       board: [ DoorElectronicsJustice ]
 
+- type: entity
+  parent: HighSecDoor
+  id: HighSecEngineeringLocked
+  suffix: Engineering, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsEngineering ]
+
 - type: entity
   parent: HighSecDoor
   id: HighSecChiefJusticeLocked

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

@@ -225,3 +225,43 @@
     board: EpistemicsTechFabCircuitboard
   - type: StealTarget
     stealGroup: EpistemicsTechFabCircuitboard
+
+- type: entity
+  parent: BaseTechFabDepartmental
+  id: JusticeTechFab
+  name: justice techfab
+  description: Prints equipment for the justice department.
+  components:
+  - type: Sprite
+    sprite: _DV/Structures/Machines/techfab.rsi
+    layers:
+    - state: icon
+      map: ["enum.LatheVisualLayers.IsRunning"]
+    - state: jus
+    - state: unlit
+      shader: unshaded
+      map: ["enum.PowerDeviceVisualLayers.Powered"]
+    - state: inserting
+      map: ["enum.MaterialStorageVisualLayers.Inserting"]
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: Lathe
+    staticPacks:
+    - ToolsStatic
+    - PartsStatic
+    - LVCablesStatic
+    - MaterialsStatic
+    - PowerCellsStatic
+    - ReportingStatic
+    - SimpleElectronicsStatic
+    - EVASuit
+    - PaperStatic
+    - PensStatic
+    - FoldersStatic
+    - StampsStatic
+  - type: Machine
+    board: JusticeTechFabCircuitboard
+  - type: StealTarget
+    stealGroup: JusticeTechFabCircuitboard
+  - type: LatheAnnouncing
+    channels: [Justice]

Resources/Prototypes/_DV/Objectives/stealTargetGroups.yml

@@ -89,6 +89,13 @@
     sprite: Objects/Misc/module.rsi
     state: supply
 
+- type: stealTargetGroup
+  id: JusticeTechFabCircuitboard
+  name: steal-target-groups-justice-techfab-circuitboard
+  sprite:
+    sprite: Objects/Misc/module.rsi
+    state: security
+
 - type: stealTargetGroup
   id: ServiceTechFabCircuitboard
   name: steal-target-groups-service-techfab-circuitboard

Resources/Prototypes/_DV/Reagents/toxins.yml

@@ -12,3 +12,51 @@
         effectProto: StatusEffectPsionicsDisabled
         type: Add
         time: 5
+
+- type: reagent
+  id: Goreicide
+  name: reagent-name-goreicide
+  group: Toxins
+  desc: reagent-desc-goreicide
+  physicalDesc: reagent-physical-desc-highcorrosive
+  contrabandSeverity: Major
+  flavor: acid
+  color: "#458254"
+  plantMetabolism:
+  - !type:PlantAdjustToxins
+    amount: 20
+  - !type:PlantAdjustWeeds
+    amount: -4
+  - !type:PlantAdjustHealth
+    amount: -8
+  reactiveEffects:
+    Acidic:
+      methods: [ Touch ]
+      effects:
+      - !type:HealthChange
+        ignoreResistances: false
+        damage:
+          types:
+            Caustic: 2.3 #5u will do 11.5 caustic damage. Try not to exceed 3.0 as putting it in a spray bottle will just about insta crit
+      - !type:Emote
+        emote: Scream
+        probability: 0.5
+  metabolisms:
+    Bloodstream:
+      metabolismRate : 5.00 # High metabolism rate since the Pacifier uses a lot of gas to do its contact damage. Dead people will bleed out the chemical but still do not want excesses
+      effects:
+      - !type:HealthChange
+        damage:
+          types:
+            Caustic: 5.0
+            Heat: 4.0
+      - !type:ModifyBleed
+        amount: 3
+      - !type:PopupMessage
+        type: Local
+        visualType: Large
+        messages: [ "generic-reagent-effect-burning-insides" ]
+        probability: 0.6
+      - !type:Emote
+        emote: Scream
+        probability: 0.4

Resources/Prototypes/_DV/Recipes/Lathes/Packs/bureaucracy.yml

@@ -0,0 +1,36 @@
+- type: latheRecipePack
+  id: PaperStatic
+  recipes:
+  - BoxReamWhite
+  - BoxReamClassic
+  - BoxReamBright
+  - PaperStickyNoteStackFilled
+  - PaperStickyNoteStackFilledBlue
+  - PaperStickyNoteStackFilledGreen
+  - PaperStickyNoteStackFilledPink
+
+- type: latheRecipePack
+  id: PensStatic
+  recipes:
+  - Pen
+  - LuxuryPen
+
+- type: latheRecipePack
+  id: FoldersStatic
+  recipes:
+  - BoxFolderBaseEmpty
+  - BoxFolderGreyEmpty
+  - BoxFolderBlackEmpty
+  - BoxFolderBlueEmpty
+  - BoxFolderGreenEmpty
+  - BoxFolderRedEmpty
+  - BoxFolderYellowEmpty
+  - BoxFolderClipboardEmpty
+  - BoxFolderPlasticClipboardEmpty
+  # Not a BoxFolderWhiteEmpty due to it being used for prescription and having a little blue cross.
+
+- type: latheRecipePack
+  id: StampsStatic
+  recipes:
+  - RubberStampApproved
+  - RubberStampDenied

Resources/Prototypes/_DV/Recipes/Lathes/bureaucracy.yml

@@ -0,0 +1,105 @@
+# Reams
+- type: latheRecipe
+  id: BoxReamWhite
+  result: BoxReamWhite
+  completetime: 2
+  materials:
+    Paper: 300
+
+- type: latheRecipe
+  parent: BoxReamWhite
+  id: BoxReamClassic
+  result: BoxReamClassic
+
+- type: latheRecipe
+  parent: BoxReamWhite
+  id: BoxReamBright
+  result: BoxReamBright
+
+- type: latheRecipe
+  id: PaperStickyNoteStackFilled
+  result: PaperStickyNoteStackFilled
+  materials:
+    Paper: 200
+
+# Sticky notes
+- type: latheRecipe
+  parent: PaperStickyNoteStackFilled
+  id: PaperStickyNoteStackFilledBlue
+  result: PaperStickyNoteStackFilledBlue
+
+- type: latheRecipe
+  parent: PaperStickyNoteStackFilled
+  id: PaperStickyNoteStackFilledGreen
+  result: PaperStickyNoteStackFilledGreen
+
+- type: latheRecipe
+  parent: PaperStickyNoteStackFilled
+  id: PaperStickyNoteStackFilledPink
+  result: PaperStickyNoteStackFilledPink
+
+# Pens
+- type: latheRecipe
+  id: Pen
+  result: Pen
+  materials:
+    Plastic: 50
+
+- type: latheRecipe
+  id: LuxuryPen
+  result: LuxuryPen
+  materials:
+    Steel: 300
+    Gold: 100
+
+# Folders
+
+- type: latheRecipe
+  id: BoxFolderBaseEmpty
+  result: BoxFolderBaseEmpty
+  materials:
+    Cardboard: 100
+    Paper: 100
+
+- type: latheRecipe
+  parent: BoxFolderBaseEmpty
+  id: BoxFolderBlackEmpty
+  result: BoxFolderBlackEmpty
+
+- type: latheRecipe
+  parent: BoxFolderBaseEmpty
+  id: BoxFolderBlueEmpty
+  result: BoxFolderBlueEmpty
+
+- type: latheRecipe
+  parent: BoxFolderBaseEmpty
+  id: BoxFolderGreenEmpty
+  result: BoxFolderGreenEmpty
+
+- type: latheRecipe
+  parent: BoxFolderBaseEmpty
+  id: BoxFolderGreyEmpty
+  result: BoxFolderGreyEmpty
+
+- type: latheRecipe
+  parent: BoxFolderBaseEmpty
+  id: BoxFolderRedEmpty
+  result: BoxFolderRedEmpty
+
+- type: latheRecipe
+  parent: BoxFolderBaseEmpty
+  id: BoxFolderYellowEmpty
+  result: BoxFolderYellowEmpty
+
+# Stamps
+
+- type: latheRecipe
+  id: RubberStampApproved
+  result: RubberStampApproved
+  materials:
+    Plastic: 500
+
+- type: latheRecipe
+  parent: RubberStampApproved
+  id: RubberStampDenied
+  result: RubberStampDenied

Resources/Prototypes/_DV/Recipes/Reactions/chemicals.yml

@@ -0,0 +1,12 @@
+- type: reaction
+  id: Goreicide
+  minTemp: 370
+  reactants:
+    Heparin:
+      amount: 1
+    FluorosulfuricAcid:
+      amount: 1
+    Vestine:
+      amount: 1
+  products:
+    Goreicide: 6

Resources/Prototypes/_DV/tags.yml

@@ -320,3 +320,6 @@
 
 - type: Tag
   id: UnstableCoreRefractor
+
+- type: Tag
+  id: Acid40mm # Ammo tag for pacifier acid grenades

Resources/Prototypes/lobbyscreens.yml

@@ -69,3 +69,7 @@
 - type: lobbyBackground
   id: CrueltyStation
   background: /Textures/LobbyScreens/CRUELTY_STATION.webp
+
+- type: lobbyBackground
+  id: TheBorgEvent
+  background: /Textures/LobbyScreens/The_Borg_event.webp

Resources/Textures/LobbyScreens/attributions.yml

@@ -87,3 +87,8 @@
   license: "CC-BY-4.0"
   copyright: "Gilzar - Winner of the Delta V art contest"
   source: "https://discord.gg/deltav"
+
+- files: [ "The_Borg_event.webp" ]
+  license: "CC-BY-4.0"
+  copyright: "gintoki23 - fanart of Delta V"
+  source: "https://discord.gg/deltav"

Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Explosives/pacifier-grenade.rsi/meta.json

@@ -0,0 +1,29 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Pacifier acid projector by PresumptuousSpacemans for server Delta-V",
+    "states": [
+        {
+            "name": "item"
+        },
+        {
+            "name": "projectile"
+        },
+        {
+            "name": "primed"
+        },
+        {
+            "name": "spent"
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "munition"
+        }
+    ]
+}

Resources/Textures/_DV/Objects/Weapons/Guns/Launchers/pacifier_acid_launcher.rsi/meta.json

@@ -0,0 +1,41 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Pacifier acid projector by PresumptuousSpacemans for server Delta-V",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_DV/Structures/Doors/Airlocks/Glass/justice.rsi/meta.json

@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and recolored by leonardo_dabepis (Discord)",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and recolored by leonardo_dabepis (Discord). Modified by turtlemutt (Discord)",
     "size": {
         "x": 32,
         "y": 32

Resources/Textures/_DV/Structures/Doors/Airlocks/Standard/justice.rsi/meta.json

@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and recolored by leonardo_dabepis (Discord). Modified by Gray.",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and recolored by leonardo_dabepis (Discord). Modified by Gray. Modified by turtlemutt (Discord)",
     "size": {
         "x": 32,
         "y": 32

Resources/Textures/_DV/Structures/Machines/techfab.rsi/meta.json

@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "made by EmoGarbage, ammo state made by AjexRose and modified by Emo garbage. Further modified by TJohnson. Additional building and unlit building animations by SubspaceEmber",
+    "copyright": "made by EmoGarbage, ammo state made by AjexRose and modified by Emo garbage. Further modified by TJohnson. Additional building and unlit building animations by SubspaceEmber, justice variant by Radezolid",
     "size": {
         "x": 32,
         "y": 32
@@ -13,6 +13,9 @@
         {
             "name": "sec"
         },
+        {
+            "name": "jus"
+        },
         {
             "name": "ammo"
         },

Resources/deltav_map_attributions.yml

@@ -1,3 +1,9 @@
+
+- files: ["anvil.yml"]
+  license: "CC-BY-NC-SA-4.0"
+  copyright: "Created by Gray for Delta-V."
+  source: "https://github.com/DeltaV-Station/Delta-v/pull/4338"
+
 - files: ["academy.yml"]
   license: "CC-BY-NC-SA-4.0"
   copyright: "Created by Biddy Gelson for Delta V."