Merge branch 'thaven-port' of https://github.com/kushbreth/Delta-v-fo…

…rk-for-doing-shit-and-things into thaven-port

Content.Server/_Shitmed/Medical/Surgery/SurgerySystem.cs

@@ -200,7 +200,7 @@ public FixedPoint2 DamageToBeDealt(Entity<SurgeryContaminableComponent> ent, Fix
         var exceedsAmount = (dirtiness - ent.Comp.DirtinessThreshold).Float();
         var additionalDamage = (1f / ent.Comp.InverseDamageCoefficient.Float()) * (exceedsAmount * exceedsAmount);
 
-        return FixedPoint2.New(additionalDamage) + ent.Comp.BaseDamage;
+        return FixedPoint2.Min(FixedPoint2.New(additionalDamage) + ent.Comp.BaseDamage, ent.Comp.ToxinStepLimit);
     }
 
     private void AddDirt(EntityUid ent, FixedPoint2 amount)

Content.Shared/_DV/Surgery/SurgeryContaminableComponent.cs

@@ -14,7 +14,7 @@ public sealed partial class SurgeryContaminableComponent : Component
     ///     How much cross contamination should increase dirtiness per incompatible DNA
     /// </summary>
     [DataField]
-    public FixedPoint2 CrossContaminationDirtinessLevel = 40.0;
+    public FixedPoint2 CrossContaminationDirtinessLevel = 60.0;
 
     /// <summary>
     ///     The level of dirtiness above which toxin damage will be dealt
@@ -26,7 +26,7 @@ public sealed partial class SurgeryContaminableComponent : Component
     ///     The base amount of toxin damage to deal above the threshold
     /// </summary>
     [DataField]
-    public FixedPoint2 BaseDamage = 2.0;
+    public FixedPoint2 BaseDamage = 1.0;
 
     /// <summary>
     ///     The inverse of the coefficient to scale the toxin damage by

Content.Shared/_DV/Surgery/SurgeryStepDirtinessComponent.cs

@@ -13,11 +13,11 @@ public sealed partial class SurgeryStepDirtinessComponent : Component
     ///     The amount of dirtiness this step should add to tools on completion
     /// </summary>
     [DataField]
-    public FixedPoint2 ToolDirtiness = 2.0;
+    public FixedPoint2 ToolDirtiness = 0.5;
 
     /// <summary>
     ///     The amount of dirtiness this step should add to gloves on completion
     /// </summary>
     [DataField]
-    public FixedPoint2 GloveDirtiness = 2.0;
+    public FixedPoint2 GloveDirtiness = 0.5;
 }

Resources/Changelog/DeltaVChangelog.yml

@@ -1,48 +1,4 @@
 Entries:
-- author: rosieposieeee
-  changes:
-  - message: Added Space Disposals with a warning sign on them, and made disposals
-      pretty again.
-    type: Tweak
-  id: 519
-  time: '2024-09-05T05:46:01.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1009
-- author: Radezolid
-  changes:
-  - message: Fixed Mystagogue cloak not counting towards the thief's cloak objective
-    type: Fix
-  id: 520
-  time: '2024-09-06T21:26:21.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1759
-- author: adeinitas
-  changes:
-  - message: Wing covers have been installed on various ERT suits and some others,
-      and they now fit harpies.
-    type: Tweak
-  id: 521
-  time: '2024-09-07T04:37:28.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1754
-- author: flyingkarii
-  changes:
-  - message: Removed command age requirement.
-    type: Tweak
-  id: 522
-  time: '2024-09-07T04:38:34.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1611
-- author: deltanedas
-  changes:
-  - message: Fulton recipes can now be unlocked with the Aerial Extractions tech.
-    type: Add
-  id: 523
-  time: '2024-09-07T13:17:16.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1760
-- author: Fox
-  changes:
-  - message: New Lobby Track "The Station" by A-Guy
-    type: Add
-  id: 524
-  time: '2024-09-07T13:44:12.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1761
 - author: Fox
   changes:
   - message: Added cryo and some new maints to Pebble!
@@ -3843,3 +3799,61 @@
   id: 1018
   time: '2025-02-08T10:46:09.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2927
