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 #14

Merged
merged 969 commits into from
Feb 3, 2019
Merged
Changes from 4 commits
Commits
Show all changes
969 commits
Select commit Hold shift + click to select a range
96c2044
Update cop_3.json
I-am-Erk Jan 22, 2019
f902f00
Make SDL_version.h non-private
jbytheway Jan 22, 2019
e8ff5a1
Update evacuee_1.json
I-am-Erk Jan 22, 2019
7be83df
Merge pull request #27537 from I-am-Erk/patch-11
ZhilkinSerg Jan 22, 2019
556a7c3
Merge pull request #27766 from I-am-Erk/npc-gradstudent
ZhilkinSerg Jan 22, 2019
ca89f03
Merge pull request #27765 from I-am-Erk/npc-criminal
ZhilkinSerg Jan 22, 2019
fae9fba
Merge pull request #27727 from mlangsdorf/npc_shout_sleep
ZhilkinSerg Jan 22, 2019
8abae01
Merge pull request #27762 from prestidigitation/mutations-json-typos
ZhilkinSerg Jan 22, 2019
66ea2e7
Merge pull request #27767 from ralreegorganon/region-map-flag-whiteli…
ZhilkinSerg Jan 22, 2019
bbb58a7
Merge pull request #27709 from Treah/colorised_notes
ZhilkinSerg Jan 22, 2019
837627a
Merge pull request #27739 from ACCount12/patch-1
ZhilkinSerg Jan 22, 2019
9720ee5
Update evacuee_3.json
I-am-Erk Jan 22, 2019
97bf6d3
Update evacuee_3.json
I-am-Erk Jan 22, 2019
e4cfba7
New Flag : HIDE_PLACE (#27620)
Fris0uman Jan 22, 2019
ab702bc
Merge pull request #27734 from mlangsdorf/npctalk_misc_json
ZhilkinSerg Jan 22, 2019
28eb762
Merge pull request #27736 from kevingranade/460-magazine-mag-fix
ZhilkinSerg Jan 22, 2019
7a511c3
Merge pull request #27756 from hyper2snyper/mp5sd
ZhilkinSerg Jan 22, 2019
947e30c
Merge pull request #27769 from kevingranade/prevent-monster-npc-colli…
ZhilkinSerg Jan 22, 2019
7151c04
Merge pull request #27771 from darktoes/Minor-QOL
ZhilkinSerg Jan 22, 2019
911f310
Bring back smiley while driving (#27775)
nsklaus Jan 22, 2019
d07e1e4
Merge pull request #27785 from jbytheway/iwyu_vs_fixes
ZhilkinSerg Jan 22, 2019
3e21d66
Merge pull request #27788 from jbytheway/iwyu_release_fixes
ZhilkinSerg Jan 22, 2019
1b60a01
Merge pull request #27781 from KorGgenT/vitamin-rate-fix
ZhilkinSerg Jan 22, 2019
caa0f1c
Linted files from DinoMod
ZhilkinSerg Jan 22, 2019
9a010a0
Linted files from alt_map_key
ZhilkinSerg Jan 22, 2019
299197a
Patches the mp5sd to make it more realistic.
hyper2snyper Jan 23, 2019
38b13dd
more patches
hyper2snyper Jan 23, 2019
1915b1a
Merge pull request #27794 from hyper2snyper/fixmp5sd
Rivet-the-Zombie Jan 23, 2019
1c7e2cb
Address a use-after-erase in zone deserialization error handling
kevingranade Jan 23, 2019
56bbae8
Only find zones on same z-level.
ifreund Jan 23, 2019
65dacce
Merge remote-tracking branch 'upstream/master'
I-am-Erk Jan 23, 2019
48dcbfc
Revert "Merge pull request #6 from CleverRaven/master"
I-am-Erk Jan 23, 2019
b80432b
Fix type
kevingranade Jan 23, 2019
43f1f2b
More SDL mappings
jbytheway Jan 23, 2019
a5bf38f
Update dev tooling docs
jbytheway Jan 23, 2019
50bd125
Fix missing include in posix_time.cpp
jbytheway Jan 23, 2019
defba3c
Update nuts.json
hyper2snyper Jan 23, 2019
8740acf
Merge pull request #27811 from jbytheway/missing_cerrno_include
ZhilkinSerg Jan 23, 2019
5a71779
Merge pull request #27810 from jbytheway/iwyu_sdl_fixes
ZhilkinSerg Jan 23, 2019
8e71a4e
Merge pull request #27806 from ifreund/zone-z-levels
ZhilkinSerg Jan 23, 2019
eec7977
Merge pull request #27812 from hyper2snyper/NutFix
ZhilkinSerg Jan 23, 2019
2e14661
Fix player lighting walls at night
jbytheway Jan 23, 2019
be8f6ce
Vision test for player lighting at night
jbytheway Jan 23, 2019
e52615d
Remove coreutils from travis-ci homebrew list
ralreegorganon Jan 23, 2019
17e54d2
Revert "Revert "Merge pull request #6 from CleverRaven/master""
I-am-Erk Jan 24, 2019
d9a03c7
Merge remote-tracking branch 'upstream/master'
I-am-Erk Jan 24, 2019
475301c
Food results nutrition (#27252)
KorGgenT Jan 24, 2019
3d707cd
Recipe Rebalance (#27542)
KorGgenT Jan 24, 2019
be1b069
Fixed check of option prerequisites (#27735)
ZhilkinSerg Jan 24, 2019
e64e832
Wind direction generation / tweaks of windpower (#27772)
Jan 24, 2019
82d1363
Mutations - generic_factory (#27774)
Kelenius Jan 24, 2019
72c428c
Make route_adjacent non-static (#27798)
prutschman Jan 24, 2019
ca7031a
Fix morale decay check frequency (#27803)
Jan 24, 2019
9572152
Merge pull request #27814 from jbytheway/night_light_sources
kevingranade Jan 24, 2019
e089877
Create activity for control laptop (#27816)
ifreund Jan 24, 2019
71ef81f
Merge pull request #27783 from I-am-Erk/npc_cop_3
Rivet-the-Zombie Jan 24, 2019
096dabd
Astyle weather_gen (#27822)
Jan 24, 2019
b872857
Add reactir flag to vehicle part bitfield.
kevingranade Jan 24, 2019
de1c45c
Optimize inbounds checks.
kevingranade Jan 24, 2019
19b6183
Fix crash when stacking items
GoLoT Jan 24, 2019
fbc4ca0
made cockroach nymph less aggressive
Jan 24, 2019
434d331
reverted melee-cut
Jan 24, 2019
820fef5
fixed weather reader windchill display
Jan 24, 2019
40966af
Update src/map.cpp
ZhilkinSerg Jan 24, 2019
327fea8
Merge pull request #27833 from davidpwbrown/weather_reader_fix
ZhilkinSerg Jan 24, 2019
06ff7da
Merge pull request #27828 from GoLoT/componentstacking_tempfix
ZhilkinSerg Jan 24, 2019
e90b1ed
Merge pull request #27805 from CleverRaven/kevingranade-fix-use-after…
ZhilkinSerg Jan 24, 2019
a8f1cdf
Merge pull request #27825 from kevingranade/optimize-inbounds
ZhilkinSerg Jan 24, 2019
0525397
Merge pull request #27829 from davidpwbrown/nymph_fix
ZhilkinSerg Jan 24, 2019
d9b52e7
Fixed graphic options check
ZhilkinSerg Jan 24, 2019
05e443d
Additional guards in draw_benchmark debug function
ZhilkinSerg Jan 24, 2019
7b14660
added terrain blocking to wind turbine and upped its power
Jan 24, 2019
20079e8
removed test code
Jan 24, 2019
44a0c97
removd more redundant code
Jan 24, 2019
4ec2616
changed comment
Jan 24, 2019
796eb3d
removed include
Jan 24, 2019
6a6570e
add skinning butchery action
KorGgenT Jan 25, 2019
8dfe1a9
if already skinned, won't drop additional skins.
KorGgenT Jan 25, 2019
28c87d1
Merge pull request #27840 from ZhilkinSerg/android-graphics-options
kevingranade Jan 25, 2019
6a8e1f9
minor recipe tweaks
KorGgenT Jan 24, 2019
3177adb
minor recipe tweaks
KorGgenT Jan 24, 2019
ca13842
Added stab damage to sojutsu
Hymore246 Jan 24, 2019
6c3cbcd
Added stab damage to sojutsu
Hymore246 Jan 24, 2019
f286ca0
Fix looks_like for memorized tiles
jbytheway Jan 24, 2019
f81e175
Merge pull request #27787 from I-am-Erk/npc-evacuee1-time
Rivet-the-Zombie Jan 25, 2019
b58b1f2
Merge remote-tracking branch 'origin/pr/27849' into 0.D-branch
kevingranade Jan 25, 2019
dd3cfb2
Disallow pseudo items in crafting component selection
ifreund Jan 25, 2019
ef24fa6
Fix looks_like for memorized tiles
jbytheway Jan 24, 2019
c2b20ef
Merge pull request #27849 from KorGgenT/skinning
kevingranade Jan 25, 2019
1aeee0e
Disallow pseudo items in crafting component selection
ifreund Jan 25, 2019
1c1d7bf
Add (failing) map bounds checking test
kevingranade Jan 25, 2019
407494e
Apply virtual tag to map::inbounds so tinymap can override it
kevingranade Jan 25, 2019
7ea5c49
Restore previous bounds for tinymaps.
kevingranade Jan 25, 2019
2eba6a2
Fix recipe output portions for junkfood.json entries
Jan 25, 2019
c831b9e
Rename hot dog cooked, uncooked to be singular
Jan 25, 2019
a561917
Move number of charges for corrected junkfood portions into recipes
Jan 25, 2019
9007d16
Add missing i18n on sidebar
BrettDong Jan 25, 2019
1c793b9
Routine i18n updates as of Jan 25, 2019 based on master branch
BrettDong Jan 25, 2019
beb5d09
Merge pull request #27853 from kevingranade/fix-inbounds-override
ZhilkinSerg Jan 25, 2019
95f66e3
Merge pull request #27860 from BrettDong/i18n-fix
ZhilkinSerg Jan 25, 2019
5a18119
Merge pull request #27861 from BrettDong/i18n-master
ZhilkinSerg Jan 25, 2019
44abf4a
Fix spelling of 'acquire'
reinerh Jan 25, 2019
857bd71
Fix spelling of 'acquire'
reinerh Jan 25, 2019
69e5ca3
Update RetroDays - Buildings, bionics
halfahermit Jan 24, 2019
ec0e3ee
Unguard variable declaration
ZhilkinSerg Jan 25, 2019
516c1f0
Only setup prompt for prying tool if it will actually be displayed
ThinkInvis Jan 25, 2019
42eeab0
Make map deconstructor virtual
ifreund Jan 25, 2019
293e103
Quick fix for map memory crash when drawing a destroyed vehicle tile
GoLoT Jan 25, 2019
07d6219
fix(butcher): fix "cut up everything" message for low morale
Insineer Jan 26, 2019
5c4dcac
Merge branch '0.D-branch'
kevingranade Jan 26, 2019
72e801b
Special bionic installation messages for Prototype mutants and masoch…
Firestorm01X2 Jan 26, 2019
1391c34
Increase duration of most morale effects
rselias Jan 26, 2019
ca3a26e
JSONizing CBM slot feature (#27780)
Firestorm01X2 Jan 26, 2019
3bb94ce
Boost vehicle interior heating.
DeltaEpsilon7787 Jan 24, 2019
34cad8d
Boost vehicle interior heating.
DeltaEpsilon7787 Jan 24, 2019
da0d8a3
added terrain blocking to wind turbine and upped its power
Jan 24, 2019
0d7b11a
added terrain blocking to wind turbine and upped its power
Jan 24, 2019
2c2b384
Moved windgen variables to region json (#27848)
Jan 26, 2019
ff845a0
npctalk: move NPC needs to JSON (#27858)
mlangsdorf Jan 26, 2019
5da8e39
zombie dance dance coach instructor 3k
Jan 20, 2019
3c087f8
Update main.cpp header comment
jbytheway Jan 26, 2019
5cd6b13
npctalk: NPC AI follower rules to JSON
mlangsdorf Jan 25, 2019
abbaad3
Disable starting_items test on Clang ASan CI
jbytheway Jan 26, 2019
4aded44
Deduplicate divide_round_up functions
jbytheway Jan 26, 2019
38ee48b
Bind '?' to open_keybindings by default
jbytheway Jan 26, 2019
9dbc892
Fix Medieval Stuff martial style traits
ifreund Jan 26, 2019
e73e57c
Merge pull request #27894 from jbytheway/unnecessary_comment
Rivet-the-Zombie Jan 26, 2019
3c8c40c
Add pry 1 to toolbox
ifreund Jan 27, 2019
a9341fb
Merge pull request #27914 from ifreund/toolbox-add-pry
Rivet-the-Zombie Jan 27, 2019
abcfbdb
Merge pull request #27909 from jbytheway/divide_round_up_dedupe
ZhilkinSerg Jan 27, 2019
7142526
Merge pull request #27904 from jbytheway/disable_starting_items_test_…
ZhilkinSerg Jan 27, 2019
b3d915b
Merge pull request #27846 from davidpwbrown/turbine_forest_wind
ZhilkinSerg Jan 27, 2019
fa8ccb2
Merge pull request #27857 from prestidigitation/fix-food-recipe-portions
ZhilkinSerg Jan 27, 2019
7e78b20
Merge pull request #27859 from mlangsdorf/npctalk_ally_rules
ZhilkinSerg Jan 27, 2019
981f9c8
Add pry one to items containg hammers
ifreund Jan 27, 2019
f64c567
Serialize recipe charges
ifreund Jan 27, 2019
6a0277e
npctalk: move almost all dialogue into JSON
mlangsdorf Jan 25, 2019
b40866e
Add missing i18n on sidebar
BrettDong Jan 25, 2019
1fd7cb8
Fix recipe output portions for junkfood.json entries
Jan 25, 2019
62b3e14
Rename hot dog cooked, uncooked to be singular
Jan 25, 2019
0684bde
Move number of charges for corrected junkfood portions into recipes
Jan 25, 2019
af625fc
npc: fix NPC followers not closing doors
mlangsdorf Jan 27, 2019
8675561
Fixing minor typo in sewer gator description
MetroidHunter Jan 28, 2019
d969df7
Fix some typos
Cyrano7 Jan 28, 2019
34508ce
Trim some more spaces
Cyrano7 Jan 28, 2019
df42daf
Adjust bio_tools description to the real features
l29ah Jan 27, 2019
27f5f2d
Fix change to NPC train persuade chance
mscarter Jan 28, 2019
2dd2bc1
Merge pull request #27933 from MetroidHunter/bugfix/fix_minor_descrip…
Rivet-the-Zombie Jan 28, 2019
cd40817
Merge pull request #27940 from paroid01/fix_train_persuade
ZhilkinSerg Jan 28, 2019
9782187
Merge pull request #27936 from Cyrano7/Typos
ZhilkinSerg Jan 28, 2019
e4d4227
Merge pull request #27932 from mlangsdorf/npc_close_door_fix
ZhilkinSerg Jan 28, 2019
24f4cdd
Merge pull request #27931 from l29ah/toolset-desc
ZhilkinSerg Jan 28, 2019
4c3ee92
fix_fallback_tiles_rotation (#27930)
nsklaus Jan 28, 2019
e1e4791
Merge pull request #27918 from ifreund/add-pry-to-hammer-recipes
ZhilkinSerg Jan 28, 2019
c5477a4
Merge pull request #27920 from ifreund/serialize-recipe-charges
ZhilkinSerg Jan 28, 2019
9e8d055
Merge pull request #27906 from ifreund/fix-medieval-style-traits
ZhilkinSerg Jan 28, 2019
ccd1afc
Light eater cancels rapid metabolism (#27896)
sneeze-attack Jan 28, 2019
8efc667
Merge pull request #27910 from jbytheway/default_keybindings_keybinding
ZhilkinSerg Jan 28, 2019
c3bc827
npctalk: NPC AI follower rules to JSON
mlangsdorf Jan 25, 2019
21bb648
Fix change to NPC train persuade chance
mscarter Jan 28, 2019
d9124c5
Fix some typos
Cyrano7 Jan 28, 2019
0290729
Trim some more spaces
Cyrano7 Jan 28, 2019
5203009
npc: fix NPC followers not closing doors
mlangsdorf Jan 27, 2019
2f026bb
Adjust bio_tools description to the real features
l29ah Jan 27, 2019
e28b5bc
fix_fallback_tiles_rotation
Jan 27, 2019
8d49ad6
Serialize recipe charges
ifreund Jan 27, 2019
e827405
Add pry one to items containg hammers
ifreund Jan 27, 2019
846ecdc
Fix Medieval Stuff martial style traits
ifreund Jan 26, 2019
15b6acd
Light eater cancels rapid metabolism
sneeze-attack Jan 26, 2019
5ea2e59
Bind '?' to open_keybindings by default
jbytheway Jan 26, 2019
9294d34
Rapid metabolism made purifiable
sneeze-attack Jan 28, 2019
efdbc7d
Lint ammo json
ifreund Jan 28, 2019
e02117f
Merge pull request #27951 from ifreund/lint-ammo
ZhilkinSerg Jan 28, 2019
77d5cf2
Merge pull request #27901 from mlangsdorf/npctalk_ally_to_json
ZhilkinSerg Jan 28, 2019
4a0bc2d
Merge pull request #27890 from rselias/morale_balance
ZhilkinSerg Jan 28, 2019
ae0d1a8
Fix crafting resumption
jbytheway Jan 26, 2019
076ce95
Add test for resuming interrupted crafts
jbytheway Jan 26, 2019
19183d1
fix power value placement
Jan 26, 2019
19d38d7
Changed Inanition to a more general commonly understood term.
Treah Jan 24, 2019
bac0975
Reorder item variables for efficient packing
OrenAudeles Jan 26, 2019
51bf7a2
Reduced lethality of tear gas to rough estimate of IRL, leaning towar…
jeremyshannon Jan 28, 2019
c66f538
Checking for wielded card when withdrawing cash from ATM
MetroidHunter Jan 28, 2019
3d2fb09
Add (failing) map bounds checking test
kevingranade Jan 25, 2019
5ae2e4b
Apply virtual tag to map::inbounds so tinymap can override it
kevingranade Jan 25, 2019
c80dcde
Restore previous bounds for tinymaps.
kevingranade Jan 25, 2019
3dd53d2
Increase duration of most morale effects
rselias Jan 26, 2019
6c27147
JSONizing CBM slot feature (#27780)
Firestorm01X2 Jan 26, 2019
ff2d308
npctalk: move NPC needs to JSON (#27858)
mlangsdorf Jan 26, 2019
a29a4b3
Support nested color tags
jbytheway Jan 25, 2019
1c46208
Fixing position of morale and power on skinny siderbar
MetroidHunter Jan 29, 2019
51ee54e
Merge branch '0.D-branch'
kevingranade Jan 29, 2019
bccc1e8
Merge branch 'master' into bugfix/CDDA-27927_fix_morale_horizontal_in…
MetroidHunter Jan 29, 2019
88c8f68
Merge pull request #27946 from sneeze-attack/rapmet_update
Rivet-the-Zombie Jan 29, 2019
6a60e93
Make dollchat items display their speech lines again
hbnix Jan 29, 2019
dbacaa6
Adding const correctness for morale horizontal bool
MetroidHunter Jan 29, 2019
013d478
Merge branch 'bugfix/CDDA-27927_fix_morale_horizontal_interface' of g…
MetroidHunter Jan 29, 2019
9d763b0
Add lab gates
sneeze-attack Jan 29, 2019
bdb7d16
Add lab-specific terrain
sneeze-attack Jan 29, 2019
91e61c3
Switch to lab terrain
sneeze-attack Jan 29, 2019
945b08d
Add lab terrain
sneeze-attack Jan 29, 2019
57f0ab6
RetroAscii tileset - cleanup, update, lint
halfahermit Jan 30, 2019
8a43072
Update gfx/RetroASCIITileset/tile_config.json
halfahermit Jan 30, 2019
cb05f0e
Merge remote-tracking branch 'upstream/master'
I-am-Erk Jan 30, 2019
046b8c0
Merge pull request #27956 from MetroidHunter/bugfix/CDDA-27927_fix_mo…
Rivet-the-Zombie Jan 30, 2019
7757b62
Updating help for 0.D (#27900)
Firestorm01X2 Jan 30, 2019
5a949a1
Fixed cyan color in COLOR.md (#27969)
int-ua Jan 30, 2019
0840d8c
RetroAscii tileset - cleanup and update (#27966)
ZhilkinSerg Jan 30, 2019
7f34f29
Merge pull request #27958 from hbnix/fix_dollchat_speech_not_displaying
ZhilkinSerg Jan 30, 2019
f53995c
Merge pull request #27962 from sneeze-attack/floorfix_lab
ZhilkinSerg Jan 30, 2019
366c62d
Setting default renderer for Windows to Direct3D for 0.D (#27915)
Firestorm01X2 Jan 30, 2019
025a91d
Clear traps in test clear_map helper
jbytheway Jan 28, 2019
87f6781
Update lab_1.json
I-am-Erk Jan 30, 2019
8f29596
Fix items rotting while smoking outside of reality bubble.
ifreund Jan 26, 2019
0e56b6f
Add CSC_*_HIDDEN recipe subtab
ThinkInvis Jan 29, 2019
a4ae88a
Add check against deploying a furniture item into same tile as a vehicle
ThinkInvis Jan 30, 2019
5709ffe
Fix for Fish traits
Hymore246 Jan 30, 2019
db89b63
Overhauled default zombie drops
Night-Pryanik Jan 14, 2019
917f536
Default text color for popups
Jan 24, 2019
6f98e3b
Fixing position of morale and power on skinny siderbar
MetroidHunter Jan 29, 2019
55b47fd
Make dollchat items display their speech lines again
hbnix Jan 29, 2019
704f663
Merge branch '0.D-branch'
kevingranade Jan 31, 2019
e6e1890
Merge pull request #27987 from I-am-Erk/npc-lab1-fix
Rivet-the-Zombie Jan 31, 2019
3d633e0
Update RetroDays - Mouse mutants, mailboxes
halfahermit Jan 31, 2019
121091b
Update MSX++DeadPeopleEdition 2019-01-31
Pupsi-Mupsi Jan 31, 2019
a11526b
Fix NPC dialog around lying and succeeding mission
mscarter Jan 30, 2019
34e0d46
Display both primary and secondary recipe skill requirements as unifo…
Asmageddon Jan 30, 2019
d04eebd
Updated plastic chunk from cash cards recipe
Night-Pryanik Jan 31, 2019
028d72e
set seed to same as other weather
Jan 31, 2019
d42de03
Worker ants are brown
Jan 31, 2019
58b75cd
Charcoal smoker shouldn't hold more charcoal than its own volume
jeremyshannon Jan 31, 2019
1ef866b
Merge pull request #27996 from halfahermit/update-retrodays-mouse-mut…
Rivet-the-Zombie Feb 1, 2019
2d47130
Merge branch '0.D-branch'
kevingranade Feb 1, 2019
af61c23
Fix some more mission completion dialog bugs
mscarter Feb 1, 2019
b575483
Added Color manager mention to COLOR.md (#27991)
int-ua Feb 1, 2019
a9b8568
Clear traps in test clear_map helper (#27981)
ZhilkinSerg Feb 1, 2019
3933b6a
Refactor advanced inventory item movement to use activities
ifreund Jan 23, 2019
7a1b2cc
Remove unused functions.
ifreund Feb 1, 2019
f184723
Tests that recipes output kcal within a certain bound, based on the d…
KorGgenT Jan 27, 2019
a7c2321
Added small time cost for harvesting flowers
Night-Pryanik Jan 30, 2019
1c17840
Adds check_empty to pillow fort recipe to avoid building under vehicle
Jan 31, 2019
9b11e70
Don't play indoors rain sound when outdoors.
mark7 Feb 1, 2019
4562506
make laundry baskets craftable & fixes #27478
mount2010 Feb 1, 2019
7bbaecb
Merge branch '0.D-branch'
kevingranade Feb 2, 2019
37a8bcd
Merge pull request #27999 from Pupsi-Mupsi/Pupsi-Mupsi-dpup
Rivet-the-Zombie Feb 2, 2019
0a3fc3b
Adds a reading light
Feb 1, 2019
18aa0e9
Resuming resumable activities on cancel. No longer adding redundant d…
MetroidHunter Feb 2, 2019
12fcfd7
Harvest items to inventory
Hirmuolio Feb 2, 2019
1a53b8d
Successfully cracking the safe turns it into unlocked, closed variant
Night-Pryanik Feb 2, 2019
0f1d6c1
Merge branch '0.D-branch'
kevingranade Feb 3, 2019
4feabd3
Merge pull request #27972 from paroid01/fix_json_talks
Rivet-the-Zombie Feb 3, 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
6 changes: 3 additions & 3 deletions data/json/items/comestibles/junkfood.json
Original file line number Diff line number Diff line change
@@ -1099,7 +1099,7 @@
{
"type": "COMESTIBLE",
"id": "hotdogs_frozen",
"name": "uncooked hot dogs",
"name": "uncooked hot dog",
"name_plural": "uncooked hot dogs",
"weight": 43,
"color": "red",
@@ -1133,7 +1133,7 @@
{
"type": "COMESTIBLE",
"id": "hotdogs_cooked",
"name": "cooked hot dogs",
"name": "cooked hot dog",
"name_plural": "cooked hot dogs",
"weight": 383,
"color": "red",
@@ -1149,7 +1149,7 @@
"volume": 2,
"flags": [ "EATEN_HOT" ],
"fun": 12,
"vitmins": [ [ "vitC", 20 ], [ "calcium", 5 ], [ "iron", 3 ] ],
"vitamins": [ [ "vitC", 20 ], [ "calcium", 5 ], [ "iron", 3 ] ],
"rot_spawn": "GROUP_CARRION",
"rot_spawn_chance": 15
},
13 changes: 8 additions & 5 deletions data/json/recipes/recipe_food.json
Original file line number Diff line number Diff line change
@@ -3741,7 +3741,7 @@
"difficulty": 1,
"time": 2000,
"autolearn": true,
"qualities": [ { "id": "COOK", "level": 1, "amount": 1 } ],
"qualities": [ { "id": "COOK", "level": 1 } ],
"tools": [ [ [ "surface_heat", 2, "LIST" ] ] ],
"components": [ [ [ "grahmcrackers", 1 ] ], [ [ "marshmallow", 1 ] ], [ [ "chocolate", 1 ] ] ]
},
@@ -5182,9 +5182,10 @@
"subcategory": "CSC_FOOD_MEAT",
"skill_used": "cooking",
"time": 1000,
"charges": 1,
"autolearn": true,
"batch_time_factors": [ 67, 5 ],
"qualities": [ { "id": "COOK", "level": 1, "amount": 1 } ],
"qualities": [ { "id": "COOK", "level": 1 } ],
"tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
"components": [ [ [ "hotdogs_frozen", 1 ] ] ]
},
@@ -5334,7 +5335,8 @@
"subcategory": "CSC_FOOD_MEAT",
"skill_used": "cooking",
"difficulty": 2,
"time": 3500,
"time": 1750,
"charges": 1,
"autolearn": true,
"qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ],
"tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
@@ -5520,10 +5522,11 @@
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_SNACK",
"skill_used": "cooking",
"time": 5000,
"time": 2500,
"charges": 1,
"autolearn": true,
"tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
"components": [ [ [ "toasterpastryfrozen", 2 ] ] ]
"components": [ [ [ "toasterpastryfrozen", 1 ] ] ]
},
{
"type": "recipe",