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

Remove tequilla!

Browse Source
This commit is contained in:
BestName
2015-03-02 19:44:51 +02:00
parent 509fc42497
commit ade45aedcb
7 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/__HELPERS/names.dm
View File

@@ -273,7 +273,7 @@ var/syndicate_code_response//Code response for traitors.
else
syndicate_code_phrase += pick("One")
syndicate_code_phrase += " "
syndicate_code_phrase += pick("vodka and tonic","gin fizz","bahama mama","manhattan","black Russian","whiskey soda","long island tea","margarita","Irish coffee"," manly dwarf","Irish cream","doctor's delight","Beepksy Smash","tequilla sunrise","brave bull","gargle blaster","bloody mary","whiskey cola","white Russian","vodka martini","martini","Cuba libre","kahlua","vodka","wine","moonshine")
syndicate_code_phrase += pick("vodka and tonic","gin fizz","bahama mama","manhattan","black Russian","whiskey soda","long island tea","margarita","Irish coffee"," manly dwarf","Irish cream","doctor's delight","Beepksy Smash","tequila sunrise","brave bull","gargle blaster","bloody mary","whiskey cola","white Russian","vodka martini","martini","Cuba libre","kahlua","vodka","wine","moonshine")
syndicate_code_phrase += "."
if(4)
syndicate_code_phrase += pick("I wish I was","My dad was","His mom was","Where do I find","The hero this station needs is","I'd fuck","I wouldn't trust","Someone caught","HoS caught","Someone found","I'd wrestle","I wanna kill")

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

@@ -763,7 +763,7 @@
icon_state = "boozeomat" //////////////18 drink entities below, plus the glasses, in case someone wants to edit the number of bottles
icon_deny = "boozeomat-deny"
products = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/gin = 5,/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey = 5,
/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla = 5,/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka = 5,
/obj/item/weapon/reagent_containers/food/drinks/bottle/tequila = 5,/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka = 5,
/obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth = 5,/obj/item/weapon/reagent_containers/food/drinks/bottle/rum = 5,
/obj/item/weapon/reagent_containers/food/drinks/bottle/wine = 5,/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac = 5,
/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua = 5,/obj/item/weapon/reagent_containers/food/drinks/beer = 6,

2
code/modules/maps/spawners/spawners.dm
View File

@@ -554,7 +554,7 @@
/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe,
/obj/item/weapon/reagent_containers/food/drinks/bottle/cream,
/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice,
/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla,
/obj/item/weapon/reagent_containers/food/drinks/bottle/tequila,
/obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth,
/obj/item/weapon/reagent_containers/food/drinks/bottle/wine,
/obj/item/weapon/reagent_containers/food/drinks/coffee,

12
code/modules/reagents/Chemistry-Reagents.dm
View File

@@ -3740,9 +3740,9 @@
description = "Yohoho and all that."
color = "#664300" // rgb: 102, 67, 0
/datum/reagent/ethanol/tequilla
/datum/reagent/ethanol/tequila
name = "Tequila"
id = "tequilla"
id = "tequila"
description = "A strong and mildly flavoured, mexican produced spirit. Feeling thirsty hombre?"
color = "#FFFF91" // rgb: 255, 255, 145
//boozepwr = 2
@@ -3887,9 +3887,9 @@
description = "Anime's favorite drink."
color = "#664300" // rgb: 102, 67, 0
/datum/reagent/ethanol/deadrum/tequilla
/datum/reagent/ethanol/deadrum/tequila
name = "Tequila"
id = "tequilla"
id = "tequila"
description = "A strong and mildly flavoured, mexican produced spirit. Feeling thirsty hombre?"
color = "#A8B0B7" // rgb: 168, 176, 183
@@ -4068,9 +4068,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
/datum/reagent/ethanol/deadrum/tequilla_sunrise
/datum/reagent/ethanol/deadrum/tequila_sunrise
name = "Tequila Sunrise"
id = "tequillasunrise"
id = "tequilasunrise"
description = "Tequila and orange juice. Much like a Screwdriver, only Mexican~"
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0

18
code/modules/reagents/Chemistry-Recipes.dm
View File

@@ -1885,7 +1885,7 @@ datum
name = "Patron"
id = "patron"
result = "patron"
required_reagents = list("tequilla" = 10, "silver" = 1)
required_reagents = list("tequila" = 10, "silver" = 1)
result_amount = 10
bilk
@@ -2030,14 +2030,14 @@ datum
name = "Brave Bull"
id = "bravebull"
result = "bravebull"
required_reagents = list("tequilla" = 2, "kahlua" = 1)
required_reagents = list("tequila" = 2, "kahlua" = 1)
result_amount = 3
tequilla_sunrise
name = "Tequilla Sunrise"
id = "tequillasunrise"
result = "tequillasunrise"
required_reagents = list("tequilla" = 2, "orangejuice" = 1)
tequila_sunrise
name = "Tequila Sunrise"
id = "tequilasunrise"
result = "tequilasunrise"
required_reagents = list("tequila" = 2, "orangejuice" = 1)
result_amount = 3
toxins_special
@@ -2107,14 +2107,14 @@ datum
name = "Margarita"
id = "margarita"
result = "margarita"
required_reagents = list("tequilla" = 2, "limejuice" = 1)
required_reagents = list("tequila" = 2, "limejuice" = 1)
result_amount = 3
longislandicedtea
name = "Long Island Iced Tea"
id = "longislandicedtea"
result = "longislandicedtea"
required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "cubalibre" = 1)
required_reagents = list("vodka" = 1, "gin" = 1, "tequila" = 1, "cubalibre" = 1)
result_amount = 4
threemileisland

8
code/modules/reagents/reagent_containers/food/drinks.dm
View File

@@ -464,7 +464,7 @@
reagents.add_reagent("space_drugs", 20)
if(4)
name = "Grifeo: Rich"
reagents.add_reagent("tequilla", 10)
reagents.add_reagent("tequila", 10)
reagents.add_reagent("chemical_waste", 10)
if(5)
name = "Grifeo: Pure"
@@ -797,15 +797,15 @@
..()
reagents.add_reagent("vodka", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla
/obj/item/weapon/reagent_containers/food/drinks/bottle/tequila
name = "Caccavo Guaranteed Quality Tequila"
desc = "Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!"
icon_state = "tequillabottle"
icon_state = "tequilabottle"
isGlass = 1
molotov = -1
New()
..()
reagents.add_reagent("tequilla", 100)
reagents.add_reagent("tequila", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing
name = "Bottle of Nothing"

8
code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
View File

@@ -117,8 +117,8 @@
icon_state = "vermouthglass"
name = "glass of vermouth"
desc = "You wonder why you're even drinking this straight."
if("tequilla")
icon_state = "tequillaglass"
if("tequila")
icon_state = "tequilaglass"
name = "glass of tequila"
desc = "Now all that's missing is the weird colored shades!"
if("patron")
@@ -165,8 +165,8 @@
icon_state = "bravebullglass"
name = "Brave Bull"
desc = "Tequila and coffee liquor, brought together in a mouthwatering mixture. Drink up."
if("tequillasunrise")
icon_state = "tequillasunriseglass"
if("tequilasunrise")
icon_state = "tequilasunriseglass"
name = "Tequila Sunrise"
desc = "Oh great, now you feel nostalgic about sunrises back on Terra..."
if("toxinsspecial")