cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-30 08:39:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #802 from SplinterGP/master

Browse Source 
Quick fix for drinks and puts the old love potion back(i'll do a quick test before travis accepts)
This commit is contained in:
Izac Joof Forsgren
2020-06-13 01:32:15 +02:00
committed by GitHub
parent 9a7c16f08a c8b4b944ec
commit 44fa7f7923
5 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_yw.dm
+29
View File
@@ -0,0 +1,29 @@
/datum/reagent/drink/lovepotion_yw
name = "Strawberry Love Potion"
id = "strawberrylovepotion"
description = "Creamy strawberries and sugar, simple and sweet."
taste_description = "strawberries and cream"
color = "#fc8a8a" // rgb(252, 138, 138)
glass_name = "Love Potion"
glass_desc = "Love me tender, love me sweet."
/datum/reagent/ethanol/wormblood
name = "Worm Blood"
id = "wormblood"
description = "Who had the grand idea to bottle THE BLOOD OF A WORM."
taste_description = "Wriggly cave fungus"
color = "#827A00"
strength = 30
druggy = 10
glass_name = "Worm blood"
glass_desc = "Who had the grand idea to bottle THE BLOOD OF A WORM."
glass_icon_state = "wormblood"
glass_center_of_mass = list("x"=16, "y"=8)
glass_icon_file = 'icons/obj/drinks_yw.dmi'
code/modules/reagents/Chemistry-Recipes_vr.dm
+1 -1
View File
@@ -161,7 +161,7 @@
name = "Space Bulldog"
id = "bulldog"
result = "bulldog"
required_reagents = list("blackrussian" = 3, "cola" =1, "cream" =1)
required_reagents = list("blackrussian" = 3, "cola" =1) // YW edit, cream makes it turn into white russian, when they change on vorestation and we update, can change this
result_amount = 5
/datum/chemical_reaction/drinks/sbagliato
code/modules/reagents/Chemistry-Recipes_yw.dm
+14
View File
@@ -0,0 +1,14 @@
/datum/chemical_reaction/drinks/lovepotion_yw
name = "Strawberry Love Potion"
id = "strawberrylovepotion"
result = "strawberrylovepotion"
required_reagents = list("cream" = 1, "berryjuice" = 1, "sugar" = 1)
result_amount = 3
/datum/chemical_reaction/drinks/wormblood
name = "Wormblood"
id = "wormblood"
result = "wormblood"
required_reagents = list("booger" = 1, "psilocybin" = 1)
result_amount = 2
icons/obj/drinks_yw.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 315 B

vorestation.dme
+2
View File
@@ -3306,6 +3306,7 @@
#include "code\modules\reagents\Chemistry-Reagents_vr.dm"
#include "code\modules\reagents\Chemistry-Recipes.dm"
#include "code\modules\reagents\Chemistry-Recipes_vr.dm"
#include "code\modules\reagents\Chemistry-Recipes_yw.dm"
#include "code\modules\reagents\kelshark.dm"
#include "code\modules\reagents\reagent_containers.dm"
#include "code\modules\reagents\reagent_dispenser.dm"
@@ -3313,6 +3314,7 @@
#include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Dispenser.dm"
#include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Food-Drinks.dm"
#include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Food-Drinks_vr.dm"
#include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Food-Drinks_yw.dm"
#include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Medicine.dm"
#include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Medicine_vr.dm"
#include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Modifiers.dm"