Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Disease Tweaks & Fixes (#7121)

Browse Source
This commit is contained in:
Rane
2022-03-14 02:05:01 -04:00
committed by GitHub
parent 6c5f22d4f2
commit c2711259a9
5 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Disease/DiseaseDiagnosisSystem.cs
View File

@@ -139,7 +139,7 @@ namespace Content.Server.Disease
if (args.Handled || !args.CanReach) if (args.Handled || !args.CanReach)
return; return;
if (TryComp<ApcPowerReceiverComponent>(uid, out var power) && !power.Powered) if (HasComp<DiseaseMachineRunningComponent>(uid) || TryComp<ApcPowerReceiverComponent>(uid, out var power) && !power.Powered)
return; return;
if (!HasComp<HandsComponent>(args.User) || HasComp<ToolComponent>(args.Used)) // Don't want to accidentally breach wrenching or whatever 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) if (args.Handled || !args.CanReach)
return; return;
if (TryComp<ApcPowerReceiverComponent>(uid, out var power) && !power.Powered) if (HasComp<DiseaseMachineRunningComponent>(uid) || TryComp<ApcPowerReceiverComponent>(uid, out var power) && !power.Powered)
return; return;
if (!HasComp<HandsComponent>(args.User) || HasComp<ToolComponent>(args.Used)) //This check ensures tools don't break without yaml ordering jank if (!HasComp<HandsComponent>(args.User) || HasComp<ToolComponent>(args.Used)) //This check ensures tools don't break without yaml ordering jank

2
Resources/Prototypes/Diseases/infectious.yml
View File

@@ -27,7 +27,7 @@
effects: effects:
- !type:DiseasePopUp - !type:DiseasePopUp
probability: 0.025 probability: 0.025
message: burning-insides message: generic-reagent-effect-burning-insides
- !type:DiseaseSnough - !type:DiseaseSnough
probability: 0.025 probability: 0.025
snoughMessage: disease-cough snoughMessage: disease-cough

2
Resources/Prototypes/Diseases/noninfectious.yml
View File

@@ -5,7 +5,7 @@
cureResist: 0.15 cureResist: 0.15
effects: effects:
- !type:DiseaseHealthChange - !type:DiseaseHealthChange
probability: 0.5 probability: 0.35
damage: damage:
types: types:
Cellular: 1 Cellular: 1

12
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
View File

@@ -76,7 +76,9 @@
maxVol: 30 maxVol: 30
reagents: reagents:
- ReagentId: IcedTea - ReagentId: IcedTea
Quantity: 30 Quantity: 28
- ReagentId: Theobromine
Quantity: 2
- type: Sprite - type: Sprite
sprite: Objects/Consumable/Drinks/ice_tea_can.rsi sprite: Objects/Consumable/Drinks/ice_tea_can.rsi
- type: Item - type: Item
@@ -236,7 +238,9 @@
maxVol: 30 maxVol: 30
reagents: reagents:
- ReagentId: FourteenLoko - ReagentId: FourteenLoko
Quantity: 30 Quantity: 28
- ReagentId: Theobromine
Quantity: 2
- type: Sprite - type: Sprite
sprite: Objects/Consumable/Drinks/fourteen_loko.rsi sprite: Objects/Consumable/Drinks/fourteen_loko.rsi
- type: Item - type: Item
@@ -292,7 +296,9 @@
maxVol: 30 maxVol: 30
reagents: reagents:
- ReagentId: EnergyDrink - ReagentId: EnergyDrink
Quantity: 30 Quantity: 28
- ReagentId: Theobromine
Quantity: 2
- type: Drink - type: Drink
- type: Sprite - type: Sprite
sprite: Objects/Consumable/Drinks/energy_drink.rsi sprite: Objects/Consumable/Drinks/energy_drink.rsi

8
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
View File

@@ -160,7 +160,9 @@
drink: drink:
reagents: reagents:
- ReagentId: Coffee - ReagentId: Coffee
Quantity: 20 Quantity: 19
- ReagentId: Theobromine
Quantity: 1
maxVol: 20 maxVol: 20
- type: Sprite - type: Sprite
sprite: Objects/Consumable/Drinks/hot_coffee.rsi sprite: Objects/Consumable/Drinks/hot_coffee.rsi
@@ -176,7 +178,9 @@
drink: drink:
reagents: reagents:
- ReagentId: Tea - ReagentId: Tea
Quantity: 20 Quantity: 19
- ReagentId: Theobromine
Quantity: 1
maxVol: 20 maxVol: 20
- type: Sprite - type: Sprite
sprite: Objects/Consumable/Drinks/teacup.rsi sprite: Objects/Consumable/Drinks/teacup.rsi