diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm index f83b1d29539..aa59d4153d5 100644 --- a/code/modules/chemical/Chemistry-Reagents.dm +++ b/code/modules/chemical/Chemistry-Reagents.dm @@ -3279,6 +3279,12 @@ datum reagent_state = LIQUID color = "#2E6671" // rgb: 46, 102, 113 + driestmartini + name = "Driest Martini" + id = "driestmartini" + description = "Only for the experienced. You think you see sand floating in the glass." + nutriment_factor = 1 * REAGENTS_METABOLISM + color = "#2E6671" // rgb: 46, 102, 113 //ALCHOHOL end diff --git a/code/modules/chemical/Chemistry-Recipes.dm b/code/modules/chemical/Chemistry-Recipes.dm index 10914601d01..ad825ca068d 100644 --- a/code/modules/chemical/Chemistry-Recipes.dm +++ b/code/modules/chemical/Chemistry-Recipes.dm @@ -1012,7 +1012,6 @@ datum required_reagents = list("gin" = 2, "tonic" = 1) result_amount = 3 - cuba_libre name = "Cuba Libre" id = "cubalibre" @@ -1034,12 +1033,11 @@ datum required_reagents = list("vodka" = 2, "vermouth" = 1) result_amount = 3 - white_russian name = "White Russian" id = "whiterussian" result = "whiterussian" - required_reagents = list("vodka" = 3, "cream" = 1, "kahlua" = 1) + required_reagents = list("blackrussian" = 3, "cream" = 2) result_amount = 5 whiskey_cola @@ -1221,15 +1219,15 @@ datum name = "Singulo" id = "singulo" result = "singulo" - required_reagents = list("vodka" = 5, "radium" = 1, "acid" = 1, "wine" = 5) + required_reagents = list("vodka" = 5, "radium" = 1, "wine" = 5) result_amount = 10 -/* alliescocktail + alliescocktail name = "Allies Cocktail" id = "alliescocktail" result = "alliescocktail" - required_reagents = list("gin" = 1, "vermouth" = 1) - result_amount = 2*/ + required_reagents = list("martini" = 1, "vodka" = 1) + result_amount = 2 demonsblood name = "Demons Blood" @@ -1256,11 +1254,11 @@ datum name = "Barefoot" id = "barefoot" result = "barefoot" - required_reagents = list("vodka" = 1, "cream" = 1, "vermouth" = 1, "whiskey" = 1) - result_amount = 4 + required_reagents = list("berryjuice" = 1, "cream" = 1, "vermouth" = 1) + result_amount = 3 -////DRINKS THAT REQUIRE IMPROVED SPRITES BELOW:: -Agouri///// +////DRINKS THAT REQUIRED IMPROVED SPRITES BELOW:: -Agouri///// sbiten name = "Sbiten" @@ -1344,7 +1342,7 @@ datum name = "Aloe" id = "aloe" result = "aloe" - required_reagents = list("cream" = 1, "whiskey" = 1) + required_reagents = list("cream" = 1, "whiskey" = 1, "watermelonjuice" = 1) result_amount = 2 andalusia @@ -1372,15 +1370,15 @@ datum name = "Irish Car Bomb" id = "irishcarbomb" result = "irishcarbomb" - required_reagents = list("ale" = 1, "cream" = 1, "whiskey" = 1) - result_amount = 3 + required_reagents = list("ale" = 1, "irishcream" = 1) + result_amount = 2 syndicatebomb name = "Syndicate Bomb" id = "syndicatebomb" result = "syndicatebomb" - required_reagents = list("beer" = 1, "cola" = 1, "whiskey" = 1) - result_amount = 3 + required_reagents = list("beer" = 1, "whiskeycola" = 1) + result_amount = 2 erikasurprise name = "Erika Surprise" @@ -1389,7 +1387,6 @@ datum required_reagents = list("ale" = 1, "limejuice" = 1, "whiskey" = 1, "banana" = 1, "ice" = 1) result_amount = 5 - devilskiss name = "Devils Kiss" id = "devilskiss" @@ -1418,6 +1415,10 @@ datum required_reagents = list("nothing" = 1, "cream" = 1, "sugar" = 1) result_amount = 3 - - + driestmartini + name = "Driest Martini" + id = "driestmartini" + result = "driestmartini" + required_reagents = list("nothing" = 1, "gin" = 1) + result_amount = 2 diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index 59f7393eb73..77735e6ccc9 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -2310,7 +2310,7 @@ /obj/item/weapon/reagent_containers/glass/bottle/pacid name = "Polytrinic Acid Bottle" - desc = "A small bottle. Contains a small amount of Polytronic Acid" + desc = "A small bottle. Contains a small amount of Polytrinic Acid" icon = 'chemical.dmi' icon_state = "bottle17" New() @@ -3592,7 +3592,7 @@ desc = "Creepy time!" if("changelingsting") icon_state = "changelingsting" - name = "Changeling sting" + name = "Changeling Sting" desc = "A stingy drink." if("irishcarbomb") icon_state = "irishcarbomb" @@ -3606,6 +3606,10 @@ icon_state = "erikasurprise" name = "Erika Surprise" desc = "The surprise is, it's green!" + if("driestmartini") + icon_state = "driestmartini" + name = "Driest Martini" + desc = "Only for the experienced. You think you see sand floating in the glass." else icon_state ="glass_brown" name = "Glass of ..what?" diff --git a/code/modules/mob/simple_animal/corgi.dm b/code/modules/mob/simple_animal/corgi.dm index a6e7e687a2f..2461e55f6e6 100644 --- a/code/modules/mob/simple_animal/corgi.dm +++ b/code/modules/mob/simple_animal/corgi.dm @@ -171,7 +171,8 @@ /obj/item/clothing/head/helmet/hardhat/white, /obj/item/weapon/bedsheet, /obj/item/clothing/head/helmet/space/santahat, - /obj/item/clothing/head/collectable/paper + /obj/item/clothing/head/collectable/paper, + /obj/item/clothing/head/cargosoft ) if( ! ( item_to_add.type in allowed_types ) ) @@ -183,7 +184,7 @@ src.inventory_head = item_to_add update_clothing() - //Various hats and items (worn on his head) change Ian's behaviour. His attributesare reset when a HAT is removed. + //Various hats and items (worn on his head) change Ian's behaviour. His attributes are reset when a HAT is removed. switch(inventory_head && inventory_head.type) @@ -240,6 +241,10 @@ emote_hear = list("barks christmas songs", "yaps") desc = "He has a very shiny nose." src.sd_SetLuminosity(6) + if(/obj/item/clothing/head/cargosoft) + name = "Corgi Tech [real_name]" + speak = list("Needs a stamp!", "Request DENIED!", "Fill these out in triplicate!") + desc = "The reason your yellow gloves have chew-marks." if("back") if(inventory_back)