Merge pull request #35870 from Kodiologist/high-on-cheese

Remove stim values from cheeseburgers etc.
CleverRaven · Dec 5, 2019 · baeea93 · baeea93
2 parents 1305b8c + 8bf1bdb
commit baeea93
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 36 deletions.
diff --git a/data/json/items/comestibles/dairy.json b/data/json/items/comestibles/dairy.json
@@ -188,7 +188,6 @@
     "weight": "34 g",
     "color": "yellow",
     "spoils_in": "180 days",
-    "stim": 1,
     "container": "wrapper",
     "comestible_type": "FOOD",
     "symbol": "%",
@@ -211,7 +210,6 @@
     "weight": "30 g",
     "color": "yellow",
     "spoils_in": "28 days",
-    "stim": 1,
     "container": "bag_plastic",
     "comestible_type": "FOOD",
     "symbol": "%",

diff --git a/data/json/items/comestibles/drink_other.json b/data/json/items/comestibles/drink_other.json
@@ -217,7 +217,6 @@
     "name_plural": "molasses",
     "weight": "89 g",
     "color": "brown",
-    "stim": 3,
     "container": "jar_glass",
     "comestible_type": "DRINK",
     "symbol": "~",
@@ -254,7 +253,6 @@
     "charges": 48,
     "healthy": 1,
     "fun": -20,
