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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-10-22 19:48:49 -04:00
committed by GitHub
parent deae206b41
commit ed6e2d7eb6
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/reagents/reagents/food_drinks.dm
View File

@@ -3064,17 +3064,9 @@
/datum/reagent/ethanol/cuba_libre /datum/reagent/ethanol/cuba_libre
name = "Cuba Libre" name = "Cuba Libre"
id = "cubalibre" id = "cubalibre"
<<<<<<< HEAD
description = "Rum, mixed with cola. Viva la revolucion."
taste_description = "cola"
nutriment_factor = 1.5 //CHOMPStation addition
||||||| parent of 7ef4a5b686... Merge pull request #11541 from VOREStation/upstream-merge-8249
description = "Rum, mixed with cola. Viva la revolucion."
taste_description = "cola"
=======
description = "Rum, mixed with cola and a splash of lime. Viva la revolucion." description = "Rum, mixed with cola and a splash of lime. Viva la revolucion."
taste_description = "cola with lime" taste_description = "cola with lime"
>>>>>>> 7ef4a5b686... Merge pull request #11541 from VOREStation/upstream-merge-8249 nutriment_factor = 1.5 //CHOMPStation addition
color = "#3E1B00" color = "#3E1B00"
strength = 30 strength = 30