MadisonBarks/Monolith
1
0
Fork 0
forked from SpaceStation14-Shenanigans/Monolith
Code Pull Requests Activity

Merge branch 'master' into buckle-locker-fix-1262

Browse Source
This commit is contained in:
DrSmugleaf
2020-07-07 20:36:43 +02:00
parent e0f888344e ae41d03ec6
commit 8f685f0541
5598 changed files with 6598 additions and 6497 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs
+1 -1
View File
@@ -55,7 +55,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
serializer.DataField(ref _useSound, "useSound", "/Audio/items/drink.ogg");
serializer.DataField(ref _useSound, "useSound", "/Audio/Items/drink.ogg");
serializer.DataField(ref _defaultToOpened, "isOpen", false); //For things like cups of coffee.
serializer.DataField(ref _soundCollection, "openSounds","canOpenSounds");
}
Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs
+1 -1
View File
@@ -48,7 +48,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
serializer.DataField(ref _useSound, "useSound", "/Audio/items/eatfood.ogg");
serializer.DataField(ref _useSound, "useSound", "/Audio/Items/eatfood.ogg");
serializer.DataField(ref _transferAmount, "transferAmount", ReagentUnit.New(5));
serializer.DataField(ref _trashPrototype, "trash", null);
Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs
+5 -5
View File
@@ -72,11 +72,11 @@ namespace Content.Server.GameObjects.Components.Nutrition
[UsedImplicitly]
public static readonly string[] _hungerThresholdImages =
{
"/Textures/Mob/UI/Hunger/Overfed.png",
"/Textures/Mob/UI/Hunger/Okay.png",
"/Textures/Mob/UI/Hunger/Peckish.png",
"/Textures/Mob/UI/Hunger/Starving.png",
"/Textures/Mob/UI/Hunger/Dead.png",
"/Textures/Interface/StatusEffects/Hunger/Overfed.png",
"/Textures/Interface/StatusEffects/Hunger/Okay.png",
"/Textures/Interface/StatusEffects/Hunger/Peckish.png",
"/Textures/Interface/StatusEffects/Hunger/Starving.png",
"/Textures/Interface/StatusEffects/Hunger/Dead.png",
};
public void HungerThresholdEffect(bool force = false)
Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs
+6 -6
View File
@@ -66,11 +66,11 @@ namespace Content.Server.GameObjects.Components.Nutrition
[UsedImplicitly]
public static readonly string[] _thirstThresholdImages =
{
"/Textures/Mob/UI/Thirst/OverHydrated.png",
"/Textures/Mob/UI/Thirst/Okay.png",
"/Textures/Mob/UI/Thirst/Thirsty.png",
"/Textures/Mob/UI/Thirst/Parched.png",
"/Textures/Mob/UI/Thirst/Dead.png",
"/Textures/Interface/StatusEffects/Thirst/OverHydrated.png",
"/Textures/Interface/StatusEffects/Thirst/Okay.png",
"/Textures/Interface/StatusEffects/Thirst/Thirsty.png",
"/Textures/Interface/StatusEffects/Thirst/Parched.png",
"/Textures/Interface/StatusEffects/Thirst/Dead.png",
};
public override void ExposeData(ObjectSerializer serializer)
@@ -92,7 +92,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
// Update UI
Owner.TryGetComponent(out ServerStatusEffectsComponent statusEffectsComponent);
statusEffectsComponent?.ChangeStatusEffectIcon(StatusEffect.Thirst, "/Textures/Mob/UI/Thirst/" +
statusEffectsComponent?.ChangeStatusEffectIcon(StatusEffect.Thirst, "/Textures/Interface/StatusEffects/Thirst/" +
_currentThirstThreshold + ".png");
switch (_currentThirstThreshold)