+- author: deltanedas
+  changes:
+  - message: Made air alarms less sensitive to higher oxygen and slightly lower pressure.
+      Opening random firelocks is more likely to actually be dangerous!
+    type: Tweak
+  id: 1019
+  time: '2025-02-09T03:00:40.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2939
+- author: Lyndomen
+  changes:
+  - message: Surgical procedures repairing burns and brute damage are slightly more
+      effective.
+    type: Tweak
+  id: 1020
+  time: '2025-02-09T05:31:12.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2935
+- author: Lyndomen
+  changes:
+  - message: Nukie medic and commander armor can now actually get purchased, and they
+      get 5 extra TC.
+    type: Tweak
+  id: 1021
+  time: '2025-02-09T05:32:37.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2934
+- author: Quanteey
+  changes:
+  - message: NT now stocks brute trauma kits with additional bicaridine pills
+    type: Tweak
+  id: 1022
+  time: '2025-02-09T17:33:48.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2941
+- author: sowelipililimute
+  changes:
+  - message: Surgical tools get less dirtier than before from normal procedures and
+      dirtier from cross contamination, and have a lower base poison damage once they
+      become too dirty
+    type: Tweak
+  - message: Poor sanitation now deals poison damage on the specific part
+    type: Add
+  - message: Poison damage from surgery is no longer unbounded
+    type: Fix
+  id: 1023
+  time: '2025-02-09T19:24:44.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2926
+- author: Smugman
+  changes:
+  - message: Added the Chainsmoker Bundle to the Uplink. 6 Packs of Interdynes plus
+      a Valid Lighter that shoots fire!
+    type: Add
+  - message: After a "False Advertising" lawsuit, Cigarette Cartons now ACTUALLY Contain
+      6 packs. (except discount dan's)
+    type: Tweak
+  - message: Fixed Cigarette cartons aside from "Nomads" not displaying their Opened
+      State.
+    type: Fix
+  id: 1024
+  time: '2025-02-09T22:21:28.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2894

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

@@ -43,6 +43,9 @@ 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.
 
+uplink-chainsmoker-bundle-name = Chainsmoker Bundle.
+uplink-chainsmoker-bundle-desc = A Carton of 6 Packs of Interdyne Herbals, plus a weaponized flippo that turns welding fuel into incendiary shots.
+
 uplink-hardsuit-commander-syndie-name = Commander's Hardsuit
 uplink-hardsuit-commander-syndie-desc = The premiere blood-red hardsuit, with improved mobility and superior protection. Limit of 1.
 

Resources/Prototypes/Atmospherics/thresholds.yml

@@ -15,11 +15,11 @@
     threshold: 550 # HazardHighPressure from Atmospherics.cs
   lowerBound: !type:AlarmThresholdSetting
     # Actual low pressure damage threshold is at 20 kPa, but below ~85 kPa you can't breathe due to lack of oxygen.
-    threshold: 85
+    threshold: 40 # DeltaV - was 80
   upperWarnAround: !type:AlarmThresholdSetting
     threshold: 0.7 # 385 kPa, WarningHighPressure from Atmospherics.cs
   lowerWarnAround: !type:AlarmThresholdSetting
-    threshold: 1.05 # ~90 kPa
+    threshold: 2 # DeltaV - 80kpa, was 1.05 (90kpa)
 
 # a reminder that all of these are percentages (where 1 is 100%),
 # so 0.01 is 1%,
@@ -31,7 +31,7 @@
   lowerBound: !type:AlarmThresholdSetting
     threshold: 0.10
   upperBound: !type:AlarmThresholdSetting
-    threshold: 0.3
+    threshold: 0.8 # DeltaV - was 0.3, ridiculous
   lowerWarnAround: !type:AlarmThresholdSetting
     threshold: 1.5
   upperWarnAround: !type:AlarmThresholdSetting

Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml

@@ -35,6 +35,7 @@
       - id: Gauze
       - id: PillCanisterIron
       - id: PillCanisterCopper
+      - id: PillCanisterBicaridine # DeltaV
 
 - type: entity
   id: MedkitToxinFilled

Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml

@@ -16,11 +16,11 @@
     size: Normal
   - type: Storage
     grid:
-    - 0,0,4,1
+    - 0,0,5,1 # DeltaV - increased from 5x2 to 6x2
   - type: StorageFill
     contents:
       - id: CigPackGreen
-        amount: 5
+        amount: 6 # DeltaV - Increased contents to match description
   - type: Tag
     tags:
     - Trash
@@ -37,14 +37,14 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi
-    layers:
-      - state: closed
+    ##layers:
+    ##  - state: closed #DeltaV - Already inherited, causes issues.
   - type: Item
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi
   - type: StorageFill
     contents:
       - id: CigPackRed
-        amount: 5
+        amount: 6 # DeltaV - Increased contents to match description
 
 - type: entity
   id: CigCartonBlue
@@ -54,14 +54,14 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi
-    layers:
-      - state: closed
+    ##layers:
+    ##  - state: closed #DeltaV - Already inherited, causes issues.
   - type: Item
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi
   - type: StorageFill
     contents:
       - id: CigPackBlue
-        amount: 5
+        amount: 6 # DeltaV - Increased contents to match description
 
 - type: entity
   id: CigCartonBlack
@@ -71,14 +71,14 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi
-    layers:
-      - state: closed
+    ##layers:
+    ##  - state: closed #DeltaV - Already inherited, causes issues.
   - type: Item
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi
   - type: StorageFill
     contents:
       - id: CigPackBlack
-        amount: 5
+        amount: 6 # DeltaV - Increased contents to match description
 
 - type: entity
   id: CigCartonMixed
@@ -88,8 +88,8 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi
-    layers:
-      - state: closed
+    ##layers:
+    ##  - state: closed #DeltaV - Already inherited, causes issues.
   - type: Item
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi
   - type: StorageFill

Resources/Prototypes/Roles/Antags/nukeops.yml

@@ -121,4 +121,4 @@
   id: SyndicateLoneOperativeGearFull
   parent: SyndicateOperativeGearFull
   equipment:
-    pocket2: BaseUplinkRadio60TC
+    pocket2: BaseUplinkRadio65TC # DeltaV more TC less armor

Resources/Prototypes/Voice/speech_emote_sounds.yml

@@ -532,13 +532,13 @@
   id: UnisexThaven
   sounds:
     Scream:
-      collection: UnisexScreams
+      collection: MaleScreams
     Laugh:
-      collection: UnisexLaugh
+      collection: MaleLaugh
     Sneeze:
-      collection: UnisexSneezes
+      collection: MaleSneezes
     Cough:
-      collection: UnisexCoughs
+      collection: MaleCoughs
     CatMeow:
       collection: CatMeows
     CatHisses:
@@ -548,15 +548,15 @@
     RobotBeep:
       collection: RobotBeeps
     Yawn:
-      collection: UnisexYawn
+      collection: MaleYawn
     Snore:
       collection: Snores
     Sigh:
-      collection: UnisexSigh
+      collection: MaleSigh
     Honk:
       collection: BikeHorn
     Crying:
-      collection: UnisexCry
+      collection: MaleCry
     Whistle:
       collection: Whistles
     Weh:
@@ -566,9 +566,9 @@
     Ungh:
       collection: Ungh
     Gasp:
-      collection: UnisexGasp
+      collection: MaleGasp
     DefaultDeathgasp:
-      collection: UnisexDeathGasp
+      collection: MaleDeathGasp
   params:
     variation: 0.05
     pitch: 1.25

Resources/Prototypes/_DV/Catalog/uplink_catalog.yml

@@ -3,7 +3,7 @@
   name: uplink-hardsuit-commander-syndie-name
   description: uplink-hardsuit-commander-syndie-desc
   icon: { sprite: /Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi, state: icon }
-  productEntity:
+  productEntity: ClothingOuterHardsuitSyndieCommander
   cost:
     Telecrystal: 8
   categories:
@@ -25,7 +25,7 @@
   name: uplink-hardsuit-agent-syndie-name
   description: uplink-hardsuit-agent-syndie-desc
   icon: { sprite: /Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi, state: icon }
-  productEntity:
+  productEntity: ClothingOuterHardsuitSyndieMedic
   cost:
     Telecrystal: 8
   categories:
@@ -350,3 +350,18 @@
     whitelist:
       tags:
       - NukeOpsUplink
+
+- type: listing
+  id: UplinkChainsmokerBundle
+  name: uplink-chainsmoker-bundle-name
+  description: uplink-chainsmoker-bundle-desc
+  productEntity: CigCartonSyndicate
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 3 # Incredible value! (Still a horrendous waste)
+  cost:
+    Telecrystal: 6 # 12TC worth of cigs, plus a bonus lighter. (Or you could just emag a shadycig, and get infinite interdynes for free)
+  categories:
+  - UplinkChemicals
+  - UplinkPointless
+  - UplinkWeaponry