Merge branch 'master' into Chitinid

Content.Server/_DV/DeviceLinking/Components/DeadMansSignallerComponent.cs

@@ -0,0 +1,14 @@
+using Content.Shared.DeviceLinking;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server._DV.DeviceLinking.Components;
+
+[RegisterComponent]
+public sealed partial class DeadMansSignallerComponent : Component
+{
+    /// <summary>
+    ///     The port that gets signaled when the switch turns on.
+    /// </summary>
+    [DataField]
+    public ProtoId<SourcePortPrototype> Port = "Pressed";
+}

Content.Server/_DV/DeviceLinking/Systems/DeadMansSignallerSystem.cs

@@ -0,0 +1,27 @@
+using Content.Server._DV.DeviceLinking.Components;
+using Content.Server.DeviceLinking.Systems;
+using Content.Shared.Hands;
+using Content.Shared.Item.ItemToggle;
+
+namespace Content.Server._DV.DeviceLinking.Systems;
+
+public sealed class DeadMansSignallerSystem : EntitySystem
+{
+    [Dependency] private readonly DeviceLinkSystem _link = default!;
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DeadMansSignallerComponent, GotUnequippedHandEvent>(DeadMans);
+    }
+
+    private void DeadMans(Entity<DeadMansSignallerComponent> ent, ref GotUnequippedHandEvent args)
+    {
+        if (_toggle.IsActivated(ent.Owner))
+        {
+            _link.InvokePort(ent.Owner, ent.Comp.Port);
+        }
+    }
+}

Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs

