Substation Maintenance (take 3) #32550

AwareFoxy · 2024-09-30T18:05:04Z

About the PR

This PR not ready, and suggestions or critiques are welcome. It builds upon Peptide90's earlier pull request (#25191) and aims to address issue #18278.

Objectives

Accessibility Improvements: Change the substation screen icons to be more legible and distinct, rather than just color-coded. Rotate the red icon as needed.
Configuration Updates: Move substation decay settings to CVars for better manageability.
Bug Fixes:
- Resolve the issue causing the verb to eject the nitrogen booster even when the maintenance door is closed.
- Investigate and fix why substations do not decay their integrity as expected.

Why / Balance

Refer to the previous two PRs for detailed context on why these changes are necessary.

Media

Media will be added soon :3

Requirements

I have read and am following the Pull Request and Changelog Guidelines.
I have added media to this PR or it does not require an in-game showcase.

Breaking Changes

Changelog

🆑

add: Added fun!
remove: Removed fun!
tweak: Changed fun!
fix: Fixed fun!

…tion-14 into substation

…n_maintenance

…upgrade stuff.

github-actions · 2024-09-30T18:05:42Z

RSI Diff Bot; head commit 18e52e6 merging into adb7aee
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Tanks/nitrogenbooster.rsi

State	Old	New	Status
equipped-BELT			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/Structures/Power/substation.rsi

State	Old	New	Status
screen1			Added
screen2			Added

Edit: diff updated after 18e52e6

…nance

AwareFoxy

uh

Content.Server/Power/EntitySystems/SubstationSystem.cs

AwareFoxy · 2024-10-14T17:29:16Z

Ok I think its ready for review now(not for merge obviously)

0x6273 · 2024-10-14T17:35:14Z

Content.Client/Power/Substation/SubstationVisualsSystem.cs