-    "stim": 1,
     "phase": "liquid"
   },
   {

diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json
@@ -201,7 +201,6 @@
     "weight": "34 g",
     "color": "brown",
     "spoils_in": "360 days",
-    "stim": 1,
     "container": "wrapper",
     "comestible_type": "FOOD",
     "symbol": "%",
@@ -241,7 +240,6 @@
     "weight": "180 g",
     "color": "brown",
     "spoils_in": "90 days",
-    "stim": 8,
     "container": "bag_plastic",
     "comestible_type": "FOOD",
     "symbol": "%",
@@ -262,7 +260,6 @@
     "weight": "39 g",
     "color": "brown",
     "spoils_in": "360 days",
-    "stim": 1,
     "container": "bag_plastic",
     "comestible_type": "FOOD",
     "symbol": "%",
@@ -285,7 +282,6 @@
     "weight": "57 g",
     "color": "red",
     "spoils_in": "360 days",
-    "stim": 2,
     "container": "bag_plastic",
     "comestible_type": "FOOD",
     "symbol": "%",
@@ -308,7 +304,6 @@
     "weight": "46 g",
     "color": "yellow",
     "spoils_in": "360 days",
-    "stim": 2,
     "container": "bag_plastic",
     "comestible_type": "FOOD",
     "symbol": "%",
@@ -330,7 +325,6 @@
     "weight": "46 g",
     "color": "red",
     "spoils_in": "360 days",
-    "stim": 2,
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": -6,
@@ -352,7 +346,6 @@
     "weight": "18 g",
     "color": "brown",
     "spoils_in": "360 days",
-    "stim": 1,
     "container": "bag_plastic",
     "comestible_type": "FOOD",
     "symbol": "%",
@@ -374,7 +367,6 @@
     "weight": "31 g",
     "color": "brown",
     "spoils_in": "90 days",
-    "stim": 2,
     "container": "box_small",
     "comestible_type": "FOOD",
     "symbol": "%",
@@ -477,16 +469,14 @@
     "name": "cake",
     "spoils_in": "4 days",
     "copy-from": "jihelucake",
-    "description": "Delicious chocolate cake.  It has all the icing.  All of it.",
-    "stim": 4
+    "description": "Delicious chocolate cake.  It has all the icing.  All of it."
   },
   {
     "type": "COMESTIBLE",
     "id": "cake3",
     "name": "cake",
     "spoils_in": "4 days",
     "copy-from": "jihelucake",
-    "stim": 8,
     "quench": -5,
     "description": "A cake coated in the thickest icing you've ever seen.  Someone has written guff in quotation marks on it…",
     "fun": 20
@@ -555,7 +545,6 @@
     "weight": "43 g",
     "color": "brown",
     "spoils_in": "180 days",
-    "stim": 1,
     "container": "bag_plastic",
     "comestible_type": "FOOD",
     "symbol": "%",
@@ -577,7 +566,6 @@
     "weight": "60 g",
     "color": "magenta",
     "spoils_in": "180 days",
-    "stim": 1,
     "container": "bag_plastic",
     "comestible_type": "FOOD",
     "symbol": "%",
@@ -598,7 +586,6 @@
     "weight": "18 g",
     "color": "white",
     "spoils_in": "180 days",
-    "stim": 1,
     "container": "box_cigarette",
     "comestible_type": "FOOD",
     "symbol": "%",
@@ -620,7 +607,6 @@
     "name_plural": "caramel",
     "weight": "67 g",
     "color": "white",
-    "stim": 4,
     "container": "box_small",
     "comestible_type": "FOOD",
     "symbol": "%",
@@ -664,7 +650,6 @@
     "weight": "38 g",
     "color": "yellow",
     "spoils_in": "90 days",
-    "stim": 4,
     "container": "box_small",
     "comestible_type": "FOOD",
     "symbol": "%",
@@ -685,7 +670,6 @@
     "weight": "39 g",
     "color": "yellow",
     "spoils_in": "90 days",
-    "stim": 4,
     "container": "box_small",
     "comestible_type": "FOOD",
     "symbol": "%",
@@ -1015,7 +999,6 @@
     "weight": "30 g",
     "color": "yellow",
     "spoils_in": "4 days",
-    "stim": 1,
     "container": "can_food",
     "comestible_type": "FOOD",
     "symbol": "%",
@@ -1133,14 +1116,13 @@
     "weight": "40 g",
     "color": "brown",
     "spoils_in": "180 days",
-    "stim": 3,
     "container": "box_small",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": -2,
     "healthy": -2,
     "calories": 200,
-    "description": "Crunchy sugar in chocolate capsules.  Legal and stimmy.",
+    "description": "Crunchy sugar in chocolate capsules.  The malt gives them a distinct, yet delicious flavor.",
     "price": 100,
     "material": [ "junk", "milk" ],
     "primary_material": "processed_food",

diff --git a/data/json/items/comestibles/meat_dishes.json b/data/json/items/comestibles/meat_dishes.json
@@ -888,7 +888,6 @@
     "weight": "133 g",
     "color": "brown",
     "spoils_in": "1 day 12 hours",
-    "stim": 1,
     "container": "wrapper",
     "comestible_type": "FOOD",
     "symbol": "%",
@@ -909,7 +908,6 @@
     "weight": "99 g",
     "color": "brown",
     "spoils_in": "1 day 12 hours",
-    "stim": 1,
     "container": "wrapper",
     "comestible_type": "FOOD",
     "symbol": "%",
@@ -929,7 +927,6 @@
     "weight": "113 g",
     "color": "brown",
     "spoils_in": "1 day 12 hours",
-    "stim": 1,
     "container": "wrapper",
     "comestible_type": "FOOD",
     "symbol": "%",

diff --git a/data/json/items/comestibles/raw_veggy.json b/data/json/items/comestibles/raw_veggy.json
@@ -583,7 +583,6 @@
     "weight": "143 g",
     "color": "brown",
     "spoils_in": "95 days",
-    "stim": 1,
     "comestible_type": "FOOD",
     "symbol": "%",
     "calories": 62,

diff --git a/data/json/items/comestibles/sandwich.json b/data/json/items/comestibles/sandwich.json
@@ -7,7 +7,6 @@
     "weight": "106 g",
     "color": "brown",
     "spoils_in": "1 day 10 hours",
-    "stim": 1,
     "container": "wrapper",
     "comestible_type": "FOOD",
     "symbol": "%",
@@ -30,7 +29,6 @@
     "weight": "292 g",
     "color": "brown",
     "spoils_in": "1 day 8 hours",
-    "stim": 1,
     "container": "wrapper",
     "comestible_type": "FOOD",
     "symbol": "%",
@@ -76,7 +74,6 @@
     "weight": "106 g",
     "color": "brown",
     "spoils_in": "1 day 12 hours",
-    "stim": 1,
     "container": "wrapper",
     "comestible_type": "FOOD",
     "symbol": "%",
@@ -335,7 +332,6 @@
     "weight": "220 g",
     "color": "brown",
     "spoils_in": "2 days 12 hours",
-    "stim": 1,
     "container": "wrapper",
     "comestible_type": "FOOD",
     "symbol": "%",

diff --git a/data/json/items/comestibles/wheat.json b/data/json/items/comestibles/wheat.json
@@ -6,7 +6,6 @@
     "weight": "52 g",
     "color": "yellow",
     "spoils_in": "90 days",
-    "stim": 4,
     "container": "box_small",
     "comestible_type": "FOOD",
     "symbol": "%",
@@ -370,7 +369,6 @@
     "weight": "125 g",
     "color": "brown",
     "spoils_in": "3 days",
-    "stim": 2,
     "container": "box_small",
     "comestible_type": "FOOD",
     "symbol": "%",
@@ -394,7 +392,6 @@
     "weight": "170 g",
     "color": "yellow",
     "spoils_in": "2 days",
-    "stim": 1,
     "container": "box_small",
     "comestible_type": "FOOD",
     "symbol": "%",
@@ -439,7 +436,6 @@
     "weight": "74 g",
     "color": "brown",
     "spoils_in": "3 days",
-    "stim": 2,
     "container": "box_small",
     "comestible_type": "FOOD",
     "symbol": "%",