Merge remote-tracking branch 'upstream/master'

Content.Server/Body/Components/BloodstreamComponent.cs

@@ -181,9 +181,9 @@ public sealed partial class BloodstreamComponent : Component
         public bool HasBloodDeficiency = false;
 
         /// <summary>
-        ///     How much reagent of blood should be removed with blood deficiency in each update interval?
+        ///     How much percentage of max blood volume should be removed with blood deficiency in each update interval?
         /// </summary>
         [DataField]
-        public FixedPoint2 BloodDeficiencyLossAmount;
+        public float BloodDeficiencyLossPercentage;
     }
 }

Content.Server/Body/Systems/BloodstreamSystem.cs

@@ -122,7 +122,7 @@ public override void Update(float frameTime)
             if (bloodstream.HasBloodDeficiency)
             {
                 if (!_mobStateSystem.IsDead(uid))
-                    RemoveBlood(uid, bloodstream.BloodDeficiencyLossAmount, bloodstream);
+                    RemoveBlood(uid, bloodstream.BloodMaxVolume * bloodstream.BloodDeficiencyLossPercentage, bloodstream);
             }
             // Adds blood to their blood level if it is below the maximum.
             else if (bloodSolution.Volume < bloodSolution.MaxVolume && !_mobStateSystem.IsDead(uid))
@@ -349,6 +349,14 @@ public void SetBloodLossThreshold(EntityUid uid, float threshold, BloodstreamCom
         comp.BloodlossThreshold = threshold;
     }
 
+    public void SetBloodMaxVolume(EntityUid uid, FixedPoint2 volume, BloodstreamComponent? comp = null)
+    {
+        if (!Resolve(uid, ref comp))
+            return;
+
+        comp.BloodMaxVolume = volume;
+    }
+
     /// <summary>
     ///     Attempts to modify the blood level of this entity directly.
     /// </summary>

Content.Server/HeightAdjust/BloodstreamAdjustSystem.cs

@@ -1,4 +1,5 @@
 using Content.Server.Body.Components;
+using Content.Server.Body.Systems;
 using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Shared.CCVar;
 using Content.Shared.Chemistry.Reagent;
@@ -10,6 +11,7 @@ namespace Content.Server.HeightAdjust;
 
 public sealed class BloodstreamAdjustSystem : EntitySystem
 {
+    [Dependency] private readonly BloodstreamSystem _bloodstream = default!;
     [Dependency] private readonly IConfigurationManager _config = default!;
     [Dependency] private readonly ContestsSystem _contests = default!;
     [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!;
@@ -40,6 +42,8 @@ public bool TryAdjustBloodstream(Entity<BloodstreamAffectedByMassComponent> ent)
         bloodSolution.MaxVolume = newVolume;
         bloodSolution.SetContents([new ReagentQuantity(bloodstream.BloodReagent, newBloodLevel, null)], false);
 
+        _bloodstream.SetBloodMaxVolume(ent.Owner, newVolume, bloodstream);
+
         return true;
     }
 }

Content.Server/Traits/BloodDeficiencyComponent.cs

@@ -7,8 +7,8 @@ namespace Content.Server.Traits.Assorted;
 public sealed partial class BloodDeficiencyComponent : Component
 {
     // <summary>
-    //     How much reagent of blood should be removed in each update interval?
+    ///     How much percentage of max blood volume should be removed in each update interval?
     // </summary>
     [DataField(required: true)]
-    public float BloodLossAmount;
+    public float BloodLossPercentage;
 }

Content.Server/Traits/BloodDeficiencySystem.cs

@@ -18,6 +18,6 @@ private void OnStartup(EntityUid uid, BloodDeficiencyComponent component, Compon
             return;
 
         bloodstream.HasBloodDeficiency = true;
-        bloodstream.BloodDeficiencyLossAmount = component.BloodLossAmount;
+        bloodstream.BloodDeficiencyLossPercentage = component.BloodLossPercentage;
     }
 }

Resources/Audio/DeltaV/Jukebox/attributions.yml

