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.

Sign up for GitHub

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

Refactor the json files relative to the three rigs among Aftershock and BlazeIndustries #49977

Merged
merged 9 commits into from
Jul 18, 2021
Merged

Refactor the json files relative to the three rigs among Aftershock and BlazeIndustries #49977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
027598d
Update options.cpp
martinrhan Jun 14, 2021
a73dfb5
Update obsolete.json
martinrhan Jul 16, 2021
551a4c2
Remove duplicate item and vehicle part
martinrhan Jul 16, 2021
d3a1c83
Revert "Update options.cpp"
martinrhan Jul 16, 2021
3a8fe47
Revert "Update obsolete.json"
martinrhan Jul 16, 2021
3baa017
Revert "Remove duplicate item and vehicle part"
martinrhan Jul 16, 2021
ee2adaa
Update part_items.json
martinrhan Jul 16, 2021
e4eb068
Update blaze_other_recipes.json
martinrhan Jul 16, 2021
fc5b18b
Update blaze_other_recipes.json
martinrhan Jul 16, 2021
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
21 changes: 0 additions & 21 deletions data/mods/Aftershock/vehicles/part_items.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,27 +23,6 @@
"name": { "str": "ultralight foldable frame" },
"description": "A sturdy, lightweight foldable frame made from titanium."
},
{
"type": "GENERIC",
"id": "afs_metal_rig",
"copy-from": "vehicle_rig",
"name": { "str": "MetalMaster forge buddy", "str_pl": "MetalMaster forge buddies" },
"description": "From the makers of the best-selling* FOODCO kitchen buddy comes the MetalMaster forge buddy, for all your metalworking, firing, and welding needs! It's just as clunky and awkward as the thing it's spinning off, and still requires a vehicle battery to function."
},
{
"type": "GENERIC",
"id": "afs_kitchen_rig",
"copy-from": "vehicle_rig",
"name": { "str": "KitchenMaster cooking buddy", "str_pl": "KitchenMaster cooking buddies" },
"description": "Because it *clearly* needed one, this large all-in-one station provides the functions of FOODCO's kitchen buddy, now with complementary fume hoods and chemistry materials. Why a chef would need a chemical rig is anyone's guess, but you can mount it on a vehicle to make use of it."
},
{
"type": "GENERIC",
"id": "afs_cooking_rig",
"copy-from": "vehicle_rig",
"name": { "str": "cooking rig" },
"description": "Skillet, pot, hotplate, and chemistry set; everything you need to cook food and chemicals. Includes proper fume vents and a separator, so you don't contaminate your food with toxic chemicals."
},
{
"type": "GENERIC",
"id": "afs_control_station",
Expand Down
3 changes: 3 additions & 0 deletions data/mods/BlazeIndustries/recipes/blaze_other_recipes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@
},
{
"result": "afs_metal_rig",
"id_suffix": "blaze",
"type": "recipe",
"activity_level": "fake",
"category": "CC_OTHER",
Expand All @@ -130,6 +131,7 @@
},
{
"result": "afs_kitchen_rig",
"id_suffix": "blaze",
"type": "recipe",
"activity_level": "fake",
"category": "CC_OTHER",
Expand Down Expand Up @@ -160,6 +162,7 @@
},
{
"result": "afs_cooking_rig",
"id_suffix": "blaze",
"type": "recipe",
"activity_level": "fake",
"category": "CC_OTHER",
Expand Down