cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

7/22/2021 Food Revamp (#11210)

Browse Source 
* Base Commit

* Forgot the New Chips

* Forgot Chicken Fillet

* Base Commit

* Forgot the New Chips

* Forgot Chicken Fillet

* Conflict Fix

* Oopsie

* Fixes known issues

* Uploads Files for Remote Work

* Small Fix

* Final Commit (hopefully)

* Small Fix
This commit is contained in:
Ghost Actual
2021-07-26 12:51:00 -04:00
committed by Chompstation Bot
parent 15fe33624a
commit 50c2de86d2
20 changed files with 1364 additions and 1310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
code/game/machinery/vending_machines_vr.dm
View File

@@ -2406,7 +2406,7 @@
/obj/item/weapon/reagent_containers/food/snacks/cb09 = 10, /obj/item/weapon/reagent_containers/food/snacks/cb09 = 10,
/obj/item/weapon/reagent_containers/food/snacks/cb10 = 10, /obj/item/weapon/reagent_containers/food/snacks/cb10 = 10,
/obj/item/weapon/reagent_containers/food/snacks/chawanmushi = 10, /obj/item/weapon/reagent_containers/food/snacks/chawanmushi = 10,
/obj/item/weapon/reagent_containers/food/snacks/cheese_cracker = 10, /obj/item/weapon/reagent_containers/food/snacks/cheesetoast = 10,
/obj/item/weapon/reagent_containers/food/snacks/cheeseburger = 10, /obj/item/weapon/reagent_containers/food/snacks/cheeseburger = 10,
/obj/item/weapon/reagent_containers/food/snacks/cheeseburrito = 10, /obj/item/weapon/reagent_containers/food/snacks/cheeseburrito = 10,
/obj/item/weapon/reagent_containers/food/snacks/cheesenachos = 10, /obj/item/weapon/reagent_containers/food/snacks/cheesenachos = 10,
@@ -2558,7 +2558,7 @@
/obj/item/weapon/reagent_containers/food/snacks/meatcube = 10, /obj/item/weapon/reagent_containers/food/snacks/meatcube = 10,
/obj/item/weapon/reagent_containers/food/snacks/meatpie = 10, /obj/item/weapon/reagent_containers/food/snacks/meatpie = 10,
/obj/item/weapon/reagent_containers/food/snacks/meatsteak = 10, /obj/item/weapon/reagent_containers/food/snacks/meatsteak = 10,
/obj/item/weapon/reagent_containers/food/snacks/microchips = 10, /obj/item/weapon/reagent_containers/food/snacks/microfries = 10,
/obj/item/weapon/reagent_containers/food/snacks/milosoup = 10, /obj/item/weapon/reagent_containers/food/snacks/milosoup = 10,
/obj/item/weapon/reagent_containers/food/snacks/mimeburger = 10, /obj/item/weapon/reagent_containers/food/snacks/mimeburger = 10,
/obj/item/weapon/reagent_containers/food/snacks/mint = 10, /obj/item/weapon/reagent_containers/food/snacks/mint = 10,
@@ -2577,8 +2577,9 @@
/obj/item/weapon/reagent_containers/food/snacks/omelette = 10, /obj/item/weapon/reagent_containers/food/snacks/omelette = 10,
/obj/item/weapon/reagent_containers/food/snacks/onionrings = 10, /obj/item/weapon/reagent_containers/food/snacks/onionrings = 10,
/obj/item/weapon/reagent_containers/food/snacks/onionsoup = 10, /obj/item/weapon/reagent_containers/food/snacks/onionsoup = 10,
/obj/item/weapon/reagent_containers/food/snacks/ovenchips = 10, /obj/item/weapon/reagent_containers/food/snacks/ovenfries = 10,
/obj/item/weapon/reagent_containers/food/snacks/pancakes = 10, /obj/item/weapon/reagent_containers/food/snacks/pancakes = 10,
/obj/item/weapon/reagent_containers/food/snacks/pancakes/berry = 10,
/obj/item/weapon/reagent_containers/food/snacks/pastatomato = 10, /obj/item/weapon/reagent_containers/food/snacks/pastatomato = 10,
/obj/item/weapon/reagent_containers/food/snacks/pie = 10, /obj/item/weapon/reagent_containers/food/snacks/pie = 10,
/obj/item/weapon/reagent_containers/food/snacks/piginblanket = 10, /obj/item/weapon/reagent_containers/food/snacks/piginblanket = 10,
@@ -2800,9 +2801,9 @@
/obj/item/weapon/reagent_containers/food/snacks/spagetti = 10, /obj/item/weapon/reagent_containers/food/snacks/spagetti = 10,
/obj/item/weapon/reagent_containers/food/snacks/xenomeat = 10, /obj/item/weapon/reagent_containers/food/snacks/xenomeat = 10,
/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat = 10, /obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat = 10,
/obj/item/weapon/reagent_containers/food/snacks/vendor_burger = 10, /obj/item/weapon/reagent_containers/food/snacks/packaged/vendburger = 10,
/obj/item/weapon/reagent_containers/food/snacks/vendor_hotdog = 10, /obj/item/weapon/reagent_containers/food/snacks/packaged/vendhotdog = 10,
/obj/item/weapon/reagent_containers/food/snacks/vendor_burrito = 10) /obj/item/weapon/reagent_containers/food/snacks/packaged/vendburrito = 10)
vend_delay = 15 vend_delay = 15
/obj/machinery/vending/event/food/safe //FOR FACILITATING/OUTFITTING EVENTS, DO NOT PUT THESE ON THE MAP// /obj/machinery/vending/event/food/safe //FOR FACILITATING/OUTFITTING EVENTS, DO NOT PUT THESE ON THE MAP//
@@ -2889,7 +2890,7 @@
/obj/item/weapon/reagent_containers/food/snacks/cb09 = 10, /obj/item/weapon/reagent_containers/food/snacks/cb09 = 10,
/obj/item/weapon/reagent_containers/food/snacks/cb10 = 10, /obj/item/weapon/reagent_containers/food/snacks/cb10 = 10,
/obj/item/weapon/reagent_containers/food/snacks/chawanmushi = 10, /obj/item/weapon/reagent_containers/food/snacks/chawanmushi = 10,
/obj/item/weapon/reagent_containers/food/snacks/cheese_cracker = 10, /obj/item/weapon/reagent_containers/food/snacks/cheesetoast = 10,
/obj/item/weapon/reagent_containers/food/snacks/cheeseburger = 10, /obj/item/weapon/reagent_containers/food/snacks/cheeseburger = 10,
/obj/item/weapon/reagent_containers/food/snacks/cheeseburrito = 10, /obj/item/weapon/reagent_containers/food/snacks/cheeseburrito = 10,
/obj/item/weapon/reagent_containers/food/snacks/cheesenachos = 10, /obj/item/weapon/reagent_containers/food/snacks/cheesenachos = 10,
@@ -3041,7 +3042,7 @@
/obj/item/weapon/reagent_containers/food/snacks/meatcube = 10, /obj/item/weapon/reagent_containers/food/snacks/meatcube = 10,
/obj/item/weapon/reagent_containers/food/snacks/meatpie = 10, /obj/item/weapon/reagent_containers/food/snacks/meatpie = 10,
/obj/item/weapon/reagent_containers/food/snacks/meatsteak = 10, /obj/item/weapon/reagent_containers/food/snacks/meatsteak = 10,
/obj/item/weapon/reagent_containers/food/snacks/microchips = 10, /obj/item/weapon/reagent_containers/food/snacks/microfries = 10,
/obj/item/weapon/reagent_containers/food/snacks/milosoup = 10, /obj/item/weapon/reagent_containers/food/snacks/milosoup = 10,
/obj/item/weapon/reagent_containers/food/snacks/mimeburger = 10, /obj/item/weapon/reagent_containers/food/snacks/mimeburger = 10,
/obj/item/weapon/reagent_containers/food/snacks/mint = 10, /obj/item/weapon/reagent_containers/food/snacks/mint = 10,
@@ -3060,8 +3061,9 @@
/obj/item/weapon/reagent_containers/food/snacks/omelette = 10, /obj/item/weapon/reagent_containers/food/snacks/omelette = 10,
/obj/item/weapon/reagent_containers/food/snacks/onionrings = 10, /obj/item/weapon/reagent_containers/food/snacks/onionrings = 10,
/obj/item/weapon/reagent_containers/food/snacks/onionsoup = 10, /obj/item/weapon/reagent_containers/food/snacks/onionsoup = 10,
/obj/item/weapon/reagent_containers/food/snacks/ovenchips = 10, /obj/item/weapon/reagent_containers/food/snacks/ovenfries = 10,
/obj/item/weapon/reagent_containers/food/snacks/pancakes = 10, /obj/item/weapon/reagent_containers/food/snacks/pancakes = 10,
/obj/item/weapon/reagent_containers/food/snacks/pancakes/berry = 10,
/obj/item/weapon/reagent_containers/food/snacks/pastatomato = 10, /obj/item/weapon/reagent_containers/food/snacks/pastatomato = 10,
/obj/item/weapon/reagent_containers/food/snacks/pie = 10, /obj/item/weapon/reagent_containers/food/snacks/pie = 10,
/obj/item/weapon/reagent_containers/food/snacks/piginblanket = 10, /obj/item/weapon/reagent_containers/food/snacks/piginblanket = 10,
@@ -3194,9 +3196,9 @@
/obj/item/weapon/reagent_containers/food/snacks/wishsoup = 10, /obj/item/weapon/reagent_containers/food/snacks/wishsoup = 10,
/obj/item/weapon/reagent_containers/food/snacks/yellowcurry = 10, /obj/item/weapon/reagent_containers/food/snacks/yellowcurry = 10,
/obj/item/weapon/reagent_containers/food/snacks/zestfish = 10, /obj/item/weapon/reagent_containers/food/snacks/zestfish = 10,
/obj/item/weapon/reagent_containers/food/snacks/vendor_burger = 10, /obj/item/weapon/reagent_containers/food/snacks/packaged/vendburger = 10,
/obj/item/weapon/reagent_containers/food/snacks/vendor_hotdog = 10, /obj/item/weapon/reagent_containers/food/snacks/packaged/vendhotdog = 10,
/obj/item/weapon/reagent_containers/food/snacks/vendor_burrito = 10) /obj/item/weapon/reagent_containers/food/snacks/packaged/vendburrito = 10)
vend_delay = 15 vend_delay = 15
/obj/machinery/vending/event/food/ingredients //FOR FACILITATING/OUTFITTING EVENTS, DO NOT PUT THESE ON THE MAP// /obj/machinery/vending/event/food/ingredients //FOR FACILITATING/OUTFITTING EVENTS, DO NOT PUT THESE ON THE MAP//

