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

Update background traits to new name format #37165

Merged
merged 46 commits into from
Jan 18, 2020
Merged
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
d6941e7
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Oct 24, 2019
c74dd17
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Oct 25, 2019
8f7710e
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Oct 28, 2019
adf523b
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Oct 29, 2019
dbe3e9b
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
snipercup Oct 30, 2019
a2958bd
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
snipercup Oct 30, 2019
8e4280a
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Oct 30, 2019
8d518d8
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Oct 31, 2019
f57c82c
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Nov 1, 2019
1ce3ca0
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Nov 3, 2019
6fded34
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Nov 4, 2019
7b88e44
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Nov 4, 2019
c747d0f
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Nov 5, 2019
0d4beeb
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Nov 6, 2019
1d3345e
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Nov 8, 2019
1b087c1
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Nov 9, 2019
d219126
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Nov 9, 2019
e80f492
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Nov 12, 2019
a5d8472
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Nov 17, 2019
74871f8
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Nov 24, 2019
bf24350
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Nov 29, 2019
9fbe3f4
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Dec 1, 2019
b3671bd
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Dec 6, 2019
c6dda7b
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Dec 12, 2019
403d3e5
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Dec 22, 2019
7583780
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Dec 23, 2019
fa46188
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Dec 24, 2019
212423a
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Dec 29, 2019
9589f2f
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Dec 30, 2019
b9b22bc
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Jan 12, 2020
388ba07
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Jan 13, 2020
6a50094
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Jan 13, 2020
51fb185
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Jan 13, 2020
36af26c
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Jan 14, 2020
565c492
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Jan 14, 2020
5c4e81a
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Jan 15, 2020
460b454
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Jan 15, 2020
2da1749
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Jan 16, 2020
79d7561
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Jan 16, 2020
861f0e7
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Jan 16, 2020
1264cb3
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Jan 16, 2020
8f17f7b
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Jan 17, 2020
c317dcc
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Jan 17, 2020
3a36ba9
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Jan 17, 2020
42108c4
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Jan 17, 2020
6641b76
Update background traits to new name format
snipercup Jan 18, 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
Loading