Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
This commit is contained in:
Ghommie
@@ -133,18 +133,27 @@
|
||||
icon_state = "ginbottle"
|
||||
list_reagents = list("gin" = 100)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/gin/empty
|
||||
list_reagents = list("gin" = 0)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/whiskey
|
||||
name = "Uncle Git's special reserve"
|
||||
desc = "A premium single-malt whiskey, gently matured inside the tunnels of a nuclear shelter. TUNNEL WHISKEY RULES."
|
||||
icon_state = "whiskeybottle"
|
||||
list_reagents = list("whiskey" = 100)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/whiskey/empty
|
||||
list_reagents = list("whiskey" = 0)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/vodka
|
||||
name = "Tunguska triple distilled"
|
||||
desc = "Aah, vodka. Prime choice of drink AND fuel by Russians worldwide."
|
||||
icon_state = "vodkabottle"
|
||||
list_reagents = list("vodka" = 100)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/vodka/empty
|
||||
list_reagents = list("vodka" = 0)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka
|
||||
name = "Badminka vodka"
|
||||
desc = "The label's written in Cyrillic. All you can make out is the name and a word that looks vaguely like 'Vodka'."
|
||||
@@ -157,6 +166,9 @@
|
||||
icon_state = "tequilabottle"
|
||||
list_reagents = list("tequila" = 100)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/tequila/empty
|
||||
list_reagents = list("tequila" = 0)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing
|
||||
name = "bottle of nothing"
|
||||
desc = "A bottle filled with nothing."
|
||||
@@ -164,18 +176,27 @@
|
||||
list_reagents = list("nothing" = 100)
|
||||
foodtype = NONE
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing/empty
|
||||
list_reagents = list("nothing" = 0)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/patron
|
||||
name = "Wrapp Artiste Patron"
|
||||
desc = "Silver laced tequila, served in space night clubs across the galaxy."
|
||||
icon_state = "patronbottle"
|
||||
list_reagents = list("patron" = 100)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/patron/empty
|
||||
list_reagents = list("patron" = 0)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/rum
|
||||
name = "Captain Pete's Cuban spiced rum"
|
||||
desc = "This isn't just rum, oh no. It's practically GRIFF in a bottle."
|
||||
icon_state = "rumbottle"
|
||||
list_reagents = list("rum" = 100)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/rum/empty
|
||||
list_reagents = list("rum" = 0)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/holywater
|
||||
name = "flask of holy water"
|
||||
desc = "A flask of the chaplain's holy water."
|
||||
@@ -207,6 +228,9 @@
|
||||
icon_state = "vermouthbottle"
|
||||
list_reagents = list("vermouth" = 100)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/vermouth/empty
|
||||
list_reagents = list("vermouth" = 0)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/kahlua
|
||||
name = "Robert Robust's coffee liqueur"
|
||||
desc = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936, HONK."
|
||||
@@ -214,18 +238,27 @@
|
||||
list_reagents = list("kahlua" = 100)
|
||||
foodtype = VEGETABLES
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/kahlua/empty
|
||||
list_reagents = list("kahlua" = 0)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/goldschlager
|
||||
name = "College Girl goldschlager"
|
||||
desc = "Because they are the only ones who will drink 100 proof cinnamon schnapps."
|
||||
icon_state = "goldschlagerbottle"
|
||||
list_reagents = list("goldschlager" = 100)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/goldschlager/empty
|
||||
list_reagents = list("goldschlager" = 0)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/cognac
|
||||
name = "Chateau de Baton premium cognac"
|
||||
desc = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time."
|
||||
icon_state = "cognacbottle"
|
||||
list_reagents = list("cognac" = 100)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/cognac/empty
|
||||
list_reagents = list("cognac" = 0)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/wine
|
||||
name = "Doublebeard's bearded special wine"
|
||||
desc = "A faint aura of unease and asspainery surrounds the bottle."
|
||||
@@ -233,12 +266,18 @@
|
||||
list_reagents = list("wine" = 100)
|
||||
foodtype = FRUIT | ALCOHOL
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/wine/empty
|
||||
list_reagents = list("wine" = 0)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/absinthe
|
||||
name = "extra-strong absinthe"
|
||||
desc = "An strong alcoholic drink brewed and distributed by"
|
||||
icon_state = "absinthebottle"
|
||||
list_reagents = list("absinthe" = 100)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/absinthe/empty
|
||||
list_reagents = list("absinthe" = 0)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/absinthe/Initialize()
|
||||
. = ..()
|
||||
redact()
|
||||
@@ -300,18 +339,27 @@
|
||||
volume = 50
|
||||
list_reagents = list("hcider" = 50)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/hcider/empty
|
||||
list_reagents = list("hcider" = 0)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/grappa
|
||||
name = "Phillipes well-aged Grappa"
|
||||
desc = "Bottle of Grappa."
|
||||
icon_state = "grappabottle"
|
||||
list_reagents = list("grappa" = 100)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/grappa/empty
|
||||
list_reagents = list("grappa" = 0)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/sake
|
||||
name = "Ryo's traditional sake"
|
||||
desc = "Sweet as can be, and burns like fire going down."
|
||||
icon_state = "sakebottle"
|
||||
list_reagents = list("sake" = 100)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/sake/empty
|
||||
list_reagents = list("sake" = 0)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/sake/Initialize()
|
||||
. = ..()
|
||||
if(prob(10))
|
||||
@@ -329,6 +377,9 @@
|
||||
icon_state = "fernetbottle"
|
||||
list_reagents = list("fernet" = 100)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/fernet/empty
|
||||
list_reagents = list("fernet" = 0)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/applejack
|
||||
name = "Buckin' Bronco's Applejack"
|
||||
desc = "Kicks like a horse, tastes like an apple!"
|
||||
@@ -336,18 +387,27 @@
|
||||
list_reagents = list("applejack" = 100)
|
||||
foodtype = FRUIT
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/applejack/empty
|
||||
list_reagents = list("applejack" = 0)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/champagne
|
||||
name = "Eau d' Dandy Brut Champagne"
|
||||
desc = "Finely sourced from only the most pretentious French vineyards."
|
||||
icon_state = "champagne_bottle"
|
||||
list_reagents = list("champagne" = 100)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/champagne/empty
|
||||
list_reagents = list("champagne" = 0)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/blazaam
|
||||
name = "Ginbad's Blazaam"
|
||||
desc = "You feel like you should give the bottle a good rub before opening."
|
||||
icon_state = "blazaambottle"
|
||||
list_reagents = list("blazaam" = 100)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/blazaam/empty
|
||||
list_reagents = list("blazaam" = 0)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/trappist
|
||||
name = "Mont de Requin Trappistes Bleu"
|
||||
desc = "Brewed in space-Belgium. Fancy!"
|
||||
@@ -355,6 +415,8 @@
|
||||
volume = 50
|
||||
list_reagents = list("trappist" = 50)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/trappist/empty
|
||||
list_reagents = list("trappist" = 0)
|
||||
|
||||
//////////////////////////JUICES AND STUFF ///////////////////////
|
||||
|
||||
@@ -420,6 +482,8 @@
|
||||
list_reagents = list("grenadine" = 100)
|
||||
foodtype = FRUIT
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/grenadine/empty
|
||||
list_reagents = list("grenadine" = 0)
|
||||
|
||||
////////////////////////// MOLOTOV ///////////////////////
|
||||
/obj/item/reagent_containers/food/drinks/bottle/molotov
|
||||
@@ -487,3 +551,131 @@
|
||||
to_chat(user, "<span class='info'>You snuff out the flame on [src].</span>")
|
||||
cut_overlay(GLOB.fire_overlay)
|
||||
active = 0
|
||||
|
||||
/obj/item/export/bottle/attack_self(mob/user)
|
||||
to_chat(user, "<span class='danger'>The seal seems fine. Best to not open it.</span>")
|
||||
return
|
||||
|
||||
/obj/item/export/bottle
|
||||
name = "Report this please"
|
||||
desc = "A sealed bottle of alcohol, ready to be exported"
|
||||
icon = 'icons/obj/drinks.dmi'
|
||||
force = 0
|
||||
throwforce = 0
|
||||
throw_speed = 0
|
||||
throw_range = 0
|
||||
w_class = WEIGHT_CLASS_TINY
|
||||
item_state = "beer"
|
||||
attack_verb = list("boop", "thunked", "shown")
|
||||
|
||||
/obj/item/export/bottle/gin
|
||||
icon_state = "ginbottle"
|
||||
name = "Sealed Gin"
|
||||
|
||||
/obj/item/export/bottle/wine
|
||||
icon_state = "winebottle"
|
||||
name = "Sealed Wine"
|
||||
|
||||
/obj/item/export/bottle/whiskey
|
||||
icon_state = "whiskeybottle"
|
||||
name = "Sealed Whiskey"
|
||||
|
||||
/obj/item/export/bottle/vodka
|
||||
icon_state = "vodkabottle"
|
||||
name = "Sealed Vodka"
|
||||
|
||||
/obj/item/export/bottle/tequila
|
||||
icon_state = "tequilabottle"
|
||||
name = "Sealed Tequila"
|
||||
|
||||
/obj/item/export/bottle/patron
|
||||
icon_state = "patronbottle"
|
||||
name = "Sealed Patron"
|
||||
|
||||
/obj/item/export/bottle/rum
|
||||
icon_state = "rumbottle"
|
||||
name = "Sealed Rum"
|
||||
|
||||
/obj/item/export/bottle/vermouth
|
||||
icon_state = "vermouthbottle"
|
||||
name = "Sealed Vermouth"
|
||||
|
||||
/obj/item/export/bottle/kahlua
|
||||
icon_state = "kahluabottle"
|
||||
name = "Sealed Kahlua"
|
||||
|
||||
/obj/item/export/bottle/goldschlager
|
||||
icon_state = "goldschlagerbottle"
|
||||
name = "Sealed Goldschlager"
|
||||
|
||||
/obj/item/export/bottle/hcider
|
||||
icon_state = "hcider"
|
||||
name = "Sealed Cider"
|
||||
|
||||
/obj/item/export/bottle/cognac
|
||||
icon_state = "cognacbottle"
|
||||
name = "Sealed Cognac"
|
||||
|
||||
/obj/item/export/bottle/absinthe
|
||||
icon_state = "absinthebottle"
|
||||
name = "Sealed Unmarked Absinthe"
|
||||
|
||||
/obj/item/export/bottle/grappa
|
||||
icon_state = "grappabottle"
|
||||
name = "Sealed Grappa"
|
||||
|
||||
/obj/item/export/bottle/sake
|
||||
icon_state = "sakebottle"
|
||||
name = "Sealed Sake"
|
||||
|
||||
/obj/item/export/bottle/fernet
|
||||
icon_state = "fernetbottle"
|
||||
name = "Sealed Fernet"
|
||||
|
||||
/obj/item/export/bottle/applejack
|
||||
icon_state = "applejack_bottle"
|
||||
name = "Sealed Applejack"
|
||||
|
||||
/obj/item/export/bottle/champagne
|
||||
icon_state = "champagne_bottle"
|
||||
name = "Sealed Champagne"
|
||||
|
||||
/obj/item/export/bottle/blazaam
|
||||
icon_state = "blazaambottle"
|
||||
name = "Sealed Blazaam"
|
||||
|
||||
/obj/item/export/bottle/trappist
|
||||
icon_state = "trappistbottle"
|
||||
name = "Sealed Trappist"
|
||||
|
||||
/obj/item/export/bottle/grenadine
|
||||
icon_state = "grenadine"
|
||||
name = "Sealed Grenadine"
|
||||
|
||||
/obj/item/export/bottle/minikeg
|
||||
name = "Mini-Beer Keg"
|
||||
icon_state = "keggy"
|
||||
desc = "A small wooden barrle with metal rings, untapped beer inside."
|
||||
|
||||
/obj/item/export/bottle/blooddrop
|
||||
icon_state = "champagne_selling_bottle"
|
||||
name = "Blood Drop"
|
||||
desc = "Large red bottle filled with a mix of wine and other named brands."
|
||||
|
||||
/obj/item/export/bottle/slim_gold
|
||||
name = "Slim Gold "
|
||||
icon_state = "selling_bottle_alt"
|
||||
desc = "A gold looking yellow bottle that has a mix of different named brands."
|
||||
|
||||
/obj/item/export/bottle/white_bloodmoon
|
||||
name = "White Bloodmoon"
|
||||
icon_state = "selling_bottle_basic"
|
||||
desc = "Rather simple bottle for this kind of drink."
|
||||
|
||||
/obj/item/export/bottle/greenroad
|
||||
name = "Green Road"
|
||||
icon_state = "selling_bottle"
|
||||
desc = "Ironic name as the fruit used is from ashy plants."
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user