remove aerosol whip cream

CleverRaven · Mar 15, 2021 · b8570f6 · b8570f6
1 parent 7438158
commit b8570f6
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 39 deletions.
diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json
@@ -44,19 +44,6 @@
     "phase": "liquid",
     "ammo_type": "aerosol_paint"
   },
-  {
-    "type": "AMMO",
-    "id": "aerosol_whipped_cream",
-    "name": { "str_sp": "aerosol whipped cream" },
-    "symbol": "~",
-    "description": "A shelf stable whipped cream that comes in a sealed, pressurized container and is released in an aerosol spray when a valve button is depressed.",
-    "volume": "1 ml",
-    "weight": "5 mg",
-    "color": "white",
-    "flags": [ "TRADER_AVOID" ],
-    "phase": "liquid",
-    "ammo_type": "aerosol_whipped_cream"
-  },
   {
     "type": "AMMO",
     "id": "permanent_ink",

diff --git a/data/json/items/ammo_types.json b/data/json/items/ammo_types.json
@@ -311,12 +311,6 @@
     "name": "paint",
     "default": "aerosol_paint"
   },
-  {
-    "type": "ammunition_type",
-    "id": "aerosol_whipped_cream",
-    "name": "whipped cream",
-    "default": "aerosol_whipped_cream"
-  },
   {
     "type": "ammunition_type",
     "id": "permanent_ink",

diff --git a/data/json/items/tool/misc.json b/data/json/items/tool/misc.json
@@ -659,25 +659,6 @@
     "use_action": [ "SPRAY_CAN" ],
     "flags": [ "WRITE_MESSAGE", "NO_RELOAD", "NO_UNLOAD" ]
   },
-  {
-    "id": "spray_can_whip",
-    "type": "TOOL",
-    "name": { "str": "whipped cream spray can" },
-    "description": "This is a spray can, filled with shelf stable whipped cream.  Use this tool to make graffiti on the floor or cook with it.",
-    "weight": "340 g",
-    "volume": "250 ml",
-    "price": 500,
-    "price_postapoc": 10,
-    "material": [ "aluminum" ],
-    "symbol": ";",
-    "color": "light_gray",
-    "initial_charges": 10,
-    "max_charges": 10,
-    "charges_per_use": 1,
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "aerosol_whipped_cream": 20 }, "watertight": true, "rigid": true } ],
-    "use_action": [ "SPRAY_CAN" ],
-    "flags": [ "WRITE_MESSAGE", "NO_RELOAD", "NO_UNLOAD" ]
-  },
   {
     "id": "stepladder",
     "type": "TOOL",

diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json
@@ -15,7 +15,7 @@
     "components": [
       [ [ "flour", 4 ] ],
       [ [ "salt", 12 ] ],
-      [ [ "sugar", 24 ], [ "artificial_sweetener", 24 ] ],
+      [ [ "any_frosting", 2, "LIST" ] ],
       [ [ "chocolate", 3 ] ],
       [ [ "any_butter_or_oil", 2, "LIST" ] ],
       [ [ "powder_eggs", 2 ], [ "eggs_bird", 2, "LIST" ], [ "egg_reptile", 2 ] ],