@@ -362,7 +362,6 @@ private void Buckle(Entity<BuckleComponent> buckle, Entity<StrapComponent> strap
 
         _audio.PlayPredicted(strap.Comp.BuckleSound, strap, user);
 
-        SetBuckledTo(buckle, strap!);
         Appearance.SetData(strap, StrapVisuals.State, true);
         Appearance.SetData(buckle, BuckleVisuals.Buckled, true);
 
@@ -384,6 +383,8 @@ private void Buckle(Entity<BuckleComponent> buckle, Entity<StrapComponent> strap
                 break;
         }
 
+        SetBuckledTo(buckle, strap!); // DeltaV - Allow standing system to handle Down/Stand before buckling
+
         var ev = new StrappedEvent(strap, buckle);
         RaiseLocalEvent(strap, ref ev);
 

Resources/Changelog/DeltaVChangelog.yml

@@ -1,20 +1,4 @@
 Entries:
-- author: jimmy12or
-  changes:
-  - message: Adds Crystalthistle! A plant that produces Quartzite!
-    type: Add
-  - message: Adds Quartzite! A reagent that turns into glass when heated!
-    type: Add
-  id: 440
-  time: '2024-07-22T04:28:46.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1462
-- author: NullWanderer
-  changes:
-  - message: The security resprite has been reverted after admin discussion
-    type: Remove
-  id: 441
-  time: '2024-07-22T07:56:03.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1517
 - author: DangerRevolution
   changes:
   - message: Security Cyborgs have been authorised for use aboard Delta-V class stations.
@@ -3859,3 +3843,17 @@
   id: 939
   time: '2025-01-19T00:33:45.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2744
+- author: BarryNorfolk
+  changes:
+  - message: Fix the up/down when entities are buckled.
+    type: Fix
+  id: 940
+  time: '2025-01-19T12:38:44.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2769
+- author: deltanedas
+  changes:
+  - message: Added a nitrous oxide tank to surgeon lockers.
+    type: Add
+  id: 941
+  time: '2025-01-19T18:56:46.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2773

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

@@ -35,4 +35,7 @@ uplink-storage-implanter-delta-desc = Hide goodies inside of yourself with new b
 uplink-hardsuit-syndieelite-delta-name = Syndicate Thermal Hardsuit
 
 uplink-objective-syndicate-board-name = Syndicate law board
-uplink-objective-syndicate-board-desc = Its expensive, don't lose it!
+uplink-objective-syndicate-board-desc = Its expensive, don't lose it!
+
+uplink-dead-mans-signaller-name = Dead Man's Signaller
+uplink-dead-mans-signaller-desc = A device that if armed, will send a signal to any linked devices (such as bombs) when it is dropped or put away.

Resources/Prototypes/Entities/Mobs/Player/skeleton.yml

@@ -56,7 +56,7 @@
     description: ghost-role-information-closet-skeleton-description
     rules: ghost-role-information-closet-skeleton-rules # DeltaV - No longer free agent, now a non-antag (Some leeway given).
     mindRoles:
-    - MindRoleGhostRoleFreeAgent
+    - MindRoleGhostRoleNeutral # DeltaV - neutral ghost role instead of free agent
     raffle:
       settings: default
     requirements: # DeltaV

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

@@ -376,6 +376,7 @@
       - FultonBeacon
       - PowerCellHyper
       - FireExtinguisherBluespace
+      - SignallerDeadMans
       # End DeltaV additions
       - EnergyScalpel # Shitmed Change
       - EnergyCautery # Shitmed Change

Resources/Prototypes/Nyanotrasen/Research/experimental.yml

@@ -12,7 +12,8 @@
   recipeUnlocks:
   - ClothingHeadHelmetInsulated
   - ClothingHeadCage
-  # - ShellSoulbreaker # DeltaV - Placing it under Exotic Ammunition because that's what it is.
+  - MagazineBoxSpecialMindbreaker
+  - BoxShellSoulbreaker
 
 - type: technology
   id: Metempsychosis

Resources/Prototypes/Research/arsenal.yml

@@ -1,26 +1,25 @@
 # Tier 1
 
-- type: technology
-  id: DraconicMunitions
-  name: research-technology-draconic-munitions
-  icon:
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi
-    state: incendiarydisplay
-  discipline: Arsenal
-  tier: 2 # DeltaV moved to t2 from t1
-  cost: 10000
-  recipeUnlocks:
-  - BoxShotgunIncendiary
-  - MagazineRifleIncendiary
-  - MagazinePistolIncendiary
-  - MagazineLightRifleIncendiary
-  - SpeedLoaderMagnumIncendiary
-  - MagazineShotgunIncendiary
-  - MagazineBoxPistolIncendiary
-  - MagazineBoxMagnumIncendiary
-  - MagazineBoxLightRifleIncendiary
-  - MagazineBoxRifleIncendiary
-  - MagazineBoxSpecialIncendiary # DeltaV
+#- type: technology # DeltaV merged draconic and uranium munitions and moved to our namespace
+#  id: DraconicMunitions
+#  name: research-technology-draconic-muntions
+#  icon:
+#    sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi
+#    state: incendiarydisplay
+#  discipline: Arsenal
+#  tier: 1
+#  cost: 10000
+#  recipeUnlocks:
+#  - BoxShotgunIncendiary
+#  - MagazineRifleIncendiary
+#  - MagazinePistolIncendiary
+#  - MagazineLightRifleIncendiary
+#  - SpeedLoaderMagnumIncendiary
+#  - MagazineShotgunIncendiary
+#  - MagazineBoxPistolIncendiary
+#  - MagazineBoxMagnumIncendiary
+#  - MagazineBoxLightRifleIncendiary
+#  - MagazineBoxRifleIncendiary
 
 - type: technology
   id: WeaponizedLaserManipulation
@@ -50,28 +49,28 @@
 #  - BoxBeanbag
 #  - WeaponDisabler
 
-- type: technology
-  id: UraniumMunitions
-  name: research-technology-uranium-munitions
-  icon:
-    sprite: Objects/Materials/Sheets/other.rsi
-    state: uranium
-  discipline: Arsenal
-  tier: 2 # DeltaV moved to t2 from t1
-  cost: 7500
-  recipeUnlocks:
-  - MagazineRifleUranium
-  - MagazinePistolUranium
-  - MagazineLightRifleUranium
-  - SpeedLoaderMagnumUranium
-  - MagazineBoxPistolUranium
-  - MagazineBoxMagnumUranium
-  - MagazineBoxLightRifleUranium
-  - MagazineBoxRifleUranium
-  - BoxShotgunUranium
+#- type: technology # DeltaV merged draconic and uranium munitions and moved to our namespace
+#  id: UraniumMunitions
+#  name: research-technology-uranium-munitions
+#  icon:
+#    sprite: Objects/Materials/Sheets/other.rsi
+#    state: uranium
+#  discipline: Arsenal
+#  tier: 1
+#  cost: 7500
+#  recipeUnlocks:
+#  - MagazineRifleUranium
+#  - MagazinePistolUranium
+#  - MagazineLightRifleUranium
+#  - SpeedLoaderMagnumUranium
+#  - MagazineBoxPistolUranium
+#  - MagazineBoxMagnumUranium
+#  - MagazineBoxLightRifleUranium
+#  - MagazineBoxRifleUranium
+#  - BoxShotgunUranium
   # DeltaV - .38 special uranium ammo - Adds .38 special uranium ammo to the research tree
-  - SpeedLoaderSpecialUranium
-  - MagazineBoxSpecialUranium
+#  - SpeedLoaderSpecialUranium
+#  - MagazineBoxSpecialUranium
   # End of modified code
 
 - type: technology
@@ -107,6 +106,7 @@
   - FlashPayload
   - ExplosivePayload
   - ChemicalPayload
+  - SignallerDeadMans # DeltaV - Dead Man's Signaller
 
 - type: technology
   id: SpecialMeans

Resources/Prototypes/StatusIcon/job.yml

@@ -73,7 +73,7 @@
   parent: JobIcon
   id: JobIconPrisoner
   icon:
-    sprite: /Textures/Interface/Misc/job_icons.rsi
+    sprite: /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - resprite prisoner jobicon
     state: Prisoner
   jobName: job-name-prisoner
 

Resources/Prototypes/_DV/Catalog/Fills/Lockers/medical.yml

@@ -100,6 +100,7 @@
     - id: ClothingEyesHudMedical
     - id: ClothingBackpackDuffelSurgeryFilled
     - id: ClothingOuterVestTank
+    - id: NitrousOxideTankFilled
     - id: LunchboxMedicalFilledRandom
       prob: 0.3
     - id: BoxSyringe

Resources/Prototypes/_DV/Catalog/uplink_catalog.yml

@@ -166,3 +166,16 @@
     blacklist:
       components:
       - SurplusBundle
+
+- type: listing
+  id: UplinkDeadMansSignaller
+  name: uplink-dead-mans-signaller-name
+  description: uplink-dead-mans-signaller-desc
+  productEntity: DeadMansSignaler
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 1
+  cost:
+    Telecrystal: 2
+  categories:
+  - UplinkDisruption

Resources/Prototypes/_DV/Entities/Objects/Devices/Electronics/dead-mans-signaller.yml

@@ -0,0 +1,25 @@
+#This signaller device will send a signal if it is dropped while activated
+
+- type: entity
+  parent: RemoteSignaller
+  id: DeadMansSignaler
+  name: dead man's signaler
+  description: A device that if armed will send signals to objects within 50 meters when dropped or put away.
+  components:
+  - type: DeadMansSignaller
+  - type: ItemToggle
+  - type: Sprite
+    drawdepth: Items
+    sprite: _DV/Objects/Devices/deadmanssignaller.rsi
+    layers:
+    - state: inactive
+      map: [ "enum.ToggleVisuals.Layer" ]
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.ToggleVisuals.Toggled:
+        enum.ToggleVisuals.Layer:
+          True: {state: active}
+          False: {state: inactive}
+  - type: WirelessNetworkConnection
+    range: 50

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

@@ -18,3 +18,12 @@
     Silver: 750
     Plasma: 500
     Bluespace: 100
+
+- type: latheRecipe
+  parent: BasePartRecipe
+  id: SignallerDeadMans
+  result: DeadMansSignaler
+  materials:
+    Steel: 100
+    Plastic: 200
+    Plasma: 100

Resources/Prototypes/_DV/Research/arsenal.yml

@@ -10,9 +10,28 @@
   tier: 1
   cost: 7500
   recipeUnlocks:
+  - MagazineRifleUranium
+  - MagazinePistolUranium
+  - MagazineLightRifleUranium
+  - SpeedLoaderMagnumUranium
+  - MagazineBoxPistolUranium
+  - MagazineBoxMagnumUranium
+  - MagazineBoxLightRifleUranium
+  - MagazineBoxRifleUranium
+  - BoxShotgunUranium
+  - SpeedLoaderSpecialUranium
+  - MagazineBoxSpecialUranium
+  - BoxShotgunIncendiary
+  - MagazineRifleIncendiary
+  - MagazinePistolIncendiary
+  - MagazineLightRifleIncendiary
+  - SpeedLoaderMagnumIncendiary
+  - MagazineShotgunIncendiary
+  - MagazineBoxPistolIncendiary
+  - MagazineBoxMagnumIncendiary
+  - MagazineBoxLightRifleIncendiary
+  - MagazineBoxRifleIncendiary
   - MagazineBoxSpecialHoly
-  - MagazineBoxSpecialMindbreaker
-  - BoxShellSoulbreaker # Nyanotrasen - Soulbreaker shotgun ammo
 
 - type: technology
   id: EnergyGuns

Resources/Textures/_DV/Interface/Misc/job_icons.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/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoPrisonGuard, nyanoMartialArtist, nyanoGladiator made by Floofers | ChiefJustice, Clerk by leonardo_dabepis (Discord), SecurityBorg recoloured from MedicalBorg by DangerRevolution(github), CargoAssistant recoloured from MedicalIntern by Radezolid, AdminAssistant made by noctyrnal (github), Surgeon by Janet Blackquill <[email protected]> 2024. Security cards modified by TJohnson.",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | SecurityOfficer, nyanoMartialArtist, nyanoGladiator made by Floofers | ChiefJustice, Clerk by leonardo_dabepis (Discord), SecurityBorg recoloured from MedicalBorg by DangerRevolution(github), CargoAssistant recoloured from MedicalIntern by Radezolid, AdminAssistant made by noctyrnal (github), Surgeon by Janet Blackquill <[email protected]> 2024. Security cards modified by TJohnson.",
     "size": {
         "x": 8,
         "y": 8
@@ -69,6 +69,9 @@
         },
         {
             "name": "SeniorOfficer"
+        },
+        {
+            "name": "Prisoner"
         }
     ]
 }

Resources/Textures/_DV/Objects/Devices/deadmanssignaller.rsi/meta.json

@@ -0,0 +1,25 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "signaller state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/2c980a1f423f26e990a578bae057d1eca19675ec. inhands & advanced made by Flaregy for Space Station 14. Dead Man's Signaller is modified from signaller",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "active"
+        },
+        {
+            "name": "inactive"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_DV/Objects/Misc/id_cards.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/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoprisonguard, nyanogladiator, nyanomartialartist made by Floofers, idchiefjustice idclerk and idlawyer made by leonardo_dabepis (Discord), idprosecutor made by Timemaster99 (Discord), idcargoassistant made by Radezolid, idadminassistant by noctyrnal (github), idsurgeon by Janet Blackquill <[email protected]> 2024. Security sprites modified by TJohnson.",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | idsecurityofficer, nyanogladiator, nyanomartialartist made by Floofers, idchiefjustice idclerk and idlawyer made by leonardo_dabepis (Discord), idprosecutor made by Timemaster99 (Discord), idcargoassistant made by Radezolid, idadminassistant by noctyrnal (github), idsurgeon by Janet Blackquill <[email protected]> 2024. Security sprites modified by TJohnson.",
     "size": {
         "x": 32,
         "y": 32