Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions data/json/item_actions.json
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,7 @@
{
"type": "item_action",
"id": "musical_instrument",
"name": { "ctxt": "musical_instrument", "str": "Play" }
"name": { "str": "Play instrument" }
},
{
"type": "item_action",
Expand Down Expand Up @@ -932,7 +932,7 @@
{
"type": "item_action",
"id": "effect_on_conditions",
"name": { "str": "Activate item" }
"name": { "str": "Activate" }
},
{
"type": "item_action",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/ammo/sling-ready_grenade.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"target": "grenade_act",
"msg": "You snap the retaining fuse on the grenade.",
"target_timer": "5 seconds",
"menu_text": "Activate grenade",
"menu_text": "Activate",
"type": "transform"
},
"flags": [ "BOMB", "GRENADE" ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/bespoke_armor/custom_bodysuits.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
"ammo_scale": 0,
"type": "transform",
"menu_text": "Turn off",
"msg": "The %s pipes stop humming.",
"msg": "The hum of the suit's climate control fades.",
"target": "armor_nomad_advanced"
}
},
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/bespoke_armor/utility.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
"transparent": true
}
],
"use_action": { "type": "holster", "holster_prompt": "Store item", "holster_msg": "You put your %1$s in your %2$s" },
"use_action": { "type": "holster", "holster_prompt": "Store tool or blade", "holster_msg": "You put your %1$s in your %2$s" },
"flags": [ "WATER_FRIENDLY", "STURDY", "BELTED", "OVERSIZE" ],
"armor": [ { "encumbrance": [ 2, 6 ], "coverage": 100, "covers": [ "torso" ], "specifically_covers": [ "torso_waist" ] } ]
},
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/cloaks.json
Original file line number Diff line number Diff line change
Expand Up @@ -2043,7 +2043,7 @@
"ammo_scale": 0,
"type": "transform",
"menu_text": "Turn off",
"msg": "The %s flickers for a moment as it becomes opaque.",
"msg": "Your optical cloak flickers for a moment as it becomes opaque.",
"target": "optical_cloak"
}
},
Expand Down
7 changes: 5 additions & 2 deletions data/json/items/armor/coats.json
Original file line number Diff line number Diff line change
Expand Up @@ -2595,9 +2595,12 @@
"copy-from": "grim_reaper_robe",
"type": "ITEM",
"subtypes": [ "ARMOR" ],
"name": { "str": "grim reaper's robe (faceless)", "str_pl": "grim reaper's robes (faceless)" },
"name": {
"str": "grim reaper's robe (faceless)",
"str_pl": "grim reaper's robes (faceless)",
"//~": "'Faceless' as in 'face cover'less and because, without the cover of darkness (A black face cover) a real grim reaper would really be faceless"
},
"description": "A black hooded grim reaper's robe with the face cover removed to show the user's lack of facial skin. It pairs nicely with a scythe. Use it to hide your lack of facial features.",
"//": "'Faceless' as in 'face cover'less and because, without the cover of darkness (A black face cover) a real grim reaper would really be faceless",
"use_action": {
"type": "transform",
"msg": "You shroud your face in darkness.",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/armor/exotic.json
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@
{
"target": "migo_skin_off",
"msg": "The gorget hums and the liquid gets sucked back into it.",
"menu_text": "Deactivate the device",
"menu_text": "Deactivate",
"type": "transform"
}
],
Expand All @@ -300,7 +300,7 @@
"need_worn": true,
"target": "migo_skin",
"msg": "Murky ooze begins to leak out of the gorget and engulf your body from the neck down!",
"menu_text": "Activate the device",
"menu_text": "Activate",
"type": "transform"
},
"armor": [
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/hats.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"price_postapoc": "10 cent",
"use_action": {
"type": "transform",
"msg": "You adjust the %s to cover your mouth.",
"msg": "You adjust the bandana to cover your mouth.",
"target": "bandana",
"menu_text": "Cover mouth"
},
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/masks.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"price_postapoc": "10 cent",
"use_action": {
"type": "transform",
"msg": "You adjust the %s to cover your head.",
"msg": "You adjust the bandana to cover your head.",
"target": "bandana_head",
"menu_text": "Cover head"
},
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/armor/misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
"menu_text": "Roll up",
"type": "transform",
"target": "sleeping_bag_fur_roll",
"msg": "You roll up the fur sleeping bag, preparing it for transport."
"msg": "You roll up the sleeping bag, preparing it for transport."
},
"armor": [
{
Expand All @@ -162,7 +162,7 @@
"description": "A large sleeping bag lined with fur, with a strap for carrying it on your back when not in use. Who needs a tent? Activate it to unroll it so you can use it for warmth.",
"looks_like": "sleeping_bag_roll",
"flags": [ "OVERSIZE", "BELTED" ],
"use_action": { "menu_text": "Unroll", "type": "transform", "target": "sleeping_bag_fur", "msg": "You unroll the fur sleeping bag." },
"use_action": { "menu_text": "Unroll", "type": "transform", "target": "sleeping_bag_fur", "msg": "You unroll the sleeping bag." },
"armor": [ { "encumbrance": 5, "coverage": 20, "covers": [ "torso" ], "specifically_covers": [ "torso_hanging_back" ] } ]
},
{
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/armor/robofac_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@
],
"use_action": {
"type": "transform",
"menu_text": "Turn on anchor",
"msg": "You activate the anchor, and the Hub 01 logo on your front begins to glow white.",
"target": "robofac_armor_anchor_on",
"need_charges": 1,
Expand Down Expand Up @@ -283,7 +282,7 @@
"revert_to": "robofac_armor_anchor",
"use_action": {
"type": "transform",
"menu_text": "Turn off anchor",
"menu_text": "Turn off",
"msg": "The Hub logo on your front stops glowing.",
"target": "robofac_armor_anchor"
},
Expand Down
Loading
Loading