diff --git a/Content.Server/Shuttles/EntitySystems/ThrusterSystem.cs b/Content.Server/Shuttles/EntitySystems/ThrusterSystem.cs index 80b555a920..698e7322de 100644 --- a/Content.Server/Shuttles/EntitySystems/ThrusterSystem.cs +++ b/Content.Server/Shuttles/EntitySystems/ThrusterSystem.cs @@ -12,6 +12,7 @@ using Content.Shared.Interaction; using Content.Shared.Maps; using Content.Shared.Physics; using Content.Shared.Shuttles.Components; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Log; @@ -233,7 +234,7 @@ namespace Content.Server.Shuttles.EntitySystems if (!EntityManager.TryGetComponent(grid.GridEntityId, out ShuttleComponent? shuttleComponent)) return; - Logger.DebugS("thruster", $"Enabled thruster {uid}"); + // Logger.DebugS("thruster", $"Enabled thruster {uid}"); switch (component.Type) { @@ -277,6 +278,11 @@ namespace Content.Server.Shuttles.EntitySystems appearanceComponent.SetData(ThrusterVisualState.State, true); } + if (EntityManager.TryGetComponent(uid, out PointLightComponent? pointLightComponent)) + { + pointLightComponent.Enabled = true; + } + _ambient.SetAmbience(uid, true); } @@ -293,7 +299,7 @@ namespace Content.Server.Shuttles.EntitySystems if (!EntityManager.TryGetComponent(grid.GridEntityId, out ShuttleComponent? shuttleComponent)) return; - Logger.DebugS("thruster", $"Disabled thruster {uid}"); + // Logger.DebugS("thruster", $"Disabled thruster {uid}"); switch (component.Type) { @@ -319,6 +325,11 @@ namespace Content.Server.Shuttles.EntitySystems appearanceComponent.SetData(ThrusterVisualState.State, false); } + if (EntityManager.TryGetComponent(uid, out PointLightComponent? pointLightComponent)) + { + pointLightComponent.Enabled = false; + } + _ambient.SetAmbience(uid, false); if (EntityManager.TryGetComponent(uid, out PhysicsComponent? physicsComponent)) diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml index 36be517bcc..a8b365674e 100644 --- a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml +++ b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml @@ -84,3 +84,11 @@ - state: thrust_burn_unshaded map: ["enum.ThrusterVisualLayers.ThrustingUnshaded"] shader: unshaded + - type: PointLight + radius: 1.3 + energy: 0.8 + enabled: false + mask: /Textures/Effects/LightMasks/cone.png + autoRot: true + offset: "0, 0.1" # shine from the top, not bottom of the computer + color: "#4246b3" diff --git a/Resources/Textures/Structures/Shuttles/gyroscope.rsi/base.png b/Resources/Textures/Structures/Shuttles/gyroscope.rsi/base.png index 94cda7007f..5d592b2e1d 100644 Binary files a/Resources/Textures/Structures/Shuttles/gyroscope.rsi/base.png and b/Resources/Textures/Structures/Shuttles/gyroscope.rsi/base.png differ diff --git a/Resources/Textures/Structures/Shuttles/gyroscope.rsi/meta.json b/Resources/Textures/Structures/Shuttles/gyroscope.rsi/meta.json index 574272c09a..a92125f840 100644 --- a/Resources/Textures/Structures/Shuttles/gyroscope.rsi/meta.json +++ b/Resources/Textures/Structures/Shuttles/gyroscope.rsi/meta.json @@ -4,7 +4,7 @@ "x": 32, "y": 32 }, - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/tree/23e73e051a838bc190a589d6d464a318c641b6a5", + "copyright": "Made with love by Shaeone", "license": "CC-BY-SA-3.0", "states": [ { @@ -17,8 +17,6 @@ "name": "thrust_burn", "delays": [ [ - 0.1, - 0.1, 0.1, 0.1, 0.1, @@ -30,8 +28,6 @@ "name": "thrust_burn_unshaded", "delays": [ [ - 0.1, - 0.1, 0.1, 0.1, 0.1, diff --git a/Resources/Textures/Structures/Shuttles/gyroscope.rsi/thrust.png b/Resources/Textures/Structures/Shuttles/gyroscope.rsi/thrust.png index 718c9bd738..f4b346d41f 100644 Binary files a/Resources/Textures/Structures/Shuttles/gyroscope.rsi/thrust.png and b/Resources/Textures/Structures/Shuttles/gyroscope.rsi/thrust.png differ diff --git a/Resources/Textures/Structures/Shuttles/gyroscope.rsi/thrust_burn.png b/Resources/Textures/Structures/Shuttles/gyroscope.rsi/thrust_burn.png index 0563da7e62..1e46eace58 100644 Binary files a/Resources/Textures/Structures/Shuttles/gyroscope.rsi/thrust_burn.png and b/Resources/Textures/Structures/Shuttles/gyroscope.rsi/thrust_burn.png differ diff --git a/Resources/Textures/Structures/Shuttles/gyroscope.rsi/thrust_burn_unshaded.png b/Resources/Textures/Structures/Shuttles/gyroscope.rsi/thrust_burn_unshaded.png index 7c955b68f9..d90143683e 100644 Binary files a/Resources/Textures/Structures/Shuttles/gyroscope.rsi/thrust_burn_unshaded.png and b/Resources/Textures/Structures/Shuttles/gyroscope.rsi/thrust_burn_unshaded.png differ