56
code/game/objects/items/trash.dm
View File

@@ -56,6 +56,10 @@
name = "bbq chips bag" name = "bbq chips bag"
icon_state = "chips_bbq" icon_state = "chips_bbq"
/obj/item/trash/chips/snv
name = "salt & vinegar chips bag"
icon_state = "chips_snv"
/obj/item/trash/cookiesnack /obj/item/trash/cookiesnack
name = "\improper Carps Ahoy! miniature cookies packet" name = "\improper Carps Ahoy! miniature cookies packet"
icon_state = "cookiesnack" icon_state = "cookiesnack"
@@ -89,10 +93,26 @@
/obj/item/trash/plate /obj/item/trash/plate
name = "plate" name = "plate"
icon_state = "plate" icon_state = "plate"
drop_sound = 'sound/items/drop/food.ogg'
pickup_sound = 'sound/items/pickup/food.ogg'
/obj/item/trash/asian_bowl
name = "asian bowl"
icon_state = "asian_bowl"
drop_sound = 'sound/items/drop/food.ogg'
pickup_sound = 'sound/items/pickup/food.ogg'
/obj/item/trash/snack_bowl /obj/item/trash/snack_bowl
name = "snack bowl" name = "snack bowl"
icon_state = "snack_bowl" icon_state = "snack_bowl"
drop_sound = 'sound/items/drop/food.ogg'
pickup_sound = 'sound/items/pickup/food.ogg'
/obj/item/trash/small_bowl
name = "small bowl"
icon_state = "small_bowl"
drop_sound = 'sound/items/drop/food.ogg'
pickup_sound = 'sound/items/pickup/food.ogg'
/obj/item/trash/pistachios /obj/item/trash/pistachios
name = "pistachios packet" name = "pistachios packet"
@@ -182,7 +202,7 @@
pickup_sound = 'sound/items/pickup/food.ogg' pickup_sound = 'sound/items/pickup/food.ogg'
/obj/item/trash/chipbasket /obj/item/trash/chipbasket
name = "empty basket" name = "empty chip basket"
icon_state = "chipbasket_empty" icon_state = "chipbasket_empty"
drop_sound = 'sound/items/drop/food.ogg' drop_sound = 'sound/items/drop/food.ogg'
pickup_sound = 'sound/items/pickup/food.ogg' pickup_sound = 'sound/items/pickup/food.ogg'
@@ -246,6 +266,12 @@
drop_sound = 'sound/items/drop/soda.ogg' drop_sound = 'sound/items/drop/soda.ogg'
pickup_sound = 'sound/items/pickup/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg'
/obj/item/trash/ntbeans
name = "empty baked bean can"
icon_state = "ntbeans"
drop_sound = 'sound/items/drop/soda.ogg'
pickup_sound = 'sound/items/pickup/soda.ogg'
/obj/item/trash/salo /obj/item/trash/salo
name = "salo pack" name = "salo pack"
icon_state = "pigfat" icon_state = "pigfat"
@@ -317,9 +343,9 @@
drop_sound = 'sound/items/drop/soda.ogg' drop_sound = 'sound/items/drop/soda.ogg'
pickup_sound = 'sound/items/pickup/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg'
/obj/item/trash/spacer_cake_wrap /obj/item/trash/spacercake_wrap
name = "snack cake wrapper" name = "snack cake wrapper"
icon_state = "spacer_cake_wrap" icon_state = "spacercake_wrap"
/obj/item/trash/sun_snax /obj/item/trash/sun_snax
name = "sun snax bag" name = "sun snax bag"
@@ -371,15 +397,15 @@
name = "\improper CRS ration bag" name = "\improper CRS ration bag"
icon_state = "tgmc_mre_trash" icon_state = "tgmc_mre_trash"
/obj/item/trash/vendor_burger /obj/item/trash/smolburger
name = "burger wrapper" name = "burger packaging"
icon_state = "packburger_wrapper" icon_state = "smolburger"
/obj/item/trash/vendor_hotdog /obj/item/trash/smolhotdog
name = "hotdog wrapper" name = "hotdog packaging"
icon_state = "packhotdog_wrapper" icon_state = "smolhotdog"
/obj/item/trash/vendor_burrito /obj/item/trash/smolburrito
name = "burrito wrapper" name = "burrito packaging"
icon_state = "packburrito_wrapper" icon_state = "smolburrito"

