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

Removes magic stuff adjacent to gun/magic #2877

Open
wants to merge 102 commits into
base: master
Choose a base branch
from
Open

Removes magic stuff adjacent to gun/magic #2877

wants to merge 102 commits into from
+115 −2,929

Conversation

FalloutFalcon
Copy link
Contributor

@FalloutFalcon FalloutFalcon commented Apr 4, 2024 •
edited

About The Pull Request

This was MEANT to be a pr were i was tackling gun cruft but magic accounts for a large portion of the line count.

Pulls from #2664 (minus the actual gun crafting) and #2702

Why It's Good For The Game

Cruft

Changelog

🆑
del: Removed some magic cruft
/:cl:

@FalloutFalcon
a thing
46e4dce
@FalloutFalcon
kinda workin
55d0b19
@FalloutFalcon
this uhh is not working. gonna rework this all
809d204
@FalloutFalcon
Improves deconstruction functionality to lathe
c4906ac
@FalloutFalcon
new options? half working
b1c734e
@FalloutFalcon
might try to port some eris stuff (foolish)
3bbba1f
@FalloutFalcon
gun parts
39679d8
@FalloutFalcon
"works" dont like how this is handled
d3155d0
@FalloutFalcon
we getting there
5bbc36a
@FalloutFalcon
grip dont control gun and seperate files
db2edc3
@FalloutFalcon
shrug
de7c2b5
@FalloutFalcon
scrap blueprint system
22de36f
@FalloutFalcon
frames on gun init
8f28e6b
@FalloutFalcon
dynamicly generate the parts
976ae14
@FalloutFalcon
yea
04982c4
@FalloutFalcon
yea
08df15f
@FalloutFalcon
aaa
8cc5bfe
@FalloutFalcon
wow it just works!!
5304d07
@FalloutFalcon
bitflags soon
182551f
@FalloutFalcon
ye
ad28497
@FalloutFalcon
yea
8a870e0
@FalloutFalcon
commit to recipes
a5dc317
@FalloutFalcon
yea
98b5d80
@FalloutFalcon
Refactor gun crafting module and add new tools
8c1b7c5
@FalloutFalcon
poorly optimized holy dang
2959730
@FalloutFalcon
yea
93f1813
@FalloutFalcon
evil tbh
2bf0717
@FalloutFalcon
ye
f08b4bb
@FalloutFalcon
kinda working i think?
4420698
@FalloutFalcon
unit test?
f4c2581
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Apr 11, 2024
@github-actions GitHub Actions
Copy link
Contributor

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

@FalloutFalcon FalloutFalcon marked this pull request as ready for review April 16, 2024 12:36
@FalloutFalcon FalloutFalcon requested a review from a team as a code owner April 16, 2024 12:36
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Apr 18, 2024
FalloutFalcon and others added 7 commits April 18, 2024 13:23
@FalloutFalcon
Merge branch 'master' into kills-magic
1819710
@FalloutFalcon
Update beach_ancient_ruin.dmm
4d6244f 
Signed-off-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
@FalloutFalcon
nvm im dum
de2336d 
Signed-off-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
@FalloutFalcon
Delete _maps/shuttles/syndicate/syndicate_luxembourg.dmm
1eb41c3 
oops some how readded it

Signed-off-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
@FalloutFalcon
yea
cc24059
@FalloutFalcon
Merge branch 'kills-magic' into gun-qol
36397d5
@FalloutFalcon
Merge branch 'master' into gun-qol
a4059d5
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Apr 20, 2024
@github-actions GitHub Actions
Copy link
Contributor

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

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Apr 23, 2024
@FalloutFalcon
Copy link
Contributor Author

linters failing and i cant tell why.

@FalloutFalcon
Copy link
Contributor Author

wtf is causing this
html/changelogs/example.yml: OK
/home/runner/work/Shiptest/Shiptest/html/changelogs/AutoChangeLog-pr-2944.yml: Invalid prefix tweak
/home/runner/work/Shiptest/Shiptest/html/changelogs/AutoChangeLog-pr-2924.yml: Invalid prefix tweak
Reading changelogs...
Reading /home/runner/work/Shiptest/Shiptest/html/changelogs/AutoChangeLog-pr-2944.yml...
Added 1 new changelog entries.
Deleting /home/runner/work/Shiptest/Shiptest/html/changelogs/AutoChangeLog-pr-2944.yml (delete-after set)...
Reading /home/runner/work/Shiptest/Shiptest/html/changelogs/AutoChangeLog-pr-2947.yml...
Added 2 new changelog entries.
Deleting /home/runner/work/Shiptest/Shiptest/html/changelogs/AutoChangeLog-pr-2947.yml (delete-after set)...
Reading /home/runner/work/Shiptest/Shiptest/html/changelogs/AutoChangeLog-pr-2922.yml...
Added 1 new changelog entries.
Deleting /home/runner/work/Shiptest/Shiptest/html/changelogs/AutoChangeLog-pr-2922.yml (delete-after set)...
Reading /home/runner/work/Shiptest/Shiptest/html/changelogs/AutoChangeLog-pr-2938.yml...
Added 1 new changelog entries.
Deleting /home/runner/work/Shiptest/Shiptest/html/changelogs/AutoChangeLog-pr-2938.yml (delete-after set)...
Reading /home/runner/work/Shiptest/Shiptest/html/changelogs/AutoChangeLog-pr-2946.yml...
Added 1 new changelog entries.
Deleting /home/runner/work/Shiptest/Shiptest/html/changelogs/AutoChangeLog-pr-2946.yml (delete-after set)...
Reading /home/runner/work/Shiptest/Shiptest/html/changelogs/AutoChangeLog-pr-2924.yml...
Added 1 new changelog entries.
Deleting /home/runner/work/Shiptest/Shiptest/html/changelogs/AutoChangeLog-pr-2924.yml (delete-after set)...
Reading /home/runner/work/Shiptest/Shiptest/html/changelogs/AutoChangeLog-pr-2935.yml...
Added 1 new changelog entries.
Deleting /home/runner/work/Shiptest/Shiptest/html/changelogs/AutoChangeLog-pr-2935.yml (delete-after set)...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MarkSuckerberg MarkSuckerberg Awaiting requested review from MarkSuckerberg MarkSuckerberg is a code owner

Assignees
No one assigned
Labels
Code change Watch something violently break. DME Edit Map Change Tile placing is hard. Thank you for your service.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@FalloutFalcon