Skip to content

Commit

Permalink
Merge pull request #38391 from snipercup/Container-name-to-object
Browse files Browse the repository at this point in the history 
Container name to object, volume to string
  • Loading branch information
@ZhilkinSerg
ZhilkinSerg authored Feb 27, 2020
2 parents a96911f + 8af9da3 commit c294746
Showing 1 changed file with 27 additions and 27 deletions.
54 changes: 27 additions & 27 deletions data/json/items/containers.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,10 @@
"id": "bag_plastic",
"type": "CONTAINER",
"category": "container",
"name": "plastic bag",
"name": { "str": "plastic bag" },
"description": "A small, open plastic bag. Essentially trash.",
"weight": "5 g",
"volume": 0,
"volume": "10 ml",
"price": 0,
"to_hit": -1,
"rigid": false,
Expand Down Expand Up @@ -206,7 +206,7 @@
"id": "bottle_plastic",
"type": "CONTAINER",
"category": "container",
"name": "plastic bottle",
"name": { "str": "plastic bottle" },
"description": "A resealable plastic bottle, holds 500 ml of liquid.",
"weight": "13 g",
"volume": "500 ml",
Expand Down Expand Up @@ -240,7 +240,7 @@
"id": "bottle_twoliter",
"type": "CONTAINER",
"category": "container",
"name": "large plastic bottle",
"name": { "str": "large plastic bottle" },
"description": "It's a two-liter plastic bottle that can hold a lot of soda, or, nowadays, boiled water.",
"weight": "13 g",
"volume": "2 L",
Expand Down Expand Up @@ -350,7 +350,7 @@
"id": "camelbak",
"type": "CONTAINER",
"category": "container",
"name": "hydration pack",
"name": { "str": "hydration pack" },
"description": "A slim and lightweight insulated plastic bladder worn on the back. It has a large pocket and a capped mouth for filling with liquid with a hose that allows the wearer to drink hands-free.",
"weight": "286 g",
"volume": "2500 ml",
Expand Down Expand Up @@ -389,7 +389,7 @@
"id": "can_drink_unsealed",
"copy-from": "can_drink",
"type": "CONTAINER",
"name": "opened aluminum can",
"name": { "str": "opened aluminum can" },
"description": "An aluminum can, like what soda comes in. This one is opened and can't be easily sealed.",
"symbol": ")",
"color": "light_blue",
Expand All @@ -401,7 +401,7 @@
"id": "carton_sealed",
"type": "CONTAINER",
"category": "container",
"name": "paper carton",
"name": { "str": "paper carton" },
"description": "A half gallon carton constructed of a paper, aluminum and plastic laminate. It has a threaded cap for easy resealing.",
"weight": "28 g",
"volume": "2 L",
Expand All @@ -419,7 +419,7 @@
"id": "carton_unsealed",
"copy-from": "carton_sealed",
"type": "CONTAINER",
"name": "opened paper carton",
"name": { "str": "opened paper carton" },
"description": "A half gallon carton constructed of a paper, aluminum and plastic laminate. This one is open and its contents will spoil.",
"symbol": ")",
"color": "light_blue",
Expand Down Expand Up @@ -481,7 +481,7 @@
"id": "can_medium",
"copy-from": "can_food",
"type": "CONTAINER",
"name": "medium tin can",
"name": { "str": "medium tin can" },
"description": "A medium tin can, like what soup comes in.",
"//": "Represents a 4 cm radius x 10 cm height steel can.",
"looks_like": "can_food",
Expand All @@ -494,7 +494,7 @@
"id": "can_medium_unsealed",
"copy-from": "can_medium",
"type": "CONTAINER",
"name": "medium opened tin can",
"name": { "str": "medium opened tin can" },
"description": "A medium tin can, like what soup comes in. This one is opened and can't be easily sealed.",
"looks_like": "can_food_unsealed",
"preserves": false,
Expand All @@ -505,7 +505,7 @@
"id": "canteen",
"type": "CONTAINER",
"category": "container",
"name": "plastic canteen",
"name": { "str": "plastic canteen" },
"description": "A military-style water canteen with a 1.5 liter capacity. Commonly worn at the hip.",
"weight": "155 g",
"volume": "1500 ml",
Expand Down Expand Up @@ -578,7 +578,7 @@
"id": "clay_watercont",
"type": "CONTAINER",
"category": "container",
"name": "large clay pot",
"name": { "str": "large clay pot" },
"description": "A bulky and heavy clay pot with a waterproofed hide lid, meant to store water, but can carry other liquids in a pinch.",
"weight": "4887 g",
"volume": "37500 ml",
Expand All @@ -596,7 +596,7 @@
"id": "cup_plastic",
"type": "CONTAINER",
"category": "container",
"name": "plastic cup",
"name": { "str": "plastic cup" },
"description": "A small, vacuum formed cup.",
"weight": "6 g",
"volume": "250 ml",
Expand All @@ -613,7 +613,7 @@
"id": "cup_plastic_unsealed",
"copy-from": "cup_plastic",
"type": "CONTAINER",
"name": "opened plastic cup",
"name": { "str": "opened plastic cup" },
"description": "A small, vacuum formed cup, essentially trash.",
"symbol": ")",
"color": "light_cyan",
Expand Down Expand Up @@ -698,7 +698,7 @@
"id": "test_tube_micro",
"type": "CONTAINER",
"category": "container",
"name": "microcentrifuge tube",
"name": { "str": "microcentrifuge tube" },
"description": "These plastic tubes, with little built in snap-caps, are a great way to store a tiny amount of liquid. Great for jello shooters if 1mL is enough for a shot for you. Cool people call these \"eppies\".",
"weight": "1 g",
"volume": "1ml",
Expand All @@ -716,7 +716,7 @@
"id": "flask_hip",
"type": "CONTAINER",
"category": "container",
"name": "hip flask",
"name": { "str": "hip flask" },
"description": "A 250 ml metal flask with a hinged screw-on lid, commonly used to discreetly transport alcohol.",
"weight": "120 g",
"volume": "250 ml",
Expand Down Expand Up @@ -756,7 +756,7 @@
"id": "jar_3l_glass_sealed",
"copy-from": "jar_3l_glass",
"type": "CONTAINER",
"name": "sealed 3L glass jar",
"name": { "str": "sealed 3L glass jar" },
"description": "A three-liter glass jar with a metal screw top lid, used for canning. Sealed tightly to preserve contents from rot.",
"symbol": ")",
"color": "light_cyan",
Expand Down Expand Up @@ -787,7 +787,7 @@
"id": "jar_glass_sealed",
"copy-from": "jar_glass",
"type": "CONTAINER",
"name": "sealed glass jar",
"name": { "str": "sealed glass jar" },
"description": "A half-liter glass jar with a metal screw top lid, used for canning. Sealed tightly and will preserve the contents from rot (assuming it was sterile before sealing).",
"symbol": ")",
"color": "light_cyan",
Expand All @@ -799,7 +799,7 @@
"id": "jerrycan",
"type": "CONTAINER",
"category": "container",
"name": "plastic jerrycan",
"name": { "str": "plastic jerrycan" },
"description": "A bulky plastic jerrycan, meant to carry fuel, but can carry other liquids in a pinch.",
"weight": "1587 g",
"volume": "10L",
Expand Down Expand Up @@ -908,7 +908,7 @@
"id": "large_stomach_sealed",
"type": "CONTAINER",
"category": "container",
"name": "large sealed stomach",
"name": { "str": "large sealed stomach" },
"description": "The stomach of a large creature, cleaned and sealed with strings. It can hold 3 liters of water.",
"weight": "783 g",
"volume": "500 ml",
Expand Down Expand Up @@ -984,7 +984,7 @@
"id": "stomach_sealed",
"type": "CONTAINER",
"category": "container",
"name": "sealed stomach",
"name": { "str": "sealed stomach" },
"description": "The stomach of a creature, cleaned and sealed with a string. It can hold 1.5 liters of water.",
"weight": "453 g",
"volume": "250 ml",
Expand Down Expand Up @@ -1045,7 +1045,7 @@
"id": "waterskin3",
"type": "CONTAINER",
"category": "container",
"name": "large waterskin",
"name": { "str": "large waterskin" },
"description": "A large watertight leather bag with a carrying strap, can hold 5 liters of water.",
"weight": "990 g",
"volume": "750 ml",
Expand Down Expand Up @@ -1085,10 +1085,10 @@
"id": "wrapper",
"type": "CONTAINER",
"category": "container",
"name": "paper wrapper",
"name": { "str": "paper wrapper" },
"description": "Just a piece of butcher's paper. Good for starting fires.",
"weight": "3 g",
"volume": 0,
"volume": "5 ml",
"price": 0,
"to_hit": -2,
"rigid": false,
Expand Down Expand Up @@ -1118,7 +1118,7 @@
"id": "plastic_bucket",
"type": "CONTAINER",
"category": "container",
"name": "plastic tub",
"name": { "str": "plastic tub" },
"description": "A big, square plastic bucket usually used for carrying ice cream.",
"weight": "1360 g",
"volume": "4500 ml",
Expand Down Expand Up @@ -1163,7 +1163,7 @@
"id": "can_food_big",
"type": "CONTAINER",
"category": "container",
"name": "large tin can",
"name": { "str": "large tin can" },
"description": "A large tin can, like what beans come in. Holds a substantial amount of food.",
"weight": "350 g",
"volume": "3L",
Expand All @@ -1180,7 +1180,7 @@
"id": "can_food_big_unsealed",
"copy-from": "can_food_big",
"type": "CONTAINER",
"name": "large opened tin can",
"name": { "str": "large opened tin can" },
"description": "A large tin can, like what beans come in. This one is opened and can't be easily sealed.",
"symbol": ")",
"color": "blue",
Expand Down

0 comments on commit c294746

Please sign in to comment.