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

Update vending.dm

Browse Source
This commit is contained in:
Novacat
2020-03-15 14:43:33 -04:00
committed by GitHub
parent 972deeae2d
commit 92775a573a
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/machinery/vending.dm
View File

@@ -760,12 +760,8 @@
vend_power_usage = 85000 //85 kJ to heat a 250 mL cup of coffee vend_power_usage = 85000 //85 kJ to heat a 250 mL cup of coffee
products = list(/obj/item/weapon/reagent_containers/food/drinks/coffee = 25,/obj/item/weapon/reagent_containers/food/drinks/tea = 25,/obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 25) products = list(/obj/item/weapon/reagent_containers/food/drinks/coffee = 25,/obj/item/weapon/reagent_containers/food/drinks/tea = 25,/obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 25)
contraband = list(/obj/item/weapon/reagent_containers/food/drinks/ice = 10) contraband = list(/obj/item/weapon/reagent_containers/food/drinks/ice = 10)
<<<<<<< HEAD
prices = list(/obj/item/weapon/reagent_containers/food/drinks/coffee = 2, /obj/item/weapon/reagent_containers/food/drinks/tea = 2, /obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 2) //VOREStation Edit prices = list(/obj/item/weapon/reagent_containers/food/drinks/coffee = 2, /obj/item/weapon/reagent_containers/food/drinks/tea = 2, /obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 2) //VOREStation Edit
=======
prices = list(/obj/item/weapon/reagent_containers/food/drinks/coffee = 3, /obj/item/weapon/reagent_containers/food/drinks/tea = 3, /obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 3)
vending_sound = "machines/vending/vending_coffee.ogg" vending_sound = "machines/vending/vending_coffee.ogg"
>>>>>>> 22e28f2... Merge pull request #6804 from Cerebulon/bigsounds
/obj/machinery/vending/snack /obj/machinery/vending/snack
name = "Getmore Chocolate Corp" name = "Getmore Chocolate Corp"