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

Add SVT Mid-tier Weapon #1417

Merged
merged 33 commits into from
Jul 8, 2024
Merged
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
8ec9671
add a new weapon to the game
VividPups May 25, 2024
79b467c
update
VividPups May 25, 2024
ae41312
small updates
VividPups May 25, 2024
0e32673
so i can fix it
VividPups May 26, 2024
a6f3e26
fix
VividPups May 26, 2024
5d7efe7
some updates
VividPups May 26, 2024
851ba81
Update weapon_cases_shuttle_guns.yml
VividPups May 26, 2024
ee700ed
Merge branch 'new-frontiers-14:master' into SVT40
VividPups May 26, 2024
11a558e
rifle
VividPups May 26, 2024
230de00
In the wrong place
VividPups May 26, 2024
3246c04
Merge branch 'new-frontiers-14:master' into SVT40
VividPups May 28, 2024
75bb1b1
Update Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shut…
VividPups May 30, 2024
fa6d893
Update Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expe…
VividPups May 30, 2024
7a6415d
updates
VividPups May 30, 2024
0e12d86
updates again
VividPups May 30, 2024
64f08c4
Merge branch 'new-frontiers-14:master' into SVT40
VividPups May 30, 2024
74012b7
Shuttle update
VividPups May 30, 2024
9738713
ammo
VividPups May 30, 2024
99583ac
aaa
VividPups May 30, 2024
46ec8a2
Delete snipers.yml
VividPups Jun 4, 2024
339b3b7
Update snipers.yml
VividPups Jun 4, 2024
cd507dc
Merge branch 'master' of https://github.com/new-frontiers-14/frontier…
Jun 9, 2024
0ea12bb
Resolve merge conflicts (for real this time)
Jun 9, 2024
700ca3f
Merge branch 'new-frontiers-14:master' into SVT40
VividPups Jun 10, 2024
64ced0a
Merge branch 'master' into SVT40
VividPups Jun 16, 2024
bba8d44
aaa
VividPups Jun 16, 2024
471e256
Update dungeon_items_weapons.yml
VividPups Jun 16, 2024
5127867
Update weapon_cases_expedition.yml
VividPups Jun 16, 2024
01c0758
GADDAMNIT WHATSONE
VividPups Jun 23, 2024
5813bba
ADSFGAFGA
VividPups Jun 23, 2024
07c49b5
Merge branch 'master' into SVT40
VividPups Jun 24, 2024
c063ac0
Merge branch 'new-frontiers-14:master' into SVT40
VividPups Jun 27, 2024
bbb0797
Merge branch 'new-frontiers-14:master' into SVT40
VividPups Jul 2, 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
Merge branch 'new-frontiers-14:master' into SVT40
VividPups authored Jun 27, 2024
commit c063ac0996ac521122d79ce0d2fc74250fbbbf7b

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.