Skip to content

Commit

Permalink
Merge pull request #21 from CleverRaven/master
Browse files Browse the repository at this point in the history
TrueBathroomAugust25
  • Loading branch information
xanderrootslayer authored Aug 26, 2019

Verified

This commit was signed with the committer’s verified signature.
pkoutsovasilis Panos Koutsovasilis
2 parents 3337bb5 + 20d267b commit 9f45c24
Showing 290 changed files with 39,735 additions and 44,870 deletions.
1 change: 0 additions & 1 deletion .clang-tidy
Original file line number Diff line number Diff line change
@@ -49,7 +49,6 @@ readability-*,\
-readability-else-after-return,\
-readability-function-size,\
-readability-implicit-bool-conversion,\
-readability-inconsistent-declaration-parameter-name,\
-readability-isolate-declaration,\
-readability-magic-numbers,\
-readability-named-parameter,\
14 changes: 14 additions & 0 deletions .github/workflows/pr-validator.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: PR Validator
on:
pull_request:
branches:
- master
jobs:
validate:
name: Validate PR
runs-on: ubuntu-latest
steps:
- name: "Validate SUMMARY"
uses: CleverRaven/pr-validator@master
with:
description-regex: '\n\s*`{0,3}SUMMARY: +(None|((Features|Content|Interface|Mods|Balance|Bugfixes|Performance|Infrastructure|Build|I18N) +".*"))`{0,3}\s*\n'
39 changes: 1 addition & 38 deletions data/json/bionics.json
Original file line number Diff line number Diff line change
@@ -18,16 +18,6 @@
"react_cost": 10,
"time": 1
},
{
"id": "bio_advreactor",
"type": "bionic",
"name": "Advanced Microreactor System",
"description": "This stripped down mini-reactor is more efficient and safer than the base model due to integrated radiation cleansers. There is no way to shut it down once active, but you can toggle additional fuel intake.",
"occupied_bodyparts": [ [ "TORSO", 55 ] ],
"flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
"included_bionics": [ "bio_plutdump" ],
"upgraded_bionic": "bio_reactor"
},
{
"id": "bio_alarm",
"type": "bionic",
@@ -693,25 +683,6 @@
"occupied_bodyparts": [ [ "HEAD", 2 ] ],
"flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
},
{
"id": "bio_plut_filter",
"type": "bionic",
"name": "Plutonium Filter",
"description": "This set of tanks and filters allows you to extract plutonium from radioactive slurry.",
"occupied_bodyparts": [ [ "TORSO", 10 ] ],
"flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
"act_cost": 1,
"react_cost": 1,
"time": 12
},
{
"id": "bio_plutdump",
"type": "bionic",
"name": "Plutonium Purger",
"included": true,
"description": "Triggers an emergency reactor fuel purge that ejects all fuel from your reactor.",
"act_cost": 1
},
{
"id": "bio_pokedeye",
"type": "bionic",
@@ -814,15 +785,6 @@
"fake_item": "fake_razor",
"flags": [ "BIONIC_NPC_USABLE" ]
},
{
"id": "bio_reactor",
"type": "bionic",
"name": "Microreactor System",
"description": "This stripped down mini-reactor generates impressive amounts of bionic power. There is no way to shut it down, but you can toggle additional fuel intake. Irradiates your body when active.",
"occupied_bodyparts": [ [ "TORSO", 55 ] ],
"flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
"included_bionics": [ "bio_plutdump" ]
},
{
"id": "bio_recycler",
"type": "bionic",
@@ -1123,6 +1085,7 @@
"name": "Titanium Skeletal Bracing",
"description": "Titanium bracing has been installed onto your elbows, knees, and spine, making them far better at handling strain. Your carrying capacity is increased by 20 kilograms, or about 44 pounds.",
"occupied_bodyparts": [ [ "TORSO", 8 ], [ "ARM_L", 3 ], [ "ARM_R", 3 ], [ "LEG_L", 3 ], [ "LEG_R", 3 ] ],
"weight_capacity_bonus": "20 kg",
"flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ]
},
{
12 changes: 11 additions & 1 deletion data/json/construction.json
Original file line number Diff line number Diff line change
@@ -848,7 +848,6 @@
"required_skills": [ [ "fabrication", 0 ] ],
"time": 40,
"components": [ [ [ "splinter", 50 ] ] ],
"pre_special": "check_empty",
"pre_terrain": "t_pit_shallow",
"post_terrain": "t_woodchips"
},
@@ -1403,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",
28 changes: 28 additions & 0 deletions data/json/furniture_and_terrain/furniture-storage.json
Original file line number Diff line number Diff line change
@@ -414,6 +414,34 @@
]
}
},
{
"type": "furniture",
"id": "f_rack_wood",
"name": "wooden rack",
"symbol": "{",
"description": "A simple wooden rack. Display your items on it.",
"color": "brown",
"move_cost_mod": -1,
"coverage": 70,
"required_str": 7,
"looks_like": "f_bookcase",
"flags": [ "FLAMMABLE", "PLACE_ITEM", "ORGANIC", "BLOCKSDOOR" ],
"deconstruct": {
"items": [
{ "item": "2x4", "count": 12 },
{ "item": "wood_panel", "count": [ 1, 2 ] },
{ "item": "nail", "charges": [ 32, 40 ] }
]
},
"max_volume": "1500 L",
"bash": {
"str_min": 6,
"str_max": 40,
"sound": "smash!",
"sound_fail": "whump.",
"items": [ { "item": "2x4", "count": [ 2, 6 ] }, { "item": "nail", "charges": [ 20, 40 ] }, { "item": "splinter", "count": 12 } ]
}
},
{
"type": "furniture",
"id": "f_rack_coat",
Loading

0 comments on commit 9f45c24

Please sign in to comment.