summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2023-11-09 09:39:51 -0800
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2023-11-09 09:39:51 -0800
commitd8e64a780ae6d3ac843b69eeb38d53d04ee83f78 (patch)
tree2f9ed7c02f08b36d0ff7bf56ce956856f89e480f
parentFix typo in 40x46mm_flechette_m118 (diff)
downloadcataclysm-bn-mod_grenade-crafting-d8e64a780ae6d3ac843b69eeb38d53d04ee83f78.tar.xz
Flag c4 and handflares as grenade so they can be carried in a grenade pouch.
Lower the volume of a glowstick.
-rw-r--r--json/items/tool/explosive.json3
-rw-r--r--json/items/tool/lighting.json18
2 files changed, 20 insertions, 1 deletions
diff --git a/json/items/tool/explosive.json b/json/items/tool/explosive.json
index 0c8033c..138da95 100644
--- a/json/items/tool/explosive.json
+++ b/json/items/tool/explosive.json
@@ -20,7 +20,8 @@
"material": [ "plastic" ],
"symbol": ";",
"color": "light_gray",
- "use_action": "C4"
+ "use_action": "C4",
+ "flags": [ "GRENADE" ]
},
{
"id": "c4armed",
diff --git a/json/items/tool/lighting.json b/json/items/tool/lighting.json
new file mode 100644
index 0000000..c076b27
--- /dev/null
+++ b/json/items/tool/lighting.json
@@ -0,0 +1,18 @@
+[
+ {
+ "id": "handflare",
+ "copy-from": "handflare",
+ "type": "TOOL",
+ "category": "tools",
+ "name": { "str": "flare" },
+ "flags": [ "GRENADE" ]
+ },
+ {
+ "id": "glowstick",
+ "copy-from": "glowstick",
+ "type": "TOOL",
+ "category": "tools",
+ "name": { "str": "glowstick" },
+ "volume": "70 ml"
+ }
+]