Skip to content

Commit

Permalink
Revert "Revert "removing CleverRaven#50436""
Browse files Browse the repository at this point in the history
This reverts commit 7e99312.
  • Loading branch information
Invalidated-User committed Aug 12, 2021
1 parent e1956ed commit 509d6e5
Showing 1 changed file with 10 additions and 72 deletions.
82 changes: 10 additions & 72 deletions data/json/furniture_and_terrain/furniture-storage.json
Expand Up @@ -296,7 +296,7 @@
"required_str": 14,
"max_volume": "250 L",
"close": "f_gunsafe_c",
"flags": [ "TRANSPARENT", "CONTAINER", "PLACE_ITEM", "MOUNTABLE" ],
"flags": [ "TRANSPARENT", "CONTAINER", "PLACE_ITEM", "MOUNTABLE", "MINEABLE" ],
"bash": {
"str_min": 40,
"str_max": 200,
Expand All @@ -322,7 +322,7 @@
"required_str": 14,
"max_volume": "250 L",
"open": "f_gunsafe_o",
"flags": [ "TRANSPARENT", "CONTAINER", "SEALED", "PLACE_ITEM", "MOUNTABLE" ],
"flags": [ "TRANSPARENT", "CONTAINER", "SEALED", "PLACE_ITEM", "MOUNTABLE", "MINEABLE" ],
"bash": {
"str_min": 40,
"str_max": 200,
Expand All @@ -346,7 +346,7 @@
"coverage": 30,
"required_str": 14,
"max_volume": "250 L",
"flags": [ "TRANSPARENT", "CONTAINER", "SEALED", "PLACE_ITEM", "MOUNTABLE", "PICKABLE" ],
"flags": [ "TRANSPARENT", "CONTAINER", "SEALED", "PLACE_ITEM", "MOUNTABLE", "MINEABLE", "PICKABLE" ],
"lockpick_result": "f_gunsafe_o",
"lockpick_message": "With a satisfying click, the lock on the gun safe door opens.",
"examine_action": "locked_object_pickable",
Expand Down Expand Up @@ -374,7 +374,7 @@
"coverage": 30,
"required_str": 14,
"max_volume": "250 L",
"flags": [ "TRANSPARENT", "CONTAINER", "SEALED", "PLACE_ITEM", "MOUNTABLE" ],
"flags": [ "TRANSPARENT", "CONTAINER", "SEALED", "PLACE_ITEM", "MOUNTABLE", "MINEABLE" ],
"bash": {
"str_min": 40,
"str_max": 200,
Expand All @@ -399,7 +399,7 @@
"coverage": 30,
"required_str": 14,
"max_volume": "250 L",
"flags": [ "TRANSPARENT", "CONTAINER", "SEALED", "PLACE_ITEM", "MOUNTABLE" ],
"flags": [ "TRANSPARENT", "CONTAINER", "SEALED", "PLACE_ITEM", "MOUNTABLE", "MINEABLE" ],
"examine_action": "gunsafe_el",
"bash": {
"str_min": 40,
Expand Down Expand Up @@ -518,42 +518,6 @@
"coverage": 70,
"required_str": 8,
"flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "PLACE_ITEM", "BLOCKSDOOR", "MOUNTABLE" ],
"deconstruct": {
"items": [
{ "item": "pipe", "count": [ 6, 12 ] },
{ "item": "sheet_metal", "count": [ 1, 2 ] },
{ "item": "sheet_metal_small", "count": [ 0, 4 ] }
]
},
"max_volume": "1750 L",
"bash": {
"str_min": 10,
"str_max": 30,
"sound": "metal screeching!",
"sound_fail": "clang!",
"items": [
{ "item": "scrap", "count": [ 2, 8 ] },
{ "item": "steel_chunk", "count": [ 2, 4 ] },
{ "item": "sheet_metal_small", "count": [ 6, 10 ] },
{ "item": "pipe", "count": 1 }
]
}
},
{
"type": "furniture",
"id": "f_rack_l",
"looks_like": "f_rack",
"name": "locked display case",
"description": "A sheet metal shelving unit, with the storage surfaces angled in such a way as to show off the items stored. Metal fasteners with a lock hold the items securely to the rack.",
"symbol": "{",
"color": "light_gray",
"move_cost_mod": -1,
"coverage": 70,
"required_str": 8,
"flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "PLACE_ITEM", "BLOCKSDOOR", "MOUNTABLE", "SEALED", "PICKABLE" ],
"lockpick_result": "f_rack",
"lockpick_message": "With a satisfying click, the lock opens.",
"examine_action": "locked_object_pickable",
"deconstruct": {
"items": [
{ "item": "pipe", "count": [ 6, 12 ] },
Expand All @@ -563,7 +527,7 @@
},
"max_volume": "1750 L",
"bash": {
"str_min": 10,
"str_min": 6,
"str_max": 30,
"sound": "metal screeching!",
"sound_fail": "clang!",
Expand Down Expand Up @@ -656,7 +620,7 @@
"coverage": 30,
"required_str": 14,
"max_volume": "250 L",
"flags": [ "TRANSPARENT", "CONTAINER", "SEALED", "PLACE_ITEM", "MOUNTABLE" ],
"flags": [ "TRANSPARENT", "CONTAINER", "SEALED", "PLACE_ITEM", "MOUNTABLE", "MINEABLE" ],
"open": "f_safe_o",
"examine_action": "open_safe",
"bash": {
Expand All @@ -683,7 +647,7 @@
"coverage": 30,
"required_str": 14,
"max_volume": "250 L",
"flags": [ "TRANSPARENT", "CONTAINER", "SEALED", "PLACE_ITEM", "MOUNTABLE" ],
"flags": [ "TRANSPARENT", "CONTAINER", "SEALED", "PLACE_ITEM", "MOUNTABLE", "MINEABLE" ],
"examine_action": "safe",
"bash": {
"str_min": 40,
Expand All @@ -709,7 +673,7 @@
"coverage": 30,
"required_str": 14,
"max_volume": "250 L",
"flags": [ "TRANSPARENT", "CONTAINER", "PLACE_ITEM", "MOUNTABLE" ],
"flags": [ "TRANSPARENT", "CONTAINER", "PLACE_ITEM", "MOUNTABLE", "MINEABLE" ],
"close": "f_safe_c",
"bash": {
"str_min": 40,
Expand Down Expand Up @@ -936,33 +900,7 @@
"move_cost_mod": 2,
"coverage": 80,
"required_str": 9,
"flags": [ "TRANSPARENT", "SEALED", "PLACE_ITEM", "PICKABLE" ],
"lockpick_result": "f_displaycase_o",
"lockpick_message": "With a satisfying click, the lock and the display case opens",
"examine_action": "locked_object_pickable",
"bash": {
"str_min": 6,
"str_max": 20,
"sound": "glass breaking",
"sound_fail": "whack!",
"sound_vol": 16,
"sound_fail_vol": 12,
"furn_set": "f_displaycase_b",
"items": [ { "item": "glass_shard", "count": [ 25, 50 ] } ]
}
},
{
"type": "furniture",
"id": "f_displaycase_o",
"name": "open display case",
"looks_like": "f_rack",
"description": "A secure wooden case at about waist-height, with glass panelling on the top. Useful for storing valuable things while still showing them off. Not actually as secure as it looks, as the display windows are easily broken. This one has had its lock picked and is open.",
"symbol": "#",
"color": "light_cyan",
"move_cost_mod": 2,
"coverage": 80,
"required_str": 9,
"flags": [ "TRANSPARENT", "PLACE_ITEM" ],
"flags": [ "TRANSPARENT", "SEALED", "PLACE_ITEM" ],
"bash": {
"str_min": 6,
"str_max": 20,
Expand Down

0 comments on commit 509d6e5

Please sign in to comment.