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

Merge branch 'master' into replace-sounds-with-sound-specifier

Browse Source 
# Conflicts:
#	Content.Server/Kitchen/Components/ReagentGrinderComponent.cs
#	Content.Server/Storage/Components/SecureEntityStorageComponent.cs
This commit is contained in:
Galactic Chimp
2021-07-30 20:26:22 +02:00
parent f531c65a0b 898bdc9491
commit 5363f59a90
117 changed files with 1807 additions and 1851 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Light/Components/EmergencyLightComponent.cs
View File

@@ -142,7 +142,7 @@ namespace Content.Server.Light.Components
void IExamine.Examine(FormattedMessage message, bool inDetailsRange)
{
message.AddMarkup(Loc.GetString("emergency-light-component-on-examine",("batteryStateText", BatteryStateText[State])));
message.AddMarkup(Loc.GetString("emergency-light-component-on-examine",("batteryStateText", Loc.GetString(BatteryStateText[State]))));
}
public enum EmergencyLightState

2
Content.Server/Light/Components/ExpendableLightComponent.cs
View File

@@ -56,7 +56,7 @@ namespace Content.Server.Light.Components
/// </summary>
private bool TryActivate()
{
if (!Activated)
if (!Activated && CurrentState == ExpendableLightState.BrandNew)
{
if (Owner.TryGetComponent<ItemComponent>(out var item))
{