cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-26 14:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

More lemons, plus milk!

Browse Source 
Adds lemon juice and milk to booze-o-mat (not soda fountain) and adds lemon juice cartridges to appropriate Cargo lists.
This commit is contained in:
Nerezza
2016-11-16 16:47:16 -06:00
parent 1d66540460
commit bdb1096a6b
4 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/dispenser/supply.dm
+1
View File
@@ -223,6 +223,7 @@ PACK(sodawater, /obj/item/weapon/reagent_containers/chem_disp_cartridge/sodawat
PACK(lemon_lime, /obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon_lime, "Reagent refill - Lemon-Lime Juice", "lemon-lime juice reagent cartridge crate", 15)
PACK(orange, /obj/item/weapon/reagent_containers/chem_disp_cartridge/orange, "Reagent refill - Orange Juice", "orange juice reagent cartridge crate", 15)
PACK(lime, /obj/item/weapon/reagent_containers/chem_disp_cartridge/lime, "Reagent refill - Lime Juice", "lime juice reagent cartridge crate", 15)
PACK(lemon, /obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon, "Reagent refill - Lemon Juice", "lemon juice reagent cartridge crate", 15)
PACK(watermelon, /obj/item/weapon/reagent_containers/chem_disp_cartridge/watermelon, "Reagent refill - Watermelon Juice", "watermelon juice reagent cartridge crate", 15)
PACK(coffee, /obj/item/weapon/reagent_containers/chem_disp_cartridge/coffee, "Reagent refill - Coffee", "coffee reagent cartridge crate", 15)
PACK(cafe_latte, /obj/item/weapon/reagent_containers/chem_disp_cartridge/cafe_latte, "Reagent refill - Cafe Latte", "cafe latte reagent cartridge crate", 15)
code/modules/reagents/reagent_containers/food/drinks/bottle.dm
+24
View File
@@ -421,6 +421,18 @@
..()
reagents.add_reagent("orangejuice", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/milk
name = "Milk Carton"
desc = "It's milk. White and nutritious goodness!"
icon_state = "milk"
item_state = "carton"
center_of_mass = list("x"=16, "y"=9)
isGlass = 0
/obj/item/weapon/reagent_containers/food/drinks/bottle/milk/New()
..()
reagents.add_reagent("milk", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/cream
name = "Milk Cream"
desc = "It's cream. Made from milk. What else did you think you'd find in there?"
@@ -457,6 +469,18 @@
..()
reagents.add_reagent("limejuice", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/lemonjuice
name = "Lemon Juice"
desc = "Sweet-sour goodness. Minus the sweet."
icon_state = "lemonjuice"
item_state = "carton"
center_of_mass = list("x"=16, "y"=8)
isGlass = 0
/obj/item/weapon/reagent_containers/food/drinks/bottle/lemonjuice/New()
..()
reagents.add_reagent("lemonjuice", 100)
//Small bottles
/obj/item/weapon/reagent_containers/food/drinks/bottle/small
volume = 50