28
code/modules/economy/vending_machines.dm
View File

@@ -154,13 +154,14 @@
/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 12, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 12,
/obj/item/weapon/reagent_containers/food/snacks/chips = 12, /obj/item/weapon/reagent_containers/food/snacks/chips = 12,
/obj/item/weapon/reagent_containers/food/snacks/chips/bbq = 12, /obj/item/weapon/reagent_containers/food/snacks/chips/bbq = 12,
/obj/item/weapon/reagent_containers/food/snacks/chips/snv = 12,
/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 12, /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 12,
/obj/item/weapon/reagent_containers/food/snacks/pistachios = 12, /obj/item/weapon/reagent_containers/food/snacks/pistachios = 12,
/obj/item/weapon/reagent_containers/food/snacks/semki = 12, /obj/item/weapon/reagent_containers/food/snacks/semki = 12,
/obj/item/weapon/reagent_containers/food/snacks/sosjerky = 12, /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 12,
/obj/item/weapon/reagent_containers/food/snacks/vendor_burger = 12, /obj/item/weapon/reagent_containers/food/snacks/packaged/vendburger = 12,
/obj/item/weapon/reagent_containers/food/snacks/vendor_hotdog = 12, /obj/item/weapon/reagent_containers/food/snacks/packaged/vendhotdog = 12,
/obj/item/weapon/reagent_containers/food/snacks/vendor_burrito = 12, /obj/item/weapon/reagent_containers/food/snacks/packaged/vendburrito = 12,
/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 12, /obj/item/weapon/reagent_containers/food/snacks/no_raisin = 12,
/obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie = 12, /obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie = 12,
/obj/item/weapon/reagent_containers/food/snacks/tastybread = 12, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 12,
@@ -187,13 +188,14 @@
/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 5, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 5,
/obj/item/weapon/reagent_containers/food/snacks/chips = 1, /obj/item/weapon/reagent_containers/food/snacks/chips = 1,
/obj/item/weapon/reagent_containers/food/snacks/chips/bbq = 1, /obj/item/weapon/reagent_containers/food/snacks/chips/bbq = 1,
/obj/item/weapon/reagent_containers/food/snacks/chips/snv = 1,
/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 1, /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 1,
/obj/item/weapon/reagent_containers/food/snacks/pistachios = 1, /obj/item/weapon/reagent_containers/food/snacks/pistachios = 1,
/obj/item/weapon/reagent_containers/food/snacks/semki = 1, /obj/item/weapon/reagent_containers/food/snacks/semki = 1,
/obj/item/weapon/reagent_containers/food/snacks/sosjerky = 2, /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 2,
/obj/item/weapon/reagent_containers/food/snacks/vendor_burger = 7, /obj/item/weapon/reagent_containers/food/snacks/packaged/vendburger = 7,
/obj/item/weapon/reagent_containers/food/snacks/vendor_hotdog = 7, /obj/item/weapon/reagent_containers/food/snacks/packaged/vendhotdog = 7,
/obj/item/weapon/reagent_containers/food/snacks/vendor_burrito = 7, /obj/item/weapon/reagent_containers/food/snacks/packaged/vendburrito = 7,
/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 1, /obj/item/weapon/reagent_containers/food/snacks/no_raisin = 1,
/obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie = 1, /obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie = 1,
/obj/item/weapon/reagent_containers/food/snacks/tastybread = 2, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 2,
@@ -1029,13 +1031,14 @@
/obj/item/weapon/reagent_containers/food/snacks/syndicake = 8, /obj/item/weapon/reagent_containers/food/snacks/syndicake = 8,
/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 8, /obj/item/weapon/reagent_containers/food/snacks/no_raisin = 8,
/obj/item/weapon/reagent_containers/food/snacks/sosjerky = 8, /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 8,
/obj/item/weapon/reagent_containers/food/snacks/vendor_burger = 8, /obj/item/weapon/reagent_containers/food/snacks/packaged/vendburger = 8,
/obj/item/weapon/reagent_containers/food/snacks/vendor_hotdog = 8, /obj/item/weapon/reagent_containers/food/snacks/packaged/vendhotdog = 8,
/obj/item/weapon/reagent_containers/food/snacks/vendor_burrito = 8, /obj/item/weapon/reagent_containers/food/snacks/packaged/vendburrito = 8,
/obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 8, /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 8,
/obj/item/weapon/reagent_containers/food/snacks/tastybread = 8, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 8,
/obj/item/weapon/reagent_containers/food/snacks/chips/bbq = 8, /obj/item/weapon/reagent_containers/food/snacks/chips/bbq = 8,
/obj/item/weapon/reagent_containers/food/snacks/chips = 8, /obj/item/weapon/reagent_containers/food/snacks/chips = 8,
/obj/item/weapon/reagent_containers/food/snacks/chips/snv = 8,
/obj/item/weapon/reagent_containers/food/snacks/driedfish = 8, /obj/item/weapon/reagent_containers/food/snacks/driedfish = 8,
/obj/item/weapon/reagent_containers/food/snacks/cookiesnack = 8 /obj/item/weapon/reagent_containers/food/snacks/cookiesnack = 8
) )
@@ -1050,13 +1053,14 @@
/obj/item/weapon/reagent_containers/food/snacks/syndicake = 5, /obj/item/weapon/reagent_containers/food/snacks/syndicake = 5,
/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 5, /obj/item/weapon/reagent_containers/food/snacks/no_raisin = 5,
/obj/item/weapon/reagent_containers/food/snacks/sosjerky = 5, /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 5,
/obj/item/weapon/reagent_containers/food/snacks/vendor_burger = 5, /obj/item/weapon/reagent_containers/food/snacks/packaged/vendburger = 7,
/obj/item/weapon/reagent_containers/food/snacks/vendor_hotdog = 5, /obj/item/weapon/reagent_containers/food/snacks/packaged/vendhotdog = 7,
/obj/item/weapon/reagent_containers/food/snacks/vendor_burrito = 5, /obj/item/weapon/reagent_containers/food/snacks/packaged/vendburrito = 7,
/obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 5, /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 5,
/obj/item/weapon/reagent_containers/food/snacks/tastybread = 5, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 5,
/obj/item/weapon/reagent_containers/food/snacks/chips/bbq = 5, /obj/item/weapon/reagent_containers/food/snacks/chips/bbq = 5,
/obj/item/weapon/reagent_containers/food/snacks/chips = 5, /obj/item/weapon/reagent_containers/food/snacks/chips = 5,
/obj/item/weapon/reagent_containers/food/snacks/chips/snv = 5,
/obj/item/weapon/reagent_containers/food/snacks/driedfish = 5, /obj/item/weapon/reagent_containers/food/snacks/driedfish = 5,
/obj/item/weapon/reagent_containers/food/snacks/cookiesnack = 5 /obj/item/weapon/reagent_containers/food/snacks/cookiesnack = 5
) )