+        if(args.Sprite == null || !args.Sprite.LayerMapTryGet(component.LayerMap, out var layer))
+            return;
+
+        if(args.AppearanceData.TryGetValue(SubstationVisuals.Screen, out var stateObject)


Suggested change

if(args.Sprite == null || !args.Sprite.LayerMapTryGet(component.LayerMap, out var layer))

return;

if(args.AppearanceData.TryGetValue(SubstationVisuals.Screen, out var stateObject)

if (args.Sprite == null || !args.Sprite.LayerMapTryGet(component.LayerMap, out var layer))

return;

if (args.AppearanceData.TryGetValue(SubstationVisuals.Screen, out var stateObject)

0x6273 · 2024-10-14T17:39:46Z

Content.Client/Power/Substation/SubstationVisualsSystem.cs

+
+public sealed class SubstationVisualsSystem : VisualizerSystem<SubstationVisualsComponent>
+{
+    protected override void OnAppearanceChange(EntityUid uid, SubstationVisualsComponent component, ref AppearanceChangeEvent args)


All system methods that take EntityUid and one or more components should be changed to take Entity<TComp1, TComp2, ..> instead.

Suggested change

protected override void OnAppearanceChange(EntityUid uid, SubstationVisualsComponent component, ref AppearanceChangeEvent args)

protected override void OnAppearanceChange(Entity<SubstationVisualsComponent> ent, ref AppearanceChangeEvent args)

0x6273 · 2024-10-14T17:42:08Z

Content.Server/Power/EntitySystems/SubstationSystem.cs

+        if (args.IsInDetailsRange)
+        {


Negate and return early instead.

0x6273 · 2024-10-14T18:03:21Z

Content.Server/Power/EntitySystems/SubstationSystem.cs

+            subs.SubstationLightBlinkTimer -= deltaTime;
+            if (subs.SubstationLightBlinkTimer <= 0f)


Store a [AutoPausedField] TimeSpan NextUpdate on the comp instead, and compare that with CurTime.

0x6273 · 2024-10-14T18:10:07Z

Content.Server/Power/EntitySystems/SubstationSystem.cs

+                    continue;
+
+                if (!_lightSystem.TryGetLight(uid, out var shlight))
+                    return;


return will stop iterating the rest of the substations, which is probably not what you want here.

0x6273 · 2024-10-14T18:55:46Z

Content.Server/Power/EntitySystems/SubstationSystem.cs

+        _substationDecayEnabled = _cfg.GetCVar(CCVars.SubstationDecayEnabled);
+        _substationDecayTimeout = _cfg.GetCVar(CCVars.SubstationDecayTimeout);
+        _substationDecayCoefficient = _cfg.GetCVar(CCVars.SubstationDecayCoefficient);
+        _substationDecayTimer = _cfg.GetCVar(CCVars.SubstationDecayTimer);


I don't think these are updated if you change the cvars in the middle of a round?

0x6273 · 2024-10-14T18:57:57Z

Content.Shared/Power/SubstationComponent.cs

+
+[RegisterComponent]
+public sealed partial class SubstationComponent : Component


Put an xmldoc summary on the class, and every field that isn't self-explanatory from its name.

0x6273 · 2024-10-14T19:00:22Z

Content.Shared/Power/SubstationComponent.cs

+
+    public bool AllowInsert = true;
+
+    public float SubstationLightBlinkInterval = 1f;


This should be a TimeSpan, and either a datafield or a constant.

0x6273 · 2024-10-14T19:01:21Z

Content.Shared/Power/SubstationComponent.cs

+
+    public float SubstationLightBlinkInterval = 1f;
+
+    public float SubstationLightBlinkTimer = 1f;


As mentioned earlier, replace this with a TimeSpan that represents the next game time that the light should blink.

0x6273 · 2024-10-14T19:07:43Z

Content.Server/Power/EntitySystems/SubstationSystem.cs

+        if (!component.Initialized)
+            return;
+
+        if (args.Container.ID != component.NitrogenBoosterSlotId)
+            return;
+
+        if (!TryComp<WiresPanelComponent>(uid, out var panel))
+            return;


Combine ifs when possible, when the conditional code is the same.

0x6273 · 2024-10-14T19:37:23Z

Resources/Textures/Structures/Power/substation.rsi/meta.json

-      "name": "substation"
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "Created by EmoGarbage404 (github), screen sprites created by joshepvodka (github) and updated by AwareFoxy(github)",


Have you asked joshepvodka if they were the one that created the screen sprites, and that they are okay with relicensing to CC0? (In their PR they are licensed as CC-BY-SA)

Krovotushka · 2024-10-15T19:39:21Z

Based PR, merge now🦖

github-actions · 2024-10-17T11:18:30Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

joshepvodka and others added 19 commits October 31, 2023 18:43

substation wear added

19e9654

removed emag

670358d

fixed timer and added VVrw

d985825

added component to all substations

89196cf

blinking lights and screen change

ff93fc9

added substation fuse

65b977d

fuse lifetime upgrades

b8eaa36

fixed formatting

11d9691

added sprites fixed some code

2263549

Merge branch 'master' into substation

6cfde65

fixed lights and yml

92b3a57

Merge branch 'substation' of https://github.com/joshepvodka/space-sta…

739f629

…tion-14 into substation

changed conduit material composition

9d47c0e

fix some checks

b2dc9a6

change item name

f193cba

Merge remote-tracking branch 'sub_maint_pr/substation' into substatio…

543c273

…n_maintenance

changes all naming from conduit to nitrogen booster. Removes machine …

c2e71c0

…upgrade stuff.

remove plasma needs

1911b09

math changes

09e61b4

github-actions bot added the Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. label Sep 30, 2024

AwareFoxy added 3 commits September 30, 2024 21:18

Merge remote-tracking branch 'upstream/master' into substation_mainte…

dc9886e

…nance

Resprite screens to make it more accessible to colorblind

b3bb50e

some code cleanup + cvars

063cd1d

AwareFoxy commented Oct 1, 2024

View reviewed changes

AwareFoxy added 5 commits October 1, 2024 15:25

gazanalyzer error fix

d12de7d

weh

0b04231

uh

c118947

some code cleanup

6ff3278

goddamn

620c79c

AwareFoxy marked this pull request as ready for review October 14, 2024 17:29

meow :33

c5fe7d4

0x6273 suggested changes Oct 14, 2024

View reviewed changes

0x6273 reviewed Oct 14, 2024

View reviewed changes

github-actions bot added the Merge Conflict This PR currently has conflicts that need to be addressed. label Oct 17, 2024

Merge branch 'master' into substation_maintenance

18e52e6

github-actions bot removed the Merge Conflict This PR currently has conflicts that need to be addressed. label Oct 18, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Substation Maintenance (take 3) #32550

Substation Maintenance (take 3) #32550

AwareFoxy commented Sep 30, 2024 •

edited

Loading

github-actions bot commented Sep 30, 2024 •

edited

Loading

AwareFoxy left a comment

AwareFoxy commented Oct 14, 2024

0x6273 Oct 14, 2024

0x6273 Oct 14, 2024

0x6273 Oct 14, 2024

0x6273 Oct 14, 2024

0x6273 Oct 14, 2024

0x6273 Oct 14, 2024

0x6273 Oct 14, 2024

0x6273 Oct 14, 2024

0x6273 Oct 14, 2024

0x6273 Oct 14, 2024

0x6273 Oct 14, 2024

Krovotushka commented Oct 15, 2024

github-actions bot commented Oct 17, 2024

	protected override void OnAppearanceChange(EntityUid uid, SubstationVisualsComponent component, ref AppearanceChangeEvent args)
	protected override void OnAppearanceChange(Entity<SubstationVisualsComponent> ent, ref AppearanceChangeEvent args)

		subs.SubstationLightBlinkTimer -= deltaTime;
		if (subs.SubstationLightBlinkTimer <= 0f)


		[RegisterComponent]
		public sealed partial class SubstationComponent : Component


		public bool AllowInsert = true;

		public float SubstationLightBlinkInterval = 1f;


		public float SubstationLightBlinkInterval = 1f;

		public float SubstationLightBlinkTimer = 1f;

Substation Maintenance (take 3) #32550

Are you sure you want to change the base?

Substation Maintenance (take 3) #32550

Conversation

AwareFoxy commented Sep 30, 2024 • edited Loading

About the PR

Objectives

Why / Balance

Media

Requirements

Breaking Changes

Changelog

github-actions bot commented Sep 30, 2024 • edited Loading

AwareFoxy left a comment

Choose a reason for hiding this comment

AwareFoxy commented Oct 14, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Krovotushka commented Oct 15, 2024

github-actions bot commented Oct 17, 2024

AwareFoxy commented Sep 30, 2024 •

edited

Loading

github-actions bot commented Sep 30, 2024 •

edited

Loading