Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Partial Merge Up to 2024-11-17 #402

Merged
Merged
Changes from 1 commit
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
12e5363
Update Credits (#1179)
github-actions[bot] Nov 7, 2024
ffdaa84
Updates Health Analyzer UI (#1183)
gluesniffler Nov 7, 2024
779583d
Automatic Changelog Update (#1183)
SimpleStation14 Nov 7, 2024
fa87a39
Nerf The Shit Out Of Familiars (#1184)
VMSolidus Nov 8, 2024
9e85b73
Automatic Changelog Update (#1184)
SimpleStation14 Nov 8, 2024
3209838
Show Language Names In Chat (#1165)
VMSolidus Nov 8, 2024
ff43313
Automatic Changelog Update (#1165)
SimpleStation14 Nov 8, 2024
8116581
Minor Fixes on Rad and Gax (#1178)
Ichaie Nov 8, 2024
ae204a8
Port Cool Punpun (#1157)
DEATHB4DEFEAT Nov 8, 2024
d521d46
Automatic Changelog Update (#1178)
SimpleStation14 Nov 8, 2024
e7d40d1
Traits V2 (#1182)
VMSolidus Nov 8, 2024
9b8ad31
Automatic Changelog Update (#1182)
SimpleStation14 Nov 8, 2024
09ffbd3
Disable Shadowkin (#1187)
VMSolidus Nov 8, 2024
b72d7c3
Automatic Changelog Update (#1187)
SimpleStation14 Nov 8, 2024
55e2170
Cherry Pick WizDen PR #28488 (#1194)
sleepyyapril Nov 8, 2024
8faeaa7
Port Bloodstains And Footprints (#1190)
VMSolidus Nov 9, 2024
8d5572b
Automatic Changelog Update (#1190)
SimpleStation14 Nov 9, 2024
a2b86bc
Beacons (#1196)
sleepyyapril Nov 9, 2024
4713261
Cherry-Pick Wizden PR 28375 (#1191)
VMSolidus Nov 9, 2024
94157bd
Fix Call Shuttle (#1199)
sleepyyapril Nov 10, 2024
4de7f50
Fix AddTrait And ReplaceTrait Functions (#1195)
VMSolidus Nov 10, 2024
e469816
Automatic Changelog Update (#1195)
SimpleStation14 Nov 10, 2024
6305e2d
Update Credits (#1202)
github-actions[bot] Nov 10, 2024
04cdc14
Add Missing `DOTNET_ROOT` Environment Variable For Nix Devs (#1203)
DocNITE Nov 11, 2024
20ac0b3
Swapped Hands HUD Fix (#1207)
Suraru Nov 13, 2024
c909724
Fix Butlertron's Hitbox (#1192)
VMSolidus Nov 13, 2024
66490ca
Automatic Changelog Update (#1192)
SimpleStation14 Nov 13, 2024
d1e4d11
The Hive: Update Engineering (#1201)
Ichaie Nov 13, 2024
4071d41
Automatic Changelog Update (#1201)
SimpleStation14 Nov 13, 2024
12c0a63
Return Old Lobby Music (#1204)
DocNITE Nov 13, 2024
74688cf
Automatic Changelog Update (#1204)
SimpleStation14 Nov 13, 2024
a77f581
Prevent Listening Posts From Spawning On Planets (#1188)
VMSolidus Nov 13, 2024
7063c79
Automatic Changelog Update (#1188)
SimpleStation14 Nov 13, 2024
ccb26b2
Fix Silver Crate Name (#1218)
sleepyyapril Nov 14, 2024
6b2ec00
Auto Voting System (#1213)
sleepyyapril Nov 14, 2024
8385fb1
Automatic Changelog Update (#1213)
SimpleStation14 Nov 14, 2024
3c31771
Fix Trait Component Removal (#1221)
DEATHB4DEFEAT Nov 14, 2024
387a362
Some Language Fixes (#1223)
Mnemotechnician Nov 14, 2024
8739096
Automatic Changelog Update (#1223)
SimpleStation14 Nov 14, 2024
3423e93
The Return of Spray Paint (#1222)
DEATHB4DEFEAT Nov 15, 2024
cfdc273
Bounties Localization Fix (#1219)
sleepyyapril Nov 15, 2024
45fdd0c
Automatic Changelog Update (#1222)
SimpleStation14 Nov 15, 2024
a505ed7
Change some Code Style Settings (#1226)
DEATHB4DEFEAT Nov 16, 2024
71185a7
Give Penguins Cold Resistance (#1229)
zelezniciar1 Nov 16, 2024
1c20299
Automatic Changelog Update (#1229)
SimpleStation14 Nov 16, 2024
7573650
Merge commit '1c202993ed0986f72205c31a14176f4fbb8e1420' into floof/fe…
Mnemotechnician Dec 4, 2024
2342a3b
Tonight's the night, we discover entity parenting
Mnemotechnician Dec 4, 2024
14d52ed
some fixes or something?
Mnemotechnician Dec 5, 2024
3bde61d
yaml fixes
Mnemotechnician Dec 9, 2024
7feee73
Merge remote-tracking branch 'floofstation/master' into floof/feat/pa…
Mnemotechnician Dec 9, 2024
cada5ea
Exclude rodentia and resomi from lightweight
Mnemotechnician Dec 9, 2024
971fe73
Nevermind - trystan was right
Mnemotechnician Dec 9, 2024
9283d62
Fix disposal trunk ejection
Mnemotechnician Dec 12, 2024
a0e6fcb
Merge remote-tracking branch 'origin-floofstation-fork/floof/feat/par…
Mnemotechnician Dec 12, 2024
626231a
Remove useless ccvar
Fansana Dec 14, 2024
56293da
Update BatteryRampPegSolver.cs
Fansana Dec 14, 2024
44b9192
Update PowerNetSystem.cs
Fansana Dec 14, 2024
e6d88cd
Update CCVars.cs
Fansana Dec 14, 2024
dfbbd99
update summary
Fansana Dec 14, 2024
a38504e
enable roundstart shadowkin
Fansana Dec 14, 2024
8c096b7
scales slider fixes (Thanks april)
Fansana Dec 14, 2024
903e3e9
Revert "scales slider fixes (Thanks april)"
Fansana Dec 15, 2024
f7ff7dd
skibedi
Fansana Dec 15, 2024
33f8509
rizzler
Fansana Dec 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update BatteryRampPegSolver.cs
  • Loading branch information
Fansana authored Dec 14, 2024
commit 56293da55f14cc1802f5299bcbb035e28082fac7
1 change: 0 additions & 1 deletion Content.Server/Power/Pow3r/BatteryRampPegSolver.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ namespace Content.Server.Power.Pow3r
public sealed class BatteryRampPegSolver : IPowerSolver
{
private UpdateNetworkJob _networkJob;
private bool _disableParallel;

public BatteryRampPegSolver()
{
Expand Down
Loading