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

Big bore air rifles #33106

Closed
Closed
Changes from 1 commit
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
7f0a765
Update military.json
misterprimus Jul 22, 2019
d4177f1
Update defense_bot.json
misterprimus Jul 22, 2019
3a6056b
Update generic.json
misterprimus Jul 22, 2019
1cfc92d
Update recipe_deconstruction.json
misterprimus Jul 22, 2019
d0f2f4c
Update monstergenerator.cpp
misterprimus Jul 22, 2019
7a8eaf8
Update mtype.h
misterprimus Jul 22, 2019
41f440c
Update mondeath.cpp
misterprimus Jul 22, 2019
e9e1e0a
Update data/json/items/generic.json
misterprimus Jul 22, 2019
7eda425
Update data/json/items/generic.json
misterprimus Jul 22, 2019
a534c77
Update data/json/items/generic.json
misterprimus Jul 22, 2019
064e51f
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
5241ab4
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
9948d17
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
0d489e5
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
15a9982
Update src/mondeath.cpp
misterprimus Jul 22, 2019
d399b1b
Update src/monstergenerator.cpp
misterprimus Jul 22, 2019
80c4ed5
Update src/mondeath.cpp
misterprimus Jul 22, 2019
d94706d
Update data/json/items/generic.json
misterprimus Jul 22, 2019
40b643c
Update data/json/items/generic.json
misterprimus Jul 22, 2019
0667e0f
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
a5e2f3a
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
4607c7c
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
7eb7655
Update src/mtype.h
misterprimus Jul 22, 2019
b35930f
Update src/mondeath.cpp
misterprimus Jul 22, 2019
db94001
Update data/json/items/generic.json
misterprimus Jul 22, 2019
76d4ff1
Update data/json/items/generic.json
misterprimus Jul 22, 2019
4d8d6e8
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
f39a0cf
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
0548b3c
Update src/mondeath.cpp
misterprimus Jul 22, 2019
831dde5
Update src/mondeath.cpp
misterprimus Jul 22, 2019
197b8f2
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
35ee6b8
Update src/mondeath.cpp
misterprimus Jul 22, 2019
8fe4969
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
0e36911
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
ca8062f
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
20f6922
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
373d376
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
ec4074f
Update src/monstergenerator.cpp
misterprimus Jul 22, 2019
6154128
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
440d8ca
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
08c98d5
Update src/mtype.h
misterprimus Jul 22, 2019
40849ec
Update src/mtype.h
misterprimus Jul 22, 2019
52b1e36
Update src/monstergenerator.cpp
misterprimus Jul 22, 2019
0b843eb
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
181c1d8
Update mondeath.cpp
misterprimus Jul 23, 2019
683bb9f
Update recipe_deconstruction.json
misterprimus Jul 23, 2019
7a32800
Merge branch 'master' into master
misterprimus Jul 23, 2019
d1fd87f
Update recipe_deconstruction.json
misterprimus Jul 23, 2019
6911bba
Update recipe_deconstruction.json
misterprimus Jul 23, 2019
12feb8d
Update military.json
misterprimus Jul 23, 2019
209229d
Update defense_bot.json
misterprimus Jul 23, 2019
a13a5d5
Update mondeath.cpp
misterprimus Jul 23, 2019
81c442d
Update mondeath.cpp
misterprimus Jul 23, 2019
b5b1a58
Update mondeath.cpp
misterprimus Jul 23, 2019
1acc735
Update mondeath.cpp
misterprimus Jul 23, 2019
ab80519
Update data/json/items/generic.json
misterprimus Jul 28, 2019
264f731
Update data/json/items/generic.json
misterprimus Jul 28, 2019
f2a46e9
Update data/json/items/generic.json
misterprimus Jul 28, 2019
c8559a9
Update data/json/items/generic.json
misterprimus Jul 28, 2019
1d6b736
Merge branch 'master' into master
misterprimus Jul 28, 2019
702651c
Update generic.json
misterprimus Jul 28, 2019
c40b5cc
Update generic.json
misterprimus Jul 28, 2019
6b99810
Update src/mondeath.cpp
misterprimus Jul 29, 2019
1408a8b
Update mondeath.cpp
misterprimus Jul 29, 2019
632add5
adds big bore air rifles
misterprimus Aug 10, 2019
c520a84
Update data/json/items/ammo.json
misterprimus Aug 10, 2019
65490ba
Update data/json/items/ammo/50pellet.json
misterprimus Aug 10, 2019
aec5979
Update data/json/items/ammo/50pellet.json
misterprimus Aug 10, 2019
26c1c52
pellet volume and air fitting price
misterprimus Aug 10, 2019
8dbe585
Update data/json/items/vehicle_parts.json
misterprimus Aug 10, 2019
c736897
Update src/activity_handlers.cpp
misterprimus Aug 10, 2019
9c0c437
Update src/activity_handlers.cpp
misterprimus Aug 10, 2019
505809f
Update src/activity_handlers.cpp
misterprimus Aug 10, 2019
696b4f0
Update src/avatar_action.cpp
misterprimus Aug 10, 2019
d5a9fe7
Update src/avatar_action.cpp
misterprimus Aug 10, 2019
0029bef
Update src/item.cpp
misterprimus Aug 10, 2019
e75583c
Update src/player.cpp
misterprimus Aug 10, 2019
da9b591
Update src/player.cpp
misterprimus Aug 10, 2019
22eae75
Update data/json/vehicleparts/vehicle_parts.json
misterprimus Aug 10, 2019
df4a75e
Update src/player.cpp
misterprimus Aug 10, 2019
01c07fe
Update src/player.cpp
misterprimus Aug 10, 2019
85e120a
Update player.cpp
misterprimus Aug 10, 2019
795e626
Merge branch 'big_bore_air_rifle' of https://github.com/misterprimus/…
misterprimus Aug 10, 2019
e824e54
Update itype.h
misterprimus Aug 10, 2019
ce60830
Update item.cpp
misterprimus Aug 10, 2019
8910336
remove references to UPS form air-related activity
misterprimus Aug 10, 2019
ce44264
Update src/visitable.cpp
misterprimus Aug 11, 2019
5b2a81c
remove redundant string formatting (bevapdin)
misterprimus Aug 11, 2019
3a58829
Update iuse.cpp
misterprimus Aug 11, 2019
3d02b7f
Update player.cpp
misterprimus Aug 11, 2019
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

Update data/json/recipes/recipe_deconstruction.json

Co-Authored-By: anothersimulacrum <anothersimulacrum@gmail.com>
  • Loading branch information...
misterprimus and anothersimulacrum committed Jul 22, 2019
commit 0d489e57bee1aef7fb49785a7fd4c4d94278f926
@@ -446,7 +446,7 @@
[ [ "scrap", 4 ] ]
]
},
{
{
"result": "broken_turret",
"type": "uncraft",
"skill_used": "electronics",
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.