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

Batteries and animecon modern json name #37717

Merged
merged 2 commits into from
Feb 5, 2020
Merged

Batteries and animecon modern json name #37717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89b2bc4
Batteries and animecon modern json name
snipercup Feb 5, 2020
e2dfea9
Update data/json/items/vehicle/battery.json
snipercup Feb 5, 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
3 changes: 1 addition & 2 deletions data/json/items/book/tailor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
"id": "mag_animecon",
"copy-from": "mag_tailor",
"type": "BOOK",
"name": "Boston AnimeCon magazine",
"name_plural": "Boston AnimeCon magazines",
"name": { "str": "Boston AnimeCon magazine", "str_pl": "Boston AnimeCon magazines" },
"description": "A short magazine printed as an advertisement for the now canceled Boston AnimeCon. A few costume ideas are intermixed with miscellaneous information about the event."
},
{
Expand Down
21 changes: 7 additions & 14 deletions data/json/items/vehicle/battery.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
"id": "battery_car",
"type": "MAGAZINE",
"category": "veh_parts",
"name": "car battery",
"name_plural": "car batteries",
"name": { "str": "car battery", "str_pl": "car batteries" },
"description": "A 12v lead-acid battery used to power car electrical systems.",
"weight": "18000 g",
"volume": "6250 ml",
Expand All @@ -21,8 +20,7 @@
"id": "battery_motorbike",
"copy-from": "battery_car",
"type": "MAGAZINE",
"name": "motorbike battery",
"name_plural": "motorbike batteries",
"name": { "str": "motorbike battery", "str_pl": "motorbike batteries" },
"description": "A 12v lead-acid battery used to power smaller vehicles' electrical systems.",
"weight": "4000 g",
"volume": "1250 ml",
Expand All @@ -34,8 +32,7 @@
"id": "battery_motorbike_small",
"copy-from": "battery_car",
"type": "MAGAZINE",
"name": "small motorbike battery",
"name_plural": "small motorbike batteries",
"name": { "str": "small motorbike battery", "str_pl": "small motorbike batteries" },
"description": "A miniature 12v lead-acid battery used to power smaller vehicles' electrical systems.",
"weight": "1500 g",
"volume": "750 ml",
Expand Down Expand Up @@ -63,8 +60,7 @@
"id": "large_storage_battery",
"copy-from": "storage_battery",
"type": "MAGAZINE",
"name": "large storage battery",
"name_plural": "large storage batteries",
"name": { "str": "large storage battery", "str_pl": "large storage batteries" },
"description": "A huge storage battery containing many lithium ion cells. Holds a tremendous amount of energy. Could be installed into a storage battery case for easy removal from a vehicle, or just welded straight in.",
"weight": "400 kg",
"volume": "50 L",
Expand All @@ -77,8 +73,7 @@
"id": "medium_storage_battery",
"copy-from": "storage_battery",
"type": "MAGAZINE",
"name": "medium storage battery",
"name_plural": "medium storage batteries",
"name": { "str": "medium storage battery", "str_pl": "medium storage batteries" },
"description": "A medium storage battery containing multiple lithium ion cells.",
"weight": "35000 g",
"volume": "6250 ml",
Expand All @@ -91,8 +86,7 @@
"id": "small_storage_battery",
"copy-from": "storage_battery",
"type": "MAGAZINE",
"name": "small storage battery",
"name_plural": "small storage batteries",
"name": { "str": "small storage battery", "str_pl": "small storage batteries" },
"description": "A small storage battery created with pre-Cataclysm lithium ion technology. Useful for crafting.",
"weight": "2500 g",
"volume": "500 ml",
Expand All @@ -105,8 +99,7 @@
"id": "storage_battery",
"type": "MAGAZINE",
"category": "veh_parts",
"name": "storage battery",
"name_plural": "storage batteries",
"name": { "str": "storage battery", "str_pl": "storage batteries" },
"description": "A large storage battery containing many lithium ion cells. Could be installed into a storage battery case for easy removal from a vehicle, or just welded straight in.",
"weight": "200000 g",
"volume": "25 L",
Expand Down