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.

Sign up for GitHub

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

Jump to bottom

Sentry review #35424

Merged
merged 16 commits into from
Feb 23, 2025
Merged

Sentry review #35424

merged 16 commits into from
Feb 23, 2025
+47 −27

Conversation

metalgearsloth
Copy link
Contributor

Couldn't push the changes so made a pr with the review, just minor stuff + networking.

chromiumboy and others added 14 commits February 9, 2025 22:01
@chromiumboy
Initial commit
48640f3
@chromiumboy
Initial commit
5603b8b
@chromiumboy
Remove additions made in previous PR
bb0ec74
@chromiumboy
Merge branch 'master' of https://github.com/space-wizards/space-stati…
bd35172 
…on-14 into senty-turret-base-prototype
@chromiumboy
Included self-recharging battery changes
50c3e2c
@chromiumboy
Merge branch 'master' of https://github.com/space-wizards/space-stati…
06a543d 
…on-14 into senty-turret-base-prototype
@chromiumboy
Formatting fix
f3a7a5a
@chromiumboy
Merge branch 'space-wizards:master' into senty-turret-base-prototype
7574a23
@chromiumboy
Reviewer requests
2079a9e
@chromiumboy
Merge branch 'master' of https://github.com/space-wizards/space-stati…
c3e3370 
…on-14 into senty-turret-base-prototype
@chromiumboy
Removed changes to self recharging batteries, created APC receiver ba…
3dde1c4 
…tteries to replace them
@metalgearsloth
Review
ab717d3
@metalgearsloth
Merge remote-tracking branch 'upstream/master' into senty-turret-base…
a4a3d78 
…-prototype
@metalgearsloth
Merge remote-tracking branch 'upstream/master' into 2025-02-24-sentry…
ad027bf 
…-review

# Conflicts:
#	Content.Server/Power/EntitySystems/PowerNetSystem.cs
@github-actions github-actions bot added S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. size/S Denotes a PR that changes 10-99 lines. labels Feb 23, 2025
@github-actions github-actions bot added size/M Denotes a PR that changes 100-999 lines. and removed size/S Denotes a PR that changes 10-99 lines. labels Feb 23, 2025
@github-actions github-actions bot added size/S Denotes a PR that changes 10-99 lines. and removed size/M Denotes a PR that changes 100-999 lines. labels Feb 23, 2025
@metalgearsloth metalgearsloth merged commit 1d004f4 into space-wizards:master Feb 23, 2025
12 checks passed
@metalgearsloth metalgearsloth deleted the 2025-02-24-sentry-review branch February 23, 2025 13:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. size/S Denotes a PR that changes 10-99 lines.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@metalgearsloth @chromiumboy