From e93cbba5527601201dadc096bf3ad12c4b552069 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Sat, 28 Sep 2024 20:58:55 -0400 Subject: [PATCH 1/6] Hauler: add guidebook entry --- .../Prototypes/_NF/Guidebook/shipyard.yml | 1 + Resources/Prototypes/_NF/Shipyard/hauler.yml | 2 +- .../_NF/Guidebook/Shipyard/Hauler.xml | 90 +++++++++++++++++++ 3 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 Resources/ServerInfo/_NF/Guidebook/Shipyard/Hauler.xml diff --git a/Resources/Prototypes/_NF/Guidebook/shipyard.yml b/Resources/Prototypes/_NF/Guidebook/shipyard.yml index ebabaa7063e..126efa068aa 100644 --- a/Resources/Prototypes/_NF/Guidebook/shipyard.yml +++ b/Resources/Prototypes/_NF/Guidebook/shipyard.yml @@ -21,6 +21,7 @@ - ShipyardGasbender - ShipyardGourd - ShipyardHammer + - ShipyardHauler - ShipyardHarbormaster - ShipyardInvestigator - ShipyardKestrel diff --git a/Resources/Prototypes/_NF/Shipyard/hauler.yml b/Resources/Prototypes/_NF/Shipyard/hauler.yml index 00fc6d3beef..9c13a0ae662 100644 --- a/Resources/Prototypes/_NF/Shipyard/hauler.yml +++ b/Resources/Prototypes/_NF/Shipyard/hauler.yml @@ -6,7 +6,7 @@ category: Medium group: Shipyard shuttlePath: /Maps/_NF/Shuttles/hauler.yml - guidebookPage: Null + guidebookPage: ShipyardHauler class: - Cargo - Salvage diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Hauler.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Hauler.xml new file mode 100644 index 00000000000..ec8daa7b6bd --- /dev/null +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Hauler.xml @@ -0,0 +1,90 @@ + + # HAULER-CLASS SALVAGE SHUTTLE + + + + + + [color=#a4885c]Ship Size:[/color] Medium + + [color=#a4885c]Recommended Crew:[/color] 2-4 + + [color=#a4885c]Power Gen Type:[/color] Uranium + + [color=#a4885c]Expeditions:[/color] None + + [color=#a4885c]IFF Console:[/color] None + + "A medium sized vessel specializing in long-haul salvage, mining, and cargo operations." + + # PREFLIGHT CHECKLIST + + ## 1. Power supply + + ## 1.1. Battery units + + + + + + + - Check that the substation unit is anchored to the floor. + - Check that all APC units' Main Breakers are toggled on. + - Check the APC unit's current Load* (W). + + ## 1.2. S.U.P.E.R.P.A.C.M.A.N. generator unit + + + + + + + - Check that the S.U.P.E.R.P.A.C.M.A.N. generator unit is anchored to the floor. + - Check that the S.U.P.E.R.P.A.C.M.A.N. generator unit has fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation during flight. + - Check that the S.U.P.E.R.P.A.C.M.A.N. generator unit is set to HV output. + - Set Target Power for 30-35[bold]**[/bold] [bold]kW[/bold]. + - Start the S.U.P.E.R.P.A.C.M.A.N. generator unit. + + ## 2. Atmospherics + + ## 2.1. Distribution Loop + + + + + + + + + - Check that the O2 canister is anchored to connector port. + - Check that the N2 canister is anchored to connector port. + - Check that the gas mixer is set to the correct mixing ratio (21% Oxygen, 79% Nitrogen). + - Check that the gas mixer is set to 101kPa. + - Enable gas mixer. + + ## 2.2. Waste Loop + + + + + + - Locate the release valve leading to the passive ventilation duct located on the back exterior of the ship and make sure it is open. The release valve can be found inside the back airlock leading up to the ship exterior. + + ## 3. Other checks + + + + + + - Check if the gyroscope is anchored, powered, and enabled. It can be found adjacent to your engine. + - Check if the mini gravity generator is anchored, powered, and enabled inside the engine room. + + ## Sidenotes + + * - Hauler-class salvage ships are equipped with three APC units that can be used to appraise the ship's total power consumption. Unmodified Hauler-class ships require ~27 kW of power to remain operational. + + ** - Hauler-class salvage ships have higher power demand than a standard P.A.C.M.A.N. can provide at optimal settings, and come equipped with a S.U.P.E.R.P.A.C.M.A.N. instead. Please note that the recommended Target Power value to avoid blackouts during Gravity Generator charging sequence is 35 kW. + + [bold]Note:[/bold] Without a working generator, fully charged battery units (SMES and substation) can provide power in a stock Hauler for approximately 5 minutes. + + From 41b10e8e7fe53f3756cd5f597e3fc21d82f38145 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Sat, 28 Sep 2024 21:18:07 -0400 Subject: [PATCH 2/6] Hauler guidebook entry --- Resources/Locale/en-US/_NF/guidebook/guides.ftl | 1 + Resources/Prototypes/_NF/Guidebook/shipyard.yml | 5 +++++ Resources/ServerInfo/_NF/Guidebook/Shipyard/Hauler.xml | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/en-US/_NF/guidebook/guides.ftl b/Resources/Locale/en-US/_NF/guidebook/guides.ftl index a6c7b0958dd..9ff5fb0c7c1 100644 --- a/Resources/Locale/en-US/_NF/guidebook/guides.ftl +++ b/Resources/Locale/en-US/_NF/guidebook/guides.ftl @@ -41,6 +41,7 @@ guide-entry-shipyard-garden = Garden guide-entry-shipyard-gasbender = Gasbender guide-entry-shipyard-gourd = Gourd guide-entry-shipyard-hammer = Hammer +guide-entry-shipyard-hauler = Hauler guide-entry-shipyard-harbormaster = Harbormaster guide-entry-shipyard-investigator = Investigator guide-entry-shipyard-kestrel = Kestrel diff --git a/Resources/Prototypes/_NF/Guidebook/shipyard.yml b/Resources/Prototypes/_NF/Guidebook/shipyard.yml index 126efa068aa..b7cfca601bf 100644 --- a/Resources/Prototypes/_NF/Guidebook/shipyard.yml +++ b/Resources/Prototypes/_NF/Guidebook/shipyard.yml @@ -130,6 +130,11 @@ name: guide-entry-shipyard-hammer text: "/ServerInfo/_NF/Guidebook/Shipyard/Hammer.xml" +- type: guideEntry + id: ShipyardHauler + name: guide-entry-shipyard-hauler + text: "/ServerInfo/_NF/Guidebook/Shipyard/Hauler.xml" + - type: guideEntry id: ShipyardInvestigator name: guide-entry-shipyard-investigator diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Hauler.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Hauler.xml index ec8daa7b6bd..beb5c8881f1 100644 --- a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Hauler.xml +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Hauler.xml @@ -1,8 +1,8 @@ # HAULER-CLASS SALVAGE SHUTTLE - - + + [color=#a4885c]Ship Size:[/color] Medium From 95d7b008ffd34744402f3a4f2fb1d600efea710f Mon Sep 17 00:00:00 2001 From: Whatstone Date: Sun, 29 Sep 2024 23:08:41 -0400 Subject: [PATCH 3/6] Shuttle map cleanup, Hauler map-thank you, Mygnol --- .../Prototypes/_NF/Guidebook/shuttle_maps.yml | 38 ++++++++++++------ .../_NF/Guidebook/Shipyard/Hauler.xml | 13 +++--- .../shuttle_maps/128x96.rsi/hauler.png | Bin 0 -> 2277 bytes .../shuttle_maps/128x96.rsi/meta.json | 17 ++++---- 4 files changed, 44 insertions(+), 24 deletions(-) create mode 100644 Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/hauler.png diff --git a/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml b/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml index 6d900bf0370..444728cf99d 100644 --- a/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml +++ b/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml @@ -154,6 +154,18 @@ state: harbormaster scale: 1.2, 1.2 +- type: entity + parent: PosterBase + id: ShuttleMapHauler + name: "NC Hauler" + description: "Detailed map of a Hauler shuttle." + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: _NF/Guidebook/shuttle_maps/128x96.rsi + state: hauler + scale: 1.2, 1.2 + - type: entity parent: PosterBase id: ShuttleMapInvestigator @@ -286,23 +298,12 @@ state: searchlight scale: 1.2, 1.2 -- type: entity - parent: PosterBase - id: ShuttleMapVagabond - name: "NT Vagabond" - description: "Detailed map of a Vagabond shuttle." - categories: [ HideSpawnMenu ] - components: - - type: Sprite - sprite: _NF/Guidebook/shuttle_maps/128x96.rsi - state: vagabond - scale: 1.2, 1.2 - - type: entity parent: PosterBase id: ShuttleMapSpirit name: "NM Spirit" description: "Detailed map of a Spirit shuttle." + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: _NF/Guidebook/shuttle_maps/128x96.rsi @@ -314,8 +315,21 @@ id: ShuttleMapStasis name: "NM Stasis" description: "Detailed map of a Stasis shuttle." + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: _NF/Guidebook/shuttle_maps/128x96.rsi state: stasis scale: 1.2, 1.2 + +- type: entity + parent: PosterBase + id: ShuttleMapVagabond + name: "NT Vagabond" + description: "Detailed map of a Vagabond shuttle." + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: _NF/Guidebook/shuttle_maps/128x96.rsi + state: vagabond + scale: 1.2, 1.2 diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Hauler.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Hauler.xml index beb5c8881f1..776d34e1682 100644 --- a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Hauler.xml +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Hauler.xml @@ -5,15 +5,18 @@ - [color=#a4885c]Ship Size:[/color] Medium + + + + [color=#a4885c]Ship Size:[/color] Medium - [color=#a4885c]Recommended Crew:[/color] 2-4 + [color=#a4885c]Recommended Crew:[/color] 2-4 - [color=#a4885c]Power Gen Type:[/color] Uranium + [color=#a4885c]Power Gen Type:[/color] Uranium - [color=#a4885c]Expeditions:[/color] None + [color=#a4885c]Expeditions:[/color] None - [color=#a4885c]IFF Console:[/color] None + [color=#a4885c]IFF Console:[/color] None "A medium sized vessel specializing in long-haul salvage, mining, and cargo operations." diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/hauler.png b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/hauler.png new file mode 100644 index 0000000000000000000000000000000000000000..31990495b84905119b0ffa93d9c79996df0d69b4 GIT binary patch literal 2277 zcmV1oc$3R&SQbU%a*z<%!-fQ-95#jx zN}_=c1Og@|>_ty2OE8#KJaK{(7!q|MkgOUwaL_~(!vT%agR2l_fyj6uo|c3VFc}X! z)&077uYS6_s(YsDyL4Ce>#EmPuV4LibvFP2bUK|5bm?@F!y-=JM*P9m4GvTBa$KfP zxr*f~IvPNAnAVkP9RdI}#ZIHqXkY<3T>j;#QC$pY`6lwz-GR^5rOV~R$*AdMKhJVYK$%LL0&bzFuwath_jO57vX?nK# z>hi0a7C_couq%_}#6CdQ1&hQ~?uoiX%kU(o9!!^?t&A>T?yl42q075;@>;U)j?|?e zvBOolwensE!Rg*iG%F_i^jdXnVp^U*D0@ogZlcRLXe?|7x-7~q;uL+Q~$h^Y} z3^pk4SnckDNWI8wgp~2g9*Roa)Fa`o>^W6l(bQw=@-LfKm9Ec~7r^}tc`F~cNmni_ z`FyVDPlfB^1zS}q;nMJ^LRTF(MQ$GRrcMpG}+dr@yXPrP7iTb2S!I*jppT^<4dFXiq0B~PuzAB{(FVvTPfQUKK z00Ji(K;ZO6AAn=$n{Om->hRi)N&Nh^pE7bE5BvrI05{)V)0uhkdJ=#Cn;psixeH&` zX6#-j(E|idG=RYA>m~p*aqmpBe+brPj?FIL2h-i{s=q%;;^!Ucftw}FXQ%G~0KlWg zO`T;={phW^i5?(uq5%YsvI*eal?hz08K?PZaZ|Ft=fE?GjOek?968pJd+dTIx6UQ| z`%lp`Xt)>O9(t4>XlLb?nujTvxOWEdC;+ad=g%BDmgIqT60V!O23elto%2`W^ns=A z{!@_Tg|7kYfI0l(`?;Hp=m7#J8bIJEn*i*_b?zD<>*}zp$L<=tG@K6R=Cf1j7P;Z8 z6AzKpw(j;4e79m7P>jG6WctZl`F!P6GM8Tk~q{}N5;Q;`8FAk`D^ZHGXA+880cxd@N4$5`Z9K(<#;gN=cc$1-2N^rw{$umAcy z8ILEgWVi{OvPJjH>EsUy>s}%E|t2EF%Pt!Dh3CJll|9*zOc&AmVXuxCHs39oo2-nJwOlf{pAgM zAxokG@hMo&u@ZB8R3Z|j`%DfVnsB7z$yG*0Oz_ff1qr3Ln@Emy9s#Bew$gugJobd zmlFSIcgxf1ei4^$@^~A|WLG;qB;`4<+sBx^N)|mp;5apavF-CPw%zV6`#k4F@>BZ{ zMBv_WTOn5jF|Av4aVWKbRV-W;%hya6xpGV0I9HFU)q4S#zaG{Lm2gfZKd}$c#nsYq z+l8yX7rHuY0z?mgY&*c*ziFG!P0rvE0Y2w`JC#2;RL;W8Jjf%0(Mk0vVPqBs#?#(> z_WMNog|iqJpRJ1?AaJ4q1dj1Hg7z@4vYJfh;GQW?ll#67K>9ct4+u@x)MN0RIwzw` zTfi-THTgym2cF~+&pBScn|TNo$oqRX-8tNc zpfTM03o_G3r(oAxORm+SOcirfBhnkQT@?cgt@IRy@!};SNHMj53>DN=}di}c5KpDMk)wy}~Gu78LKU;nBT&ruW<^kkp0*A4@JV{j5q>-#& zk!H@NkynXwCQy!3T{LAJRU1K>`Kyed3ik>|4};`+0BT-96fQ1k{M-PC%Rr@%k9iB- zHM!0|7+iP_-|oB4eSq4(8AMTKQ_^qrqyhMLt^MrEgIf_4$r25KLDf&_bditCGVZku z03QXJcVfqMVkoa3K4^9jLJ5_1b8=idDtVLqs)U>95@ES-;7VsIU9K#}R#%6DCcxv% zzwlUITqyU57-vMK!==lmqsq@W^0nb(RW6AWWu(eqSEeG|6ar-_rVE=^Y?U6sb|R^Y ziKskKUL)}UHYanKOqbTdwVNQ{Evl`&PlfA-(60rcp4POnW;q>Ix+=x0xO-e0W*OIl z%aST1Rhe<}MRoE*&nQ{~Ra|Q;qyp{*eAmbS5|+a>q6 Date: Mon, 30 Sep 2024 05:10:49 -0400 Subject: [PATCH 4/6] Remove the rotation from the Nanotrasen sign (#2123) --- Resources/Maps/_NF/Outpost/frontier.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Resources/Maps/_NF/Outpost/frontier.yml b/Resources/Maps/_NF/Outpost/frontier.yml index 84135499ae8..23ddc5471de 100644 --- a/Resources/Maps/_NF/Outpost/frontier.yml +++ b/Resources/Maps/_NF/Outpost/frontier.yml @@ -31944,7 +31944,6 @@ entities: - uid: 1310 components: - type: Transform - rot: 1.5707963267948966 rad pos: 10.5,9.5 parent: 2173 - proto: SignNanotrasen2 @@ -31952,7 +31951,6 @@ entities: - uid: 4308 components: - type: Transform - rot: 1.5707963267948966 rad pos: 11.5,9.5 parent: 2173 - proto: SignNanotrasen3 @@ -31960,7 +31958,6 @@ entities: - uid: 4309 components: - type: Transform - rot: 1.5707963267948966 rad pos: 12.5,9.5 parent: 2173 - proto: SignNanotrasen4 @@ -31968,7 +31965,6 @@ entities: - uid: 4310 components: - type: Transform - rot: 1.5707963267948966 rad pos: 13.5,9.5 parent: 2173 - proto: SignNanotrasen5 @@ -31976,7 +31972,6 @@ entities: - uid: 4311 components: - type: Transform - rot: 1.5707963267948966 rad pos: 14.5,9.5 parent: 2173 - proto: SignPrison From 7ffa71853cf70410e8f14fa04982fc4cf4f3d207 Mon Sep 17 00:00:00 2001 From: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Mon, 30 Sep 2024 10:39:40 -0400 Subject: [PATCH 5/6] Fixes to upstream EMP power generation (#28984) (#2122) --- .../Power/EntitySystems/BatterySystem.cs | 3 -- .../Power/EntitySystems/ChargerSystem.cs | 47 +++++++++++++------ 2 files changed, 33 insertions(+), 17 deletions(-) diff --git a/Content.Server/Power/EntitySystems/BatterySystem.cs b/Content.Server/Power/EntitySystems/BatterySystem.cs index f7b56831b20..7bd87906d14 100644 --- a/Content.Server/Power/EntitySystems/BatterySystem.cs +++ b/Content.Server/Power/EntitySystems/BatterySystem.cs @@ -192,9 +192,6 @@ public bool IsFull(EntityUid uid, BatteryComponent? battery = null) if (!Resolve(uid, ref battery)) return false; - // If the battery is full, remove its charging component. - RemComp(uid); // Frontier: Upstream - #28984 - return battery.CurrentCharge / battery.MaxCharge >= 0.99f; } } diff --git a/Content.Server/Power/EntitySystems/ChargerSystem.cs b/Content.Server/Power/EntitySystems/ChargerSystem.cs index d8540129ac4..a5fd72477a1 100644 --- a/Content.Server/Power/EntitySystems/ChargerSystem.cs +++ b/Content.Server/Power/EntitySystems/ChargerSystem.cs @@ -115,7 +115,7 @@ public override void Update(float frameTime) var query = EntityQueryEnumerator(); // Frontier: Upstream - #28984 while (query.MoveNext(out var uid, out var charging)) // Frontier: Upstream - #28984 { - if (!HasComp(charging.ChargerUid)) // Frontier: Upstream - #28984 + if (!TryComp(charging.ChargerUid, out var charger)) // Frontier: Upstream - #28984 continue; if (charging.ChargerComponent.Status == CellChargerStatus.Off || charging.ChargerComponent.Status == CellChargerStatus.Empty) // Frontier: Upstream - #28984 @@ -135,7 +135,20 @@ public override void Update(float frameTime) if (Math.Abs(battery.MaxCharge - battery.CurrentCharge) < 0.01) StopChargingBattery(charging.ChargerUid, charging.ChargerComponent, uid); - TransferPower(charging.ChargerUid, uid, charging.ChargerComponent, frameTime); + + // Frontier: we already have the battery separated (it is what charges) + // so we will charge the battery ourselves, instead of finding it + // again through TransferPower + _battery.TrySetCharge(uid, battery.CurrentCharge + charger.ChargeRate * frameTime, battery); // Frontier: Upstream - #28984 + // Just so the sprite won't be set to 99.99999% visibility + if (battery.MaxCharge - battery.CurrentCharge < 0.01) + { + _battery.TrySetCharge(uid, battery.MaxCharge, battery); // Frontier: Upstream - #28984 + } + + UpdateStatus(uid, charger); + + //TransferPower(charging.ChargerUid, uid, charging.ChargerComponent, frameTime); // Frontier: Upstream - #28984 End } } @@ -153,7 +166,10 @@ private void OnInserted(EntityUid uid, ChargerComponent component, EntInsertedIn if (args.Container.ID != component.SlotId) return; - StartChargingBattery(uid, component, args.Entity); // Frontier: Upstream - #28984 + if (!SearchForBattery(args.Entity, out var batteryEntity, out _)) // Frontier: fixing #28984 + return; // Frontier + + StartChargingBattery(uid, component, batteryEntity.Value); // Frontier: Upstream - #28984 } private void OnRemoved(EntityUid uid, ChargerComponent component, EntRemovedFromContainerMessage args) @@ -161,7 +177,10 @@ private void OnRemoved(EntityUid uid, ChargerComponent component, EntRemovedFrom if (args.Container.ID != component.SlotId) return; - StopChargingBattery(uid, component, args.Entity); // Frontier: Upstream - #28984 + if (!SearchForBattery(args.Entity, out var batteryEntity, out _)) // Frontier: fixing #28984 + return; // Frontier + + StopChargingBattery(uid, component, batteryEntity.Value); // Frontier: Upstream - #28984 } /// @@ -225,11 +244,11 @@ private void UpdateStatus(EntityUid uid, ChargerComponent component) switch (component.Status) { case CellChargerStatus.Off: - receiver.Load = 0; + receiver.Load = 1; _appearance.SetData(uid, CellVisual.Light, CellChargerStatus.Off, appearance); break; case CellChargerStatus.Empty: - receiver.Load = 0; + receiver.Load = 1; _appearance.SetData(uid, CellVisual.Light, CellChargerStatus.Empty, appearance); break; case CellChargerStatus.Charging: @@ -237,7 +256,7 @@ private void UpdateStatus(EntityUid uid, ChargerComponent component) _appearance.SetData(uid, CellVisual.Light, CellChargerStatus.Charging, appearance); break; case CellChargerStatus.Charged: - receiver.Load = 0; + receiver.Load = 1; _appearance.SetData(uid, CellVisual.Light, CellChargerStatus.Charged, appearance); break; default: @@ -260,10 +279,10 @@ private void OnEmpPulse(EntityUid uid, ChargerComponent component, ref EmpPulseE foreach (var containedEntity in container.ContainedEntities) { - if (!SearchForBattery(containedEntity, out _, out _)) + if (!SearchForBattery(containedEntity, out var batteryEntity, out _)) continue; - StopChargingBattery(uid, component, containedEntity); + StopChargingBattery(uid, component, batteryEntity.Value); } } @@ -276,10 +295,10 @@ private void OnEmpDisabledRemoved(EntityUid uid, ChargerComponent component, ref foreach (var containedEntity in container.ContainedEntities) { - if (!SearchForBattery(containedEntity, out _, out _)) + if (!SearchForBattery(containedEntity, out var batteryEntity, out _)) continue; - StartChargingBattery(uid, component, containedEntity); + StartChargingBattery(uid, component, batteryEntity.Value); } } @@ -308,15 +327,15 @@ private CellChargerStatus GetStatus(EntityUid uid, ChargerComponent component) / foreach (var containedEntity in container.ContainedEntities) { // if none of the slotted items are actually batteries, represent the charger as off - if (!SearchForBattery(containedEntity, out _, out _)) + if (!SearchForBattery(containedEntity, out var batteryEntity, out _)) continue; // if all batteries are either EMP'd or fully charged, represent the charger as fully charged statusOut = CellChargerStatus.Charged; - if (HasComp(containedEntity)) + if (HasComp(batteryEntity)) continue; - if (!HasComp(containedEntity)) + if (!HasComp(batteryEntity)) continue; // if we have atleast one battery being charged, represent the charger as charging; From 8b61236316fd911802d1e56af3b0306d5f57ea6d Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Mon, 30 Sep 2024 14:40:09 +0000 Subject: [PATCH 6/6] Automatic Changelog (#2122) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 1dae1a2b8db..68a83fbbc52 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4162,3 +4162,9 @@ Entries: meters. id: 5349 time: '2024-09-29T15:08:36.0000000+00:00' +- author: whatston3 + changes: + - type: Fix + message: Cyborgs should now recharge properly in cyborg recharge stations. + id: 5350 + time: '2024-09-30T14:39:40.0000000+00:00'