From fa2961861c988e90a2a74cd63972c0d169606f3f Mon Sep 17 00:00:00 2001 From: BalthazarArgall Date: Tue, 9 Apr 2024 12:06:59 +0200 Subject: [PATCH] active gas masks now use GASMASK_DEACTIVATE --- data/json/items/tool_armor.json | 128 ++++---------------------------- 1 file changed, 16 insertions(+), 112 deletions(-) diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json index 8544f5f0ba2b6..24e2882bfb998 100644 --- a/data/json/items/tool_armor.json +++ b/data/json/items/tool_armor.json @@ -1964,13 +1964,7 @@ "name": { "str": "filter mask (on)" }, "armor": [ { "encumbrance": 15, "rigid_layer_only": true, "coverage": 100, "covers": [ "mouth" ] } ], "tick_action": [ "GASMASK" ], - "use_action": { - "type": "transform", - "msg": "You set up the mask to stop using its filter.", - "target": "mask_filter", - "active": true, - "need_worn": true - } + "use_action": [ "GASMASK_DEACTIVATE" ] }, { "id": "mask_gas", @@ -2062,13 +2056,7 @@ { "covers": [ "mouth" ], "rigid_layer_only": true, "coverage": 100, "encumbrance": 35 } ], "tick_action": [ "GASMASK" ], - "use_action": { - "type": "transform", - "msg": "You set up the mask to stop using its filter.", - "target": "mask_gas_xl", - "active": false, - "need_worn": true - } + "use_action": [ "GASMASK_DEACTIVATE" ] }, { "id": "mask_gas_xs", @@ -2114,13 +2102,7 @@ { "covers": [ "mouth" ], "rigid_layer_only": true, "coverage": 100, "encumbrance": 35 } ], "tick_action": [ "GASMASK" ], - "use_action": { - "type": "transform", - "msg": "You set up the mask to stop using its filter.", - "target": "mask_gas_xs", - "active": false, - "need_worn": true - } + "use_action": [ "GASMASK_DEACTIVATE" ] }, { "id": "mask_gas_half", @@ -2160,13 +2142,7 @@ "name": { "str": "half-face gas mask (on)" }, "armor": [ { "covers": [ "mouth" ], "rigid_layer_only": true, "coverage": 100, "encumbrance": 35 } ], "tick_action": [ "GASMASK" ], - "use_action": { - "type": "transform", - "msg": "You set up the mask to stop using its filter.", - "target": "mask_gas_half", - "active": false, - "need_worn": true - } + "use_action": [ "GASMASK_DEACTIVATE" ] }, { "id": "mask_fsurvivor", @@ -2237,13 +2213,7 @@ } ], "tick_action": [ "GASMASK" ], - "use_action": { - "type": "transform", - "msg": "You set up the mask to stop using its filter.", - "target": "mask_fsurvivor", - "active": false, - "need_worn": true - } + "use_action": [ "GASMASK_DEACTIVATE" ] }, { "id": "mask_fsurvivorxl", @@ -2277,13 +2247,7 @@ } ], "tick_action": [ "GASMASK" ], - "use_action": { - "type": "transform", - "msg": "You set up the mask to stop using its filter.", - "target": "mask_fsurvivorxl", - "active": false, - "need_worn": true - } + "use_action": [ "GASMASK_DEACTIVATE" ] }, { "id": "mask_fsurvivorxs", @@ -2317,13 +2281,7 @@ } ], "tick_action": [ "GASMASK" ], - "use_action": { - "type": "transform", - "msg": "You set up the mask to stop using its filter.", - "target": "mask_fsurvivorxs", - "active": false, - "need_worn": true - } + "use_action": [ "GASMASK_DEACTIVATE" ] }, { "id": "mask_bunker", @@ -2394,13 +2352,7 @@ } ], "tick_action": [ "GASMASK" ], - "use_action": { - "type": "transform", - "msg": "You set up the mask to stop using its filter.", - "target": "mask_bunker", - "active": false, - "need_worn": true - } + "use_action": [ "GASMASK_DEACTIVATE" ] }, { "id": "mask_hsurvivor", @@ -2477,13 +2429,7 @@ } ], "tick_action": [ "GASMASK" ], - "use_action": { - "type": "transform", - "msg": "You set up the mask to stop using its filter.", - "target": "mask_hsurvivor", - "active": false, - "need_worn": true - } + "use_action": [ "GASMASK_DEACTIVATE" ] }, { "id": "mask_hsurvivorxl", @@ -2520,13 +2466,7 @@ } ], "tick_action": [ "GASMASK" ], - "use_action": { - "type": "transform", - "msg": "You set up the mask to stop using its filter.", - "target": "mask_hsurvivorxl", - "active": false, - "need_worn": true - } + "use_action": [ "GASMASK_DEACTIVATE" ] }, { "id": "mask_hsurvivorxs", @@ -2563,13 +2503,7 @@ } ], "tick_action": [ "GASMASK" ], - "use_action": { - "type": "transform", - "msg": "You set up the mask to stop using its filter.", - "target": "mask_hsurvivorxs", - "active": false, - "need_worn": true - } + "use_action": [ "GASMASK_DEACTIVATE" ] }, { "id": "mask_lsurvivor", @@ -2622,13 +2556,7 @@ } ], "tick_action": [ "GASMASK" ], - "use_action": { - "type": "transform", - "msg": "You set up the mask to stop using its filter.", - "target": "mask_lsurvivor", - "active": false, - "need_worn": true - } + "use_action": [ "GASMASK_DEACTIVATE" ] }, { "id": "mask_lsurvivorxl", @@ -2653,13 +2581,7 @@ } ], "tick_action": [ "GASMASK" ], - "use_action": { - "type": "transform", - "msg": "You set up the mask to stop using its filter.", - "target": "mask_lsurvivorxl", - "active": false, - "need_worn": true - } + "use_action": [ "GASMASK_DEACTIVATE" ] }, { "id": "mask_lsurvivorxs", @@ -2684,13 +2606,7 @@ } ], "tick_action": [ "GASMASK" ], - "use_action": { - "type": "transform", - "msg": "You set up the mask to stop using its filter.", - "target": "mask_lsurvivorxs", - "active": false, - "need_worn": true - } + "use_action": [ "GASMASK_DEACTIVATE" ] }, { "id": "mask_survivor", @@ -2755,13 +2671,7 @@ } ], "tick_action": [ "GASMASK" ], - "use_action": { - "type": "transform", - "msg": "You set up the mask to stop using its filter.", - "target": "mask_survivor", - "active": false, - "need_worn": true - } + "use_action": [ "GASMASK_DEACTIVATE" ] }, { "id": "mask_survivorxl", @@ -2792,13 +2702,7 @@ } ], "tick_action": [ "GASMASK" ], - "use_action": { - "type": "transform", - "msg": "You set up the mask to stop using its filter.", - "target": "mask_survivorxl", - "active": false, - "need_worn": true - } + "use_action": [ "GASMASK_DEACTIVATE" ] }, { "id": "mask_survivorxs",