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 pull request CleverRaven#37829 from BevapDin/bor #76

Merged
merged 60 commits into from
Feb 8, 2020
Merged
Changes from 2 commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
f90d05e
looks_like fields
I-am-Erk Feb 4, 2020
af493d6
Update house_wooded.json
curstwist Feb 6, 2020
3beed9a
Remove Circus Strongman
Xanmyral Feb 7, 2020
b9a79d3
Prevent broken legs dropping weapon
Ramza13 Feb 7, 2020
73da9d2
Add new map::has_nearby_table function
wapcaplet Feb 7, 2020
f4d6648
Use map::has_nearby_table for eating/butchering
wapcaplet Feb 7, 2020
d54f2fb
Add debug menu item for spawning nested mapgen
ralreegorganon Feb 6, 2020
8acd318
Name to object, leave the s
snipercup Feb 7, 2020
ebb4e4c
Name to object, flags to array
snipercup Feb 7, 2020
f52c2de
Name to object, fix looks_like
snipercup Feb 7, 2020
6c48955
Name to object, flags to array
snipercup Feb 7, 2020
70de8fa
Name to object
snipercup Feb 7, 2020
2cd4312
Name to object
snipercup Feb 7, 2020
016623e
Name to object
snipercup Feb 7, 2020
b3bc95d
Name to object, volume to string
snipercup Feb 7, 2020
f7c0472
Name to object
snipercup Feb 7, 2020
4dc5b81
Name to object
snipercup Feb 7, 2020
e2cf75c
Merge pull request #37792 from snipercup/Tool-name-to-object-leave-the-s
ZhilkinSerg Feb 7, 2020
999937b
Merge pull request #37793 from snipercup/Comestible-modern-json
ZhilkinSerg Feb 7, 2020
cb6e55e
Gun name to object (#37795)
snipercup Feb 7, 2020
5304aa1
Armor name to object (#37796)
ZhilkinSerg Feb 7, 2020
7106502
Merge pull request #37797 from snipercup/ammo-modern-json
ZhilkinSerg Feb 7, 2020
f4f0434
Generic modern json (#37799)
snipercup Feb 7, 2020
f24a046
Merge pull request #37790 from wapcaplet/wapcaplet-has-table-nearby
ZhilkinSerg Feb 7, 2020
a4cf065
Merge pull request #37788 from ralreegorganon/nested-mapgen-debug
ZhilkinSerg Feb 7, 2020
3e4a4ea
Merge pull request #37780 from curstwist/house-stair-fix
ZhilkinSerg Feb 7, 2020
7ad7c3d
Allow using short cordage pieces to craft candles (#37777)
l29ah Feb 7, 2020
3569c49
Merge pull request #37786 from Ramza13/dropping
ZhilkinSerg Feb 7, 2020
9aa7645
Check if entire pane is liquid items before allowing moving all in AI…
Feb 7, 2020
8340fba
Skimming through book's contents won't show skill increasing indicator
Night-Pryanik Feb 7, 2020
09073af
Remove DROPS_AMMO from firefighter bot
CSHague Feb 7, 2020
3000130
Routine i18n updates on 7 Feb 2020
BrettDong Feb 7, 2020
6f354d1
Migrate direct item spawns
ifreund Feb 7, 2020
dc49cec
Always prompt for direction if autoselect disabled
ifreund Feb 7, 2020
839babb
Merge pull request #37802 from BrettDong/i18n
ZhilkinSerg Feb 7, 2020
8f085f4
Merge pull request #37801 from CSHague/patch-6
ZhilkinSerg Feb 7, 2020
ff590a0
Rename bodypart name variables to better explain their functions
Qrox Feb 7, 2020
8ebd79c
Migrate bodypart names to class translation
Qrox Feb 7, 2020
eeee409
Update TRANSLATING.md and extract_json_strings.py
Qrox Feb 7, 2020
e7271b0
Merge pull request #37803 from ifreund/migrate-direct-item-spawn
ZhilkinSerg Feb 7, 2020
73ddf8e
aim_mv to int
Kilvoctu Feb 7, 2020
5885a7e
Fix typo
olanti-p Feb 7, 2020
5079712
Merge pull request #37814 from olanti-p/pseuso-typo-fix
ZhilkinSerg Feb 7, 2020
63798be
Merge pull request #37807 from Qrox/bodypart-names
ZhilkinSerg Feb 7, 2020
073e2dc
Merge pull request #37805 from ifreund/tweak-direction-prompt
ZhilkinSerg Feb 7, 2020
543a969
Merge pull request #37800 from Night-Pryanik/skimming-book-doesn't-sh…
ZhilkinSerg Feb 7, 2020
09de9e8
Merge pull request #37783 from Xanmyral/Remove-Circus-Strong
ZhilkinSerg Feb 7, 2020
d31cd4a
Display appropriate item values with less precision (#37812)
Kilvoctu Feb 7, 2020
8e990f5
Increase body bag storage capacity (#37723)
Alterforce Feb 7, 2020
c398d45
Update tileset compose colorspace handling
ralreegorganon Feb 7, 2020
5341545
Fix NPC equip message
Ramza13 Feb 8, 2020
e48836f
Added scrub brush to washing kit recipe
Feb 8, 2020
f7bc0e6
Merge pull request #37818 from ralreegorganon/tileset-compose-colorsp…
ZhilkinSerg Feb 8, 2020
cb1289a
Merge pull request #37825 from ashGlaw/Washing-Kit-Recipe-Expansion
ZhilkinSerg Feb 8, 2020
d4566de
Merge pull request #37824 from Ramza13/npc_equip_mutant
ZhilkinSerg Feb 8, 2020
0a5669c
Explosives requirements infrastructure (#37822)
Brian-Otten Feb 8, 2020
b0d1189
Merge pull request #37809 from Kilvoctu/moves-int
ZhilkinSerg Feb 8, 2020
45eb2f8
Merge pull request #37706 from I-am-Erk/field-lookslike
Rivet-the-Zombie Feb 8, 2020
7fd16fa
Fix reference to non-existing item group
BevapDin Feb 8, 2020
4a7753d
Merge pull request #37829 from BevapDin/bor
ZhilkinSerg Feb 8, 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
2 changes: 1 addition & 1 deletion data/mods/Salvaged_Robots/monsters.json
Original file line number Diff line number Diff line change
@@ -377,7 +377,7 @@
"ranges": [ [ 0, 5, "BURST" ] ]
}
],
"extend": { "flags": [ "FIREPROOF", "BASHES", "DROPS_AMMO" ] }
"extend": { "flags": [ "FIREPROOF", "BASHES" ] }
},
{
"id": "mon_utilibot_blob",