diff --git a/Content.Server/Body/Components/BloodstreamComponent.cs b/Content.Server/Body/Components/BloodstreamComponent.cs
index dd93da9598..a272d5f365 100644
--- a/Content.Server/Body/Components/BloodstreamComponent.cs
+++ b/Content.Server/Body/Components/BloodstreamComponent.cs
@@ -181,9 +181,9 @@ public sealed partial class BloodstreamComponent : Component
public bool HasBloodDeficiency = false;
///
- /// 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?
///
[DataField]
- public FixedPoint2 BloodDeficiencyLossAmount;
+ public float BloodDeficiencyLossPercentage;
}
}
diff --git a/Content.Server/Body/Systems/BloodstreamSystem.cs b/Content.Server/Body/Systems/BloodstreamSystem.cs
index b37ac5efeb..91ed7a2480 100644
--- a/Content.Server/Body/Systems/BloodstreamSystem.cs
+++ b/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;
+ }
+
///
/// Attempts to modify the blood level of this entity directly.
///
diff --git a/Content.Server/HeightAdjust/BloodstreamAdjustSystem.cs b/Content.Server/HeightAdjust/BloodstreamAdjustSystem.cs
index 92e03e0c11..9ba0ee4b00 100644
--- a/Content.Server/HeightAdjust/BloodstreamAdjustSystem.cs
+++ b/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 ent)
bloodSolution.MaxVolume = newVolume;
bloodSolution.SetContents([new ReagentQuantity(bloodstream.BloodReagent, newBloodLevel, null)], false);
+ _bloodstream.SetBloodMaxVolume(ent.Owner, newVolume, bloodstream);
+
return true;
}
}
diff --git a/Content.Server/Traits/BloodDeficiencyComponent.cs b/Content.Server/Traits/BloodDeficiencyComponent.cs
index 616f60cd83..c6219d3e02 100644
--- a/Content.Server/Traits/BloodDeficiencyComponent.cs
+++ b/Content.Server/Traits/BloodDeficiencyComponent.cs
@@ -7,8 +7,8 @@ namespace Content.Server.Traits.Assorted;
public sealed partial class BloodDeficiencyComponent : Component
{
//
- // 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?
//
[DataField(required: true)]
- public float BloodLossAmount;
+ public float BloodLossPercentage;
}
diff --git a/Content.Server/Traits/BloodDeficiencySystem.cs b/Content.Server/Traits/BloodDeficiencySystem.cs
index f1ae490995..ee7a39e46e 100644
--- a/Content.Server/Traits/BloodDeficiencySystem.cs
+++ b/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;
}
}
diff --git a/Resources/Audio/DeltaV/Jukebox/DOS=HIGH,_UMB.ogg b/Resources/Audio/DeltaV/Jukebox/DOS=HIGH,_UMB.ogg
new file mode 100644
index 0000000000..b16a328b13
Binary files /dev/null and b/Resources/Audio/DeltaV/Jukebox/DOS=HIGH,_UMB.ogg differ
diff --git a/Resources/Audio/DeltaV/Jukebox/Patricia_Taxxon_-_Minute_-_MONO.ogg b/Resources/Audio/DeltaV/Jukebox/Patricia_Taxxon_-_Minute_-_MONO.ogg
new file mode 100644
index 0000000000..05a7fb5fda
Binary files /dev/null and b/Resources/Audio/DeltaV/Jukebox/Patricia_Taxxon_-_Minute_-_MONO.ogg differ
diff --git a/Resources/Audio/DeltaV/Jukebox/Phoron_Will_Make_Us_RichMONO2.ogg b/Resources/Audio/DeltaV/Jukebox/Phoron_Will_Make_Us_RichMONO2.ogg
new file mode 100644
index 0000000000..f0c5919c3c
Binary files /dev/null and b/Resources/Audio/DeltaV/Jukebox/Phoron_Will_Make_Us_RichMONO2.ogg differ
diff --git a/Resources/Audio/DeltaV/Jukebox/Scratch_Post_-_OST_MONO.ogg b/Resources/Audio/DeltaV/Jukebox/Scratch_Post_-_OST_MONO.ogg
new file mode 100644
index 0000000000..edaa29c836
Binary files /dev/null and b/Resources/Audio/DeltaV/Jukebox/Scratch_Post_-_OST_MONO.ogg differ
diff --git a/Resources/Audio/DeltaV/Jukebox/a_different_reality_lagoona_remix.xm-MONO.ogg b/Resources/Audio/DeltaV/Jukebox/a_different_reality_lagoona_remix.xm-MONO.ogg
new file mode 100644
index 0000000000..bb857bd105
Binary files /dev/null and b/Resources/Audio/DeltaV/Jukebox/a_different_reality_lagoona_remix.xm-MONO.ogg differ
diff --git a/Resources/Audio/DeltaV/Jukebox/aggravated.it-MONO.ogg b/Resources/Audio/DeltaV/Jukebox/aggravated.it-MONO.ogg
new file mode 100644
index 0000000000..5570556f4d
Binary files /dev/null and b/Resources/Audio/DeltaV/Jukebox/aggravated.it-MONO.ogg differ
diff --git a/Resources/Audio/DeltaV/Jukebox/attributions.yml b/Resources/Audio/DeltaV/Jukebox/attributions.yml
new file mode 100644
index 0000000000..67555c5445
--- /dev/null
+++ b/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"
+
diff --git a/Resources/Audio/DeltaV/Jukebox/autumnal_equinox.xm-MONO.ogg b/Resources/Audio/DeltaV/Jukebox/autumnal_equinox.xm-MONO.ogg
new file mode 100644
index 0000000000..db13ac8d70
Binary files /dev/null and b/Resources/Audio/DeltaV/Jukebox/autumnal_equinox.xm-MONO.ogg differ
diff --git a/Resources/Audio/DeltaV/Jukebox/drozerix_-_alone.xm-MONO.ogg b/Resources/Audio/DeltaV/Jukebox/drozerix_-_alone.xm-MONO.ogg
new file mode 100644
index 0000000000..7bb1cefdde
Binary files /dev/null and b/Resources/Audio/DeltaV/Jukebox/drozerix_-_alone.xm-MONO.ogg differ
diff --git a/Resources/Audio/DeltaV/Jukebox/drozerix_-_leisurely_voice.xm-MONO.ogg b/Resources/Audio/DeltaV/Jukebox/drozerix_-_leisurely_voice.xm-MONO.ogg
new file mode 100644
index 0000000000..9eb8028c2f
Binary files /dev/null and b/Resources/Audio/DeltaV/Jukebox/drozerix_-_leisurely_voice.xm-MONO.ogg differ
diff --git a/Resources/Audio/DeltaV/Jukebox/every_light_is_blinking_at_onceMONO.ogg b/Resources/Audio/DeltaV/Jukebox/every_light_is_blinking_at_onceMONO.ogg
new file mode 100644
index 0000000000..5de6bfe2c7
Binary files /dev/null and b/Resources/Audio/DeltaV/Jukebox/every_light_is_blinking_at_onceMONO.ogg differ
diff --git a/Resources/Audio/DeltaV/Jukebox/hackers-MONO.ogg b/Resources/Audio/DeltaV/Jukebox/hackers-MONO.ogg
new file mode 100644
index 0000000000..3603aeac32
Binary files /dev/null and b/Resources/Audio/DeltaV/Jukebox/hackers-MONO.ogg differ
diff --git a/Resources/Audio/DeltaV/Jukebox/lasers_rip_apart_the_bulkheadMONO.ogg b/Resources/Audio/DeltaV/Jukebox/lasers_rip_apart_the_bulkheadMONO.ogg
new file mode 100644
index 0000000000..addbfcc6c0
Binary files /dev/null and b/Resources/Audio/DeltaV/Jukebox/lasers_rip_apart_the_bulkheadMONO.ogg differ
diff --git a/Resources/Audio/DeltaV/Jukebox/marhaba-MONO.ogg b/Resources/Audio/DeltaV/Jukebox/marhaba-MONO.ogg
new file mode 100644
index 0000000000..18b39a0296
Binary files /dev/null and b/Resources/Audio/DeltaV/Jukebox/marhaba-MONO.ogg differ
diff --git a/Resources/Audio/DeltaV/Jukebox/psirius_-_nymphs_of_the_forest.mptm-MONO.ogg b/Resources/Audio/DeltaV/Jukebox/psirius_-_nymphs_of_the_forest.mptm-MONO.ogg
new file mode 100644
index 0000000000..aa26988bcd
Binary files /dev/null and b/Resources/Audio/DeltaV/Jukebox/psirius_-_nymphs_of_the_forest.mptm-MONO.ogg differ
diff --git a/Resources/Audio/DeltaV/Jukebox/shibamata-MONO.ogg b/Resources/Audio/DeltaV/Jukebox/shibamata-MONO.ogg
new file mode 100644
index 0000000000..24fc190218
Binary files /dev/null and b/Resources/Audio/DeltaV/Jukebox/shibamata-MONO.ogg differ
diff --git a/Resources/Audio/DeltaV/Jukebox/space_asshole-MONO.ogg b/Resources/Audio/DeltaV/Jukebox/space_asshole-MONO.ogg
new file mode 100644
index 0000000000..90e7848b77
Binary files /dev/null and b/Resources/Audio/DeltaV/Jukebox/space_asshole-MONO.ogg differ
diff --git a/Resources/Audio/DeltaV/Jukebox/superposition-MONO.ogg b/Resources/Audio/DeltaV/Jukebox/superposition-MONO.ogg
new file mode 100644
index 0000000000..5e7d45a886
Binary files /dev/null and b/Resources/Audio/DeltaV/Jukebox/superposition-MONO.ogg differ
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 763483169f..d833e86ffb 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/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
diff --git a/Resources/Prototypes/DeltaV/Catalog/Jukebox/Standard.yml b/Resources/Prototypes/DeltaV/Catalog/Jukebox/Standard.yml
new file mode 100644
index 0000000000..aec4fc3503
--- /dev/null
+++ b/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
diff --git a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml
index c568c1bc75..7fdc51f1de 100644
--- a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml
+++ b/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
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
index 880239b51e..9381b3f208 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
@@ -28,6 +28,10 @@
- type: Tag
tags:
- WhitelistChameleon
+ - type: ReverseEngineering
+ difficulty: 2
+ recipes:
+ - ClothingShoesBootsMag
- type: entity
parent: ClothingShoesBootsMag
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 62f3bbcb3f..891dfc1e79 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -29,6 +29,10 @@
Amount: 1
DefaultPrototype: Igniter
ExamineName: Igniter
+ - type: ReverseEngineering # Delta
+ difficulty: 2
+ recipes:
+ - AutolatheHyperConvectionMachineCircuitboard
- type: entity
id: ProtolatheMachineCircuitboard
@@ -66,6 +70,10 @@
Amount: 1
DefaultPrototype: Igniter
ExamineName: Igniter
+ - type: ReverseEngineering # Delta
+ difficulty: 2
+ recipes:
+ - ProtolatheHyperConvectionMachineCircuitboard
- type: entity
id: BiofabricatorMachineCircuitboard
@@ -79,6 +87,10 @@
MatterBin: 4
materialRequirements:
Glass: 1
+ - type: ReverseEngineering # Delta
+ difficulty: 2
+ recipes:
+ - BiofabricatorMachineCircuitboard
- type: entity
id: SecurityTechFabCircuitboard
@@ -151,10 +163,6 @@
Amount: 2
DefaultPrototype: Beaker
ExamineName: Glass Beaker
- - type: ReverseEngineering # Nyano
- difficulty: 3
- recipes:
- - CircuitImprinterMachineCircuitboard
- type: entity
id: ExosuitFabricatorMachineCircuitboard
@@ -171,7 +179,7 @@
materialRequirements:
Glass: 5
- type: ReverseEngineering # Nyano
- difficulty: 3
+ difficulty: 2
recipes:
- ExosuitFabricatorMachineCircuitboard
- type: GuideHelp
@@ -202,10 +210,6 @@
requirements:
MatterBin: 1
Manipulator: 2
- - type: ReverseEngineering # Nyano
- difficulty: 2
- recipes:
- - UniformPrinterMachineCircuitboard
- type: entity
id: VaccinatorMachineCircuitboard
@@ -313,6 +317,10 @@
materialRequirements:
Glass: 1
Steel: 5
+ - type: ReverseEngineering # Delta
+ difficulty: 3
+ recipes:
+ - ArtifactCrusherMachineCircuitboard
- type: entity
parent: BaseMachineCircuitboard
@@ -350,6 +358,10 @@
Cable: 5
PlasmaGlass: 15
MetalRod: 4
+ - type: ReverseEngineering # Nyano
+ difficulty: 2
+ recipes:
+ - AnomalyVesselExperimentalCircuitboard
- type: entity
parent: BaseMachineCircuitboard
@@ -367,6 +379,10 @@
materialRequirements:
PlasmaGlass: 5
Cable: 5
+ - type: ReverseEngineering # Delta
+ difficulty: 3
+ recipes:
+ - AnomalySynchronizerCircuitboard
- type: entity
parent: BaseMachineCircuitboard
@@ -451,6 +467,10 @@
deconstructionTarget: null
graph: ThermomachineBoard
node: hellfirefreezer
+ - type: ReverseEngineering # Delta
+ difficulty: 3
+ recipes:
+ - HellfireFreezerMachineCircuitBoard
- type: entity
parent: BaseMachineCircuitboard
@@ -596,6 +616,10 @@
materialRequirements:
Steel: 1
Cable: 2
+ - type: ReverseEngineering # Delta
+ difficulty: 3
+ recipes:
+ - CrewMonitoringServerMachineCircuitboard
- type: entity
id: CryoPodMachineCircuitboard
@@ -635,10 +659,6 @@
Amount: 2
DefaultPrototype: Beaker
ExamineName: Glass Beaker
- - type: ReverseEngineering # Nyano
- difficulty: 2
- recipes:
- - ChemMasterMachineCircuitboard
- type: entity
id: ChemDispenserMachineCircuitboard
@@ -660,10 +680,6 @@
Amount: 2
DefaultPrototype: Beaker
ExamineName: Glass Beaker
- - type: ReverseEngineering # Nyano
- difficulty: 2
- recipes:
- - ChemDispenserMachineCircuitboard
- type: entity
id: BiomassReclaimerMachineCircuitboard
@@ -750,9 +766,6 @@
PowerCell: 4
materialRequirements:
CableHV: 10
- - type: ReverseEngineering # Nyano
- recipes:
- - SMESMachineCircuitboard
- type: entity
id: CellRechargerCircuitboard
@@ -862,6 +875,10 @@
materialComposition:
Steel: 30
Plastic: 30
+ - type: ReverseEngineering # Delta
+ difficulty: 2
+ recipes:
+ - TurboItemRechargerCircuitboard
- type: entity
id: SubstationMachineCircuitboard
@@ -877,9 +894,6 @@
materialRequirements:
CableMV: 5
CableHV: 5
- - type: ReverseEngineering # Nyano
- recipes:
- - SubstationMachineCircuitboard
- type: PhysicalComposition
materialComposition:
Glass: 200
@@ -921,7 +935,7 @@
DefaultPrototype: SaxophoneInstrument
ExamineName: Woodwind Instrument
- type: ReverseEngineering # Nyano
- difficulty: 3
+ difficulty: 2
recipes:
- DawInstrumentMachineCircuitboard
@@ -938,10 +952,6 @@
Capacitor: 1
materialRequirements:
CableHV: 5
- - type: ReverseEngineering # Nyano
- difficulty: 2
- recipes:
- - GeneratorPlasmaMachineCircuitboard
- type: PhysicalComposition
materialComposition:
Glass: 200
@@ -949,6 +959,10 @@
Silicon: 20
- type: StaticPrice
price: 40
+ - type: ReverseEngineering # Nyano
+ difficulty: 2
+ recipes:
+ - PortableGeneratorPacmanMachineCircuitboard
- type: entity
id: ThrusterMachineCircuitboard
@@ -961,6 +975,10 @@
Capacitor: 4
materialRequirements:
Steel: 5
+ - type: ReverseEngineering # Delta
+ difficulty: 3
+ recipes:
+ - ThrusterMachineCircuitboard
- type: entity
id: GyroscopeMachineCircuitboard
@@ -974,6 +992,10 @@
Capacitor: 1
materialRequirements:
Glass: 2
+ - type: ReverseEngineering # Delta
+ difficulty: 3
+ recipes:
+ - GyroscopeMachineCircuitboard
- type: entity
id: PortableGeneratorSuperPacmanMachineCircuitboard
@@ -993,12 +1015,12 @@
Glass: 200
chemicalComposition:
Silicon: 20
+ - type: StaticPrice
+ price: 40
- type: ReverseEngineering # Nyano
difficulty: 2
recipes:
- PortableGeneratorSuperPacmanMachineCircuitboard
- - type: StaticPrice
- price: 40
- type: entity
id: PortableGeneratorJrPacmanMachineCircuitboard
@@ -1020,6 +1042,10 @@
Silicon: 20
- type: StaticPrice
price: 40
+ - type: ReverseEngineering # Nyano
+ difficulty: 2
+ recipes:
+ - PortableGeneratorJrPacmanMachineCircuitboard
- type: entity
id: ReagentGrinderMachineCircuitboard
@@ -1054,7 +1080,7 @@
Capacitor: 2
materialRequirements:
Glass: 1
- - type: ReverseEngineering # Nyano
+ - type: ReverseEngineering # Delta
difficulty: 2
recipes:
- HotplateMachineCircuitboard
@@ -1072,6 +1098,10 @@
materialRequirements:
Glass: 2
Cable: 5
+ - type: ReverseEngineering # Delta
+ difficulty: 2
+ recipes:
+ - ElectricGrillMachineCircuitboard
- type: entity
id: StasisBedMachineCircuitboard
@@ -1137,6 +1167,10 @@
materialRequirements:
Steel: 5
Plastic: 5
+ - type: ReverseEngineering # Delta
+ difficulty: 2
+ recipes:
+ - MaterialReclaimerMachineCircuitboard
- type: entity
id: OreProcessorMachineCircuitboard
@@ -1152,9 +1186,6 @@
Manipulator: 3
materialRequirements:
Glass: 1
- - type: ReverseEngineering # Nyano
- recipes:
- - OreProcessorMachineCircuitboard
- type: entity
parent: BaseMachineCircuitboard
@@ -1170,6 +1201,10 @@
Manipulator: 3
materialRequirements:
Glass: 1
+ - type: ReverseEngineering # Delta
+ difficulty: 2
+ recipes:
+ - OreProcessorIndustrialMachineCircuitboard
- type: entity
id: SheetifierMachineCircuitboard
@@ -1216,6 +1251,10 @@
Amount: 1
DefaultPrototype: ForkPlastic
ExamineName: Utensil
+ - type: ReverseEngineering # Delta
+ difficulty: 2
+ recipes:
+ - FatExtractorMachineCircuitboard
- type: entity
parent: BaseMachineCircuitboard
@@ -1229,6 +1268,10 @@
MatterBin: 1
materialRequirements:
Steel: 1
+ - type: ReverseEngineering # Delta
+ difficulty: 2
+ recipes:
+ - FlatpackerMachineCircuitboard
- type: entity
id: EmitterCircuitboard
@@ -1348,9 +1391,6 @@
Amount: 1
DefaultPrototype: Beaker
ExamineName: Glass Beaker
- - type: ReverseEngineering # Nyano
- recipes:
- - BoozeDispenserMachineCircuitboard
- type: entity
id: CargoTelepadMachineCircuitboard
@@ -1367,6 +1407,10 @@
materialRequirements:
Steel: 5
Bluespace: 2 #DeltaV Bluespace Exists
+ - type: ReverseEngineering # Delta
+ difficulty: 3
+ recipes:
+ - CargoTelepadMachineCircuitboard
- type: entity
id: SodaDispenserMachineCircuitboard
@@ -1385,9 +1429,6 @@
Amount: 1
DefaultPrototype: Beaker
ExamineName: Glass Beaker
- - type: ReverseEngineering # Nyano
- recipes:
- - SodaDispenserMachineCircuitboard
- type: entity
id: TelecomServerCircuitboard
@@ -1437,6 +1478,10 @@
Steel: 5
CableHV: 5
Uranium: 2
+ - type: ReverseEngineering # Delta
+ difficulty: 3
+ recipes:
+ - MiniGravityGeneratorCircuitboard
- type: entity
id: ShuttleGunSvalinnMachineGunCircuitboard
@@ -1454,6 +1499,10 @@
materialRequirements:
Steel: 5
CableHV: 5
+ - type: ReverseEngineering # Delta
+ difficulty: 3
+ recipes:
+ - ShuttleGunSvalinnMachineGunCircuitboard
- type: entity
id: ShuttleGunPerforatorCircuitboard
@@ -1471,6 +1520,10 @@
materialRequirements:
Steel: 10
CableHV: 5
+ - type: ReverseEngineering # Delta
+ difficulty: 3
+ recipes:
+ - ShuttleGunPerforatorCircuitboard
- type: entity
id: ShuttleGunFriendshipCircuitboard
@@ -1488,6 +1541,10 @@
materialRequirements:
Steel: 7
CableHV: 5
+ - type: ReverseEngineering # Delta
+ difficulty: 3
+ recipes:
+ - ShuttleGunFriendshipCircuitboard
- type: entity
id: ShuttleGunDusterCircuitboard
@@ -1506,6 +1563,10 @@
Steel: 10
CableHV: 5
Uranium: 2
+ - type: ReverseEngineering # Delta
+ difficulty: 4
+ recipes:
+ - ShuttleGunDusterCircuitboard
- type: entity
id: ShuttleGunKineticCircuitboard
@@ -1523,6 +1584,10 @@
materialRequirements:
Steel: 5
CableHV: 2
+ - type: ReverseEngineering # Delta
+ difficulty: 2
+ recipes:
+ - ShuttleGunKineticCircuitboard
- type: entity
parent: BaseMachineCircuitboard
@@ -1536,6 +1601,10 @@
Manipulator: 3
materialRequirements:
Glass: 1
+ - type: ReverseEngineering # Delta
+ difficulty: 2
+ recipes:
+ - ReagentGrinderIndustrialMachineCircuitboard
- type: entity
parent: BaseMachineCircuitboard
@@ -1550,3 +1619,8 @@
Steel: 2
Glass: 5
Cable: 2
+ - type: ReverseEngineering # Delta
+ difficulty: 2
+ recipes:
+ - JukeboxCircuitBoard
+
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
index ffff8847ed..1210f302fc 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
@@ -122,6 +122,10 @@
prototype: ComputerSalvageExpedition
- type: StealTarget
stealGroup: SalvageExpeditionsComputerCircuitboard
+ - type: ReverseEngineering # Nyano
+ difficulty: 2
+ recipes:
+ - SalvageExpeditionsComputerCircuitboard
- type: entity
parent: BaseComputerCircuitboard
@@ -177,6 +181,10 @@
- type: Tag
tags:
- ComputerTelevisionCircuitboard
+ - type: ReverseEngineering # Nyano
+ difficulty: 2
+ recipes:
+ - ComputerTelevisionCircuitboard
- type: entity
parent: BaseComputerCircuitboard
@@ -286,6 +294,10 @@
components:
- type: ComputerBoard
prototype: ComputerRadar
+ - type: ReverseEngineering # Nyano
+ difficulty: 2
+ recipes:
+ - RadarConsoleCircuitboard
- type: entity
parent: BaseComputerCircuitboard
@@ -339,6 +351,10 @@
components:
- type: ComputerBoard
prototype: ComputerShuttle
+ - type: ReverseEngineering # Nyano
+ difficulty: 3
+ recipes:
+ - ShuttleConsoleCircuitboard
- type: entity
parent: BaseComputerCircuitboard
@@ -396,6 +412,10 @@
price: 150
- type: ComputerBoard
prototype: ComputerMassMedia
+ - type: ReverseEngineering # Nyano
+ difficulty: 3
+ recipes:
+ - ComputerMassMediaCircuitboard
- type: entity
parent: BaseComputerCircuitboard
diff --git a/Resources/Prototypes/Entities/Objects/Devices/hand_teleporter.yml b/Resources/Prototypes/Entities/Objects/Devices/hand_teleporter.yml
index 2e6c2d8c27..deac20e05e 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/hand_teleporter.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/hand_teleporter.yml
@@ -9,10 +9,6 @@
layers:
- state: icon
- type: HandTeleporter
- - type: ReverseEngineering # Nyano
- difficulty: 4
- recipes:
- - HandTeleporter
- type: Tag
tags:
- HighRiskItem
diff --git a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
index 5cbf64c560..b7ad8ddd6a 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
@@ -68,6 +68,7 @@
- type: StaticPrice
price: 80
- type: ReverseEngineering # Nyano
+ difficulty: 3
recipes:
- HolofanProjector
@@ -98,6 +99,10 @@
- HolofanProjector
- type: StaticPrice
price: 130
+ - type: ReverseEngineering # Nyano
+ difficulty: 3
+ recipes:
+ - HoloprojectorField
- type: entity
parent: HoloprojectorField
diff --git a/Resources/Prototypes/Entities/Objects/Devices/swapper.yml b/Resources/Prototypes/Entities/Objects/Devices/swapper.yml
index 8a743f4796..3ab014b28c 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/swapper.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/swapper.yml
@@ -25,3 +25,7 @@
- type: Tag
tags:
- QuantumSpinInverter
+ - type: ReverseEngineering # Delta
+ difficulty: 4
+ recipes:
+ - DeviceQuantumSpinInverter
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
index 9e68879fb4..fd32523d8f 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -227,6 +227,10 @@
beaker:
maxVol: 60
canReact: false
+ - type: ReverseEngineering # Delta
+ difficulty: 3
+ recipes:
+ - CryostasisBeaker
- type: entity
name: bluespace beaker
@@ -245,6 +249,10 @@
beaker:
maxVol: 1000
canMix: true
+ - type: ReverseEngineering # Delta
+ difficulty: 4
+ recipes:
+ - BluespaceBeaker
- type: entity
name: dropper
@@ -401,6 +409,10 @@
tags:
- Syringe
- Trash
+ - type: ReverseEngineering # Delta
+ difficulty: 4
+ recipes:
+ - SyringeBluespace
- type: entity
id: SyringeCryostasis
@@ -432,7 +444,10 @@
tags:
- Syringe
- Trash
-
+ - type: ReverseEngineering # Delta
+ difficulty: 3
+ recipes:
+ - SyringeCryostasis
- type: entity
name: pill
diff --git a/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml b/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
index 5647737219..131bb1960b 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
@@ -38,6 +38,10 @@
type: RadarConsoleBoundUserInterface
- type: StaticPrice
price: 150
+ - type: ReverseEngineering # Delta
+ difficulty: 3
+ recipes:
+ - HandHeldMassScanner
- type: entity
id: HandHeldMassScannerEmpty
@@ -69,4 +73,4 @@
name: power-cell-slot-component-slot-name-default
startingItem: PowerCellMicroreactor
disableEject: true
- swap: false
\ No newline at end of file
+ swap: false
diff --git a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
index 36d2f1308f..12521ff644 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
@@ -58,6 +58,10 @@
angle: 20
soundHit:
collection: MetalThud
+ - type: ReverseEngineering # Delta
+ difficulty: 3
+ recipes:
+ - JawsOfLife
- type: entity
name: syndicate jaws of life
diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
index a6926f1d8c..c0d4fa179f 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -413,10 +413,6 @@
Plastic: 100
# - type: DynamicPrice
# price: 100
- - type: ReverseEngineering # Nyano
- difficulty: 2
- recipes:
- - PowerDrill
- type: StaticPrice
price: 100
- type: MeleeWeapon
@@ -433,6 +429,10 @@
angle: 20
soundHit:
path: "/Audio/Items/drill_hit.ogg"
+ - type: ReverseEngineering # Nyano
+ difficulty: 2
+ recipes:
+ - PowerDrill
- type: entity
id: RCD
@@ -478,7 +478,7 @@
- type: PhysicalComposition
materialComposition:
Steel: 600
- Plastic: 100
+ Plastic: 150
- type: StaticPrice
price: 100
- type: UserInterface
@@ -487,6 +487,10 @@
type: RCDMenuBoundUserInterface
- type: ActivatableUI
key: enum.RcdUiKey.Key
+ - type: ReverseEngineering # Nyano
+ difficulty: 3
+ recipes:
+ - RCD
- type: entity
id: RCDEmpty
@@ -548,7 +552,7 @@
heldPrefix: ammo
- type: PhysicalComposition
materialComposition:
- Steel: 100
+ Steel: 300
Plastic: 100
- type: StaticPrice
price: 60
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index dd8182b24f..7986dca6c8 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -356,6 +356,8 @@
- AnimalTranslator
- MofficTranslatorImplanter
- MofficTranslator
+ - RCDAmmo #DeltaV
+ - RCD #EE
- type: EmagLatheRecipes
emagDynamicRecipes:
- ExplosivePayload
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml
index 6e80ec7c4e..2ed4a594e3 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml
@@ -12,9 +12,8 @@
MatterBin: 1
Manipulator: 1
materialRequirements:
- Glass: 1
Cable: 1
- Diamond: 10
+ PlasmaGlass: 5
tagRequirements:
BorgArm:
Amount: 3
diff --git a/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Drink/alcohol.yml
index 972fc08239..19d49b913a 100644
--- a/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Drink/alcohol.yml
+++ b/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Drink/alcohol.yml
@@ -19,7 +19,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.07
+ amount: 0.15
- type: reagent
id: Soju
@@ -42,7 +42,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.15
+ amount: 0.2
- type: reagent
id: OrangeCreamice
@@ -65,7 +65,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.05
+ amount: 0.1
- type: reagent
id: Silverjack
@@ -88,7 +88,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.0625
+ amount: 0.1375
- type: reagent
id: Brainbomb
@@ -118,7 +118,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.085
+ amount: 0.13
- !type:AdjustReagent
reagent: THC
amount: 0.33
@@ -147,7 +147,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.025
+ amount: 0.08
- type: reagent
id: CircusJuice
@@ -170,7 +170,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.0625
+ amount: 0.12
- !type:Emote #It's very funny
emote: Laugh
probability: 0.15
@@ -196,7 +196,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.065
+ amount: 0.1125
- !type:AdjustTemperature
amount: 75 # thermal energy, not temperature!
@@ -221,4 +221,4 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.03
+ amount: 0.12
diff --git a/Resources/Prototypes/Nyanotrasen/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Nyanotrasen/Recipes/Lathes/electronics.yml
index 1e53c715af..695fb42150 100644
--- a/Resources/Prototypes/Nyanotrasen/Recipes/Lathes/electronics.yml
+++ b/Resources/Prototypes/Nyanotrasen/Recipes/Lathes/electronics.yml
@@ -4,7 +4,7 @@
completetime: 4
materials:
Steel: 100
- Glass: 900
+ Glass: 700
Gold: 100
- type: latheRecipe
@@ -13,7 +13,7 @@
completetime: 4
materials:
Steel: 100
- Glass: 900
+ Glass: 700
Gold: 100
- type: latheRecipe
@@ -21,8 +21,8 @@
result: CrewMonitoringComputerCircuitboard
completetime: 4
materials:
- Steel: 100
- Glass: 900
+ Steel: 100
+ Glass: 700
- type: latheRecipe
id: ClothingEyesHudMedical
@@ -41,4 +41,4 @@
completetime: 4
materials:
Steel: 100
- Glass: 900
+ Glass: 700
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
index e31087c309..d9e57d5b80 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
@@ -22,7 +22,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.3
+ amount: 0.7
- type: reagent
id: Ale
@@ -77,7 +77,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.1
+ amount: 0.25
- type: reagent
id: BlueHawaiian
@@ -97,7 +97,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.2
+ amount: 0.154
- type: reagent
id: Cognac
@@ -121,7 +121,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.2
+ amount: 0.4
- type: reagent
id: DeadRum
@@ -144,7 +144,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.2
+ amount: 0.6
- type: reagent
id: Ethanol
@@ -163,7 +163,7 @@
- !type:HealthChange
conditions:
- !type:ReagentThreshold
- min: 15
+ min: 45
damage:
types:
Poison: 1
@@ -278,7 +278,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.2
+ amount: 0.45
- type: reagent
id: CoffeeLiqueur
@@ -294,6 +294,13 @@
metamorphicMaxFillLevels: 3
metamorphicFillBaseName: fill-
metamorphicChangeColor: true
+ metabolisms:
+ Drink:
+ effects:
+ - !type:AdjustReagent
+ reagent: Ethanol
+ amount: 0.20
+
- type: reagent
id: MelonLiquor
@@ -309,6 +316,12 @@
metamorphicMaxFillLevels: 5
metamorphicFillBaseName: fill-
metamorphicChangeColor: true
+ metabolisms:
+ Drink:
+ effects:
+ - !type:AdjustReagent
+ reagent: Ethanol
+ amount: 0.20
- type: reagent
id: NTCahors
@@ -324,6 +337,12 @@
metamorphicMaxFillLevels: 5
metamorphicFillBaseName: fill-
metamorphicChangeColor: true
+ metabolisms:
+ Drink:
+ effects:
+ - !type:AdjustReagent
+ reagent: Ethanol
+ amount: 0.17
- type: reagent
id: PoisonWine
@@ -346,7 +365,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.05
+ amount: 0.11
Poison:
effects:
- !type:HealthChange
@@ -376,7 +395,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.2
+ amount: 0.40
##Commented out in favor of Nyano sake/soju
#- type: reagent
@@ -409,7 +428,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.2
+ amount: 0.40
- type: reagent
id: Vermouth
@@ -425,6 +444,12 @@
metamorphicMaxFillLevels: 4
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
+ metabolisms:
+ Drink:
+ effects:
+ - !type:AdjustReagent
+ reagent: Ethanol
+ amount: 0.16
- type: reagent
id: Vodka
@@ -448,7 +473,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.2
+ amount: 0.40
- type: reagent
id: Whiskey
@@ -472,7 +497,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.2
+ amount: 0.40
- type: reagent
id: Wine
@@ -489,6 +514,14 @@
metamorphicMaxFillLevels: 5
metamorphicFillBaseName: fill-
metamorphicChangeColor: true
+ metabolisms:
+ Drink:
+ effects:
+ - !type:SatiateThirst
+ factor: 2
+ - !type:AdjustReagent
+ reagent: Ethanol
+ amount: 0.11
- type: reagent
id: Champagne
@@ -512,7 +545,7 @@
factor: 3
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.3
+ amount: 0.12
# Mixed Alcohol
@@ -530,6 +563,14 @@
metamorphicMaxFillLevels: 5
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
+ metabolisms:
+ Drink:
+ effects:
+ - !type:SatiateThirst
+ factor: 1
+ - !type:AdjustReagent
+ reagent: Ethanol
+ amount: 0.073
- type: reagent
id: AlliesCocktail
@@ -545,6 +586,14 @@
metamorphicMaxFillLevels: 4
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
+ metabolisms:
+ Drink:
+ effects:
+ - !type:SatiateThirst
+ factor: 2
+ - !type:AdjustReagent
+ reagent: Ethanol
+ amount: 0.37
- type: reagent
id: Aloe
@@ -575,6 +624,14 @@
metamorphicMaxFillLevels: 5
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
+ metabolisms:
+ Drink:
+ effects:
+ - !type:SatiateThirst
+ factor: 2
+ - !type:AdjustReagent
+ reagent: Ethanol
+ amount: 0.204
- type: reagent
id: Andalusia
@@ -590,6 +647,14 @@
metamorphicMaxFillLevels: 4
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
+ metabolisms:
+ Drink:
+ effects:
+ - !type:SatiateThirst
+ factor: 2
+ - !type:AdjustReagent
+ reagent: Ethanol
+ amount: 0.27
- type: reagent
id: Antifreeze
@@ -612,7 +677,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.15
+ amount: 0.2
- type: reagent
id: AtomicBomb
@@ -635,7 +700,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.15
+ amount: 0.254
- !type:AdjustReagent
reagent: Uranium
amount: 0.05
@@ -661,7 +726,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.15
+ amount: 0.28
- type: reagent
id: BahamaMama
@@ -677,6 +742,14 @@
metamorphicMaxFillLevels: 5
metamorphicFillBaseName: fill-
metamorphicChangeColor: true
+ metabolisms:
+ Drink:
+ effects:
+ - !type:SatiateThirst
+ factor: 2
+ - !type:AdjustReagent
+ reagent: Ethanol
+ amount: 0.11
- type: reagent
id: BananaHonk
@@ -707,6 +780,14 @@
metamorphicMaxFillLevels: 3
metamorphicFillBaseName: fill-
metamorphicChangeColor: true
+ metabolisms:
+ Drink:
+ effects:
+ - !type:SatiateThirst
+ factor: 2
+ - !type:AdjustReagent
+ reagent: Ethanol
+ amount: 0.05
- type: reagent
id: BeepskySmash
@@ -729,7 +810,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.15
+ amount: 0.13
- type: reagent
id: BlackRussian
@@ -752,7 +833,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.2
+ amount: 0.33
- type: reagent
id: BloodyMary
@@ -768,6 +849,14 @@
metamorphicMaxFillLevels: 5
metamorphicFillBaseName: fill-
metamorphicChangeColor: true
+ metabolisms:
+ Drink:
+ effects:
+ - !type:SatiateThirst
+ factor: 2
+ - !type:AdjustReagent
+ reagent: Ethanol
+ amount: 0.13
- type: reagent
id: Booger
@@ -783,6 +872,14 @@
metamorphicMaxFillLevels: 5
metamorphicFillBaseName: fill-
metamorphicChangeColor: true
+ metabolisms:
+ Drink:
+ effects:
+ - !type:SatiateThirst
+ factor: 2
+ - !type:AdjustReagent
+ reagent: Ethanol
+ amount: 0.08
- type: reagent
id: BraveBull
@@ -805,7 +902,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.2
+ amount: 0.33
- type: reagent
id: CoconutRum
@@ -825,7 +922,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.2
+ amount: 0.26
- type: reagent
id: Cosmopolitan
@@ -845,7 +942,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.15
+ amount: 0.13
- type: reagent
id: CubaLibre
@@ -868,7 +965,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.07
+ amount: 0.13
- type: reagent
id: DemonsBlood
@@ -884,6 +981,14 @@
metamorphicMaxFillLevels: 4
metamorphicFillBaseName: fill-
metamorphicChangeColor: true
+ metabolisms:
+ Drink:
+ effects:
+ - !type:SatiateThirst
+ factor: 2
+ - !type:AdjustReagent
+ reagent: Ethanol
+ amount: 0.10
- type: reagent
id: DevilsKiss
@@ -899,6 +1004,14 @@
metamorphicMaxFillLevels: 3
metamorphicFillBaseName: fill-
metamorphicChangeColor: true
+ metabolisms:
+ Drink:
+ effects:
+ - !type:SatiateThirst
+ factor: 2
+ - !type:AdjustReagent
+ reagent: Ethanol
+ amount: 0.20
- type: reagent
id: DoctorsDelight
@@ -921,9 +1034,6 @@
factor: 2
- !type:SatiateHunger
factor: -2
- - !type:AdjustReagent
- reagent: Ethanol
- amount: 0.05
Medicine:
effects:
- !type:HealthChange
@@ -955,7 +1065,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.15
+ amount: 0.225
- type: reagent
id: ErikaSurprise
@@ -971,6 +1081,14 @@
metamorphicMaxFillLevels: 5
metamorphicFillBaseName: fill-
metamorphicChangeColor: true
+ metabolisms:
+ Drink:
+ effects:
+ - !type:SatiateThirst
+ factor: 2
+ - !type:AdjustReagent
+ reagent: Ethanol
+ amount: 0.02
- type: reagent
id: GargleBlaster
@@ -993,7 +1111,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.2
+ amount: 0.32
- type: reagent
id: GinFizz
@@ -1016,7 +1134,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.07
+ amount: 0.15
- type: reagent
id: GinTonic
@@ -1039,7 +1157,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.07
+ amount: 0.15
- type: reagent
id: Gildlager
@@ -1062,7 +1180,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.2
+ amount: 0.363
- type: reagent
id: Grog
@@ -1078,6 +1196,14 @@
metamorphicMaxFillLevels: 5
metamorphicFillBaseName: fill-
metamorphicChangeColor: true
+ metabolisms:
+ Drink:
+ effects:
+ - !type:SatiateThirst
+ factor: 2
+ - !type:AdjustReagent
+ reagent: Ethanol
+ amount: 0.10
- type: reagent
id: HippiesDelight
@@ -1093,6 +1219,14 @@
metamorphicMaxFillLevels: 6
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
+ metabolisms:
+ Drink:
+ effects:
+ - !type:SatiateThirst
+ factor: 2
+ - !type:AdjustReagent
+ reagent: Ethanol
+ amount: 0.16
- type: reagent
id: Hooch
@@ -1102,6 +1236,14 @@
physicalDesc: reagent-physical-desc-strong-smelling
flavor: alcohol
color: "#664e00"
+ metabolisms:
+ Drink:
+ effects:
+ - !type:SatiateThirst
+ factor: 2
+ - !type:AdjustReagent
+ reagent: Ethanol
+ amount: 0.50
- type: reagent
id: IcedBeer
@@ -1139,7 +1281,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.15
+ amount: 0.16
- type: reagent
id: IrishCream
@@ -1162,7 +1304,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.2
+ amount: 0.266
- type: reagent
id: IrishCoffee
@@ -1185,7 +1327,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.15
+ amount: 0.133
- type: reagent
id: LongIslandIcedTea
@@ -1208,7 +1350,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.15
+ amount: 0.273
- type: reagent
id: Manhattan
@@ -1224,6 +1366,14 @@
metamorphicMaxFillLevels: 3
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
+ metabolisms:
+ Drink:
+ effects:
+ - !type:SatiateThirst
+ factor: 2
+ - !type:AdjustReagent
+ reagent: Ethanol
+ amount: 0.32
- type: reagent
id: ManhattanProject
@@ -1239,6 +1389,14 @@
metamorphicMaxFillLevels: 3
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
+ metabolisms:
+ Drink:
+ effects:
+ - !type:SatiateThirst
+ factor: 2
+ - !type:AdjustReagent
+ reagent: Ethanol
+ amount: 0.363
- type: reagent
id: ManlyDorf
@@ -1291,7 +1449,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.15
+ amount: 0.353
- type: reagent
id: Mead
@@ -1322,6 +1480,14 @@
metamorphicMaxFillLevels: 6
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
+ metabolisms:
+ Drink:
+ effects:
+ - !type:SatiateThirst
+ factor: 2
+ - !type:AdjustReagent
+ reagent: Ethanol
+ amount: 0.10
- type: reagent
id: Moonshine
@@ -1338,7 +1504,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.25
+ amount: 0.40
- type: reagent
id: Neurotoxin
@@ -1361,7 +1527,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.25
+ amount: 0.16
Poison:
effects:
- !type:HealthChange
@@ -1387,7 +1553,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.2
+ amount: 0.04
- type: reagent
id: Patron
@@ -1410,7 +1576,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.2
+ amount: 0.50
- type: reagent
id: RedMead
@@ -1438,6 +1604,14 @@
metamorphicSprite:
sprite: Objects/Consumable/Drinks/pinacolada.rsi
state: icon
+ metabolisms:
+ Drink:
+ effects:
+ - !type:SatiateThirst
+ factor: 2
+ - !type:AdjustReagent
+ reagent: Ethanol
+ amount: 0.06
- type: reagent
id: Sbiten
@@ -1453,6 +1627,14 @@
metamorphicMaxFillLevels: 5
metamorphicFillBaseName: fill-
metamorphicChangeColor: true
+ metabolisms:
+ Drink:
+ effects:
+ - !type:SatiateThirst
+ factor: 2
+ - !type:AdjustReagent
+ reagent: Ethanol
+ amount: 0.2
- type: reagent
id: ScrewdriverCocktail
@@ -1475,7 +1657,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.07
+ amount: 0.13
- type: reagent
id: CogChamp
@@ -1501,7 +1683,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.15
+ amount: 0.176
- type: reagent
id: Silencer
@@ -1540,6 +1722,14 @@
metamorphicMaxFillLevels: 5
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
+ metabolisms:
+ Drink:
+ effects:
+ - !type:SatiateThirst
+ factor: 2
+ - !type:AdjustReagent
+ reagent: Ethanol
+ amount: 0.23
- type: reagent
id: SnowWhite
@@ -1555,6 +1745,14 @@
metamorphicMaxFillLevels: 6
metamorphicFillBaseName: fill-
metamorphicChangeColor: true
+ metabolisms:
+ Drink:
+ effects:
+ - !type:SatiateThirst
+ factor: 2
+ - !type:AdjustReagent
+ reagent: Ethanol
+ amount: 0.03
- type: reagent
id: SuiDream
@@ -1570,6 +1768,14 @@
metamorphicMaxFillLevels: 5
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
+ metabolisms:
+ Drink:
+ effects:
+ - !type:SatiateThirst
+ factor: 2
+ - !type:AdjustReagent
+ reagent: Ethanol
+ amount: 0.13
- type: reagent
id: SyndicateBomb
@@ -1585,6 +1791,14 @@
metamorphicMaxFillLevels: 6
metamorphicFillBaseName: fill-
metamorphicChangeColor: true
+ metabolisms:
+ Drink:
+ effects:
+ - !type:SatiateThirst
+ factor: 2
+ - !type:AdjustReagent
+ reagent: Ethanol
+ amount: 0.095
- type: reagent
id: TequilaSunrise
@@ -1607,7 +1821,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.15
+ amount: 0.26
- type: reagent
id: TheMartinez
@@ -1623,6 +1837,14 @@
metamorphicMaxFillLevels: 3
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
+ metabolisms:
+ Drink:
+ effects:
+ - !type:SatiateThirst
+ factor: 2
+ - !type:AdjustReagent
+ reagent: Ethanol
+ amount: 0.13
- type: reagent
id: ThreeMileIsland
@@ -1645,7 +1867,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.15
+ amount: 0.273
- !type:AdjustReagent
reagent: Uranium
amount: 0.05
@@ -1664,6 +1886,14 @@
metamorphicMaxFillLevels: 4
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
+ metabolisms:
+ Drink:
+ effects:
+ - !type:SatiateThirst
+ factor: 2
+ - !type:AdjustReagent
+ reagent: Ethanol
+ amount: 0.112
- type: reagent
id: VodkaMartini
@@ -1686,7 +1916,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.15
+ amount: 0.32
- type: reagent
id: VodkaTonic
@@ -1709,7 +1939,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.07
+ amount: 0.13
- type: reagent
id: WhiskeyCola
@@ -1732,7 +1962,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.07
+ amount: 0.013
- type: reagent
id: WhiskeySoda
@@ -1755,7 +1985,7 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.07
+ amount: 0.13
- type: reagent
id: WhiteGilgamesh
@@ -1772,7 +2002,7 @@
factor: 1
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.15
+ amount: 0.04
- type: reagent
id: WhiteRussian
@@ -1795,4 +2025,4 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
- amount: 0.15
+ amount: 0.33
diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml
index c810ebb0ce..812cded972 100644
--- a/Resources/Prototypes/Recipes/Reactions/drinks.yml
+++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml
@@ -857,7 +857,7 @@
LemonLime:
amount: 1
products:
- SnowWhite: 3
+ SnowWhite: 2
- type: reaction
id: SoyLatte
diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml
index 0dbcded546..d46e1db144 100644
--- a/Resources/Prototypes/Research/experimental.yml
+++ b/Resources/Prototypes/Research/experimental.yml
@@ -56,6 +56,7 @@
cost: 5000
recipeUnlocks:
- TechDiskComputerCircuitboard
+ - ReverseEngineeringMachineCircuitboard #DeltaV
- type: technology
id: MagnetsTech
diff --git a/Resources/Prototypes/Traits/disabilities.yml b/Resources/Prototypes/Traits/disabilities.yml
index ba727cb266..51099839ac 100644
--- a/Resources/Prototypes/Traits/disabilities.yml
+++ b/Resources/Prototypes/Traits/disabilities.yml
@@ -172,8 +172,8 @@
species:
- IPC
components:
- - type: BloodDeficiency # 0.07 = start taking bloodloss damage at around ~21.4 minutes,
- bloodLossAmount: 0.07 # then become crit ~10 minutes later
+ - type: BloodDeficiency # by default, start taking bloodloss damage at around ~21.4 minutes,
+ bloodLossPercentage: 0.0002333333 # then become crit ~10 minutes
- type: trait
id: Hemophilia