diff --git a/Content.Server/Disease/DiseaseDiagnosisSystem.cs b/Content.Server/Disease/DiseaseDiagnosisSystem.cs
index 148bdd8b89..f156c926af 100644
--- a/Content.Server/Disease/DiseaseDiagnosisSystem.cs
+++ b/Content.Server/Disease/DiseaseDiagnosisSystem.cs
@@ -139,7 +139,7 @@ namespace Content.Server.Disease
             if (args.Handled || !args.CanReach)
                 return;
 
-            if (TryComp<ApcPowerReceiverComponent>(uid, out var power) && !power.Powered)
+            if (HasComp<DiseaseMachineRunningComponent>(uid) || TryComp<ApcPowerReceiverComponent>(uid, out var power) && !power.Powered)
                 return;
 
             if (!HasComp<HandsComponent>(args.User) || HasComp<ToolComponent>(args.Used)) // Don't want to accidentally breach wrenching or whatever
@@ -171,7 +171,7 @@ namespace Content.Server.Disease
             if (args.Handled || !args.CanReach)
                 return;
 
-            if (TryComp<ApcPowerReceiverComponent>(uid, out var power) && !power.Powered)
+            if (HasComp<DiseaseMachineRunningComponent>(uid) || TryComp<ApcPowerReceiverComponent>(uid, out var power) && !power.Powered)
                 return;
 
             if (!HasComp<HandsComponent>(args.User) || HasComp<ToolComponent>(args.Used)) //This check ensures tools don't break without yaml ordering jank
diff --git a/Resources/Prototypes/Diseases/infectious.yml b/Resources/Prototypes/Diseases/infectious.yml
index 78e02884da..fd1153673d 100644
--- a/Resources/Prototypes/Diseases/infectious.yml
+++ b/Resources/Prototypes/Diseases/infectious.yml
@@ -27,7 +27,7 @@
   effects:
     - !type:DiseasePopUp
       probability: 0.025
-      message: burning-insides
+      message: generic-reagent-effect-burning-insides
     - !type:DiseaseSnough
       probability: 0.025
       snoughMessage: disease-cough
diff --git a/Resources/Prototypes/Diseases/noninfectious.yml b/Resources/Prototypes/Diseases/noninfectious.yml
index d3a2a173e8..af1a722d09 100644
--- a/Resources/Prototypes/Diseases/noninfectious.yml
+++ b/Resources/Prototypes/Diseases/noninfectious.yml
@@ -5,7 +5,7 @@
   cureResist: 0.15
   effects:
     - !type:DiseaseHealthChange
-      probability: 0.5
+      probability: 0.35
       damage:
         types:
           Cellular: 1
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
index e1fe9f9a9e..72dc3606f3 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -76,7 +76,9 @@
         maxVol: 30
         reagents:
         - ReagentId: IcedTea
-          Quantity: 30
+          Quantity: 28
+        - ReagentId: Theobromine
+          Quantity: 2
   - type: Sprite
     sprite: Objects/Consumable/Drinks/ice_tea_can.rsi
   - type: Item
@@ -236,7 +238,9 @@
         maxVol: 30
         reagents:
         - ReagentId: FourteenLoko
-          Quantity: 30
+          Quantity: 28
+        - ReagentId: Theobromine
+          Quantity: 2
   - type: Sprite
     sprite: Objects/Consumable/Drinks/fourteen_loko.rsi
   - type: Item
@@ -292,7 +296,9 @@
         maxVol: 30
         reagents:
         - ReagentId: EnergyDrink
-          Quantity: 30
+          Quantity: 28
+        - ReagentId: Theobromine
+          Quantity: 2
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/energy_drink.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
index 32ca610a53..46894bb7d1 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -160,7 +160,9 @@
       drink:
         reagents:
         - ReagentId: Coffee
-          Quantity: 20
+          Quantity: 19
+        - ReagentId: Theobromine
+          Quantity: 1
         maxVol: 20
   - type: Sprite
     sprite: Objects/Consumable/Drinks/hot_coffee.rsi
@@ -176,7 +178,9 @@
       drink:
         reagents:
         - ReagentId: Tea
-          Quantity: 20
+          Quantity: 19
+        - ReagentId: Theobromine
+          Quantity: 1
         maxVol: 20
   - type: Sprite
     sprite: Objects/Consumable/Drinks/teacup.rsi