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

[Aftershock] Mastodon Mutation Line and Uplifted SWAT Profession #37660

Merged
merged 45 commits into from
Apr 14, 2020
Merged
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
6abee0d
Merge pull request #14 from CleverRaven/master
Maleclypse Mar 27, 2020
ea82db7
Merge pull request #15 from CleverRaven/master
Maleclypse Apr 3, 2020
d4109f9
Mastodon Mutations and Profession
Maleclypse Feb 3, 2020
6bdab95
Update mastodon_mutation.json
Maleclypse Feb 3, 2020
27f959c
Update data/mods/Aftershock/player/mutations/mastodon_mutation.json
Maleclypse Feb 3, 2020
55eef9f
Update data/mods/Aftershock/player/professions.json
Maleclypse Feb 3, 2020
71b5122
Update data/mods/Aftershock/player/mutations/mastodon_mutation.json
Maleclypse Feb 3, 2020
114fd80
Update mastodon_mutation.json
Maleclypse Feb 3, 2020
2c2ab42
Mastodon Items
Maleclypse Feb 4, 2020
849cbc6
spacing
Maleclypse Feb 4, 2020
de69329
Fixes, suggestions
Maleclypse Feb 8, 2020
e070311
Update data/mods/Aftershock/player/mutations/mastodon_mutation.json
Maleclypse Feb 8, 2020
8558b70
Update data/mods/Aftershock/player/mutations/mastodon_mutation.json
Maleclypse Feb 8, 2020
e68490f
Update data/mods/Aftershock/player/professions.json
Maleclypse Feb 8, 2020
1a3c381
Update data/mods/Aftershock/player/mutations/mastodon_mutation.json
Maleclypse Feb 8, 2020
2aeba32
Update data/mods/Aftershock/player/mutations/mastodon_mutation.json
Maleclypse Feb 8, 2020
1aa94f2
Update data/mods/Aftershock/player/professions.json
Maleclypse Feb 8, 2020
887eb5a
remove xl power armor from item groups
Maleclypse Feb 8, 2020
3506e3f
typos and 4th wall changes
Maleclypse Mar 4, 2020
8c45dfa
Update data/mods/Aftershock/player/professions.json
Maleclypse Mar 8, 2020
8c8435f
Update data/mods/Aftershock/player/mutations/mastodon_mutation.json
Maleclypse Mar 22, 2020
887107d
updating prof and mutations
Maleclypse Mar 22, 2020
005a6ac
biomaterial scrap added, name string convetion for remainder
Maleclypse Apr 3, 2020
8ffaf95
adding mutagens and recipes
Maleclypse Apr 3, 2020
b274a84
Update mutagens.json
Maleclypse Apr 3, 2020
1067c5f
lint
Maleclypse Apr 3, 2020
e56bd17
mutagen recipe books
Maleclypse Apr 4, 2020
533cd66
typo
Maleclypse Apr 4, 2020
d7e5823
extend mutations
Maleclypse Apr 4, 2020
928aadb
Update mastodon_mutation.json
Maleclypse Apr 4, 2020
24770ad
trying to make extends work
Maleclypse Apr 4, 2020
56290fa
trait groups and npc class
Maleclypse Apr 5, 2020
49ed7e4
Update professions.json
Maleclypse Apr 5, 2020
e5e5bdd
linting
Maleclypse Apr 5, 2020
aeb5564
extraneous comma
Maleclypse Apr 5, 2020
bbdc53c
Update npc_classes_mutant.json
Maleclypse Apr 5, 2020
1fdef30
Update trait_groups.json
Maleclypse Apr 5, 2020
9ef1ddc
Merge branch 'master' into AFS-SWATODON-Profession
Maleclypse Apr 12, 2020
7424fdc
fix profession
Maleclypse Apr 13, 2020
366b0fc
Update mastodon_mutation.json
Maleclypse Apr 13, 2020
c4ac802
Delete npc_classes_mutant.json
Maleclypse Apr 13, 2020
c1af1dc
Create npc_classes_mutant.json
Maleclypse Apr 13, 2020
31d8713
Update npc_classes_mutant.json
Maleclypse Apr 13, 2020
634a102
remove trigger happy
Maleclypse Apr 13, 2020
bfec2ea
Update npc_classes_mutant.json
Maleclypse Apr 13, 2020
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

This merge commit was added into this branch cleanly.

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