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

Update latest codes #6

Merged
merged 100 commits into from
Aug 27, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
8bc6b4e
.45 pistols
tenmillimaster Aug 17, 2019
969a161
item groups, mk23 size
tenmillimaster Aug 17, 2019
52e611b
fix item id
tenmillimaster Aug 17, 2019
2d76f08
grammar
tenmillimaster Aug 17, 2019
a934ca8
Added Mk23 to military spawns
tenmillimaster Aug 17, 2019
eda113d
Martial Arts Rebalance for Judo
Hymore246 Aug 21, 2019
3d57e23
astyle
Hymore246 Aug 22, 2019
fe98d61
astyle again
Hymore246 Aug 22, 2019
2c8c786
Even more astyle
Hymore246 Aug 22, 2019
e18b7a0
Update src/martialarts.cpp
Hymore246 Aug 22, 2019
943887d
Update src/melee.cpp
Hymore246 Aug 22, 2019
a78339f
yet more astyle
Hymore246 Aug 22, 2019
078a251
Merge branch 'master' into 45-military-pistols
tenmillimaster Aug 24, 2019
947a927
Cleaning up snippets.json
Kanexan Aug 24, 2019
8dc1497
Fix node name
ZhilkinSerg Aug 24, 2019
531c6a0
Added plural name for oxygen
ZhilkinSerg Aug 24, 2019
b215f78
Merge pull request #33448 from Hymore246/rebalance-judo
Rivet-the-Zombie Aug 24, 2019
37e1627
Check optional value before actually using it.
BevapDin Aug 24, 2019
7507200
Move splitting vehicle move into horizontal and vertical into map::mo…
BevapDin Aug 24, 2019
cac4f1d
Better error reporting from map::move_vehicle:
BevapDin Aug 24, 2019
7372b14
Give shoved vehicle a vertical velocity so map::move_vehicle wont com…
BevapDin Aug 24, 2019
6af2056
Martial Arts Rebalance for Karate
Hymore246 Aug 24, 2019
e6f1833
Fix "resin_cord is undefed" (#33504)
BevapDin Aug 24, 2019
aeacdc9
Check optional value before actually using it. (#33505)
ZhilkinSerg Aug 24, 2019
6e300c8
Add mission for claire isherwood npc (#33498)
curstwist Aug 24, 2019
5c7083b
Make Sweet Tooth a starting trait (#33477)
ebolite Aug 24, 2019
e1e05ce
Add survival kit (#33428)
ampersand55 Aug 24, 2019
2d04960
fix mana inefficiency (#33454)
Highmongrel Aug 24, 2019
06fcf52
Translate English MOTD to Simplified Chinese
Qrox Aug 24, 2019
d545f3c
Commas
Kanexan Aug 24, 2019
73e6ea1
Fix a spell name in Magiclysm
Qrox Aug 24, 2019
e38ea5a
Too many commas
Kanexan Aug 24, 2019
1962fae
Technique name change
Hymore246 Aug 24, 2019
7199a82
adjust spawns for mi-go
curstwist Aug 24, 2019
490ce3d
Merge pull request #33514 from Qrox/fix-scroll-name
ZhilkinSerg Aug 24, 2019
5545c5e
Merge pull request #33513 from Qrox/motd-zh-cn
ZhilkinSerg Aug 24, 2019
e442b42
CRIT Expansion update (#31090)
Soupster89 Aug 24, 2019
262ecd1
Update data/json/techniques.json
Hymore246 Aug 24, 2019
738d65a
Update data/json/techniques.json
Hymore246 Aug 24, 2019
a4763d4
Eating raw fat is dangerous
TheShadowFerret Aug 24, 2019
d8953f0
Add wooden rack furniture
anothersimulacrum Aug 24, 2019
984f345
Lint RetroDays tileset config (#33527)
anothersimulacrum Aug 25, 2019
d443c93
Update Retrodays tileset
anothersimulacrum Aug 25, 2019
d88e727
Fixes some Generic Guns errors
God-damnit-all Aug 24, 2019
e64fb89
invalidate mass when moving item from vehicle (fix #33512)
pierredavidbelanger Aug 24, 2019
10672e1
Merge pull request #33506 from BevapDin/fej
kevingranade Aug 25, 2019
e29aa34
Merge pull request #33502 from ZhilkinSerg/fix-name-plural
kevingranade Aug 25, 2019
8ea2938
Merge pull request #33501 from Kanexan/Snippets-Rework
kevingranade Aug 25, 2019
47cc8b6
Merge pull request #33449 from LaVeyanFiend/Fatparasites
Rivet-the-Zombie Aug 25, 2019
cb7ff9a
Fixes to the photo description
Qrox Aug 25, 2019
47ddfce
Merge pull request #33528 from anothersimulacrum/retrodays-update
ZhilkinSerg Aug 25, 2019
50eb071
Merge pull request #33530 from Qrox/fix-photo-desc
ZhilkinSerg Aug 25, 2019
03f943b
Merge pull request #33523 from anothersimulacrum/wooden-rack
ZhilkinSerg Aug 25, 2019
ab9996b
Fix and jsonize item dropping and trap conversion in trap-vehicle int…
Qrox Aug 25, 2019
a344a2d
Adds steel mill location (#33383)
Kanexan Aug 25, 2019
b82aa76
Add real summary regular expression (#33531)
kevingranade Aug 25, 2019
2783181
adjust spawns for mi-go (#33519)
ZhilkinSerg Aug 25, 2019
60e0ca9
Fix more translation and translation updating issues (#33433)
Qrox Aug 25, 2019
df03c09
npcs: always restock on first trading conversation
mlangsdorf Aug 25, 2019
d08476f
Added descriptions for copy-from, abstract, delete and extend
snipercup Aug 25, 2019
aca6649
fix random npcs offering static npc missions
curstwist Aug 25, 2019
20d267b
Disallow certain activities while riding (#33165)
Aug 25, 2019
579b334
add migo scout tower
curstwist Aug 25, 2019
b5fed6d
make Panaceus have the size of your thumbnail
l29ah Aug 25, 2019
6affddd
Fix Marloss Voice Random Spawning
John-Candlebury Aug 26, 2019
5d0737e
Merge pull request #33295 from tenmillimaster/45-military-pistols
Rivet-the-Zombie Aug 26, 2019
19f0f67
clang-tidy bugprone-use-after-move (#33557)
jbytheway Aug 26, 2019
badc312
Merge pull request #33549 from curstwist/add-migo-scout-tower
ZhilkinSerg Aug 26, 2019
cb6380f
Merge pull request #33541 from curstwist/fix-static-npcs-spawning-for…
ZhilkinSerg Aug 26, 2019
4162137
adjust and add missions for isherwood faction (#33537)
curstwist Aug 26, 2019
0033303
npcs: always restock on first trading conversation (#33536)
ZhilkinSerg Aug 26, 2019
2f740b6
Merge pull request #33540 from snipercup/Update-JSON_INFO.MD-add-copy…
ZhilkinSerg Aug 26, 2019
c5956b7
Fix #33486 'All furniture storage became 1000L' by reverting furnitur…
ampersand55 Aug 26, 2019
c2d51e5
Merge pull request #33552 from l29ah/panaceus-volume
ZhilkinSerg Aug 26, 2019
3fdaf32
Merge pull request #33558 from John-Candlebury/marloss-voice
ZhilkinSerg Aug 26, 2019
dbdebf7
Change all instances of 'volume' in JSONs to be a metric string II: T…
ampersand55 Aug 26, 2019
40817b3
map palette consistency
Aug 26, 2019
3d0a8b0
Practice survival when harvesting
ralreegorganon Aug 26, 2019
9636052
Remove inconspicuous trait
kevingranade Aug 26, 2019
fbe7298
Update crt_vamp_mutations.json
kevingranade Aug 26, 2019
7c7229e
Update starting_traits.json
kevingranade Aug 26, 2019
9a8ed72
Update trait_groups.json
kevingranade Aug 26, 2019
e885353
Update crt_classes.json
kevingranade Aug 26, 2019
21b9133
Update obsolete.json
kevingranade Aug 26, 2019
0ddd684
Merge pull request #33566 from davidpwbrown/palette_fix
ZhilkinSerg Aug 26, 2019
b4c8dff
Merge pull request #33572 from CleverRaven/kevingranade-remove-incons…
ZhilkinSerg Aug 26, 2019
94cfcd5
Merge pull request #33570 from ralreegorganon/practice-survival-when-…
ZhilkinSerg Aug 26, 2019
d2e35e5
Doc: move json inheritance wiki page to json inheritance.md and updat…
snipercup Aug 26, 2019
898a424
Lower the str required to move tables
l29ah Aug 26, 2019
1f09a1c
Merge pull request #33510 from Hymore246/rebalance-karate
Rivet-the-Zombie Aug 27, 2019
52d144a
NPC activity rework - farming and generic multi-activity loop (#32730)
Aug 27, 2019
873872c
Granularize Cartridge Reloading Part 1: Gotta keep em separated (#33310)
tenmillimaster Aug 27, 2019
8e5411c
Clean up homemade mags and guns (#33376)
tenmillimaster Aug 27, 2019
d8f806f
Fixed "Evolution doesnt happen with initial day set at 30 #33450". (#…
ipcyborg Aug 27, 2019
8e5b38a
Make makeshift glaive fragile.
kevingranade Aug 27, 2019
74f4c5e
Merge branch 'master' into tables-move-strength
ZhilkinSerg Aug 27, 2019
d0d3619
Add new mission/talk effect u_learn_recipe (#33574)
ralreegorganon Aug 27, 2019
408d4af
Lower the str required to move tables (#33575)
ZhilkinSerg Aug 27, 2019
4c28ab2
Merge pull request #33579 from CleverRaven/kevingranade-fragile-glaive
ZhilkinSerg Aug 27, 2019
f918a14
Change throwable extinguisher to perish after use (#33561)
artur-kink Aug 27, 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
1 change: 0 additions & 1 deletion .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ readability-*,\
-bugprone-misplaced-widening-cast,\
-bugprone-narrowing-conversions,\
-bugprone-unused-return-value,\
-bugprone-use-after-move,\
-cert-err34-c,\
-cert-flp30-c,\
-cert-msc30-c,\
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/pr-validator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ on:
pull_request:
branches:
- master

jobs:
validate:
name: Validate PR
Expand All @@ -12,4 +11,4 @@ jobs:
- name: "Validate SUMMARY"
uses: CleverRaven/pr-validator@master
with:
description-regex: '.*SUMMARY.*'
description-regex: '\n\s*`{0,3}SUMMARY: +(None|((Features|Content|Interface|Mods|Balance|Bugfixes|Performance|Infrastructure|Build|I18N) +".*"))`{0,3}\s*\n'
11 changes: 11 additions & 0 deletions data/json/construction.json
Original file line number Diff line number Diff line change
Expand Up @@ -1402,6 +1402,17 @@
"pre_special": "check_empty",
"post_terrain": "f_locker"
},
{
"type": "construction",
"description": "Build Wooden Rack",
"category": "FURN",
"required_skills": [ [ "fabrication", 1 ] ],
"time": "80 m",
"qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ] ],
"components": [ [ [ "2x4", 6 ] ], [ [ "wood_sheet", 2 ], [ "wood_panel", 4 ] ], [ [ "nail", 40 ] ] ],
"pre_special": "check_empty",
"post_terrain": "f_rack_wood"
},
{
"type": "construction",
"description": "Build Metal Rack",
Expand Down
68 changes: 34 additions & 34 deletions data/json/furniture.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"description": "Pile of various metals, bricks, and other building materials. You could clear it with a shovel.",
"color": "light_gray",
"move_cost_mod": 6,
"max_volume": "750 L",
"max_volume": 3000,
"required_str": -1,
"flags": [
"TRANSPARENT",
Expand All @@ -31,7 +31,7 @@
"symbol": "^",
"color": "dark_gray",
"move_cost_mod": 6,
"max_volume": "750 L",
"max_volume": 3000,
"required_str": -1,
"flags": [
"TRANSPARENT",
Expand All @@ -55,7 +55,7 @@
"symbol": "#",
"color": "green",
"move_cost_mod": 8,
"max_volume": "750 L",
"max_volume": 3000,
"required_str": -1,
"flags": [
"TRANSPARENT",
Expand All @@ -79,7 +79,7 @@
"symbol": "#",
"color": "cyan",
"move_cost_mod": 6,
"max_volume": "750 L",
"max_volume": 3000,
"required_str": -1,
"flags": [
"TRANSPARENT",
Expand Down Expand Up @@ -217,7 +217,7 @@
"floor_bedding_warmth": 50,
"required_str": -1,
"deconstruct": { "items": [ { "item": "withered", "count": 50 } ] },
"max_volume": "1000 L",
"max_volume": 4000,
"flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "SHORT", "EASY_DECONSTRUCT" ],
"bash": {
"str_min": 2,
Expand Down Expand Up @@ -289,9 +289,9 @@
"comfort": 1,
"floor_bedding_warmth": -1500,
"bonus_fire_warmth_feet": 1000,
"required_str": 8,
"required_str": 5,
"flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "SHORT", "CAN_SIT" ],
"max_volume": "1000 L",
"max_volume": 4000,
"deconstruct": { "items": [ { "item": "2x4", "count": 4 }, { "item": "nail", "charges": [ 6, 10 ] } ] },
"bash": {
"str_min": 12,
Expand All @@ -310,8 +310,8 @@
"color": "red",
"move_cost_mod": 2,
"coverage": 50,
"required_str": 8,
"max_volume": "1000 L",
"required_str": 5,
"max_volume": 4000,
"flags": [ "TRANSPARENT", "FLAMMABLE", "ORGANIC", "MOUNTABLE", "SHORT", "FLAT_SURF" ],
"deconstruct": {
"items": [ { "item": "2x4", "count": 4 }, { "item": "wood_panel", "count": 1 }, { "item": "nail", "charges": [ 6, 8 ] } ]
Expand Down Expand Up @@ -343,7 +343,7 @@
"required_str": 4,
"flags": [ "TRANSPARENT", "FLAMMABLE", "PLACE_ITEM", "BLOCKSDOOR", "MOUNTABLE" ],
"deconstruct": { "items": [ { "item": "nail", "charges": [ 2, 6 ] }, { "item": "2x4", "count": 2 } ] },
"max_volume": "30 L",
"max_volume": 120,
"bash": {
"str_min": 6,
"str_max": 30,
Expand Down Expand Up @@ -405,7 +405,7 @@
"move_cost_mod": 2,
"coverage": 50,
"required_str": -1,
"max_volume": "1000 L",
"max_volume": 4000,
"flags": [ "TRANSPARENT", "FLAMMABLE", "ORGANIC", "MOUNTABLE", "SHORT", "FLAT_SURF" ],
"deconstruct": {
"items": [
Expand Down Expand Up @@ -1903,7 +1903,7 @@
"coverage": 40,
"required_str": -1,
"examine_action": "kiln_empty",
"max_volume": "125 L",
"max_volume": 500,
"crafting_pseudo_item": "char_kiln",
"flags": [ "CONTAINER", "FIRE_CONTAINER", "PLACE_ITEM", "EASY_DECONSTRUCT", "MINEABLE" ],
"deconstruct": { "items": [ { "item": "rock", "count": [ 35, 40 ] } ] },
Expand Down Expand Up @@ -1947,7 +1947,7 @@
"coverage": 40,
"required_str": -1,
"examine_action": "kiln_empty",
"max_volume": "125 L",
"max_volume": 500,
"crafting_pseudo_item": "char_kiln",
"flags": [ "CONTAINER", "FIRE_CONTAINER", "PLACE_ITEM" ],
"deconstruct": { "items": [ { "item": "metal_tank", "count": [ 1, 4 ] }, { "item": "pipe", "count": [ 2, 4 ] } ] },
Expand Down Expand Up @@ -1999,7 +1999,7 @@
"coverage": 40,
"required_str": -1,
"examine_action": "arcfurnace_empty",
"max_volume": "200 L",
"max_volume": 800,
"crafting_pseudo_item": "arcfurnace",
"flags": [ "CONTAINER", "FIRE_CONTAINER", "PLACE_ITEM" ],
"deconstruct": { "items": [ { "item": "metal_tank", "count": [ 1, 4 ] }, { "item": "pipe", "count": [ 2, 4 ] } ] },
Expand Down Expand Up @@ -2466,7 +2466,7 @@
"flags": [ "PLACE_ITEM", "TRANSPARENT", "FIRE_CONTAINER", "EASY_DECONSTRUCT" ],
"deployed_item": "brazier",
"examine_action": "fireplace",
"max_volume": "1000 L",
"max_volume": 4000,
"bash": {
"str_min": 8,
"str_max": 30,
Expand All @@ -2493,7 +2493,7 @@
"flags": [ "PLACE_ITEM", "TRANSPARENT", "FIRE_CONTAINER", "EASY_DECONSTRUCT" ],
"deployed_item": "55gal_firebarrel",
"examine_action": "fireplace",
"max_volume": "1000 L",
"max_volume": 4000,
"bash": {
"str_min": 8,
"str_max": 30,
Expand All @@ -2520,7 +2520,7 @@
"flags": [ "PLACE_ITEM", "TRANSPARENT", "FIRE_CONTAINER", "EASY_DECONSTRUCT" ],
"deployed_item": "30gal_firebarrel",
"examine_action": "fireplace",
"max_volume": "1000 L",
"max_volume": 4000,
"bash": {
"str_min": 8,
"str_max": 30,
Expand Down Expand Up @@ -2616,7 +2616,7 @@
{ "item": "cable", "charges": [ 1, 2 ], "prob": 50 }
]
},
"max_volume": "1000 L",
"max_volume": 4000,
"flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "BLOCKSDOOR", "MOUNTABLE" ],
"bash": {
"str_min": 10,
Expand Down Expand Up @@ -2647,7 +2647,7 @@
"deployed_item": "camp_chair",
"examine_action": "deployed_furniture",
"flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "CAN_SIT" ],
"max_volume": "875 L",
"max_volume": 3500,
"deconstruct": { "items": [ { "item": "camp_chair", "count": 1 } ] }
},
{
Expand Down Expand Up @@ -2816,7 +2816,7 @@
"floor_bedding_warmth": 1000,
"required_str": -1,
"deconstruct": { "items": [ { "item": "pillow", "count": 19 }, { "item": "blanket", "count": 3 } ] },
"max_volume": "1000 L",
"max_volume": 4000,
"flags": [
"TRANSPARENT",
"FLAMMABLE_ASH",
Expand Down Expand Up @@ -2857,7 +2857,7 @@
{ "item": "pillow", "count": 4 }
]
},
"max_volume": "1000 L",
"max_volume": 4000,
"flags": [
"TRANSPARENT",
"FLAMMABLE_ASH",
Expand Down Expand Up @@ -2929,7 +2929,7 @@
"floor_bedding_warmth": 200,
"required_str": 3,
"deconstruct": { "items": [ { "item": "box_large", "count": 1 } ] },
"max_volume": "1500 L",
"max_volume": 6000,
"deployed_item": "box_large",
"examine_action": "deployed_furniture",
"flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "PLACE_ITEM", "ORGANIC", "EASY_DECONSTRUCT", "BASHABLE", "HIDE_PLACE", "NO_SIGHT" ],
Expand Down Expand Up @@ -3017,7 +3017,7 @@
{ "item": "lock", "count": [ 0, 1 ] }
]
},
"max_volume": "200 L",
"max_volume": 800,
"bash": {
"str_min": 8,
"str_max": 30,
Expand All @@ -3041,7 +3041,7 @@
"deconstruct": {
"items": [ { "item": "2x4", "count": 20 }, { "item": "nail", "charges": [ 16, 24 ] }, { "item": "pipe", "count": 2 } ]
},
"max_volume": "500 L",
"max_volume": 2000,
"bash": {
"str_min": 12,
"str_max": 40,
Expand Down Expand Up @@ -3594,7 +3594,7 @@
{ "item": "sheet_metal_small", "count": [ 0, 4 ] }
]
},
"max_volume": "1750 L",
"max_volume": 7000,
"bash": {
"str_min": 35,
"str_max": 80,
Expand Down Expand Up @@ -3670,7 +3670,7 @@
"move_cost_mod": 3,
"coverage": 45,
"required_str": 10,
"max_volume": "1000 L",
"max_volume": 4000,
"looks_like": "f_glass_fridge",
"flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "FLAT_SURF" ],
"deconstruct": {
Expand Down Expand Up @@ -3710,7 +3710,7 @@
"move_cost_mod": 3,
"coverage": 60,
"required_str": 16,
"max_volume": "1000 L",
"max_volume": 4000,
"insulation": 2,
"looks_like": "f_washer",
"flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "FLAT_SURF" ],
Expand Down Expand Up @@ -3756,7 +3756,7 @@
"move_cost_mod": 3,
"coverage": 60,
"required_str": 16,
"max_volume": "1000 L",
"max_volume": 4000,
"insulation": 2,
"looks_like": "f_washer",
"flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "FLAT_SURF", "SEALED" ],
Expand Down Expand Up @@ -3801,7 +3801,7 @@
"move_cost_mod": 2,
"coverage": 80,
"required_str": 18,
"max_volume": "1750 L",
"max_volume": 7000,
"insulation": 6,
"looks_like": "f_fridge",
"flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR" ],
Expand Down Expand Up @@ -3995,7 +3995,7 @@
"move_cost_mod": -1,
"coverage": 45,
"required_str": -1,
"max_volume": "1000 L",
"max_volume": 4000,
"looks_like": "t_machinery_heavy",
"flags": [ "TRANSPARENT" ],
"deconstruct": {
Expand Down Expand Up @@ -4037,7 +4037,7 @@
"move_cost_mod": -1,
"coverage": 65,
"required_str": -1,
"max_volume": "1000 L",
"max_volume": 4000,
"looks_like": "t_machinery_heavy",
"deconstruct": {
"items": [
Expand Down Expand Up @@ -4601,7 +4601,7 @@
{ "item": "sheet_metal_small", "count": [ 2, 4 ] }
]
},
"max_volume": "1000 L",
"max_volume": 4000,
"bash": {
"str_min": 35,
"str_max": 80,
Expand Down Expand Up @@ -4668,7 +4668,7 @@
"move_cost_mod": 0,
"comfort": 2,
"floor_bedding_warmth": -1500,
"max_volume": "1000 L",
"max_volume": 4000,
"required_str": 7,
"bash": {
"str_min": 8,
Expand Down Expand Up @@ -4711,7 +4711,7 @@
"color": "blue",
"move_cost_mod": -1,
"coverage": 50,
"max_volume": "3750 ml",
"max_volume": 15,
"required_str": 7,
"flags": [ "TRANSPARENT", "FLAMMABLE", "PLACE_ITEM" ],
"deconstruct": {
Expand Down
Loading