38
code/modules/food/food/condiment.dm
View File

@@ -61,6 +61,11 @@
desc = "You feel more American already." desc = "You feel more American already."
icon_state = "ketchup" icon_state = "ketchup"
center_of_mass = list("x"=16, "y"=6) center_of_mass = list("x"=16, "y"=6)
if("mustard")
name = "Mustard"
desc = "A somewhat bitter topping."
icon_state = "mustard"
center_of_mass = list("x"=16, "y"=6)
if("capsaicin") if("capsaicin")
name = "Hotsauce" name = "Hotsauce"
desc = "You can almost TASTE the stomach ulcers now!" desc = "You can almost TASTE the stomach ulcers now!"
@@ -76,6 +81,11 @@
desc = "A salty soy-based flavoring." desc = "A salty soy-based flavoring."
icon_state = "soysauce" icon_state = "soysauce"
center_of_mass = list("x"=16, "y"=6) center_of_mass = list("x"=16, "y"=6)
if("vinegar")
name = "Vinegar"
desc = "An acetic acid used in various dishes."
icon_state = "vinegar"
center_of_mass = list("x"=16, "y"=6)
if("frostoil") if("frostoil")
name = "Coldsauce" name = "Coldsauce"
desc = "Leaves the tongue numb in its passage." desc = "Leaves the tongue numb in its passage."
@@ -118,7 +128,6 @@
if("spacespice") if("spacespice")
name = "bottle of space spice" name = "bottle of space spice"
desc = "An exotic blend of spices for cooking. Definitely not worms." desc = "An exotic blend of spices for cooking. Definitely not worms."
icon = 'icons/obj/food_syn.dmi'
icon_state = "spacespicebottle" icon_state = "spacespicebottle"
center_of_mass = list("x"=16, "y"=6) center_of_mass = list("x"=16, "y"=6)
if("barbecue") if("barbecue")
@@ -158,6 +167,10 @@
. = ..() . = ..()
reagents.add_reagent("ketchup", 50) reagents.add_reagent("ketchup", 50)
/obj/item/weapon/reagent_containers/food/condiment/mustard/Initialize()
. = ..()
reagents.add_reagent("mustard", 50)
/obj/item/weapon/reagent_containers/food/condiment/hotsauce/Initialize() /obj/item/weapon/reagent_containers/food/condiment/hotsauce/Initialize()
. = ..() . = ..()
reagents.add_reagent("capsaicin", 50) reagents.add_reagent("capsaicin", 50)
@@ -177,6 +190,10 @@
. = ..() . = ..()
reagents.add_reagent("soysauce", 50) reagents.add_reagent("soysauce", 50)
/obj/item/weapon/reagent_containers/food/condiment/vinegar/Initialize()
. = ..()
reagents.add_reagent("vinegar", 50)
/obj/item/weapon/reagent_containers/food/condiment/yeast /obj/item/weapon/reagent_containers/food/condiment/yeast
name = "Yeast" name = "Yeast"
@@ -203,16 +220,26 @@
. = ..() . = ..()
reagents.add_reagent("sodiumchloride", 20) reagents.add_reagent("sodiumchloride", 20)
/obj/item/weapon/reagent_containers/food/condiment/small/peppermill /obj/item/weapon/reagent_containers/food/condiment/small/peppermill //Keeping name here to save map based headaches
name = "pepper mill" name = "pepper shaker"
desc = "Often used to flavor food or make people sneeze." desc = "Often used to flavor food or make people sneeze."
icon_state = "peppermillsmall" icon_state = "peppershakersmall"
center_of_mass = list("x"=17, "y"=11) center_of_mass = list("x"=17, "y"=11)
/obj/item/weapon/reagent_containers/food/condiment/small/peppermill/Initialize() /obj/item/weapon/reagent_containers/food/condiment/small/peppermill/Initialize()
. = ..() . = ..()
reagents.add_reagent("blackpepper", 20) reagents.add_reagent("blackpepper", 20)
/obj/item/weapon/reagent_containers/food/condiment/small/peppergrinder
name = "pepper mill"
desc = "Fancy way to season a dish or make people sneeze."
icon_state = "peppermill"
center_of_mass = list("x"=17, "y"=11)
/obj/item/weapon/reagent_containers/food/condiment/small/peppermill/Initialize()
. = ..()
reagents.add_reagent("blackpepper", 30)
/obj/item/weapon/reagent_containers/food/condiment/small/sugar /obj/item/weapon/reagent_containers/food/condiment/small/sugar
name = "sugar" name = "sugar"
desc = "Sweetness in a bottle" desc = "Sweetness in a bottle"
@@ -429,11 +456,10 @@
. = ..() . = ..()
reagents.add_reagent("flour", 200) reagents.add_reagent("flour", 200)
randpixel_xy() randpixel_xy()
/obj/item/weapon/reagent_containers/food/condiment/spacespice /obj/item/weapon/reagent_containers/food/condiment/spacespice
name = "space spices" name = "space spices"
desc = "An exotic blend of spices for cooking. Definitely not worms." desc = "An exotic blend of spices for cooking. Definitely not worms."
icon = 'icons/obj/food_syn.dmi'
icon_state = "spacespicebottle" icon_state = "spacespicebottle"
possible_transfer_amounts = list(1,40) //for clown turning the lid off possible_transfer_amounts = list(1,40) //for clown turning the lid off
amount_per_transfer_from_this = 1 amount_per_transfer_from_this = 1

