Merge branch 'master' into work/jblackquill/surgeon-role

Signed-off-by: deltanedas <[email protected]>
DeltaV-Station · Jan 8, 2025 · ff681e9 · ff681e9
2 parents db307c0 + 7bcce16
commit ff681e9
Show file tree

Hide file tree

Showing 70 changed files with 757 additions and 34 deletions.
diff --git a/Content.IntegrationTests/Tests/CargoTest.cs b/Content.IntegrationTests/Tests/CargoTest.cs
@@ -23,6 +23,8 @@ public sealed class CargoTest
     [
         // This is ignored because it is explicitly intended to be able to sell for more than it costs.
         // new("FunCrateGambling") // DeltaV - no gambling
+        new("LivestockArenaMobLarge"), // Deltav - add crate to exceptions
+        new("LivestockArenaMobSmall") // Deltav - add crate to exceptions
     ];
 
     [Test]
@@ -71,6 +73,7 @@ public async Task NoCargoBountyArbitrageTest()
         var cargo = entManager.System<CargoSystem>();
 
         var bounties = protoManager.EnumeratePrototypes<CargoBountyPrototype>().ToList();
+        bounties.RemoveAll(bounty => bounty.SkipArbitrage); // DeltaV
 
         await server.WaitAssertion(() =>
         {

diff --git a/Content.Shared/Cargo/Prototypes/CargoBountyPrototype.cs b/Content.Shared/Cargo/Prototypes/CargoBountyPrototype.cs
@@ -39,6 +39,12 @@ public sealed partial class CargoBountyPrototype : IPrototype
     /// </summary>
     [DataField]
     public string IdPrefix = "NT";
+
+    /// <summary>
+    /// DeltaV: Skips this bounty for the cargo bounty arbitrage test.
+    /// </summary>
+    [DataField]
+    public bool SkipArbitrage;
 }
 
 [DataDefinition, Serializable, NetSerializable]

diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -1,18 +1,4 @@
 Entries:
-- author: Haltell
-  changes:
-  - message: Nanotrasen uniform stores resotcked; many more options for your style!
-    type: Add
-  id: 376
-  time: '2024-06-01T21:32:32.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1269
-- author: Colin-Tel
-  changes:
-  - message: Micro can appear in lobbies up to 45 in population
-    type: Tweak
-  id: 377
-  time: '2024-06-02T06:50:05.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1280
 - author: Delta-V Admin Team
   changes:
   - message: Changed the rules concerning being revived by defib in Rule 3
@@ -3839,3 +3825,19 @@
   id: 875
   time: '2025-01-07T17:15:23.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2542
+- author: Velcroboy
+  changes:
+  - message: Additional aggressive mobs can now be purchased for Arena Station. Caution
+      is advised.
+    type: Add
+  id: 876
+  time: '2025-01-07T19:37:10.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2563
+- author: Radezolid
+  changes:
+  - message: Added the paperwork belt, it allows you to carry anything document related
+      + some drinks ask your local HOP to print one in the uniform printer.
+    type: Add
+  id: 877
+  time: '2025-01-08T03:52:42.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2592
diff --git a/Resources/Prototypes/Catalog/Bounties/bounties.yml b/Resources/Prototypes/Catalog/Bounties/bounties.yml
@@ -25,6 +25,7 @@
   id: BountyBrain
   reward: 12500
   description: bounty-description-brain
+  skipArbitrage: true # DeltaV - arena mob crate has mobs with brain
   entries:
   - name: bounty-item-brain
     amount: 1
@@ -74,6 +75,7 @@
   reward: 12500
   description: bounty-description-carp
   idPrefix: CC
+  skipArbitrage: true # DeltaV - arena mob crate has mobs with brain
   entries:
   - name: bounty-item-carp
     amount: 1

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -1218,6 +1218,7 @@
       - ClothingUniformJumpskirtWardenBlue # DeltaV - alternate sec uniforms
       - ClothingUniformJumpsuitWardenGrey # DeltaV - alternate sec uniforms
       - ClothingUniformJumpskirtWardenGrey # DeltaV - alternate sec uniforms
+      - ClothingBeltPaperwork # DeltaV - Added the paperwork belt
       - ClothingHeadHatParamedicsoft
       # Winter outfits
       - ClothingOuterWinterCap

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -23,10 +23,10 @@
   description: An advanced hardsuit helmet designed for work in special operations.
   components:
   - type: Sprite
-    sprite: DeltaV/Clothing/Head/ReverseEngineering/syndicate.rsi
+    sprite: _DV/Clothing/Head/ReverseEngineering/syndicate.rsi
   - type: Clothing
-    sprite: DeltaV/Clothing/Head/ReverseEngineering/syndicate.rsi
-  - type: PointLight 
+    sprite: _DV/Clothing/Head/ReverseEngineering/syndicate.rsi
+  - type: PointLight
     color: aquamarine
 
 - type: entity
@@ -37,9 +37,9 @@
   description: An assault hardsuit helmet featuring a top-secret translucent polymer.
   components:
   - type: Sprite
-    sprite: DeltaV/Clothing/Head/ReverseEngineering/juggernaut.rsi
+    sprite: _DV/Clothing/Head/ReverseEngineering/juggernaut.rsi
   - type: Clothing
-    sprite: DeltaV/Clothing/Head/ReverseEngineering/juggernaut.rsi
+    sprite: _DV/Clothing/Head/ReverseEngineering/juggernaut.rsi
 
 - type: entity
   parent: ClothingHeadHelmetHardsuitERTLeader

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -14,9 +14,9 @@
   name: SA-122 combat hardsuit
   components:
   - type: Sprite
-    sprite: DeltaV/Clothing/OuterClothing/ReverseEngineering/syndicate.rsi
+    sprite: _DV/Clothing/OuterClothing/ReverseEngineering/syndicate.rsi
   - type: Clothing
-    sprite:  DeltaV/Clothing/OuterClothing/ReverseEngineering/syndicate.rsi
+    sprite: _DV/Clothing/OuterClothing/ReverseEngineering/syndicate.rsi
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitSyndieReverseEngineered
   - type: ReverseEngineering
@@ -30,9 +30,9 @@
   description: A suit made by the special acquisitions department of Nanotrasen to be hyper resilient.
   components:
   - type: Sprite
-    sprite: DeltaV/Clothing/OuterClothing/ReverseEngineering/juggernaut.rsi
+    sprite: _DV/Clothing/OuterClothing/ReverseEngineering/juggernaut.rsi
   - type: Clothing
-    sprite:  DeltaV/Clothing/OuterClothing/ReverseEngineering/juggernaut.rsi
+    sprite: _DV/Clothing/OuterClothing/ReverseEngineering/juggernaut.rsi
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitJuggernautReverseEngineered
   - type: ReverseEngineering

diff --git a/Resources/Prototypes/_DV/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/_DV/Catalog/Cargo/cargo_livestock.yml
@@ -7,3 +7,24 @@
   cost: 3500
   category: Livestock
   group: market
+
+#Move to armory if we ever do access-specific purchasing
+- type: cargoProduct
+  id: LivestockArenaMobSmall
+  icon:
+    sprite: Mobs/Aliens/Carps/space.rsi
+    state: icon
+  product: CrateArenaMobSmall
+  cost: 4000
+  category: cargoproduct-category-name-livestock
+  group: market
+
+- type: cargoProduct
+  id: LivestockArenaMobLarge
+  icon:
+    sprite: Mobs/Aliens/Xenos/queen.rsi
+    state: running
+  product: CrateArenaMobLarge
+  cost: 6000
+  category: cargoproduct-category-name-livestock
+  group: market