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

Reworked Aftershock's UPS to custom battery #37331

Merged
merged 9 commits into from
Jan 26, 2020
8 changes: 6 additions & 2 deletions data/mods/Aftershock/items/tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -217,11 +217,15 @@
"copy-from": "UPS_off",
"name": "UPS",
"name_plural": "UPS's",
"description": "This is a unified power supply, or UPS. It is a device developed jointly by military and scientific interests for use in combat and the field. The UPS is designed to power armor and some guns, but drains batteries quickly. It can be worn around to either leg for ease of access, and it's been waterproofed to protect the delicate electronics.",
"description": "This is a unified power supply, or UPS. It is a device developed jointly by military and scientific interests for use in combat and the field. The UPS is designed to power armor and some guns, but drains batteries quickly. It can be worn around to either leg for ease of access, and it's been waterproofed to protect the delicate electronics. Has it's own custom battery, with higher capacity and rechargeable, but not removeable",
"coverage": 5,
"ammo": "battery",
"initial_charges": 1000,
"max_charges": 1500,
"encumbrance": 2,
"covers": [ "LEG_EITHER" ],
"flags": [ "RECHARGE", "WAIST", "FRAGILE", "OVERSIZE", "WATERPROOF", "IS_UPS" ]
"flags": [ "RECHARGE", "WAIST", "FRAGILE", "OVERSIZE", "WATERPROOF", "IS_UPS", "NO_RELOAD", "NO_UNLOAD" ],
"magazines": []
gwyter marked this conversation as resolved.
Show resolved Hide resolved
},
{
"id": "adv_UPS_off",
Expand Down