2443
code/modules/food/food/snacks.dm
View File

File diff suppressed because it is too large Load Diff

5
code/modules/food/food/snacks/meat.dm
View File

@@ -46,12 +46,11 @@
/obj/item/weapon/reagent_containers/food/snacks/meat/corgi /obj/item/weapon/reagent_containers/food/snacks/meat/corgi
name = "Corgi meat" name = "Corgi meat"
desc = "Tastes like... well, you know." desc = "Tastes like... well, you know."
/obj/item/weapon/reagent_containers/food/snacks/meat/chicken /obj/item/weapon/reagent_containers/food/snacks/meat/chicken
name = "chicken" name = "chicken"
icon = 'icons/obj/food_syn.dmi'
icon_state = "chickenbreast" icon_state = "chickenbreast"
cooked_icon = "chickenbreast_cooked" cooked_icon = "chickensteak"
filling_color = "#BBBBAA" filling_color = "#BBBBAA"
/obj/item/weapon/reagent_containers/food/snacks/meat/chicken/Initialize() /obj/item/weapon/reagent_containers/food/snacks/meat/chicken/Initialize()

25
code/modules/food/food/snacks_vr.dm
View File

@@ -125,7 +125,7 @@
desc = "A soup both spicy and sour from ancient Earth cooking traditions. This one is made with tofu." desc = "A soup both spicy and sour from ancient Earth cooking traditions. This one is made with tofu."
icon = 'icons/obj/food_vr.dmi' icon = 'icons/obj/food_vr.dmi'
icon_state = "hotandsoursoup" icon_state = "hotandsoursoup"
trash = /obj/item/trash/snack_bowl trash = /obj/item/trash/asian_bowl
nutriment_amt = 6 nutriment_amt = 6
nutriment_desc = list("spicyness" = 4, "sourness" = 4, "tofu" = 1) nutriment_desc = list("spicyness" = 4, "sourness" = 4, "tofu" = 1)
@@ -139,7 +139,7 @@
desc = "A purported favorite of kitsunes in ancient japanese myth: udon noodles, fried egg, and tofu." desc = "A purported favorite of kitsunes in ancient japanese myth: udon noodles, fried egg, and tofu."
icon = 'icons/obj/food_vr.dmi' icon = 'icons/obj/food_vr.dmi'
icon_state = "kitsuneudon" icon_state = "kitsuneudon"
trash = /obj/item/trash/snack_bowl trash = /obj/item/trash/asian_bowl
nutriment_amt = 6 nutriment_amt = 6
nutriment_desc = list("fried egg" = 2, "egg noodles" = 4) nutriment_desc = list("fried egg" = 2, "egg noodles" = 4)
@@ -152,7 +152,7 @@
desc = "Sweet, spicy, and fried. General's Chicken has been around for more than five-hundred years now, and still tastes good." desc = "Sweet, spicy, and fried. General's Chicken has been around for more than five-hundred years now, and still tastes good."
icon = 'icons/obj/food_vr.dmi' icon = 'icons/obj/food_vr.dmi'
icon_state = "generaltso" icon_state = "generaltso"
trash = /obj/item/trash/plate trash = /obj/item/trash/asian_bowl
nutriment_amt = 6 nutriment_amt = 6
nutriment_desc = list("sweet and spicy sauce" = 5, "chicken" = 3) nutriment_desc = list("sweet and spicy sauce" = 5, "chicken" = 3)
@@ -162,9 +162,9 @@
bitesize = 2 bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat /obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat
name = "grubmeat" name = "grub meat"
desc = "A slab of grub meat, it gives a gentle shock if you touch it" desc = "A slab of grub meat, it gives a gentle shock if you touch it"
icon = 'icons/obj/food_vr.dmi' icon = 'icons/obj/food.dmi'
icon_state = "grubmeat" icon_state = "grubmeat"
center_of_mass = list("x"=16, "y"=10) center_of_mass = list("x"=16, "y"=10)
@@ -388,6 +388,7 @@
desc = "Finally, some food for real men." desc = "Finally, some food for real men."
icon = 'icons/obj/food_vr.dmi' icon = 'icons/obj/food_vr.dmi'
icon_state = "sharkmeat_cooked" icon_state = "sharkmeat_cooked"
trash = /obj/item/trash/small_bowl
nutriment_amt = 5 nutriment_amt = 5
trash = /obj/item/trash/plate trash = /obj/item/trash/plate
nutriment_desc = list("manliness" = 1, "fish oil" = 2, "shark" = 2) nutriment_desc = list("manliness" = 1, "fish oil" = 2, "shark" = 2)
@@ -586,6 +587,20 @@
reagents.add_reagent("protein", 2) reagents.add_reagent("protein", 2)
bitesize = 2 bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/milosoup
name = "Miso soup"
desc = "The universes best soup! Yum!!!"
icon_state = "milosoup"
trash = /obj/item/trash/snack_bowl
center_of_mass = list("x"=16, "y"=7)
nutriment_amt = 8
nutriment_desc = list("soy" = 8)
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/milosoup/Initialize()
. = ..()
reagents.add_reagent("water", 5)
/obj/item/weapon/reagent_containers/food/snacks/onionsoup /obj/item/weapon/reagent_containers/food/snacks/onionsoup
name = "Onion Soup" name = "Onion Soup"
desc = "A soup with layers." desc = "A soup with layers."

