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

Bring me up to date #15

Merged
merged 2,123 commits into from
Apr 13, 2019
Merged
Changes from 4 commits
Commits
Show all changes
2123 commits
Select commit Hold shift + click to select a range
5953fac
Merge pull request #29317 from halfahermit/update-retrodays-dinos
ZhilkinSerg Apr 6, 2019
8606733
Merge pull request #29316 from curstwist/add-candy-shop-roofs
ZhilkinSerg Apr 6, 2019
548af66
Merge pull request #29315 from TheMurderUnicorn/master
ZhilkinSerg Apr 6, 2019
dd40cb0
Merge pull request #29291 from Night-Pryanik/mainline-filthy-clothes-mod
ZhilkinSerg Apr 6, 2019
94024de
Merge pull request #29324 from Night-Pryanik/fix-erroneous-furniture-…
ZhilkinSerg Apr 6, 2019
ef661c4
Moved transportation overmap terrains to separate file
ZhilkinSerg Apr 6, 2019
cf9872e
Moved residential overmap terrains to separate file
ZhilkinSerg Apr 6, 2019
baf0d4b
Moved commercial overmap terrains to separate file
ZhilkinSerg Apr 6, 2019
f92da86
Moved recreational overmap terrains to separate file
ZhilkinSerg Apr 6, 2019
d1a15ab
Moved hardcoded overmap terrains to separate file
ZhilkinSerg Apr 6, 2019
9c106a6
Moved agricultural overmap terrains to separate file
ZhilkinSerg Apr 6, 2019
7202894
Moved industrial overmap terrains to separate file
ZhilkinSerg Apr 6, 2019
ff143b0
Moved waste/junk overmap terrains to separate file
ZhilkinSerg Apr 6, 2019
ebc62a3
Moved cemetery overmap terrains to separate file
ZhilkinSerg Apr 6, 2019
a6c663b
Moved public/institutional overmap terrains to separate file
ZhilkinSerg Apr 6, 2019
b77702c
Moved several more overmap terrains to separate files
ZhilkinSerg Apr 6, 2019
855da54
Moved military overmap terrains to separate file
ZhilkinSerg Apr 6, 2019
9a8b588
Lint json
ZhilkinSerg Apr 6, 2019
f4e47ec
Add missing copy constructors / assignment operators to fix warnings …
reinerh Apr 6, 2019
68fecb7
Fix iterator invalidation after erase() and insert().
neitsa Apr 6, 2019
5c49b16
Linting blacklisted json files.
zombiethoughts Apr 6, 2019
7082559
Prevent mutating facial hair from mutagen
anothersimulacrum Apr 6, 2019
a62b594
Linting blacklisted json files.
zombiethoughts Apr 6, 2019
fa482da
Linting blackllisted json files.
zombiethoughts Apr 6, 2019
7067fae
Linting blacklisted json files.
zombiethoughts Apr 6, 2019
98b4f02
Merge pull request #29334 from zombiethoughts/Lint-06/04/2019a
ZhilkinSerg Apr 6, 2019
fdd836f
Merge pull request #29335 from zombiethoughts/Lint-06/04/2019b
ZhilkinSerg Apr 6, 2019
e2dc2bd
Merge pull request #29328 from reinerh/gcc9
ZhilkinSerg Apr 6, 2019
f1359ac
Increased time to craft and components needed for steel frame and hea…
Night-Pryanik Apr 6, 2019
846cc29
Merge pull request #29331 from neitsa/master
ZhilkinSerg Apr 6, 2019
7324d7c
Fix beard without a name
anothersimulacrum Apr 6, 2019
2ae370c
Linting blacklisted json files.
zombiethoughts Apr 6, 2019
cb478e7
Linting blacklisted json files.
zombiethoughts Apr 6, 2019
33b6002
Linting blacklisted json files.
zombiethoughts Apr 6, 2019
187a6db
Fix line endings in gradlew.bat
codemime Apr 6, 2019
37ca734
Linting blacklisted json files.
zombiethoughts Apr 6, 2019
5f180c3
Merge pull request #29342 from codemime/gradlew-eol
ZhilkinSerg Apr 6, 2019
e88b6d0
Merge pull request #29340 from zombiethoughts/Lint-06/04/2019f
ZhilkinSerg Apr 6, 2019
3ebba69
Merge pull request #29337 from zombiethoughts/Lint-06/04/2019c
ZhilkinSerg Apr 6, 2019
daa5cb6
Merge pull request #29338 from zombiethoughts/Lint-06/04/2019d
ZhilkinSerg Apr 6, 2019
dd8f6a9
Merge pull request #29339 from zombiethoughts/Lint-06/04/2019e
ZhilkinSerg Apr 6, 2019
f3b0974
mineline fire ring from more survival tools
curstwist Apr 6, 2019
7e97c9d
Optional fields loading
Apr 6, 2019
6964a90
Linting blacklisted json files.
zombiethoughts Apr 6, 2019
aa231af
remove suppress_smoke flag
curstwist Apr 6, 2019
0b7dc10
Linting blacklisted json files. (#29346)
zombiethoughts Apr 6, 2019
882cc63
Merge pull request #29348 from zombiethoughts/Lint-06/04/2019i
ZhilkinSerg Apr 6, 2019
0194338
Merge pull request #29347 from AMurkin/fix-cbms-loading
ZhilkinSerg Apr 6, 2019
873d65a
Return 0 on fuel consumption if the engine isn't running
esotericist Apr 6, 2019
01f82a8
Removing unnecessary parens
esotericist Apr 6, 2019
c1792a4
Fixed rotatable symbol definitions
ZhilkinSerg Apr 6, 2019
1724595
Realigns action highlights in ASCII
reed501 Apr 7, 2019
42d05e7
Fixes vehicle crosshair centering in ASCII
reed501 Apr 7, 2019
53f9737
Merge pull request #29352 from anothersimulacrum/beard-fixes
Rivet-the-Zombie Apr 7, 2019
d680d66
Merge pull request #29354 from esotericist/master
Rivet-the-Zombie Apr 7, 2019
0db4d0e
Make weather appear on left side of screen in ncurses
reed501 Apr 7, 2019
a846ba5
Renames variable to useful name
reed501 Apr 7, 2019
cec5436
Linting blacklisted json files.
zombiethoughts Apr 6, 2019
ea190d3
Update Brightnights item groups folder to item_groups
zombiethoughts Apr 6, 2019
ae9b5b1
fix required_skills entry
curstwist Apr 7, 2019
3353c84
Make pry-on-examine use best tool
halfahermit Apr 7, 2019
579b2bc
Enable zooming when looking around (and peeking).
anonym Apr 1, 2019
3e5a8e5
Center on "look around" cursor when zooming.
anonym Apr 7, 2019
e2c1fa6
reduce hunger delay
KorGgenT Apr 7, 2019
eae7ae3
Enable mouse panning while looking around (and peeking).
anonym Apr 1, 2019
10aa47d
remove hunger speed penalty and make starve penalty worse
KorGgenT Apr 7, 2019
caa9b8b
Merge pull request #29344 from curstwist/Mainline-fire-ring-from-More…
Rivet-the-Zombie Apr 8, 2019
38bd447
Fix #28836 - erroneous wake error message.
neitsa Apr 6, 2019
f070115
Merge pull request #29359 from reed501/ascii_offset_fixes
kevingranade Apr 8, 2019
328b603
Add sleep deprivation messages for NPCs (#29360)
anothersimulacrum Apr 8, 2019
06002e6
Make pry-on-examine use best tool (#29363)
kevingranade Apr 8, 2019
71b58ff
Merge pull request #29326 from ZhilkinSerg/overmap-terrain-split-2019…
kevingranade Apr 8, 2019
b5bfdb3
Lint json and remove from blacklist
ifreund Apr 8, 2019
4e3f31a
Wrap tiles/windows code in #ifdef.
anonym Apr 8, 2019
0a3ac5c
faction cleanup: make two display functions const
mlangsdorf Apr 8, 2019
58abdd9
faction cleanup: get rid of stupid dead code
mlangsdorf Apr 8, 2019
c4f41a0
faction cleanup: make fac_food_supply functions faction::
mlangsdorf Apr 8, 2019
f700ada
faction cleanup: refactor the basecamp display code
mlangsdorf Apr 8, 2019
46872fa
faction cleanup: move the NPC display code into npc::
mlangsdorf Apr 8, 2019
f66eaec
missions: split out reveal_om_ter and target_om_ter
mlangsdorf Nov 21, 2018
e9e6756
missions: remove mission_start_t structure
mlangsdorf Apr 5, 2019
fc44315
mapgen: add infrastructure for update_mapgen
mlangsdorf Apr 5, 2019
8cd3f29
missions: add update_mapgen and deferred loading for missions
mlangsdorf Apr 5, 2019
51fbf75
mission: move the Old Guard rep start functions to JSON
mlangsdorf Apr 5, 2019
1ee943b
missions: use a standard_npc for mission start effects
mlangsdorf Apr 7, 2019
6761481
faction cleanup: miscellaneous refactoring
mlangsdorf Apr 8, 2019
daf4d65
Linting blacklisted json files.
zombiethoughts Apr 8, 2019
56bd510
Linting blacklisted json files.
zombiethoughts Apr 8, 2019
228706f
Linting blacklisted json files.
zombiethoughts Apr 8, 2019
a2d5795
Reduce meat pizza volume (#29375)
Apr 8, 2019
fd92f1f
Lint json and remove from blacklist (#29376)
ZhilkinSerg Apr 8, 2019
b27ceea
Merge pull request #29378 from zombiethoughts/Lint-08/04/2019a
ZhilkinSerg Apr 8, 2019
bdee03a
Merge pull request #29379 from zombiethoughts/Lint-08/04/2019b
ZhilkinSerg Apr 8, 2019
ff39283
Merge pull request #29381 from zombiethoughts/Lint-08/04/2019d
ZhilkinSerg Apr 8, 2019
1990133
Linting blacklisted json files. (#29380)
zombiethoughts Apr 8, 2019
b381b65
Small Aftershock balance patch, plus a new goodie (#29369)
Ilysen Apr 8, 2019
e1615c1
NPCs: Add 3 new NPC AI rules (#29367)
mlangsdorf Apr 8, 2019
78e7a2f
Initial craft entity implementation
ifreund Mar 23, 2019
4e8f943
Reimplement long crafting
ifreund Mar 31, 2019
808d285
Faliure, xp gain, and rot reimplementations
ifreund Apr 1, 2019
4be060c
Reimplement comestible craft entitys properly
ifreund Apr 3, 2019
9862429
Apply fixes and cleanup
ifreund Apr 3, 2019
85dbfc7
Fix interrupt message
ifreund Apr 6, 2019
fbb59eb
Inherit weight/volume of components not result
ifreund Apr 8, 2019
49be2af
Linting blacklisted json files.
zombiethoughts Apr 8, 2019
20656c9
Linting blacklisted json files.
zombiethoughts Apr 8, 2019
a3d5744
Merge pull request #29385 from zombiethoughts/Lint-08/04/2019e
ZhilkinSerg Apr 8, 2019
a52b19f
Linting blacklisted json files. (#29387)
zombiethoughts Apr 8, 2019
8a61e70
Merge pull request #29389 from zombiethoughts/Lint-08/04/2019h
ZhilkinSerg Apr 8, 2019
986a05e
Linting blacklisted json files. (#29388)
zombiethoughts Apr 8, 2019
1fa537e
NPC AI: Add overrides for rule settings
mlangsdorf Apr 7, 2019
b8763dd
NPC shouts: use overrides to set and clear danger parameters
mlangsdorf Apr 7, 2019
94a157d
add bank roofs
curstwist Apr 9, 2019
6988e93
Jsonizes sleep-friendly bionics
Apr 9, 2019
7225789
Merge pull request #28937 from ifreund/craft-entity
kevingranade Apr 9, 2019
ef5b802
Merge branch 'master' into stomach-contents
kevingranade Apr 9, 2019
5e75c2e
Merge branch 'master' into refactor_faction_code
kevingranade Apr 9, 2019
ee27362
fixed pony wall deconstruct
TheMurderUnicorn Apr 8, 2019
1071d9b
Prison break no longer starts with an NPC
pjf Apr 8, 2019
4c5dace
Merge pull request #28049 from KorGgenT/stomach-contents
kevingranade Apr 9, 2019
7a3ce39
Favorite System v1.0 (#29287)
cafeoh Apr 9, 2019
eaf3290
Add speedloaders for many guns (#29366)
ArkoselabsDoesNotWork-153164711 Apr 9, 2019
00151e3
Merge pull request #29374 from mlangsdorf/refactor_faction_code
kevingranade Apr 9, 2019
b5ea5bf
Add nutrition value disclaimer to crafting UI (#29400)
esotericist Apr 9, 2019
d3f3378
Merge pull request #29294 from mlangsdorf/old_guard_mission_start_json
kevingranade Apr 9, 2019
b103651
Fonts changing ingame (#28122)
Night-Pryanik Apr 9, 2019
58f0b98
add basic appearance to Mutant NPCs mod
GearheadLydia Apr 9, 2019
e5b4597
Merge pull request #29364 from anonym/look-zoom
Rivet-the-Zombie Apr 9, 2019
083b37d
Merge pull request #29405 from GearheadLydia/fix_mutant_npc_appearance
ZhilkinSerg Apr 9, 2019
0951726
Merge pull request #29402 from Ilysen/SleepBionics
ZhilkinSerg Apr 9, 2019
04c7bb3
Merge pull request #29370 from anonym/look-mouse-panning
ZhilkinSerg Apr 9, 2019
7e1a5c0
Merge pull request #29397 from mlangsdorf/npc_rules_override
ZhilkinSerg Apr 9, 2019
d3e5239
Added a check for monster visibility
Night-Pryanik Apr 9, 2019
5cf46ff
move ladder
curstwist Apr 9, 2019
2b4f0e6
fix typo
curstwist Apr 9, 2019
7f245f8
Fix crafting time of batches (#29410)
ifreund Apr 9, 2019
a824d55
Refactor internal representation of symbols
ZhilkinSerg Apr 9, 2019
4361585
Added SDL fallback option for ASCII lines drawing
ZhilkinSerg Apr 9, 2019
cfec2e3
Style preprocessor directives (#29393)
ZhilkinSerg Apr 9, 2019
7cafa75
Jsonizes material reinforcing potential (#29404)
Ilysen Apr 9, 2019
1583900
Added a check for monster visibility (#29408)
kevingranade Apr 9, 2019
83ec5d7
Rigid Table Manners fixes
Apr 9, 2019
67eaa05
Linting blacklisted json files.
zombiethoughts Apr 9, 2019
d1e9d58
Linting blacklisted json files.
zombiethoughts Apr 9, 2019
87e3d96
Linting blacklisted json files. (#29422)
zombiethoughts Apr 9, 2019
210286d
Fix Realguns mod (#29423)
ArkoselabsDoesNotWork-153164711 Apr 9, 2019
51c0d35
Fix crash on crafting persihable from non-perishables (#29425)
ifreund Apr 9, 2019
e54a8a6
Fix In-game font settings not working #29411 (#29413)
jimmydoh Apr 10, 2019
ab04067
Add configure option to disable edge scroll/mouse panning feature
esotericist Apr 10, 2019
f2bd6e3
astyle game.cpp
Apr 10, 2019
cf66382
Adds a thermometer to disassembled refrigerators (#29398)
jokermatt999 Apr 10, 2019
4d36748
Fix craft progress calculation (#29433)
ifreund Apr 10, 2019
a892c82
Turn static NPCs and z-levels on by default (#29435)
I-am-Erk Apr 10, 2019
5de216d
Merge pull request #29401 from curstwist/adds-bank-roofs
Rivet-the-Zombie Apr 10, 2019
253ecb5
Force all "rows" to wrap in json. (#29305)
kevingranade Apr 10, 2019
d129add
Merge pull request #29437 from esotericist/master
ZhilkinSerg Apr 10, 2019
9ab8172
Introduce enum bitset and use it for monster flags and triggers (#29368)
codemime Apr 10, 2019
c28b0f4
missions: split missiondef up into multiple files
mlangsdorf Apr 9, 2019
7e06e44
mapgen: specify additional traits for NPCs in place_npcs
mlangsdorf Apr 9, 2019
31bc820
missiondef: convert the Free Merchant missions to use update_mapgen
mlangsdorf Apr 9, 2019
e4f9d76
missiondef: generalize the start func lambdas to end and fail
mlangsdorf Apr 10, 2019
76087a4
update_mapgen: support rotation
mlangsdorf Apr 10, 2019
3ba432d
Added a new menu option for ambient sound. Changed which option was b…
cburns2017 Apr 10, 2019
3562362
Added MEAT subcategory to offal dishes recipes
Night-Pryanik Apr 10, 2019
67d3106
Prevent double decrement of comestibles with iuse functions. (#29440)
kevingranade Apr 10, 2019
d025303
Merge pull request #29445 from Night-Pryanik/add-subcategories-to-off…
ZhilkinSerg Apr 10, 2019
cd3c23c
Used overmap terrain abstracts for river tiles
ZhilkinSerg Apr 10, 2019
47a89d3
update_mapgen: capture and defer errors from parsing jmapgen_piece
mlangsdorf Apr 10, 2019
2eb6ffb
mission def: move the Free Merchant Evac 5 mission end into JSON
mlangsdorf Apr 10, 2019
631fcba
Relocate entries to other files
curstwist Apr 11, 2019
4fece09
adds roofs to bike shop
curstwist Apr 11, 2019
9c4a633
panel label changes (#29439)
thquinn Apr 11, 2019
738970c
add PREV_TAB action to player display
thquinn Apr 11, 2019
6b961e2
Mainline .45 pipe rifle from Craftable Gunpowder mod (#29218)
ArkoselabsDoesNotWork-153164711 Apr 11, 2019
a9404f4
Merge pull request #29429 from mlangsdorf/update_mapgen_commune
kevingranade Apr 11, 2019
d06b0da
Merge pull request #29432 from ZhilkinSerg/refactor-unicode-symbols
kevingranade Apr 11, 2019
0003024
Merge pull request #29446 from ZhilkinSerg/overmap-terrain-abstract-r…
kevingranade Apr 11, 2019
77db2d1
add winches to urban development garages (#29450)
nornagon Apr 11, 2019
0944c64
Add unbound keybinding entry which reloads without trying weapons first.
esotericist Apr 11, 2019
cb1a0cb
Merge pull request #29449 from curstwist/add-bike-shop-roofs
Rivet-the-Zombie Apr 11, 2019
be0a9ac
Merge pull request #29453 from thquinn/character-prev-tab
ZhilkinSerg Apr 11, 2019
dd4532a
Merge pull request #29454 from esotericist/master
ZhilkinSerg Apr 11, 2019
aa75634
Change total morale formula
ifreund Apr 8, 2019
3fc0d1f
Apply sqrt of sum of squares to stacking of the same bonus
ifreund Apr 11, 2019
f8092db
Fix bug morale tests
ifreund Apr 11, 2019
e505be2
Linting blacklisted json files.
zombiethoughts Apr 11, 2019
63c420d
Revert removal of parentheses
ifreund Apr 11, 2019
9ed77b7
Linting blacklisted json files.
zombiethoughts Apr 11, 2019
e823572
Update json_blacklist
zombiethoughts Apr 11, 2019
e63e8f3
Merge pull request #29461 from zombiethoughts/11/04/2019d
ZhilkinSerg Apr 11, 2019
a95b3f7
Merge pull request #29459 from zombiethoughts/11/04/2019b
ZhilkinSerg Apr 11, 2019
92e8531
Linting blacklisted json files. (#29458)
zombiethoughts Apr 11, 2019
25e6887
Linting blacklisted json files. (#29460)
zombiethoughts Apr 11, 2019
5d207d7
Update storage.json
RarkGrames Apr 11, 2019
41c6508
fix nails, tweak item spawning
I-am-Erk Apr 11, 2019
d36ed12
Define milk temperature for cows (#29462)
Hirmuolio Apr 11, 2019
ebb0eda
Json style fix
kevingranade Apr 11, 2019
954a584
Make Clang/Tiles/Cmake build a release build (#29470)
kevingranade Apr 11, 2019
453bf33
Actually fix json style
kevingranade Apr 11, 2019
9a54f07
Cleanup json_blacklist (#29469)
Apr 11, 2019
b89d0e1
mapgen: add translate_ter special
mlangsdorf Apr 10, 2019
1898381
update_mapgen: don't crash on short terrain names
mlangsdorf Apr 11, 2019
eaa15c9
mission: move many of the the tacoma commune functions into JSON
mlangsdorf Apr 10, 2019
b46ef70
Routine i18n updates on Apr 12, 2019
BrettDong Apr 12, 2019
57b7324
Any NPC at camp can start missions etc, even by radio contact. (#29249)
Apr 12, 2019
375bc6c
Use sqrt of sum of squares to calculate total morale (#29396)
kevingranade Apr 12, 2019
46f5ee4
Merge pull request #29481 from BrettDong/i18n
Rivet-the-Zombie Apr 12, 2019
d29de5a
Disallow rotten components in non-perishable crafts
ifreund Apr 5, 2019
e3f0240
Add new `ALLOW_ROTTEN` recipe flag
ifreund Apr 7, 2019
6afe7ff
Astyle?
ifreund Apr 12, 2019
690c84a
npc bandaging: better bandage thresholds
mlangsdorf Apr 6, 2019
23884ab
npcmove: NPC followers detect wounded allies and heal them
mlangsdorf Apr 8, 2019
83af131
NPC AI: NPCs will heal bleeds, bites, and infections
mlangsdorf Apr 8, 2019
c613cb1
Refactor and fix tests
ifreund Apr 12, 2019
915c47c
Added movement sound to worms
Night-Pryanik Apr 12, 2019
caf6ae3
Linting blacklisted json files.
zombiethoughts Apr 12, 2019
5de698f
Add item for Glowy thing, sets difficulty to 3 (#29495)
Fris0uman Apr 12, 2019
c2068fe
Fixed chop shop camp mission (#29488)
Apr 12, 2019
7023fc4
Disable indention where AS 3.0.1 and 3.1 disagree (#29465)
kevingranade Apr 12, 2019
3d42307
Translate footstep strings
kevingranade Apr 12, 2019
62351f6
Merge pull request #29332 from mlangsdorf/npc_bandaging
kevingranade Apr 13, 2019
4af29b2
Merge pull request #29473 from mlangsdorf/update_mapgen_commune2
kevingranade Apr 13, 2019
93db3b6
Fix crafting 0 time recipes
ifreund Apr 11, 2019
c3bf3dd
Fix #29281 - Stop blowing in your sax if you want to sleep. (#29505)
neitsa Apr 13, 2019
9f9559f
Make water heaters act more like standing tanks (#29507)
halfahermit Apr 13, 2019
1f89a2d
Electric blankets (#29357)
Ilysen Apr 13, 2019
b0ee8a2
Tell build wrapper where to find release artifacts (#29499)
kevingranade Apr 13, 2019
5c4a67a
Style Json
kevingranade Apr 13, 2019
afdfe2a
Merge pull request #29506 from CleverRaven/kevingranade-translate-foo…
Rivet-the-Zombie Apr 13, 2019
0c2f4b5
json style
kevingranade Apr 13, 2019
50ac44e
Fix #29472 - nullptr while trying to find a NPC in the overmap (#29487)
neitsa Apr 13, 2019
16bc941
Fix temperature for water from vehicle taps (#29489)
Hirmuolio Apr 13, 2019
ba544c8
Increase size of compass in 'Classic' sidebar to match other layouts …
esotericist Apr 13, 2019
27ae914
Show "This is xxx." message when examining harvestable furniture eve…
Night-Pryanik Apr 13, 2019
4bbcdf7
Adjust view offsets + show sidebar in alternate main screen states (#…
esotericist Apr 13, 2019
94b7bba
Make minifridges/freezers reversible, autolearned (#29512)
jokermatt999 Apr 13, 2019
b5390d4
Fixed a typo in UMP magazine description (#29513)
jokermatt999 Apr 13, 2019
9a60cb2
Add skeletal brutes (#28944)
Apr 13, 2019
4627543
Add a crafting recipe for stepladders
jokermatt999 Apr 13, 2019
428ff10
Merge pull request #29309 from ifreund/component-filtering
kevingranade Apr 13, 2019
2ae9c8e
Jsonizes safe cracking
Apr 12, 2019
c00528a
Style json
kevingranade Apr 13, 2019
b0da085
Fix poisonous/psychoactive shroom spawn
ifreund Apr 13, 2019
c142c86
Linting blacklisted json files.
zombiethoughts Apr 13, 2019
92bff19
Fix item filtering bug
ifreund Apr 13, 2019
4c856d8
Silence clang warning about unused variable. (#29477)
kevingranade Apr 13, 2019
17f1504
Merge pull request #29532 from ifreund/liquid-consumption
ZhilkinSerg Apr 13, 2019
cdd45d9
Merge pull request #29530 from zombiethoughts/Lint-13/04/1019a
ZhilkinSerg Apr 13, 2019
2713c05
Merge pull request #29493 from cburns2017/ambient_sound_control
ZhilkinSerg Apr 13, 2019
38a2ebc
Merge pull request #29524 from ifreund/shrooms
ZhilkinSerg Apr 13, 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
135 changes: 50 additions & 85 deletions data/mods/FictonalWeapons/fic_item_groups.json
Original file line number Diff line number Diff line change
@@ -1,87 +1,52 @@
[
{
"type": "item_group",
"id": "rare",
"items": [
["ficrico", 3],
["gunsword", 3],
["gunknife", 4],
["50pistol", 2],
["m1911ds", 2]
]
},
{
"type": "item_group",
"id": "mags_smg_rare",
"items": [
[ "e1776mag", 10 ]
]
},
{
"type" : "item_group",
"id" : "guns_pistol_rare",
"items":[
[ "boomlighter", 2 ],
["ficrico", 2],
["gunsword", 2],
["gunknife", 2],
["50pistol", 2],
["m1911ds", 2]
]
},
{
"type" : "item_group",
"id" : "guns_rifle_rare",
"items":[
["arccan", 5]
]
},
{
"type" : "item_group",
"id" : "guns_smg_rare",
"items":[
[ "e1776", 2 ],
["hk_mp5eod", 2],
["light_carb", 4]
]
},
{
"type" : "item_group",
"id" : "cop_armory",
"items":[
["arccan", 5],
["light_carb", 5]
]
},
{
"type" : "item_group",
"id" : "prison_weapons",
"items":[
["light_carb", 5]
]
},
{
"type" : "item_group",
"id" : "cop_weapons",
"items":[
["arccan", 5],
["light_carb", 5]
]
},
{
"type" : "item_group",
"id" : "military",
"items":[
["emas", 5],
["m1911ds", 3]
]
},
{
"type" : "item_group",
"id" : "gunmod_rare",
"items":[
["emas", 5],
["retool_flaregun",7]
]
}
{
"type": "item_group",
"id": "rare",
"items": [ [ "ficrico", 3 ], [ "gunsword", 3 ], [ "gunknife", 4 ], [ "50pistol", 2 ], [ "m1911ds", 2 ] ]
},
{
"type": "item_group",
"id": "mags_smg_rare",
"items": [ [ "e1776mag", 10 ] ]
},
{
"type": "item_group",
"id": "guns_pistol_rare",
"items": [ [ "boomlighter", 2 ], [ "ficrico", 2 ], [ "gunsword", 2 ], [ "gunknife", 2 ], [ "50pistol", 2 ], [ "m1911ds", 2 ] ]
},
{
"type": "item_group",
"id": "guns_rifle_rare",
"items": [ [ "arccan", 5 ] ]
},
{
"type": "item_group",
"id": "guns_smg_rare",
"items": [ [ "e1776", 2 ], [ "hk_mp5eod", 2 ], [ "light_carb", 4 ] ]
},
{
"type": "item_group",
"id": "cop_armory",
"items": [ [ "arccan", 5 ], [ "light_carb", 5 ] ]
},
{
"type": "item_group",
"id": "prison_weapons",
"items": [ [ "light_carb", 5 ] ]
},
{
"type": "item_group",
"id": "cop_weapons",
"items": [ [ "arccan", 5 ], [ "light_carb", 5 ] ]
},
{
"type": "item_group",
"id": "military",
"items": [ [ "emas", 5 ], [ "m1911ds", 3 ] ]
},
{
"type": "item_group",
"id": "gunmod_rare",
"items": [ [ "emas", 5 ], [ "retool_flaregun", 7 ] ]
}
]
126 changes: 63 additions & 63 deletions data/mods/FictonalWeapons/fic_mods.json
Original file line number Diff line number Diff line change
@@ -1,66 +1,66 @@
[
{
"id":"retool_flaregun",
"type": "GUNMOD",
"symbol": ":",
"color": "green",
"name":"Flaregun conversion kit",
"description":"Replacing several key parts flaregun to convert it to a .40 firearm. The conversion results in reduced accuracy and increased recoil.",
"location": "accessories",
"price": 48000,
"material": "steel",
"weight": 226,
"volume": 1,
"bashing": 3,
"to_hit": -1,
"dispersion_modifier": 30,
"ammo_modifier": "40",
"min_skills": [ [ "gun", 2 ] ],
"mod_targets": ["pistol"],
"acceptable_ammo": ["signal_flare"]
{
"id": "retool_flaregun",
"type": "GUNMOD",
"symbol": ":",
"color": "green",
"name": "Flaregun conversion kit",
"description": "Replacing several key parts flaregun to convert it to a .40 firearm. The conversion results in reduced accuracy and increased recoil.",
"location": "accessories",
"price": 48000,
"material": "steel",
"weight": 226,
"volume": 1,
"bashing": 3,
"to_hit": -1,
"dispersion_modifier": 30,
"ammo_modifier": "40",
"min_skills": [ [ "gun", 2 ] ],
"mod_targets": [ "pistol" ],
"acceptable_ammo": [ "signal_flare" ]
},
{
"id": "boom_flamer",
"type": "GUNMOD",
"name": "integral flamethrower",
"description": "This genuine Herostratus flamethrower is ideal for light brush clearing and self-defense.",
"weight": 1500,
"volume": 3,
"price": 100000,
"material": [ "steel", "ceramic" ],
"symbol": ":",
"color": "light_gray",
"location": "underbarrel",
"mod_targets": [ "pistol", "smg" ],
"gun_data": {
"ammo": "flammable",
"skill": "launcher",
"dispersion": 320,
"durability": 10,
"clip_size": 300,
"flags": [ "FIRE_50" ]
},
{
"id": "boom_flamer",
"type": "GUNMOD",
"name": "integral flamethrower",
"description": "This genuine Herostratus flamethrower is ideal for light brush clearing and self-defense.",
"weight": 1500,
"volume": 3,
"price": 100000,
"material": [ "steel", "ceramic" ],
"symbol": ":",
"color": "light_gray",
"location": "underbarrel",
"mod_targets": [ "pistol", "smg" ],
"gun_data": {
"ammo": "flammable",
"skill": "launcher",
"dispersion": 320,
"durability": 10,
"clip_size": 300,
"flags": [ "FIRE_50" ]
},
"dispersion_modifier": 25,
"min_skills": [ [ "weapon", 2 ], [ "launcher", 2 ] ]
},
{
"type" : "GUNMOD",
"id" : "emas",
"name" : "E.M.A.S.",
"dispersion_modifier" : 45,
"damage_modifier" : 4,
"description" : "ElectroMagnetic Acceleration System is an array of electromagnets attached to the front of the barrel, accelerating any projectile fired to even higher velocities, increasing damage, recoil and reducing accuracy. It does however drain UPS charges when firing and due to extensive modifications the gun can no longer operate without a UPS.",
"location": "barrel",
"weight" : 450,
"color" : "light_gray",
"symbol" : ":",
"material" : ["steel"],
"mod_targets" : ["smg", "rifle", "shotgun", "pistol"],
"volume" : 2,
"bashing" : 5,
"handling_modifier" : -5,
"price" : 20000,
"min_skills": [ [ "gun", 5 ] ],
"ups_charges": 5
}
"dispersion_modifier": 25,
"min_skills": [ [ "weapon", 2 ], [ "launcher", 2 ] ]
},
{
"type": "GUNMOD",
"id": "emas",
"name": "E.M.A.S.",
"dispersion_modifier": 45,
"damage_modifier": 4,
"description": "ElectroMagnetic Acceleration System is an array of electromagnets attached to the front of the barrel, accelerating any projectile fired to even higher velocities, increasing damage, recoil and reducing accuracy. It does however drain UPS charges when firing and due to extensive modifications the gun can no longer operate without a UPS.",
"location": "barrel",
"weight": 450,
"color": "light_gray",
"symbol": ":",
"material": [ "steel" ],
"mod_targets": [ "smg", "rifle", "shotgun", "pistol" ],
"volume": 2,
"bashing": 5,
"handling_modifier": -5,
"price": 20000,
"min_skills": [ [ "gun", 5 ] ],
"ups_charges": 5
}
]
26 changes: 5 additions & 21 deletions data/mods/FictonalWeapons/fic_recipes.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"result": "m1911ds",
"type" : "recipe",
"type": "recipe",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_RANGED",
"skill_used": "fabrication",
@@ -10,26 +10,10 @@
"time": 12000,
"autolearn": true,
"tools": [
[ ["mold_plastic", -1] ],
[
[ "welder", 70 ],
[ "welder_crude", 100 ],
[ "soldering_iron", 100 ],
[ "toolset", 100 ]
]
[ [ "mold_plastic", -1 ] ],
[ [ "welder", 70 ], [ "welder_crude", 100 ], [ "soldering_iron", 100 ], [ "toolset", 100 ] ]
],
"qualities": [
{ "id": "SAW_M_FINE", "level": 1 },
{ "id": "SCREW_FINE", "level": 1 }
],
"components": [
[ ["m1911", 1] ],
[ ["gun_crossbow", 1] ],
[ ["plastic_chunk", 4] ],
[
[ "steel_chunk", 2 ],
[ "scrap", 6 ]
]
]
"qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ],
"components": [ [ [ "m1911", 1 ] ], [ [ "gun_crossbow", 1 ] ], [ [ "plastic_chunk", 4 ] ], [ [ "steel_chunk", 2 ], [ "scrap", 6 ] ] ]
}
]
Loading