cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +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/cb10 = 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/cheeseburrito = 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/meatpie = 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/mimeburger = 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/onionrings = 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/berry = 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/piginblanket = 10,
@@ -2800,9 +2801,9 @@
/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/spidermeat = 10,
/obj/item/weapon/reagent_containers/food/snacks/vendor_burger = 10,
/obj/item/weapon/reagent_containers/food/snacks/vendor_hotdog = 10,
/obj/item/weapon/reagent_containers/food/snacks/vendor_burrito = 10)
/obj/item/weapon/reagent_containers/food/snacks/packaged/vendburger = 10,
/obj/item/weapon/reagent_containers/food/snacks/packaged/vendhotdog = 10,
/obj/item/weapon/reagent_containers/food/snacks/packaged/vendburrito = 10)
vend_delay = 15
/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/cb10 = 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/cheeseburrito = 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/meatpie = 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/mimeburger = 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/onionrings = 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/berry = 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/piginblanket = 10,
@@ -3194,9 +3196,9 @@
/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/zestfish = 10,
/obj/item/weapon/reagent_containers/food/snacks/vendor_burger = 10,
/obj/item/weapon/reagent_containers/food/snacks/vendor_hotdog = 10,
/obj/item/weapon/reagent_containers/food/snacks/vendor_burrito = 10)
/obj/item/weapon/reagent_containers/food/snacks/packaged/vendburger = 10,
/obj/item/weapon/reagent_containers/food/snacks/packaged/vendhotdog = 10,
/obj/item/weapon/reagent_containers/food/snacks/packaged/vendburrito = 10)
vend_delay = 15
/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"
icon_state = "chips_bbq"
/obj/item/trash/chips/snv
name = "salt & vinegar chips bag"
icon_state = "chips_snv"
/obj/item/trash/cookiesnack
name = "\improper Carps Ahoy! miniature cookies packet"
icon_state = "cookiesnack"
@@ -89,10 +93,26 @@
/obj/item/trash/plate
name = "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
name = "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
name = "pistachios packet"
@@ -182,7 +202,7 @@
pickup_sound = 'sound/items/pickup/food.ogg'
/obj/item/trash/chipbasket
name = "empty basket"
name = "empty chip basket"
icon_state = "chipbasket_empty"
drop_sound = 'sound/items/drop/food.ogg'
pickup_sound = 'sound/items/pickup/food.ogg'
@@ -246,6 +266,12 @@
drop_sound = 'sound/items/drop/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
name = "salo pack"
icon_state = "pigfat"
@@ -317,9 +343,9 @@
drop_sound = 'sound/items/drop/soda.ogg'
pickup_sound = 'sound/items/pickup/soda.ogg'
/obj/item/trash/spacer_cake_wrap
/obj/item/trash/spacercake_wrap
name = "snack cake wrapper"
icon_state = "spacer_cake_wrap"
icon_state = "spacercake_wrap"
/obj/item/trash/sun_snax
name = "sun snax bag"
@@ -371,15 +397,15 @@
name = "\improper CRS ration bag"
icon_state = "tgmc_mre_trash"
/obj/item/trash/vendor_burger
name = "burger wrapper"
icon_state = "packburger_wrapper"
/obj/item/trash/vendor_hotdog
name = "hotdog wrapper"
icon_state = "packhotdog_wrapper"
/obj/item/trash/vendor_burrito
name = "burrito wrapper"
icon_state = "packburrito_wrapper"
/obj/item/trash/smolburger
name = "burger packaging"
icon_state = "smolburger"
/obj/item/trash/smolhotdog
name = "hotdog packaging"
icon_state = "smolhotdog"
/obj/item/trash/smolburrito
name = "burrito packaging"
icon_state = "smolburrito"