1
code/modules/food/food/z_custom_food_vr.dm
View File

@@ -8,7 +8,6 @@ var/global/ingredientLimit = 20000
/obj/item/weapon/reagent_containers/food/snacks/customizable /obj/item/weapon/reagent_containers/food/snacks/customizable
icon = 'icons/obj/food_custom.dmi' icon = 'icons/obj/food_custom.dmi'
trash = /obj/item/trash/plate
bitesize = 2 bitesize = 2
var/ingMax = 20000 var/ingMax = 20000

2
code/modules/food/recipes_grill.dm
View File

@@ -308,7 +308,7 @@
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge /obj/item/weapon/reagent_containers/food/snacks/cheesewedge
) )
reagents = list("spacespice" = 1) reagents = list("spacespice" = 1)
result = /obj/item/weapon/reagent_containers/food/snacks/cheese_cracker result = /obj/item/weapon/reagent_containers/food/snacks/cheesetoast
result_quantity = 4 result_quantity = 4
/datum/recipe/bacongrill /datum/recipe/bacongrill

11
code/modules/food/recipes_microwave.dm
View File

@@ -123,12 +123,12 @@ I said no!
items = list(/obj/item/weapon/reagent_containers/food/snacks/cheesewedge) items = list(/obj/item/weapon/reagent_containers/food/snacks/cheesewedge)
result = /obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato result = /obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato
/datum/recipe/microchips /datum/recipe/microfries
appliance = MICROWAVE appliance = MICROWAVE
items = list( items = list(
/obj/item/weapon/reagent_containers/food/snacks/rawsticks /obj/item/weapon/reagent_containers/food/snacks/rawsticks
) )
result = /obj/item/weapon/reagent_containers/food/snacks/microchips result = /obj/item/weapon/reagent_containers/food/snacks/microfries
/datum/recipe/bangersandmash /datum/recipe/bangersandmash
items = list( items = list(
@@ -330,9 +330,14 @@ I said no!
/datum/recipe/candiedapple /datum/recipe/candiedapple
fruit = list("apple" = 1) fruit = list("apple" = 1)
reagents = list("water" = 5, "sugar" = 5) reagents = list("water" = 5, "sugar" = 5) //Makes sense seeing as how it's just syrup on the exterior
result = /obj/item/weapon/reagent_containers/food/snacks/candiedapple result = /obj/item/weapon/reagent_containers/food/snacks/candiedapple
/datum/recipe/caramelapple
fruit = list("apple" = 1)
reagents = list("milk" = 5, "sugar" = 5) //Since caramel can be made with milk I thought this was appropriate
result = /obj/item/weapon/reagent_containers/food/snacks/caramelapple
/datum/recipe/twobread /datum/recipe/twobread
reagents = list("wine" = 5) reagents = list("wine" = 5)
items = list( items = list(

16
code/modules/food/recipes_oven.dm
View File

@@ -1,9 +1,9 @@
/datum/recipe/ovenchips /datum/recipe/ovenfries
appliance = OVEN appliance = OVEN
items = list( items = list(
/obj/item/weapon/reagent_containers/food/snacks/rawsticks /obj/item/weapon/reagent_containers/food/snacks/rawsticks
) )
result = /obj/item/weapon/reagent_containers/food/snacks/ovenchips result = /obj/item/weapon/reagent_containers/food/snacks/ovenfries
//Roasts //Roasts
//--------------- //---------------
@@ -512,13 +512,23 @@
/datum/recipe/pancakes /datum/recipe/pancakes
appliance = OVEN appliance = OVEN
fruit = list("berries" = 2) reagents = list("milk" = 5, "sugar" = 15)
items = list( items = list(
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough
) )
result = /obj/item/weapon/reagent_containers/food/snacks/pancakes result = /obj/item/weapon/reagent_containers/food/snacks/pancakes
/datum/recipe/pancakes/berry
appliance = OVEN
fruit = list("berries" = 2)
reagents = list("milk" = 5, "sugar" = 15)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough
)
result = /obj/item/weapon/reagent_containers/food/snacks/pancakes/berry
/datum/recipe/lasagna /datum/recipe/lasagna
appliance = OVEN appliance = OVEN
fruit = list("tomato" = 2, "eggplant" = 1) fruit = list("tomato" = 2, "eggplant" = 1)

23
code/modules/reagents/reagents/food_drinks.dm
View File

@@ -452,6 +452,14 @@
color = "#792300" color = "#792300"
allergen_type = ALLERGEN_BEANS //Soy (beans) allergen_type = ALLERGEN_BEANS //Soy (beans)
/datum/reagent/nutriment/vinegar
name = "Vinegar"
id = "vinegar"
description = "vinegar, great for fish and pickles."
taste_description = "vinegar"
reagent_state = LIQUID
nutriment_factor = 5
color = "#54410C"
/datum/reagent/nutriment/ketchup /datum/reagent/nutriment/ketchup
name = "Ketchup" name = "Ketchup"
@@ -463,6 +471,15 @@
color = "#731008" color = "#731008"
allergen_type = ALLERGEN_FRUIT //Tomatoes are a fruit. allergen_type = ALLERGEN_FRUIT //Tomatoes are a fruit.
/datum/reagent/nutriment/mustard
name = "Mustard"
id = "mustard"
description = "Delicious mustard. Good on Hot Dogs."
taste_description = "mustard"
reagent_state = LIQUID
nutriment_factor = 5
color = "#E3BD00"
/datum/reagent/nutriment/barbecue /datum/reagent/nutriment/barbecue
name = "Barbeque Sauce" name = "Barbeque Sauce"
id = "barbecue" id = "barbecue"
@@ -673,7 +690,7 @@
M.bodytemperature -= rand(1, 5) * M.species.spice_mod // Really fucks you up, cause it makes you cold. M.bodytemperature -= rand(1, 5) * M.species.spice_mod // Really fucks you up, cause it makes you cold.
if(prob(5)) if(prob(5))
M.visible_message("<span class='warning'>[M] [pick("dry heaves!","coughs!","splutters!")]</span>", pick("<span class='danger'>You feel like your insides are freezing!</span>", "<span class='danger'>Your insides feel like they're turning to ice!</span>")) M.visible_message("<span class='warning'>[M] [pick("dry heaves!","coughs!","splutters!")]</span>", pick("<span class='danger'>You feel like your insides are freezing!</span>", "<span class='danger'>Your insides feel like they're turning to ice!</span>"))
// holder.remove_reagent("capsaicin", 5) // VOREStation Edit: Nop, we don't instadelete spices for free. // holder.remove_reagent("capsaicin", 5) // VOREStation Edit: Nop, we don't instadelete spices for free.
/datum/reagent/frostoil/cryotoxin //A longer lasting version of frost oil. /datum/reagent/frostoil/cryotoxin //A longer lasting version of frost oil.
name = "Cryotoxin" name = "Cryotoxin"
@@ -719,7 +736,7 @@
M.bodytemperature += rand(1, 5) * M.species.spice_mod // Really fucks you up, cause it makes you overheat, too. M.bodytemperature += rand(1, 5) * M.species.spice_mod // Really fucks you up, cause it makes you overheat, too.
if(prob(5)) if(prob(5))
M.visible_message("<span class='warning'>[M] [pick("dry heaves!","coughs!","splutters!")]</span>", pick("<span class='danger'>You feel like your insides are burning!</span>", "<span class='danger'>You feel like your insides are on fire!</span>", "<span class='danger'>You feel like your belly is full of lava!</span>")) M.visible_message("<span class='warning'>[M] [pick("dry heaves!","coughs!","splutters!")]</span>", pick("<span class='danger'>You feel like your insides are burning!</span>", "<span class='danger'>You feel like your insides are on fire!</span>", "<span class='danger'>You feel like your belly is full of lava!</span>"))
// holder.remove_reagent("frostoil", 5) // VOREStation Edit: Nop, we don't instadelete spices for free. // holder.remove_reagent("frostoil", 5) // VOREStation Edit: Nop, we don't instadelete spices for free.
/datum/reagent/condensedcapsaicin /datum/reagent/condensedcapsaicin
name = "Condensed Capsaicin" name = "Condensed Capsaicin"
@@ -863,7 +880,7 @@
M.apply_effect(4, AGONY, 0) M.apply_effect(4, AGONY, 0)
if(prob(5)) if(prob(5))
M.visible_message("<span class='warning'>[M] [pick("dry heaves!","coughs!","splutters!")]</span>", "<span class='danger'>You feel like your insides are burning!</span>") M.visible_message("<span class='warning'>[M] [pick("dry heaves!","coughs!","splutters!")]</span>", "<span class='danger'>You feel like your insides are burning!</span>")
// holder.remove_reagent("frostoil", 5) // VOREStation Edit: Nop, we don't instadelete spices for free. // holder.remove_reagent("frostoil", 5) // VOREStation Edit: Nop, we don't instadelete spices for free.
/* Drinks */ /* Drinks */

BIN
icons/obj/food.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 179 KiB

After

Width:  |  Height:  |  Size: 205 KiB

BIN
icons/obj/food_canned.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
icons/obj/food_custom.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 27 KiB

BIN
icons/obj/food_package.dmi Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.5 KiB

BIN
icons/obj/food_snacks.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

BIN
icons/obj/food_syn.dmi
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 53 KiB

BIN
icons/obj/food_vr.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 29 KiB

BIN
icons/obj/trash.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 37 KiB