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

Merge pull request #3350 from Mechoid/Drink_bot_the_Re-Drinkening

Browse Source 
Service Borg 2: Drink Synthesizer and Rapid Service Fab changes.
This commit is contained in:
Anewbe
2017-04-23 09:43:24 -05:00
committed by GitHub
parent 751da2a195 c64bfe5e66
commit 8d8be1d52c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/items/weapons/RSF.dm
View File

@@ -39,7 +39,7 @@ RSF
playsound(src.loc, 'sound/effects/pop.ogg', 50, 0) playsound(src.loc, 'sound/effects/pop.ogg', 50, 0)
if (mode == 1) if (mode == 1)
mode = 2 mode = 2
user << "Changed dispensing mode to 'Drinking Glass'" user << "Changed dispensing mode to 'Drinking Glass:Pint'"
return return
if (mode == 2) if (mode == 2)
mode = 3 mode = 3
@@ -82,7 +82,7 @@ RSF
product = new /obj/item/clothing/mask/smokable/cigarette() product = new /obj/item/clothing/mask/smokable/cigarette()
used_energy = 10 used_energy = 10
if(2) if(2)
product = new /obj/item/weapon/reagent_containers/food/drinks/glass2() product = new /obj/item/weapon/reagent_containers/food/drinks/glass2/pint()
used_energy = 50 used_energy = 50
if(3) if(3)
product = new /obj/item/weapon/paper() product = new /obj/item/weapon/paper()

2
code/modules/reagents/reagent_containers/borghydro.dm
View File

@@ -121,7 +121,7 @@
recharge_time = 3 recharge_time = 3
volume = 60 volume = 60
possible_transfer_amounts = list(5, 10, 20, 30) possible_transfer_amounts = list(5, 10, 20, 30)
reagent_ids = list("beer", "kahlua", "whiskey", "specialwhiskey", "wine", "vodka", "gin", "rum", "tequilla", "vermouth", "cognac", "ale", "mead", "water", "sugar", "ice", "tea", "icetea", "cola", "spacemountainwind", "dr_gibb", "space_up", "tonic", "sodawater", "lemon_lime", "orangejuice", "limejuice", "watermelonjuice") reagent_ids = list("ale", "beer", "berryjuice", "coffee", "cognac", "cola", "dr_gibb", "egg", "gin", "hot_coco", "ice", "icetea", "kahlua", "lemonjuice", "lemon_lime", "limejuice", "mead", "milk", "mint", "orangejuice", "rum", "sodawater", "soymilk", "space_up", "spacemountainwind", "specialwhiskey", "sugar", "tea", "tequilla", "tomatojuice", "tonic", "vermouth", "vodka", "water", "watermelonjuice", "whiskey", "wine")
/obj/item/weapon/reagent_containers/borghypo/service/attack(var/mob/M, var/mob/user) /obj/item/weapon/reagent_containers/borghypo/service/attack(var/mob/M, var/mob/user)
return return