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

Merge #5

Merged
merged 800 commits into from
Jun 15, 2019
Merged
Changes from 1 commit
Commits
Show all changes
800 commits
Select commit Hold shift + click to select a range
ee5313f
modify spell exp gain
KorGgenT Jun 8, 2019
bbdcf0b
Integrated toolset description now matches bionic abilities (#31228)
Jun 8, 2019
a38445f
add gardening store roof
curstwist Jun 8, 2019
a1b7abd
weather_data: revert unnecessary syntax change
OrenAudeles Jun 8, 2019
9b96ecf
Merge pull request #31207 from mlangsdorf/modular_basecamps_bp_exclude
kevingranade Jun 8, 2019
0009a3a
Tell an NPC to finish your construction tasks (#31239)
Jun 9, 2019
af6d9cd
Add a bit of recipes, add item groups
I-am-Erk Jun 9, 2019
7d31648
random byproducts not supported
I-am-Erk Jun 9, 2019
21467c3
Astyle
kevingranade Jun 9, 2019
e4061f6
Update recipe_others.json
I-am-Erk Jun 9, 2019
5d774e9
Merge pull request #31259 from curstwist/add-gardening-store-roof
Rivet-the-Zombie Jun 9, 2019
fd19377
Update recipe_others.json
I-am-Erk Jun 9, 2019
331abf6
Added martial arts and weapons compatibility messages (#31244)
kevingranade Jun 9, 2019
a74f0c6
Reduce padding in uistatedata
jbytheway Jun 8, 2019
431a850
Update recipe_others.json
I-am-Erk Jun 9, 2019
5cb3b27
Merge pull request #31250 from anothersimulacrum/campus-b3
ZhilkinSerg Jun 9, 2019
7bd9888
Fix starting a fire with a firewood source (#31256)
matthemsteger Jun 9, 2019
d76f9d1
Fix another camp bug with expansions not showing up (#31255)
Jun 9, 2019
37a6167
Add motocross bikes and street-legal dirt bikes (#31169)
kristleifur Jun 9, 2019
ccd0515
Added a note with a reference to the DL
Night-Pryanik Jun 9, 2019
a1c973c
Fix spelling of JSON member name
BevapDin May 28, 2019
809d8d9
Lint
Night-Pryanik Jun 9, 2019
5948032
Magiclysm: add mana mutation type
KorGgenT Jun 9, 2019
a290eb2
Added an article in the newspaper about minefields at the bridges
Night-Pryanik Jun 9, 2019
5d65c32
Merge pull request #31274 from Night-Pryanik/dying-light-reference
kevingranade Jun 9, 2019
1e9496f
change color of invlets for keybindings
KorGgenT Jun 9, 2019
5cad157
Merge pull request #31279 from BevapDin/nrr
kevingranade Jun 9, 2019
870ff2c
Show skill exercise
Jun 9, 2019
3261440
Fixed max_index uninitialized
Jun 9, 2019
831fa83
remove recipe check
Jun 9, 2019
f61bff3
added recipe check to iuse and iexamine
Jun 9, 2019
7cceebd
fixed road / city generation, modified mod description
Jun 9, 2019
fa82dec
update mana regen less often
KorGgenT Jun 10, 2019
975ed02
Adds a new pneumatic shotgun
ddsaw Jun 10, 2019
2cb0b7d
Update shotcanister.json
ddsaw Jun 10, 2019
e5aec32
Update shotcanister.json
ddsaw Jun 10, 2019
727649f
Update data/json/items/ammo/shotcanister.json
ddsaw Jun 10, 2019
ce25909
Update data/json/items/ammo/shotcanister.json
ddsaw Jun 10, 2019
20fa33b
Update data/json/items/ammo/shotcanister.json
ddsaw Jun 10, 2019
8d0c321
Update data/json/items/ammo/shotcanister.json
ddsaw Jun 10, 2019
de520b3
Update data/json/items/ammo/shotcanister.json
ddsaw Jun 10, 2019
862203b
Update data/json/items/ammo/shotcanister.json
ddsaw Jun 10, 2019
7aacfce
Update data/json/items/ammo/shotcanister.json
ddsaw Jun 10, 2019
c88e63b
Update data/json/items/ranged.json
ddsaw Jun 10, 2019
fc58e95
Merge branch 'master' of https://github.com/ddsaw/Cataclysm-DDA
ddsaw Jun 10, 2019
e0ca4f7
Update recipe_ammo.json
ddsaw Jun 10, 2019
49253fc
Merge pull request #31293 from KorGgenT/mana-regen-fix
ZhilkinSerg Jun 10, 2019
8cea309
Update recipe_weapon.json
ddsaw Jun 10, 2019
915a4a9
Merge pull request #31287 from AMurkin/train-show-skill-exercise
ZhilkinSerg Jun 10, 2019
1a998fd
Merge pull request #31257 from OrenAudeles/weather_data
ZhilkinSerg Jun 10, 2019
980e910
Merge pull request #31253 from anothersimulacrum/parking-lots
ZhilkinSerg Jun 10, 2019
ba5692e
basecamps: add support for automatic calculation of blueprint ingredi…
mlangsdorf Jun 10, 2019
eb3ba35
Update shotcanister.json
ddsaw Jun 10, 2019
9e82880
Update recipe_ammo.json
ddsaw Jun 10, 2019
2afc018
Merge pull request #31219 from I-am-Erk/wood-beams
Rivet-the-Zombie Jun 10, 2019
4bae743
change include
Jun 10, 2019
b62b23b
Avoid clairvoyance showing tiles as lit if you have no clair.
KurzedMetal Jun 10, 2019
841d3d2
Don't make sound of engine humming if engine is of muscle type
Night-Pryanik Jun 10, 2019
75df1bf
Island prison and prisoners tweaks (#31297)
Night-Pryanik Jun 10, 2019
6253a31
Make clang tidy happy about alias
kevingranade Jun 10, 2019
065310a
split player::disp_info() into constituent parts (#31261)
KorGgenT Jun 10, 2019
9892c12
Revert "Avoid clairvoyance showing tiles as lit if you have no clair.…
kevingranade Jun 10, 2019
028d92f
Boats' "engines" will start at first attempt (#31305)
Night-Pryanik Jun 10, 2019
a70e8e7
Make pottery easier to craft (#31304)
ArkoselabsDoesNotWork-153164711 Jun 10, 2019
2b996b6
Increase performance by removing check for recipe every crafting turn…
ZhilkinSerg Jun 10, 2019
d5e3c44
add roof to botanical garden (#31313)
curstwist Jun 10, 2019
7b54a48
Add craftshop roofs (#31314)
curstwist Jun 10, 2019
4ca7348
Astyle weather.h
ZhilkinSerg Jun 10, 2019
212a694
add magic book colors
KorGgenT Jun 11, 2019
512362b
add roof to garage_gas.json
curstwist Jun 11, 2019
6fb04f2
Merge branch 'master' into pr/30656
KorGgenT Jun 11, 2019
ab04729
Updated roots and leaves mechanics to take new turn length into accou…
Saint-of-Grey Jun 11, 2019
216fe4b
Merge pull request #31294 from ddsaw/master
Rivet-the-Zombie Jun 11, 2019
8001c32
RPG dice (#31031)
krekeler0 Jun 11, 2019
a30c173
Initial commit
Mooses2k May 23, 2019
5c3e467
Cold and heat damage don't damage bandages or contaminate wounds
Night-Pryanik Jun 11, 2019
2430e38
Move get_heat_radiation() to avoid duplicate calls
kevingranade Jun 11, 2019
ac4daa9
Avoid retrieving get_vehicles() multiple times per turn
kevingranade Jun 11, 2019
ea58ce2
list items scroll fix
OzoneH3 Jun 11, 2019
248c608
Merge pull request #31330 from kevingranade/get-vehicle-once
ZhilkinSerg Jun 11, 2019
2e67a68
Merge pull request #31329 from kevingranade/avoid-refetching-heat
ZhilkinSerg Jun 11, 2019
d21ddaf
Merge pull request #31318 from KorGgenT/magic-stuff
ZhilkinSerg Jun 11, 2019
5e2375f
Merge pull request #31319 from curstwist/add-roof-to-garage-gas-station
ZhilkinSerg Jun 11, 2019
63ac9cc
Merge pull request #31328 from Night-Pryanik/cold-and-heat-damage-don…
ZhilkinSerg Jun 11, 2019
3cc8298
Merge pull request #31331 from OzoneH3/v_scroll_fix
ZhilkinSerg Jun 11, 2019
0bc2c20
Add new Politician profession (#31119)
Kanexan Jun 11, 2019
c93952d
Made seed descriptions more consistent (#31073)
RarkGrames Jun 11, 2019
f9c77c0
Fixed typo
ZhilkinSerg Jun 11, 2019
4541f9e
Item info flag for plantable seeds
ZhilkinSerg Jun 11, 2019
2a81d02
Updated more seeds descriptions
ZhilkinSerg Jun 11, 2019
c2b5062
Pneu-shottie shells/ .410s work with bandoliers, plus a name fix
Jun 11, 2019
29f373e
Fix for reading time with 1s turns (#31336)
Leosky Jun 11, 2019
552cdd0
Prevent crashes and bad behavior when vehicle updates invalidate the …
kevingranade Jun 11, 2019
107d10c
Magiclysm: Mana potions (#31273)
KorGgenT Jun 11, 2019
9626aa7
Updated toggled bionic power use for 1s turns (#31296)
RDru Jun 11, 2019
8697212
Add check for `needs_anesthesia`
Jun 11, 2019
7a858a4
Merge pull request #31345 from LaVeyanFiend/ShotBandoFix
Rivet-the-Zombie Jun 12, 2019
21fe69c
Moved map related field code to separate file
ZhilkinSerg Jun 9, 2019
ad6a670
Fix recharger comment
Jun 12, 2019
6e83b1d
Added code to read field type data from json
ZhilkinSerg Jun 10, 2019
238e25a
Added field_types.json
ZhilkinSerg Jun 9, 2019
48297aa
Refuel fires while waiting
ifreund Jun 12, 2019
5410e2a
Misc micro optimizations (#31360)
kevingranade Jun 12, 2019
9873da9
Merge pull request #31364 from ifreund/wait-refuel
ZhilkinSerg Jun 12, 2019
ed0eee6
fix crash when drawing skills tab because of an unitialised variable …
jagoly Jun 12, 2019
6147b72
Marina (#31349)
Night-Pryanik Jun 12, 2019
22e92fa
Fix map cache invalidation (#31295)
kevingranade Jun 12, 2019
a411c72
Add drying recipes for frozen ingredients (#31270)
Zetsukaze Jun 12, 2019
5bce0cd
Nerf outlandish drug effects (#31309)
kevingranade Jun 12, 2019
74d9af4
basecamps: add modular basecamps (#31115)
mlangsdorf Jun 12, 2019
3a3f0d9
Improve Spellcasting UI (#31356)
KorGgenT Jun 12, 2019
b2016d7
Enforce -Wold-style-cast (#31361)
jbytheway Jun 12, 2019
dca7f08
Various Corrections of Spelling and Clarification of Quests (#31216)
DracoGriffin Jun 12, 2019
5b52df9
Use translation markers for vehicle noise sounds
ZhilkinSerg Jun 12, 2019
f87f604
Use translation markers for monster footsteps
ZhilkinSerg Jun 12, 2019
b00272c
Use translation markers for action names
ZhilkinSerg Jun 12, 2019
17e5458
Put some translation calls inside of if blocks
ZhilkinSerg Jun 12, 2019
23cd5ce
Use dedicated function of trap class instead of checking translated n…
ZhilkinSerg Jun 12, 2019
71f3510
add roof & bar to golfcourse clubhouse
curstwist Jun 13, 2019
7e3b8eb
Remove tabs from CMake compile commands
jbytheway Jun 12, 2019
9844056
Merge pull request #31310 from ZhilkinSerg/refactor-fields-step-1
kevingranade Jun 13, 2019
64516a6
Allow items to use multiple ammotypes (#30874)
Jun 13, 2019
ad1332f
Merge pull request #31374 from ZhilkinSerg/performance-translation-ca…
kevingranade Jun 13, 2019
93ace19
Merge pull request #31381 from curstwist/add-golf-course-clubhouse-roof
Rivet-the-Zombie Jun 13, 2019
c5e5e1b
Updates Morale Menu for clarity (#31164)
Sunshine-dev-forever Jun 13, 2019
97489f1
Correct values in item processing for 1 sec turns
ifreund Jun 12, 2019
ae79126
Merge pull request #31335 from ZhilkinSerg/item-info-plantable-irradi…
kevingranade Jun 13, 2019
e9f99b9
tell the player one's attempting too hard crafting
l29ah Jun 11, 2019
8238d5a
Fix OSX and MXE Windows builds (#31385)
ZhilkinSerg Jun 13, 2019
1cebffa
Rural Content: 3 New Rural Houses, more variations (#31367)
LovamKicsiGazsii Jun 13, 2019
aac76cb
Magiclysm: More Mutation Types (#31375)
KorGgenT Jun 13, 2019
94874bc
Make toggling of music work correctly. (#31332)
mark7 Jun 13, 2019
8575f76
Added another missing cast
ZhilkinSerg Jun 13, 2019
31202b8
Add and astyle plf_colony.h as colony.h
ifreund Jun 11, 2019
54ec959
Make colony conform to cdda code style
ifreund Jun 11, 2019
a03ed09
Remove/simplfy pre-processor defines
ifreund Jun 11, 2019
a4f6f18
Clean up formatting
ifreund Jun 12, 2019
e10c5f3
Further cleanup pre-processor defines
ifreund Jun 12, 2019
62d8cc6
Add colony test cases
ifreund Jun 12, 2019
2e04c54
Update colony implementation to v5.10
ifreund Jun 13, 2019
677394c
junkfood.json: realistic Necco wafers' stats
l29ah Jun 13, 2019
a1785cd
see gender on npc Look at option
Jun 13, 2019
af1b518
Merge pull request #31386 from ZhilkinSerg/fix-build-mxe-mingw-2019-0…
ZhilkinSerg Jun 13, 2019
084d1fb
Merge pull request #31387 from l29ah/necco
ZhilkinSerg Jun 13, 2019
4259f65
Merge pull request #31390 from davidpwbrown/see_npc_gender
ZhilkinSerg Jun 13, 2019
c42e417
Revert "See gender on NPC Look at option"
kevingranade Jun 13, 2019
5dcae08
removed recipes for ir and nv goggs
Mooses2k Jun 12, 2019
d0565ff
return const ref from item::ammo_types
Jun 13, 2019
4fce0ca
Merge pull request #31338 from ifreund/colony
kevingranade Jun 13, 2019
97c1076
Normalize function names
ZhilkinSerg Jun 12, 2019
74f7d04
Edit the elec_jackhammer power drain (#31192)
RosieMcCattail Jun 13, 2019
03c4211
Update battery size mods
Highmongrel Jun 14, 2019
3b161e4
Add and update a cache of which submaps contain active items
kevingranade Jun 14, 2019
2d6ed36
Walk cached vehicle list instead of the map
kevingranade Jun 14, 2019
66063fa
Merge pull request #31019 from RarkGrames/Heavy-armor-for-huge-mutants
Rivet-the-Zombie Jun 14, 2019
7e3c4b1
Radio station broadcast audio archives - lore (#30482)
nexusmrsep Jun 14, 2019
1b4ec95
Merge pull request #30656 from ymber/power
kevingranade Jun 14, 2019
490f97e
Routine i18n updates on 14 Jun 2019
BrettDong Jun 14, 2019
c53cf0f
Research facility upgrade (#31358)
I-am-Erk Jun 14, 2019
2ab3803
Ups flag fix (#31388)
Inglonias Jun 14, 2019
d14ecb1
Period
kevingranade Jun 14, 2019
87dab61
nerf deadened pain awareness (#31401)
KorGgenT Jun 14, 2019
2401d0c
Update battery size mods (#31405)
kevingranade Jun 14, 2019
6384b48
Extra constructions, part 2: Metal constructs (#31299)
ArkoselabsDoesNotWork-153164711 Jun 14, 2019
d7fb63d
Variable weight for characters (#31373)
Fris0uman Jun 14, 2019
49e1b7b
Classes and Scenarios mod grammar fixes
mark7 Jun 14, 2019
07125b4
Add braces to fix build warning
ifreund Jun 14, 2019
4ad05d9
Merge pull request #31422 from ifreund/add-braces
ZhilkinSerg Jun 14, 2019
639de13
Merge pull request #31416 from BrettDong/i18n
ZhilkinSerg Jun 14, 2019
e959dfc
Merge pull request #31414 from kevingranade/fast-enumerate-active-items
ZhilkinSerg Jun 14, 2019
ce2654b
Merge pull request #31421 from mark7/wb-grammar-moreclasses
ZhilkinSerg Jun 14, 2019
e7ca42c
Starting bank money, millionaire profession, debt & savings traits (#…
nexusmrsep Jun 14, 2019
158b405
Add acetic acid dilution recipe
ArkoselabsDoesNotWork-153164711 Jun 14, 2019
7ab2823
game.cpp: invalidate map cache after peeking
l29ah Jun 14, 2019
baea879
Avoid clairvoyance showing tiles as lit if you have no clair.
KurzedMetal Jun 10, 2019
9abec57
Treat input and output chars as int, not long
jbytheway Jun 9, 2019
8f2e9eb
Use ints for SDL keys
jbytheway Jun 12, 2019
5399587
Fix incorrect variable name
ZhilkinSerg Jun 14, 2019
b2310b7
Joined declaration and assignment
ZhilkinSerg Jun 14, 2019
8098fe4
Initialize non-static data members
ZhilkinSerg Jun 14, 2019
5bb06dc
Initialize all object members
ZhilkinSerg Jun 14, 2019
1aa294f
Removed non-implemented functions
ZhilkinSerg Jun 14, 2019
dcf3bc2
Removed redundant empty declarations
ZhilkinSerg Jun 14, 2019
d2679f1
Removed redundant void argument list
ZhilkinSerg Jun 14, 2019
1de08f8
Removed unreachable code
ZhilkinSerg Jun 14, 2019
822a597
Removed unused declarators
ZhilkinSerg Jun 14, 2019
9548bcb
Removed redundant empty lines
ZhilkinSerg Jun 14, 2019
dc32033
Removed excessive cast
ZhilkinSerg Jun 14, 2019
7d5336b
Used constant references in function parameters
ZhilkinSerg Jun 14, 2019
e7915bb
Used clear function instead of empty string assignment
ZhilkinSerg Jun 14, 2019
4127c52
Merge pull request #31434 from ZhilkinSerg/sa-2019-06-14
kevingranade Jun 14, 2019
5f34896
Merge pull request #31432 from jbytheway/chars_as_ints
kevingranade Jun 14, 2019
44c4f03
Fix wall connections for curses with tiles option (#31435)
jbytheway Jun 14, 2019
ab77065
Merge pull request #31431 from Night-Pryanik/tools-require-charges-to…
Night-Pryanik Jun 14, 2019
d938ca2
Fixes player::suffer() for the time change (#31430)
Sunshine-dev-forever Jun 14, 2019
41e3162
Merge pull request #31428 from l29ah/window-peek-cache
ZhilkinSerg Jun 14, 2019
5d57fda
Stop tools recharging (#31426)
Inglonias Jun 14, 2019
a6cb1c7
Motor boat (#31420)
Night-Pryanik Jun 14, 2019
90c722d
Make vision unit tests not expect light on player location
KurzedMetal Jun 15, 2019
d51f7ec
make 100% fail chance string clearer
KorGgenT Jun 15, 2019
c26a931
cannot cast spells at a target you cannot see
KorGgenT Jun 15, 2019
d37a2a5
show max mana in mana panel
KorGgenT Jun 15, 2019
3edd712
add spell flags
KorGgenT Jun 15, 2019
f2725a0
add PERMANENT spell flag
KorGgenT Jun 15, 2019
911235e
add IGNORE_WALLS spell flag
KorGgenT Jun 15, 2019
b4ca517
update json flags to include new spell tags
KorGgenT Jun 15, 2019
87c64d2
spell makes permanent item only if max level
KorGgenT Jun 15, 2019
43e21c6
Adds Wing Chun martial art (#30668)
Mooses2k Jun 15, 2019
5d269a9
Fix few lightning issues related to the new Sunlight map (#31307)
KurzedMetal Jun 15, 2019
f430f91
add fitness gym roofs
curstwist Jun 14, 2019
dbd8e9a
Merge pull request #31440 from KorGgenT/minor-magic-tweaks
kevingranade Jun 15, 2019
2ab22f5
Merge pull request #31441 from KurzedMetal/fix-zero-clairvoyance-bug
kevingranade Jun 15, 2019
9f6e052
Fix UPS guns for multiple ammotype support
mark7 Jun 15, 2019
7d65bbe
[CR] Implement blackpowder fouling mechanics (#30985)
ArkoselabsDoesNotWork-153164711 Jun 15, 2019
93eda3f
Update
ArkoselabsDoesNotWork-153164711 Jun 15, 2019
fae7865
allow bathtubs to be used as liquid storage (#31438)
Korbofaux Jun 15, 2019
7a11ca5
Merge pull request #31424 from Rail-Runner/acetic_acid
Rivet-the-Zombie Jun 15, 2019
2758077
Added motor boat spawns to the docks
Night-Pryanik Jun 15, 2019
61bda0a
Convert item charges to int
jbytheway Jun 11, 2019
17bb1b5
Merge pull request #31449 from Night-Pryanik/motor-boat-spawn-at-the-…
ZhilkinSerg Jun 15, 2019
6c35d72
Merge pull request #31443 from KorGgenT/spell-flags
ZhilkinSerg Jun 15, 2019
f52e052
Merge pull request #31442 from mark7/wb-fix-ups-guns-multi-ammotype
ZhilkinSerg Jun 15, 2019
e312e49
Optimization train (#31445)
kevingranade Jun 15, 2019
647734b
fixed scrolling of traits window, fixed bionics window scrolling when…
jagoly Jun 15, 2019
7b0c54a
Merge pull request #31453 from jbytheway/item_charges_as_ints
ZhilkinSerg Jun 15, 2019
92855ff
Fix astyle regression
ZhilkinSerg Jun 15, 2019
e05b13a
Merge pull request #31455 from ZhilkinSerg/astyle-2019-06-15
ZhilkinSerg Jun 15, 2019
1970343
New Tool Qualities/Tools to use them (#31419)
ddsaw Jun 15, 2019
6508a5c
Hub 01 general mapgen additions (#31411)
John-Candlebury Jun 15, 2019
4e5dd11
obsolete realguns
Jun 15, 2019
3fa64ee
add 357mag to itemgroups
Jun 15, 2019
87aa1dd
add 357mag crafting
Jun 15, 2019
0fcacf8
clarify 357 types
Jun 15, 2019
cbd1644
update speedloaders for .357
Jun 15, 2019
c5cc4b4
fix blazemod ammo specifiers
Jun 15, 2019
9e33881
use time strings for vitamin rates
Jun 15, 2019
b845808
lint json
Jun 15, 2019
7272af5
clean up player::read_speed
Jun 15, 2019
ada4ba8
avoid checking current ammo if RELOAD_AND_SHOOT
Jun 15, 2019
45f7896
add missing word
Jun 15, 2019
5f0aee8
Merge pull request #31459 from ymber/blazemod_ammo
ZhilkinSerg Jun 15, 2019
d6d3c7c
Merge pull request #31465 from ymber/archery_fix
ZhilkinSerg Jun 15, 2019
1fc17e6
Merge pull request #31463 from ymber/read_time
ZhilkinSerg Jun 15, 2019
378943a
Merge pull request #31460 from ymber/vit_rate
ZhilkinSerg Jun 15, 2019
ac296c7
Merge pull request #31457 from ymber/ammo
ZhilkinSerg Jun 15, 2019
7e1a8d4
Merge pull request #31456 from ymber/erg
ZhilkinSerg Jun 15, 2019
b69b9a1
Rancher gear and proffesion (#31320)
hyper2snyper Jun 15, 2019
99913d3
Style and fix json (#31469)
jbytheway Jun 15, 2019
7b95b4a
Use ints for invlets (#31468)
jbytheway Jun 15, 2019
f1a5f47
Avoid clang-tidy null pointer warnings (#31467)
jbytheway Jun 15, 2019
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
add missing word
  • Loading branch information
ymber committed Jun 15, 2019
commit 45f78964092ac4a21700a95b42ef3f9bf2c37eb9
2 changes: 1 addition & 1 deletion data/json/items/magazine/38.json
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@
"id": "38_speedloader",
"type": "MAGAZINE",
"name": ".38/.357 7-round speedloader",
"description": "This speedloader can hold 7 rounds of .357 Magnum .38 Special and quickly reload a compatible revolver.",
"description": "This speedloader can hold 7 rounds of .357 Magnum or .38 Special and quickly reload a compatible revolver.",
"weight": 80,
"volume": 1,
"price": 1000,