Automatic changelog update

* PORT: Content warnings from funkystation (#4373)

* Content warnings (#2922)

Co-authored-by: funkystationbot <funky@funkystation.org>

* lala

* fix: content warning should now display

* taydeo were these on purpose?

* victor hugo mary shelley oscar wilde frankenstein we didnt start the fire

---------

Co-authored-by: taydeo <tay@funkystation.org>
Co-authored-by: funkystationbot <funky@funkystation.org>

* cw size fix

* fixes and adjustments

* two byte ops

* no attribution allowed

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

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: KOTOB <59124164+kotobdev@users.noreply.github.com>

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

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: KOTOB <59124164+kotobdev@users.noreply.github.com>

---------

Signed-off-by: KOTOB <59124164+kotobdev@users.noreply.github.com>
Co-authored-by: mq <113324899+mqole@users.noreply.github.com>
Co-authored-by: taydeo <tay@funkystation.org>
Co-authored-by: funkystationbot <funky@funkystation.org>
Co-authored-by: mqole <anactualpanacea@gmail.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

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,56 +1,4 @@
 Entries:
-- author: DisposableCrewmember42
-  changes:
-  - message: Conspirators now requires 32 connected players to roll. The ingame delay
-      before choosing conspirators is increased.
-    type: Fix
-  id: 2167
-  time: '2026-03-09T11:39:35.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5490
-- author: Stxcking
-  changes:
-  - message: 'Added a new space ruin: Abandoned Dojo!'
-    type: Add
-  id: 2168
-  time: '2026-03-09T11:48:58.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5427
-- 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
@@ -4448,4 +4396,57 @@
   id: 2667
   time: '2026-09-20T20:10:57.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/6523
+- author: Radezolid
+  changes:
+  - message: Fixed Smile's core not being able to be picked up.
+    type: Fix
+  id: 2668
+  time: '2026-09-21T17:15:20.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6529
+- author: Apersos-coll
+  changes:
+  - message: you now actually need to get all components to craft the unstable core
+      refractor. And the container can no longer hold the entire universe inside of
+      it.
+    type: Fix
+  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
 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/_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/Body/Organs/Animal/slimes.yml

@@ -1,4 +1,5 @@
 - type: entity
+  parent: BaseItem
   id: SentientSmileCore
   name: sentient smile core
   components:

Resources/Prototypes/_DV/Catalog/Cargo/cargo_armory.yml

@@ -103,7 +103,7 @@
 - type: cargoProduct
   id: ArmoryUnstableCore
   icon:
-    sprite: _DV/Objects/Misc/unstablereactorcore.rsi
+    sprite: _DV/Objects/Misc/unstable_reactor_core.rsi
     state: icon
   product: CrateArmoryUnstableCore
   cost: 10000

Resources/Prototypes/_DV/Entities/Objects/Misc/specialized_weapon_parts.yml

@@ -5,7 +5,7 @@
   description: A compact, circular-shaped reactor, incapable of fully containing its energy. It's quite the fancy paperweight.
   components:
   - type: Sprite
-    sprite: _DV/Objects/Misc/unstablereactorcore.rsi
+    sprite: _DV/Objects/Misc/unstable_reactor_core.rsi
     state: icon
   - type: RadiationSource
     intensity: 4
@@ -66,6 +66,9 @@
     slots:
       ItemCabinet:
         startingItem: UnstableReactorCore
+        whitelist:
+          tags:
+          - UnstableReactorCore
 
 - type: entity
   parent: BaseItem
@@ -74,7 +77,7 @@
   description: A heavy housing engineered to contain the power output of an unstable reactor core and focus it into a dense, radioactive beam. It's missing its power source.
   components:
   - type: Sprite
-    sprite: _DV/Objects/Misc/unstablereactorhousing.rsi
+    sprite: _DV/Objects/Misc/unstable_reactor_housing.rsi
     state: icon
   - type: Item
     size: Ginormous
@@ -84,7 +87,7 @@
     sprintModifier: 0.75
   - type: HeldSpeedModifier
   - type: Construction
-    graph: UnstableCoreRefractor
+    graph: UnstableCoreRefractorConstruct
     node: start
   - type: Tag
     tags:

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/Recipes/Construction/Graphs/unstable_core_refractor.yml

@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: UnstableCoreRefractor
+  id: UnstableCoreRefractorConstruct
   start: start
   graph:
   - node: start
@@ -10,8 +10,31 @@
       - tag: UnstableReactorCore
         name: construction-graph-tag-unstable-reactor-core
         icon:
-          sprite: _DV/Objects/Misc/unstablereactorcore.rsi
+          sprite: _DV/Objects/Misc/unstable_reactor_core.rsi
           state: icon
-        doAfter: 3
+        doAfter: 6
+  - node: UnstableRefractor
+    entity: WeaponUnstableCoreRefractor
+
+- type: constructionGraph
+  id: UnstableCoreRefractor
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: UnstableRefractor
+      steps:
+      - tag: UnstableReactorHousing
+        name: construction-graph-tag-unstable-reactor-housing
+        icon:
+          sprite: _DV/Objects/Misc/unstable_reactor_housing.rsi
+          state: icon
+        doAfter: 1
+      - tag: UnstableReactorCore
+        name: construction-graph-tag-unstable-reactor-core
+        icon:
+          sprite: _DV/Objects/Misc/unstable_reactor_core.rsi
+          state: icon
+        doAfter: 6
   - node: UnstableRefractor
     entity: WeaponUnstableCoreRefractor

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/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/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."