From 727f7629a516318af752a681983cc1bcf0d6ab12 Mon Sep 17 00:00:00 2001 From: RemberBL Date: Mon, 14 Sep 2020 12:49:45 +0200 Subject: [PATCH] Resolve issue involving flickering lights #2056 (#2076) * Fixed an issue with the welder messages, not done yet * Fixes issue #1833 The welder item no longer plays do_after when it cannot be used * Revert "Add do_after to TryInsert (#1938)" This reverts commit c09c9176ef0f5294398ded497662f0e690f940ea. * Revert "Revert "Add do_after to TryInsert (#1938)"" This reverts commit 078323bc2e10109b63c438f38a7b56103d163994. * Revert "Fixes issue #1833" This reverts commit 921712810fce73611e186fe07d7620b8cc309fdb. * Revert "Fixed an issue with the welder messages, not done yet" This reverts commit 5e946014451c6f5855cbe4fa553a04c55b907793. * Added a start to a damage sound system * Fixes issue #2056 by removing some misplaced code * Undo changes that carried over through not using git properly * Forgot to save my file before committing... --- .../PowerReceiverUsers/PoweredLightComponent.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightComponent.cs b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightComponent.cs index afd4a4a524..5e5c4a60a0 100644 --- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightComponent.cs @@ -221,18 +221,15 @@ namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerRece } else { - powerReceiver.Load = 0; sprite.LayerSetState(0, "off"); light.Enabled = false; } break; case LightBulbState.Broken: - powerReceiver.Load = 0; sprite.LayerSetState(0, "broken"); light.Enabled = false; break; case LightBulbState.Burned: - powerReceiver.Load = 0; sprite.LayerSetState(0, "burned"); light.Enabled = false; break;