@@ -0,0 +1,88 @@
+# sorted alphabetically based on filenames in the folder Resources/Audio/DeltaV/Jukebox
+# keep it ordered or I'll stab you
+
+- files: ["a_different_reality_lagoona_remix.xm-MONO.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "A.D.R (Lagoona rmx) by Andreas Viklund, converted to mono"
+  source: "https://modarchive.org/index.php?request=view_by_moduleid&query=134786"
+
+- files: ["aggravated.it-MONO.ogg"]
+  license: "CC-BY-NC-SA-4.0"
+  copyright: "MEL -Aggravated Assault by melcom, converted to mono"
+  source: "https://modarchive.org/index.php?request=view_by_moduleid&query=176234"
+
+- files: ["autumnal_equinox.xm-MONO.ogg"]
+  license: "CC-BY-NC-4.0"
+  copyright: "Autumnal Equinox by lemonade, converted to mono"
+  source: "https://modarchive.org/index.php?request=view_by_moduleid&query=143993"
+
+- files: ["DOS=HIGH,_UMB.ogg"]
+  license: "Custom"
+  copyright: "DOS=HIGH, UMB by MASTER BOOT RECORD may be used non-commercially in the Delta-V fork of SS14. Converted from FLAC to OGG, then converted to mono."
+  source: "https://masterbootrecord.bandcamp.com/album/c-edit-config-sys"
+
+- files: ["drozerix_-_alone.xm-MONO.ogg"]
+  license: "Custom"
+  copyright: "Alone by Drozerix, converted to mono"
+  source: "https://modarchive.org/index.php?request=view_by_moduleid&query=199968"
+
+- files: ["drozerix_-_leisurely_voice.xm-MONO.ogg"]
+  license: "Custom"
+  copyright: "Leisurely Voice by Drozerix, converted to mono"
+  source: "https://modarchive.org/index.php?request=view_by_moduleid&query=183837"
+
+- files: ["every_light_is_blinking_at_onceMONO.ogg"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "every light blinking at once by Sunbeamstress, converted to mono"
+  source: "https://soundcloud.com/sunbeamstress/every-light-is-blinking-at-once"
+
+- files: ["hackers-MONO.ogg"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Hackers by Karl Casey @ White Bat Audio, converted to mono"
+  source: "https://www.youtube.com/watch?v=k8nHWwO1U2Q"
+
+- files: [lasers_rip_apart_the_bulkheadMONO.ogg]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "lasers rip apart by Sunbeamstress, converted to mono"
+  source: "https://soundcloud.com/sunbeamstress/lasers-rip-apart-the-bulkhead"
+
+- files: ["marhaba-MONO.ogg"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Marhaba by Ian Alex Mac. Converted from MP3 to OGG, then converted to mono"
+  source: "https://freemusicarchive.org/music/Ian_Alex_Mac/Cues/Marhaba"
+
+- files: ["Patricia_Taxxon_-_Minute_-_MONO.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Minute by Patricia Taxxon off the album 'Aeroplane,' converted to mono"
+  source: "https://patriciataxxon.bandcamp.com/track/minute"
+
+- files: ["Phoron_Will_Make_Us_RichMONO2.ogg"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "phoron will make us rich by Sunbeamstress, converted to mono"
+  source: "https://soundcloud.com/sunbeamstress/phoron-will-make-us-rich"
+
+- files: ["psirius_-_nymphs_of_the_forest.mptm-MONO.ogg"]
+  license: "CC-BY-NC-SA-4.0"
+  copyright: "Nymphs of the forest by Psirius, converted to mono"
+  source: "https://modarchive.org/index.php?request=view_by_moduleid&query=185545"
+
+- files: ["Scratch_Post_-_OST_MONO.ogg"]
+  license: "CC-BY-SA-4.0"
+  copyright: "Scratch Post by Ghirardelli7 on SoundCloud, used with the understanding that credit is given to the artist."
+  source: "https://soundcloud.com/ghirardelli7/scratch-post-ost"
+
+- files: ["shibamata-MONO.ogg"]
+  license: "Custom"
+  copyright: "Shibamata by .2gou / Dot Nigou. This track is not released under any formal licensure, and exists in the public domain in multiple forms, including remixes and mashups. Converted to mono."
+  source: "https://www.youtube.com/watch?v=FIw-HUP7XK0"
+
+- files: ["space_asshole.ogg"]
+  license: "Custom"
+  copyright: "Space Asshole by Chris Remo is used with special permission from the author, under the condition that the project remains non-commercial and open source. The author also requested that a link to his bandcamp be included: https://chrisremo.bandcamp.com/ Converted from stereo to mono."
+  source: "https://idlethumbs.bandcamp.com/track/space-asshole"
+
+- files: ["superposition-MONO.ogg"]
+  license: "CC-BY-NC-3.0"
+  copyright: "Superposition by Amie Waters, converted to mono"
+  source: "https://amiewaters.bandcamp.com/track/superposition-2"
+

Resources/Changelog/Changelog.yml

@@ -6229,3 +6229,45 @@ Entries:
   id: 6350
   time: '2024-09-11T21:03:37.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/907
+- author: Squishy77
+  changes:
+    - type: Add
+      message: >-
+        added rcds to the list of possible re and ported over the re update from
+        delta 
+    - type: Tweak
+      message: >-
+        tweaked the costs of boards re-machine boards to be more consistent with
+        their post hyper lathe update counter parts
+  id: 6351
+  time: '2024-09-12T00:12:39.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/910
+- author: SleepyScarecrow
+  changes:
+    - type: Tweak
+      message: Ethanol Contents
+    - type: Fix
+      message: SnowWhite Recipe
+    - type: Tweak
+      message: Ethanol overdose changed from 15 to 45
+  id: 6352
+  time: '2024-09-12T00:14:06.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/911
+- author: Mnemotechnician
+  changes:
+    - type: Add
+      message: Ported a number of jukebox songs from Delta-V.
+  id: 6353
+  time: '2024-09-12T00:14:56.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/912
+- author: Skubman
+  changes:
+    - type: Fix
+      message: >-
+        Blood Deficiency now makes you lose a consistent percentage of blood
+        regardless of your blood volume, which is dictated by size. This makes
+        the time to low blood and death consistent for every character of all
+        sizes with this trait.
+  id: 6354
+  time: '2024-09-12T00:15:18.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/895

Resources/Prototypes/DeltaV/Catalog/Jukebox/Standard.yml

@@ -0,0 +1,104 @@
+# sorted alphabetically based on filenames in the folder Resources/Audio/DeltaV/Jukebox
+# keep it ordered or I'll stab you
+
+- type: jukebox
+  id: ADiffReal
+  name: Andreas Viklund - A.D.R (Lagoona rmx)
+  path:
+    path: /Audio/DeltaV/Jukebox/a_different_reality_lagoona_remix.xm-MONO.ogg
+
+- type: jukebox
+  id: AggAss
+  name: melcom - Aggravated Assault
+  path:
+    path: /Audio/DeltaV/Jukebox/aggravated.it-MONO.ogg
+
+- type: jukebox
+  id: AutEqu
+  name: lemonade - Autumnal Equinox
+  path:
+    path: /Audio/DeltaV/Jukebox/autumnal_equinox.xm-MONO.ogg
+
+- type: jukebox
+  id: DosHighUmb
+  name: MASTER BOOT RECORD - DOS=HIGH, UMB
+  path:
+    path: /Audio/DeltaV/Jukebox/DOS=HIGH,_UMB.ogg
+
+- type: jukebox
+  id: DrozAlone
+  name: Drozerix - Alone
+  path:
+    path: /Audio/DeltaV/Jukebox/drozerix_-_alone.xm-MONO.ogg
+
+- type: jukebox
+  id: DrozLeisure
+  name: Drozerix - Leisurely Voice
+  path:
+    path: /Audio/DeltaV/Jukebox/drozerix_-_leisurely_voice.xm-MONO.ogg
+
+- type: jukebox
+  id: SunbeamEvery
+  name: Sunbeamstress - Every Light Is Blinking At Once
+  path:
+    path: /Audio/DeltaV/Jukebox/every_light_is_blinking_at_onceMONO.ogg
+
+- type: jukebox
+  id: KCHaxors
+  name: Karl Casey @ White Bat Audio - Hackers
+  path:
+    path: /Audio/DeltaV/Jukebox/hackers-MONO.ogg
+
+- type: jukebox
+  id: SunbeamLaser
+  name: Sunbeamstress - Lasers Rip Apart The Bulkhead
+  path:
+    path: /Audio/DeltaV/Jukebox/lasers_rip_apart_the_bulkheadMONO.ogg
+
+- type: jukebox
+  id: IanMarhaba
+  name: Ian Alex Mac. - Marhaba
+  path:
+    path: /Audio/DeltaV/Jukebox/marhaba-MONO.ogg
+
+- type: jukebox
+  id: PTMinute
+  name: Patricia Taxxon - Minute
+  path:
+    path: /Audio/DeltaV/Jukebox/Patricia_Taxxon_-_Minute_-_MONO.ogg
+
+- type: jukebox
+  id: SunbeamPhoron
+  name: Sunbeamstress - Phoron Will Make Us Rich
+  path:
+    path: /Audio/DeltaV/Jukebox/Phoron_Will_Make_Us_RichMONO2.ogg
+
+- type: jukebox
+  id: NymphsForest
+  name: Psirius - Nymphs of the Forest
+  path:
+    path: /Audio/DeltaV/Jukebox/psirius_-_nymphs_of_the_forest.mptm-MONO.ogg
+
+- type: jukebox
+  id: GhirScratch
+  name: ghirardelli7 - Scratch Post
+  path:
+    path: /Audio/DeltaV/Jukebox/Scratch_Post_-_OST_MONO.ogg
+
+- type: jukebox
+  id: JukeShiba
+  name: Dot Nigou - Shibamata
+  path:
+    path: /Audio/DeltaV/Jukebox/shibamata-MONO.ogg
+
+- type: jukebox
+  id: SpaceAsshowl
+  name: Chris Remo - Space Asshole
+  path:
+    path: /Audio/DeltaV/Jukebox/space_asshole-MONO.ogg
+
+- type: jukebox
+  id: AmieSuperpos
+  name: Amie Waters - Superposition
+  path:
+    path: /Audio/DeltaV/Jukebox/superposition-MONO.ogg

Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml

@@ -19,7 +19,7 @@
         factor: 2
       - !type:AdjustReagent
         reagent: Ethanol
-        amount: 0.3
+        amount: 0.336
       - !type:PopupMessage
         conditions:
         - !type:ReagentThreshold
@@ -55,7 +55,7 @@
         factor: 2
       - !type:AdjustReagent
         reagent: Ethanol
-        amount: 0.20
+        amount: 0.133
     Poison:
       effects:
       - !type:HealthChange
@@ -83,7 +83,7 @@
         factor: 2
       - !type:AdjustReagent
         reagent: Ethanol
-        amount: 0.15
+        amount: 0.16
 
 - type: reagent
   id: GreenGrass
@@ -105,7 +105,7 @@
         factor: 2
       - !type:AdjustReagent
         reagent: Ethanol
-        amount: 0.05
+        amount: 0.083
 
 - type: reagent
   id: Daiquiri
@@ -128,7 +128,7 @@
         factor: 2
       - !type:AdjustReagent
         reagent: Ethanol
-        amount: 0.25
+        amount: 0.3
 
 - type: reagent
   id: ArsonistsBrew
@@ -151,7 +151,7 @@
         factor: 2
       - !type:AdjustReagent
         reagent: Ethanol
-        amount: 0.30
+        amount: 0.08
     Poison:
       effects:
       - !type:HealthChange
@@ -179,6 +179,14 @@
   metamorphicMaxFillLevels: 4
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.015
 
 - type: reagent
   id: Mothamphetamine
@@ -201,7 +209,7 @@
         factor: 2
       - !type:AdjustReagent
         reagent: Ethanol
-        amount: 0.25
+        amount: 0.126
     Poison:
       effects:
       - !type:Jitter