diff --git a/_maps/map_files/generic/z2.dmm b/_maps/map_files/generic/z2.dmm index d831d1ba2ae..bb8d965c86d 100644 --- a/_maps/map_files/generic/z2.dmm +++ b/_maps/map_files/generic/z2.dmm @@ -482,7 +482,7 @@ "jn" = (/obj/item/device/paicard,/turf/unsimulated/floor{icon_state = "grimy"},/area/syndicate_mothership) "jo" = (/obj/structure/stool/bed/chair/comfy/teal,/turf/unsimulated/floor{icon_state = "grimy"},/area/syndicate_mothership) "jp" = (/obj/structure/bookcase,/obj/item/weapon/book/manual/wiki/engineering_hacking,/obj/item/weapon/book/manual/robotics_cyborgs,/obj/item/weapon/book/manual/engineering_singularity_safety,/obj/item/weapon/book/manual/detective,/turf/unsimulated/floor{icon_state = "grimy"},/area/syndicate_mothership) -"jq" = (/obj/structure/table/wood,/obj/item/weapon/reagent_containers/food/drinks/bottle/rum,/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla,/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka{pixel_x = -5},/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey{pixel_x = 5},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/ferry) +"jq" = (/obj/structure/table/wood,/obj/item/weapon/reagent_containers/food/drinks/bottle/rum,/obj/item/weapon/reagent_containers/food/drinks/bottle/tequila,/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka{pixel_x = -5},/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey{pixel_x = 5},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/ferry) "jr" = (/turf/unsimulated/wall/fakeglass{icon_state = "fakewindows2"; dir = 6},/area/tdome/tdomeobserve) "js" = (/obj/structure/lattice,/turf/space/transit,/area/wizard_station) "jt" = (/obj/item/weapon/shard{color = "#008000"},/turf/unsimulated/floor{tag = "icon-cultdamage5"; icon_state = "cultdamage5"},/area/wizard_station) diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index 9ef9286d0b7..d0b8e36896b 100644 --- a/code/__HELPERS/names.dm +++ b/code/__HELPERS/names.dm @@ -183,7 +183,7 @@ var/syndicate_code_response//Code response for traitors. var/safety[] = list(1,2,3)//Tells the proc which options to remove later on. var/nouns[] = list("love","hate","anger","peace","pride","sympathy","bravery","loyalty","honesty","integrity","compassion","charity","success","courage","deceit","skill","beauty","brilliance","pain","misery","beliefs","dreams","justice","truth","faith","liberty","knowledge","thought","information","culture","trust","dedication","progress","education","hospitality","leisure","trouble","friendships", "relaxation") - var/drinks[] = list("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") + var/drinks[] = list("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") var/locations[] = teleportlocs.len ? teleportlocs : drinks//if null, defaults to drinks instead. var/names[] = list() @@ -270,7 +270,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") diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index eb030504a43..46690e22484 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -600,7 +600,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, diff --git a/code/modules/food&drinks/drinks/drinks/bottle.dm b/code/modules/food&drinks/drinks/drinks/bottle.dm index fc5ef2e522b..ff9c4bf433b 100644 --- a/code/modules/food&drinks/drinks/drinks/bottle.dm +++ b/code/modules/food&drinks/drinks/drinks/bottle.dm @@ -143,11 +143,11 @@ icon_state = "vodkabottle" list_reagents = list("vodka" = 100) -/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla - name = "Caccavo Guaranteed Quality 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" - list_reagents = list("tequilla" = 100) + icon_state = "tequilabottle" + list_reagents = list("tequila" = 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing name = "Bottle of Nothing" @@ -157,7 +157,7 @@ /obj/item/weapon/reagent_containers/food/drinks/bottle/patron name = "Wrapp Artiste Patron" - desc = "Silver laced tequilla, served in space night clubs across the galaxy." + desc = "Silver laced tequila, served in space night clubs across the galaxy." icon_state = "patronbottle" list_reagents = list("patron" = 100) diff --git a/code/modules/food&drinks/drinks/drinks/drinkingglass.dm b/code/modules/food&drinks/drinks/drinks/drinkingglass.dm index a7f38510bc0..5ecd507d462 100644 --- a/code/modules/food&drinks/drinks/drinks/drinkingglass.dm +++ b/code/modules/food&drinks/drinks/drinks/drinkingglass.dm @@ -110,9 +110,9 @@ icon_state = "vermouthglass" name = "glass of vermouth" desc = "You wonder why you're even drinking this straight." - if("tequilla") - icon_state = "tequillaglass" - name = "glass of tequilla" + if("tequila") + icon_state = "tequilaglass" + name = "glass of tequila" desc = "Now all that's missing is the weird colored shades!" if("patron") icon_state = "patronglass" @@ -157,10 +157,10 @@ if("bravebull") icon_state = "bravebullglass" name = "Brave Bull" - desc = "Tequilla and Coffee liquor, brought together in a mouthwatering mixture. Drink up." - if("tequillasunrise") - icon_state = "tequillasunriseglass" - name = "Tequilla Sunrise" + desc = "tequila and Coffee liquor, brought together in a mouthwatering mixture. Drink up." + if("tequilasunrise") + icon_state = "tequilasunriseglass" + name = "tequila Sunrise" desc = "Oh great, now you feel nostalgic about sunrises back on Terra..." if("toxinsspecial") icon_state = "toxinsspecialglass" diff --git a/code/modules/food&drinks/food/snacks/food_mixtures.dm b/code/modules/food&drinks/food/snacks/food_mixtures.dm index 02d2d686af2..ecfce6d07ff 100644 --- a/code/modules/food&drinks/food/snacks/food_mixtures.dm +++ b/code/modules/food&drinks/food/snacks/food_mixtures.dm @@ -20,7 +20,7 @@ name = "Chocolate Bar" id = "chocolate_bar" result = null - required_reagents = list("soymilk" = 2, "coco" = 2, "sugar" = 2) + required_reagents = list("soymilk" = 2, "cocoa" = 2, "sugar" = 2) result_amount = 1 /datum/chemical_reaction/chocolate_bar/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -34,7 +34,7 @@ name = "Chocolate Bar" id = "chocolate_bar" result = null - required_reagents = list("milk" = 2, "coco" = 2, "sugar" = 2) + required_reagents = list("milk" = 2, "cocoa" = 2, "sugar" = 2) result_amount = 1 mob_react = 1 /datum/chemical_reaction/chocolate_bar2/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -47,7 +47,7 @@ name = "Hot Coco" id = "hot_coco" result = "hot_coco" - required_reagents = list("water" = 5, "coco" = 1) + required_reagents = list("water" = 5, "cocoa" = 1) result_amount = 5 /datum/chemical_reaction/coffee diff --git a/code/modules/food&drinks/food/snacks_other.dm b/code/modules/food&drinks/food/snacks_other.dm index dd0f226b827..78e1a3ecbe1 100644 --- a/code/modules/food&drinks/food/snacks_other.dm +++ b/code/modules/food&drinks/food/snacks_other.dm @@ -12,7 +12,7 @@ desc = "Such, sweet, fattening food." icon_state = "chocolatebarunwrapped" wrapped = 0 - list_reagents = list("nutriment" = 4, "sugar" = 2, "coco" = 2, "vitamin" = 1) + list_reagents = list("nutriment" = 4, "sugar" = 2, "cocoa" = 2, "vitamin" = 1) /obj/item/weapon/reagent_containers/food/snacks/chocolatebar/attack_self(mob/user) if(wrapped) @@ -142,10 +142,10 @@ name = "chocolate coin" desc = "A completely edible but nonflippable festive coin." icon_state = "chococoin" - list_reagents = list("nutriment" = 2, "sugar" = 2, "coco" = 2) + list_reagents = list("nutriment" = 2, "sugar" = 2, "cocoa" = 2) /obj/item/weapon/reagent_containers/food/snacks/chocoorange name = "chocolate orange" desc = "A festive chocolate orange" icon_state = "chocoorange" - list_reagents = list("nutriment" = 4, "sugar" = 2, "coco" = 2) + list_reagents = list("nutriment" = 4, "sugar" = 2, "cocoa" = 2) diff --git a/code/modules/food&drinks/food/snacks_pastry.dm b/code/modules/food&drinks/food/snacks_pastry.dm index 86c7592ec6e..55313b064a7 100644 --- a/code/modules/food&drinks/food/snacks_pastry.dm +++ b/code/modules/food&drinks/food/snacks_pastry.dm @@ -24,7 +24,7 @@ /obj/item/weapon/reagent_containers/food/snacks/donut/chaos/New() ..() - extra_reagent = pick("nutriment", "capsaicin", "frostoil", "krokodil", "plasma", "coco", "slimejelly", "banana", "berryjuice", "omnizine") + extra_reagent = pick("nutriment", "capsaicin", "frostoil", "krokodil", "plasma", "cocoa", "slimejelly", "banana", "berryjuice", "omnizine") reagents.add_reagent("[extra_reagent]", 3) if(prob(30)) icon_state = "donut2" diff --git a/code/modules/food&drinks/kitchen machinery/icecream_vat.dm b/code/modules/food&drinks/kitchen machinery/icecream_vat.dm index 0fb80d32a8b..f6c7ecc3586 100644 --- a/code/modules/food&drinks/kitchen machinery/icecream_vat.dm +++ b/code/modules/food&drinks/kitchen machinery/icecream_vat.dm @@ -22,7 +22,7 @@ /obj/machinery/icecream_vat/proc/get_ingredient_list(var/type) switch(type) if(ICECREAM_CHOCOLATE) - return list("milk", "ice", "coco") + return list("milk", "ice", "cocoa") if(ICECREAM_STRAWBERRY) return list("milk", "ice", "berryjuice") if(ICECREAM_BLUE) @@ -30,7 +30,7 @@ if(CONE_WAFFLE) return list("flour", "sugar") if(CONE_CHOC) - return list("flour", "sugar", "coco") + return list("flour", "sugar", "cocoa") else return list("milk", "ice") diff --git a/code/modules/food&drinks/recipes/drinks_recipes.dm b/code/modules/food&drinks/recipes/drinks_recipes.dm index cd97b0eccc8..f7fb033d912 100644 --- a/code/modules/food&drinks/recipes/drinks_recipes.dm +++ b/code/modules/food&drinks/recipes/drinks_recipes.dm @@ -12,7 +12,7 @@ name = "Patron" id = "patron" result = "patron" - required_reagents = list("tequilla" = 10, "silver" = 1) + required_reagents = list("tequila" = 10, "silver" = 1) result_amount = 10 /datum/chemical_reaction/bilk @@ -150,14 +150,14 @@ name = "Brave Bull" id = "bravebull" result = "bravebull" - required_reagents = list("tequilla" = 2, "kahlua" = 1) + required_reagents = list("tequila" = 2, "kahlua" = 1) result_amount = 3 -/datum/chemical_reaction/tequilla_sunrise - name = "Tequilla Sunrise" - id = "tequillasunrise" - result = "tequillasunrise" - required_reagents = list("tequilla" = 2, "orangejuice" = 1) +/datum/chemical_reaction/tequila_sunrise + name = "tequila Sunrise" + id = "tequilasunrise" + result = "tequilasunrise" + required_reagents = list("tequila" = 2, "orangejuice" = 1) result_amount = 3 /datum/chemical_reaction/toxins_special @@ -234,14 +234,14 @@ name = "Margarita" id = "margarita" result = "margarita" - required_reagents = list("tequilla" = 2, "limejuice" = 1) + required_reagents = list("tequila" = 2, "limejuice" = 1) result_amount = 3 /datum/chemical_reaction/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 /datum/chemical_reaction/threemileisland diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 10fad6295a6..b524efb5e52 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -285,7 +285,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 10), 1)) - reagents.add_reagent("coco", 4 + round((potency / 5), 1)) + reagents.add_reagent("cocoa", 4 + round((potency / 5), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/sugarcane @@ -523,32 +523,32 @@ user << "- Frostoil: [reagents.get_reagent_amount("frostoil")]%" -/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chilli - seed = /obj/item/seeds/chillighost +/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili + seed = /obj/item/seeds/chilighost name = "ghost chili" desc = "It seems to be vibrating gently." icon_state = "ghostchilipepper" var/mob/held_mob -/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chilli/add_juice() +/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/add_juice() ..() reagents.add_reagent("nutriment", 1 + round((potency / 25), 1)) reagents.add_reagent("capsaicin", 8+round(potency / 2, 1)) reagents.add_reagent("condensedcapsaicin", 4+round(potency / 4, 1)) bitesize = 1 + round(reagents.total_volume / 4, 1) -/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chilli/attackby(var/obj/item/O as obj, var/mob/user as mob) +/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/attackby(var/obj/item/O as obj, var/mob/user as mob) . = ..() if (istype(O, /obj/item/device/analyzer/plant_analyzer)) user << "- Capsaicin: [reagents.get_reagent_amount("capsaicin")]%" -/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chilli/attack_hand(mob/user as mob) +/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/attack_hand(mob/user as mob) ..() if( istype(src.loc, /mob) ) held_mob = src.loc SSobj.processing.Add(src) -/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chilli/process() +/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/process() if(held_mob && src.loc == held_mob) if( (held_mob.l_hand == src) || (held_mob.r_hand == src)) if(hasvar(held_mob,"gloves") && held_mob:gloves) diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index a2230a72c26..0fb1587d716 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -57,7 +57,7 @@ plant_type = 0 growthstages = 6 rarity = 0 // CentComm knows about this species already, it's in exotic seeds crates. - mutatelist = list(/obj/item/seeds/icepepperseed, /obj/item/seeds/chillighost) + mutatelist = list(/obj/item/seeds/icepepperseed, /obj/item/seeds/chilighost) /obj/item/seeds/replicapod name = "pack of replica pod seeds" @@ -1094,13 +1094,13 @@ new /obj/effect/spacevine_controller(user.loc, mutations) qdel(src) -/obj/item/seeds/chillighost - name = "pack of ghost chilli seeds" +/obj/item/seeds/chilighost + name = "pack of ghost chili seeds" desc = "These seeds grow into a chili said to be the hottest in the galaxy." icon_state = "seed-chilighost" species = "chilighost" plantname = "chilighost" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chilli + product = /obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili lifespan = 20 endurance = 10 maturation = 10 diff --git a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Alcohols.dm b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Alcohols.dm index 2c059efc478..719f217191e 100644 --- a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Alcohols.dm +++ b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Alcohols.dm @@ -163,9 +163,9 @@ datum/reagent/consumable/ethanol/rum color = "#664300" // rgb: 102, 67, 0 boozepwr = 45 -datum/reagent/consumable/ethanol/tequilla +datum/reagent/consumable/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 = 35 @@ -289,9 +289,9 @@ datum/reagent/consumable/ethanol/brave_bull color = "#664300" // rgb: 102, 67, 0 boozepwr = 35 -datum/reagent/consumable/ethanol/tequilla_sunrise +datum/reagent/consumable/ethanol/tequila_sunrise name = "Tequila Sunrise" - id = "tequillasunrise" + id = "tequilasunrise" description = "Tequila and orange juice. Much like a Screwdriver, only Mexican~" color = "#FFE48C" // rgb: 255, 228, 140 boozepwr = 35 diff --git a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm index 9443053a549..e5109c8f07b 100644 --- a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm @@ -236,7 +236,7 @@ datum/reagent/consumable/blackpepper datum/reagent/consumable/coco name = "Coco Powder" - id = "coco" + id = "cocoa" description = "A fatty, bitter paste made from coco beans." reagent_state = SOLID nutriment_factor = 5 * REAGENTS_METABOLISM diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index 0c4388b31e9..0259599005c 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -136,7 +136,7 @@ Borg Shaker charge_cost = 20 //Lots of reagents all regenerating at once, so the charge cost is lower. They also regenerate faster. recharge_time = 3 - reagent_ids = list("beer", "orangejuice", "limejuice", "tomatojuice", "cola", "tonic", "sodawater", "ice", "cream", "whiskey", "vodka", "rum", "gin", "tequilla", "vermouth", "wine", "kahlua", "cognac", "ale") + reagent_ids = list("beer", "orangejuice", "limejuice", "tomatojuice", "cola", "tonic", "sodawater", "ice", "cream", "whiskey", "vodka", "rum", "gin", "tequila", "vermouth", "wine", "kahlua", "cognac", "ale") /obj/item/weapon/reagent_containers/borghypo/borgshaker/attack(mob/M as mob, mob/user as mob) return //Can't inject stuff with a shaker, can we? diff --git a/config/admins.txt b/config/admins.txt index dc149720d8b..e263284f00a 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -78,3 +78,4 @@ xerux = Game Master dannno = Game Master allura = Game Master lo6a4evskiy = Game Master +vekter = Game Master \ No newline at end of file