diff --git a/code/WorkInProgress/Chemistry-Reagents.dm b/code/WorkInProgress/Chemistry-Reagents.dm index 41091a53e8f..d1347e04238 100644 --- a/code/WorkInProgress/Chemistry-Reagents.dm +++ b/code/WorkInProgress/Chemistry-Reagents.dm @@ -1082,6 +1082,23 @@ datum M:confused += 3 ..() + wine + name = "Wine" + id = "wine" + description = "An premium alchoholic beverage made from distilled grape juice." + reagent_state = LIQUID + on_mob_life(var/mob/M) + if(!data) data = 1 + data++ + M.make_dizzy(5) + M:jitteriness = max(M:jitteriness-5,0) + if(data >= 35) + if (!M:stuttering) M:stuttering = 1 + M:stuttering += 4 + if(data >= 60 && prob(33)) + if (!M:confused) M:confused = 1 + M:confused += 3 + ..() tonic name = "Tonic Water" @@ -1252,6 +1269,24 @@ datum M:confused += 2 ..() + whiskey_cola + name = "Whiskey Cola" + id = "whiskeycola" + description = "Whiskey, mixed with cola. Surprisingly refreshing." + reagent_state = LIQUID + on_mob_life(var/mob/M) + if(!data) data = 1 + data++ + M.make_dizzy(3) + M.jitteriness = max(M.jitteriness-3,0) + if(data >= 35) + if (!M.stuttering) M.stuttering = 1 + M.stuttering += 3 + if(data >= 65 && prob(33)) + if (!M.confused) M.confused = 1 + M:confused += 2 + ..() + martini name = "Classic Martini" id = "martini" diff --git a/code/WorkInProgress/Chemistry-Recipes.dm b/code/WorkInProgress/Chemistry-Recipes.dm index 037d6eb21eb..f7f03febce5 100644 --- a/code/WorkInProgress/Chemistry-Recipes.dm +++ b/code/WorkInProgress/Chemistry-Recipes.dm @@ -405,90 +405,112 @@ datum name = "Gin and Tonic" id = "gintonic" result = "gintonic" - required_reagents = list("gin" = 3, "tonic" = 2) + required_reagents = list("gin" = 2, "tonic" = 1) result_amount = 5 cuba_libre name = "Cuba Libre" id = "cubalibre" - required_reagents = list("rum" = 1, "cola" = 2) + result = "cubalibre" + required_reagents = list("rum" = 2, "cola" = 1) result_amount = 5 martini name = "Classic Martini" id = "martini" - required_reagents = list("gin" = 4, "vermouth" = 1) + result = "martini" + required_reagents = list("gin" = 2, "vermouth" = 1) result_amount = 5 + vodkamartini + name = "Vodka Martini" + id = "vodkamartini" + result = "vodkamartini" + required_reagents = list("vodka" = 2, "vermouth" = 1) + result_amount = 5 + + white_russian name = "White Russian" id = "whiterussian" + result = "whiterussian" required_reagents = list("vodka" = 3, "cream" = 1, "kahlua" = 1) result_amount = 5 whiskey_cola name = "Whiskey Cola" id = "whiskeycola" - required_reagents = list("whiskey" = 1, "cola" = 3) + result = "whiskeycola" + required_reagents = list("whiskey" = 2, "cola" = 1) result_amount = 5 screwdriver name = "Screwdriver" id = "screwdrivercocktail" - required_reagents = list("vodka" = 2, "orangejuice" = 3) + result = "screwdriver" + required_reagents = list("vodka" = 2, "orangejuice" = 1) result_amount = 5 bloody_mary name = "Bloody Mary" id = "bloodymary" + result = "bloodymary" required_reagents = list("vodka" = 1, "tomatojuice" = 2, "limejuice" = 1) result_amount = 5 gargle_blaster name = "Pan-Galactic Gargle Blaster" id = "gargleblaster" + result = "gargleblaster" required_reagents = list("vodka" = 1, "gin" = 1, "whiskey" = 1, "cognac" = 1, "limejuice" = 1) result_amount = 5 brave_bull name = "Brave Bull" id = "bravebull" - required_reagents = list("tequilla" = 3, "kahlua" = 2) + result = "bravebull" + required_reagents = list("tequilla" = 2, "kahlua" = 1) result_amount = 5 tequilla_sunrise name = "Tequilla Sunrise" id = "tequillasunrise" - required_reagents = list("tequilla" = 1, "orangejuice" = 2) + result = "tequillasunrise" + required_reagents = list("tequilla" = 2, "orangejuice" = 1) result_amount = 5 toxins_special name = "Toxins Special" id = "toxinsspecial" - required_reagents = list("rum" = 1, "vermouth" = 1, "plasma" = 2) + result = "toxinsspecial" + required_reagents = list("rum" = 2, "vermouth" = 1, "plasma" = 2) result_amount = 5 beepsky_smash name = "Beepksy Smash" id = "beepksysmash" - required_reagents = list("limejuice" = 2, "whiskey" = 1, "iron" = 1) + result = "beepskysmash" + required_reagents = list("limejuice" = 2, "whiskey" = 2, "iron" = 1) result_amount = 5 doctor_delight name = "The Doctor's Delight" id = "doctordelight" + result = "doctorsdelight" required_reagents = list("limejuice" = 1, "tomatojuice" = 1, "orangejuice" = 1, "cream" = 1) result_amount = 5 irish_cream name = "Irish Cream" id = "irishcream" - required_reagents = list("whiskey" = 2, "cream" = 1, "kahlua" = 1) + result = "irishcream" + required_reagents = list("whiskey" = 2, "cream" = 1) result_amount = 5 manly_dorf name = "The Manly Dorf" id = "manlydorf" - required_reagents = list ("beer" = 2, "ale" = 2) + result = "manlydorf" + required_reagents = list ("beer" = 1, "ale" = 2) result_amount = 5 \ No newline at end of file diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm index 6571caa9b97..f3f2326d23a 100644 --- a/code/WorkInProgress/Chemistry-Tools.dm +++ b/code/WorkInProgress/Chemistry-Tools.dm @@ -838,7 +838,6 @@ playsound(M.loc,'drink.ogg', rand(10,50), 1) return 1 - else if( istype(M, /mob/living/carbon/human) ) for(var/mob/O in viewers(world.view, user)) @@ -1118,6 +1117,7 @@ else icon_state = "beaker0" + /obj/item/weapon/reagent_containers/glass/beaker/cryoxadone name = "beaker" desc = "A beaker. Can hold up to 30 units." @@ -1455,11 +1455,187 @@ src.pixel_x = rand(-10.0, 10) src.pixel_y = rand(-10.0, 10) +/obj/item/weapon/reagent_containers/food/drinks/ale + name = "Magm-Ale" + desc = "A true dorf's drink of choice." + icon_state = "alebottle" + heal_amt = 1 + New() + var/datum/reagents/R = new/datum/reagents(50) + reagents = R + R.my_atom = src + R.add_reagent("ale", 30) + /obj/item/weapon/reagent_containers/food/drinks/milk name = "Space Milk" desc = "It's milk. White and nutritious goodness!" icon_state = "milk" heal_amt = 2 + New() + var/datum/reagents/R = new/datum/reagents(50) + reagents = R + R.my_atom = src + R.add_reagent("milk", 50) + +///////////////////////////////////////////////Alchohol bottles! -Agouri ////////////////////////// + +/obj/item/weapon/reagent_containers/food/drinks/gin + name = "Griffeater Gin" + desc = "A bottle of high quality gin, produced in the New London Space Station." + icon_state = "ginbottle" + heal_amt = 1 + New() + var/datum/reagents/R = new/datum/reagents(100) + reagents = R + R.my_atom = src + R.add_reagent("gin", 100) + +/obj/item/weapon/reagent_containers/food/drinks/whiskey + name = "Ungle 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" + heal_amt = 1 + New() + var/datum/reagents/R = new/datum/reagents(100) + reagents = R + R.my_atom = src + R.add_reagent("whiskey", 100) + +/obj/item/weapon/reagent_containers/food/drinks/vodka + name = "Tunguska Triple Distilled" + desc = "Aah, vodka. Prime choice of drink AND fuel by Russians worldwide." + icon_state = "vodkabottle" + heal_amt = 1 + New() + var/datum/reagents/R = new/datum/reagents(100) + reagents = R + R.my_atom = src + R.add_reagent("vodka", 100) + +/obj/item/weapon/reagent_containers/food/drinks/tequilla + name = "Caccavo Guaranteed Quality Tequilla" + desc = "Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!" + icon_state = "tequillabottle" + heal_amt = 1 + New() + var/datum/reagents/R = new/datum/reagents(100) + reagents = R + R.my_atom = src + R.add_reagent("tequilla", 100) + +/obj/item/weapon/reagent_containers/food/drinks/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" + heal_amt = 1 + New() + var/datum/reagents/R = new/datum/reagents(100) + reagents = R + R.my_atom = src + R.add_reagent("rum", 100) + +/obj/item/weapon/reagent_containers/food/drinks/vermouth + name = "Goldeneye Vermouth" + desc = "Sweet, sweet dryness~" + icon_state = "vermouthbottle" + heal_amt = 1 + New() + var/datum/reagents/R = new/datum/reagents(100) + reagents = R + R.my_atom = src + R.add_reagent("vermouth", 100) + +/obj/item/weapon/reagent_containers/food/drinks/kahlua + name = "Robert Robust's Coffee Liqueur" + desc = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936, HONK" + icon_state = "kahluabottle" + heal_amt = 1 + New() + var/datum/reagents/R = new/datum/reagents(100) + reagents = R + R.my_atom = src + R.add_reagent("kahlua", 100) + +/obj/item/weapon/reagent_containers/food/drinks/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" + heal_amt = 1 + New() + var/datum/reagents/R = new/datum/reagents(100) + reagents = R + R.my_atom = src + R.add_reagent("cognac", 100) + +/obj/item/weapon/reagent_containers/food/drinks/wine + name = "Doublebeard Bearded Special Wine" + desc = "A faint aura of unease and asspainery surrounds the bottle." + icon_state = "winebottle" + heal_amt = 1 + New() + var/datum/reagents/R = new/datum/reagents(100) + reagents = R + R.my_atom = src + R.add_reagent("wine", 100) + +//////////////////////////JUICES AND STUFF /////////////////////// + +/obj/item/weapon/reagent_containers/food/drinks/orangejuice + name = "Orange Juice" + desc = "Full of vitamins and deliciousness!" + icon_state = "orangejuice" + heal_amt = 2 + New() + var/datum/reagents/R = new/datum/reagents(100) + reagents = R + R.my_atom = src + R.add_reagent("orangejuice", 100) + +/obj/item/weapon/reagent_containers/food/drinks/cream + name = "Milk Cream" + desc = "It's cream. Made from milk. What else did you think you'd find in there?" + icon_state = "cream" + heal_amt = 2 + New() + var/datum/reagents/R = new/datum/reagents(100) + reagents = R + R.my_atom = src + R.add_reagent("cream", 100) + +/obj/item/weapon/reagent_containers/food/drinks/tomatojuice + name = "Tomato Juice" + desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness." + icon_state = "tomatojuice" + heal_amt = 2 + New() + var/datum/reagents/R = new/datum/reagents(100) + reagents = R + R.my_atom = src + R.add_reagent("tomatojuice", 100) + +/obj/item/weapon/reagent_containers/food/drinks/limejuice + name = "Lime Juice" + desc = "Sweet-sour goodness." + icon_state = "limejuice" + heal_amt = 2 + New() + var/datum/reagents/R = new/datum/reagents(100) + reagents = R + R.my_atom = src + R.add_reagent("limejuice", 100) + +/obj/item/weapon/reagent_containers/food/drinks/tonic + name = "T-Borg's Tonic Water" + desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away." + icon_state = "tonic" + heal_amt = 2 + New() + var/datum/reagents/R = new/datum/reagents(50) + reagents = R + R.my_atom = src + R.add_reagent("tonic", 50) + + //Pills @@ -1553,3 +1729,163 @@ reagents.add_reagent("beer",1000) +//////////////////////////drinkingglass and shaker// + +/obj/item/weapon/reagent_containers/food/drinks/shaker + name = "Shaker" + desc = "A metal shaker to mix drinks in." + icon = 'food.dmi' + icon_state = "shaker" + New() + var/datum/reagents/R = new/datum/reagents(100) + reagents = R + R.my_atom = src + + +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass + name = "glass" + desc = "Your standard drinking glass." + icon = 'food.dmi' + icon_state = "glass_empty" + New() + var/datum/reagents/R = new/datum/reagents(50) + reagents = R + R.my_atom = src + + on_reagent_change() + if(reagents.reagent_list.len > 1 ) + icon_state = "glass_brown" + name = "Glass of Hooch" + desc = "Two or more drinks, mixed together." + else if(reagents.reagent_list.len == 1) + for(var/datum/reagent/R in reagents.reagent_list) + switch(R.id) + if("beer") + icon_state = "beerglass" + name = "Beer glass" + desc = "A freezing pint of beer" + if("ale") + icon_state = "aleglass" + name = "Ale glass" + desc = "A freezing pint of delicious Ale" + if("milk") + icon_state = "glass_white" + name = "Glass of milk" + desc = "White and nutritious goodness!" + if("cream") + icon_state = "glass_white" + name = "Glass of cream" + desc = "Ewwww..." + if("orangejuice") + icon_state = "glass_orange" + name = "Glass of Orange juice" + desc = "Vitamins! Yay!" + if("tomatojuice") + icon_state = "glass_red" + name = "Glass of Tomato juice" + desc = "Are you sure this is tomato juice?" + if("limejuice") + icon_state = "glass_green" + name = "Glass of Lime juice" + desc = "A glass of sweet-sour lime juice." + if("whiskey") + icon_state = "whiskeyglass" + name = "Glass of whiskey" + desc = "The silky, smokey whiskey goodness inside the glass makes the drink look very classy." + if("gin") + icon_state = "ginvodkaglass" + name = "Glass of gin" + desc = "A crystal clear glass of Griffeater gin." + if("vodka") + icon_state = "ginvodkaglass" + name = "Glass of vodka" + desc = "The glass contain wodka. Xynta." + if("wine") + icon_state = "wineglass" + name = "Glass of wine" + desc = "A very classy looking drink." + if("cognac") + icon_state = "cognacglass" + name = "Glass of cognac" + desc = "Damn, you feel like some kind of French aristocrat just by holding this." + if ("kahlua") + icon_state = "kahluaglass" + name = "Glass of RR coffee Liquor" + desc = "DAMN, THIS THING LOOKS ROBUST" + if("vermouth") + 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" + desc = "Now all that's missing is the weird colored shades!" + if("rum") + icon_state = "rumglass" + name = "Glass of Rum" + desc = "Now you want to Pray for a pirate suit, don't you?" + if("gintonic") + icon_state = "gintonicglass" + name = "Gin and Tonic" + desc = "A mild but still great cocktail. Drink up, like a true Englishman." + if("whiskeycola") + icon_state = "whiskeycolaglass" + name = "Whiskey Cola" + desc = "An innocent-looking mixture of cola and Whiskey. Delicious." + if("whiterussian") + icon_state = "whiterussianglass" + name = "White Russian" + desc = "A very nice looking drink. But that's just, like, your opinion, man." + if("screwdriver") + icon_state = "screwdriverglass" + name = "Screwdriver" + desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer." + if("bloodymary") + icon_state = "bloodymaryglass" + name = "Bloody Mary" + desc = "Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder." + if("martini") + icon_state = "martiniglass" + name = "Classic Martini" + desc = "Damn, the barman even stirred it, not shook it." + if("vodkamartini") + icon_state = "martiniglass" + name = "Vodka martini" + desc ="A bastardisation of the classic martini. Still great." + if("gargleblaster") + icon_state = "gargleblasterglass" + name = "Pan-Galactic Gargle Blaster" + desc = "Does... does this mean that Arthur and Ford are on the station? Oh joy." + 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 = "Oh great, now you feel nostalgic about sunrises back on Terra..." + if("toxinsspecial") + icon_state = "toxinsspecialglass" + name = "Toxins Special" + desc = "Whoah, this thing is on FIRE" + if("beepskysmash") + icon_state = "beepskysmashglass" + name = "Beepsky Smash" + desc = "Heavy, hot and strong. Just like the Iron fist of the LAW." + if("doctorsdelight") + icon_state = "doctorsdelightglass" + name = "Doctor's Delight" + desc = "A healthy mixture of juices, guaranteed to keep you healthy until the next toolboxing takes place." + if("manlydorf") + icon_state = "manlydorfglass" + name = "The Manly Dorf" + desc = "A manly concotion made from Ale and Beer. Intended for true men only." + if("Irish cream") + icon_state = "irishcreamglass" + name = "Irish Cream" + desc = "It's cream, mixed with whiskey. What else would you expect from the Irish?" + else + icon_state = "glass_empty" + name = "Drinking glass" + desc = "Your standard drinking glass" + return \ No newline at end of file diff --git a/code/defines/obj/machinery.dm b/code/defines/obj/machinery.dm index 25e35e032da..808f95c2948 100644 --- a/code/defines/obj/machinery.dm +++ b/code/defines/obj/machinery.dm @@ -550,6 +550,17 @@ var/panel_open = 0 //Hacking that vending machine. Gonna get a free candy bar. var/wires = 15 +/obj/machinery/vending/boozeomat + name = "Booze-O-Mat" + desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one." + icon_state = "boozeomat" //////////////18 drink entities below, plus the glasses, in case someone wants to edit the number of bottles + product_paths = "/obj/item/weapon/reagent_containers/food/drinks/gin;/obj/item/weapon/reagent_containers/food/drinks/whiskey;/obj/item/weapon/reagent_containers/food/drinks/tequilla;/obj/item/weapon/reagent_containers/food/drinks/vodka;/obj/item/weapon/reagent_containers/food/drinks/vermouth;/obj/item/weapon/reagent_containers/food/drinks/rum;/obj/item/weapon/reagent_containers/food/drinks/wine;/obj/item/weapon/reagent_containers/food/drinks/cognac;/obj/item/weapon/reagent_containers/food/drinks/kahlua;/obj/item/weapon/reagent_containers/food/drinks/beer;/obj/item/weapon/reagent_containers/food/drinks/ale;/obj/item/weapon/reagent_containers/food/drinks/orangejuice;/obj/item/weapon/reagent_containers/food/drinks/tomatojuice;/obj/item/weapon/reagent_containers/food/drinks/limejuice;/obj/item/weapon/reagent_containers/food/drinks/cream;/obj/item/weapon/reagent_containers/food/drinks/tonic;/obj/item/weapon/reagent_containers/food/drinks/cola;/obj/item/weapon/reagent_containers/food/drinks/drinkingglass" + product_amounts = "5;5;5;5;5;5;5;5;5;6;6;4;4;4;4;8;8;30" + vend_delay = 15 + product_hidden = "/obj/item/weapon/reagent_containers/food/drinks/coffee" + product_hideamt = "10" + product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Quite delighted to serve you!;Is nobody thirsty on this station?" + /obj/machinery/vending/assist product_amounts = "5;3;4;1;4" product_hidden = "/obj/item/device/flashlight;obj/item/device/timer" diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index aa9c97e18f8..30482bdf8eb 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index 35587898101..1680d9f1292 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 525d3cea78a..b8933e6631e 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 8ffcd7e0d5a..fa497ca90b2 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 2dce8338e25..0aa41f08b42 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 1fc77798716..520d3c29150 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi index c2065c03e3b..66add147639 100644 Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index 3d332fe21ef..2f70dbff92e 100644 Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ diff --git a/maps/trunkmap.dmm b/maps/trunkmap.dmm index 02a13715eae..5924984e7f6 100644 --- a/maps/trunkmap.dmm +++ b/maps/trunkmap.dmm @@ -1232,7 +1232,7 @@ "axJ" = (/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) "axK" = (/obj/stool,/obj/item/device/radio/intercom{pixel_y = 20},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) "axL" = (/obj/secure_closet/bar,/turf/simulated/floor{tag = "icon-freezerfloor"; icon_state = "freezerfloor"},/area/crew_quarters/bar) -"axM" = (/obj/reagent_dispensers/beerkeg,/turf/simulated/floor{tag = "icon-freezerfloor"; icon_state = "freezerfloor"},/area/crew_quarters/bar) +"axM" = (/obj/closet/gmcloset,/turf/simulated/floor{tag = "icon-freezerfloor"; icon_state = "freezerfloor"},/area/crew_quarters/bar) "axN" = (/obj/machinery/alarm{pixel_y = 22},/obj/reagent_dispensers/beerkeg,/turf/simulated/floor{tag = "icon-freezerfloor"; icon_state = "freezerfloor"},/area/crew_quarters/bar) "axO" = (/obj/crate/freezer,/turf/simulated/floor{tag = "icon-freezerfloor"; icon_state = "freezerfloor"},/area/crew_quarters/bar) "axP" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/turf/simulated/floor/plating,/area/hallway/primary/central) @@ -1425,7 +1425,7 @@ "aBu" = (/obj/stool/chair,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) "aBv" = (/obj/machinery/firealarm{pixel_y = 24},/obj/machinery/camera{network = "SS13"; c_tag = "Bar"},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) "aBw" = (/obj/machinery/computer/security/telescreen{icon = 'status_display.dmi'; icon_state = "entertainment"; name = "Entertainment monitor"},/turf/simulated/wall,/area/crew_quarters/bar) -"aBx" = (/obj/item/weapon/gun/shotgun,/obj/table/reinforced{tag = "icon-reinf_tabledir (SOUTHWEST)"; icon_state = "reinf_tabledir"; dir = 10},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) +"aBx" = (/obj/table{icon_state = "tabledir"; dir = 8},/obj/machinery/light{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/obj/item/weapon/reagent_containers/food/drinks/shaker,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) "aBy" = (/obj/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor,/area/hallway/primary/central) "aBz" = (/obj/cable{icon_state = "4-8"; d1 = 4; d2 = 8},/turf/simulated/floor,/area/hallway/primary/central) "aBA" = (/obj/cable{icon_state = "2-8"; d1 = 2; d2 = 8},/turf/simulated/floor,/area/hallway/primary/central) @@ -1481,7 +1481,7 @@ "aCy" = (/obj/table{icon_state = "tabledir"; dir = 5},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) "aCz" = (/obj/stool/chair{dir = 8},/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) "aCA" = (/obj/table/reinforced{dir = 8; icon_state = "reinf_tabledir"; tag = "icon-reinf_tabledir"},/obj/item/clothing/head/that,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) -"aCB" = (/obj/secure_closet/bar,/obj/machinery/light{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) +"aCB" = (/obj/table{icon_state = "tabledir"; dir = 10},/obj/item/weapon/gun/shotgun,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) "aCC" = (/obj/machinery/light,/turf/simulated/floor,/area/hallway/primary/central) "aCD" = (/obj/machinery/atmospherics/pipe/simple{dir = 5; icon_state = "intact-f"; initialize_directions = 5; layer = 3},/turf/simulated/wall,/area/hallway/primary/central) "aCE" = (/obj/machinery/atmospherics/pipe/simple{dir = 4; icon_state = "intact-f"; layer = 3},/turf/simulated/floor/plating,/area/maintenance/fsmaint) @@ -1541,7 +1541,7 @@ "aDG" = (/obj/table{icon_state = "tabledir"; dir = 6},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) "aDH" = (/obj/table/reinforced{dir = 8; icon_state = "reinf_tabledir"; tag = "icon-reinf_tabledir"},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) "aDI" = (/obj/landmark/start{name = "Barman"},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) -"aDJ" = (/obj/closet/gmcloset,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) +"aDJ" = (/obj/machinery/vending/boozeomat,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) "aDK" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/maintenance/maintcentral) "aDL" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor,/area/hallway/primary/central) "aDM" = (/obj/machinery/status_display,/turf/simulated/wall,/area/hallway/primary/starboard) @@ -1597,7 +1597,7 @@ "aEK" = (/obj/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) "aEL" = (/obj/stool,/mob/living/carbon/monkey{name = "Mr Rathen"},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) "aEM" = (/obj/machinery/light{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) -"aEN" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/plating,/area/maintenance/maintcentral) +"aEN" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/wall,/area/maintenance/maintcentral) "aEO" = (/obj/closet,/obj/machinery/alarm{pixel_y = 24},/turf/simulated/floor/plating,/area/maintenance/maintcentral) "aEP" = (/obj/table,/obj/item/weapon/hand_labeler,/turf/simulated/floor/plating,/area/maintenance/maintcentral) "aEQ" = (/obj/machinery/light{tag = "icon-tube1 (WEST)"; icon_state = "tube1"; dir = 8},/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/turf/simulated/floor,/area/hallway/primary/central) @@ -5221,9 +5221,9 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaawUawVawWawVawVawXawYawVawVawWawVawZaxaaxbasjapEaxcaxdaxeaxfalUaaaaaaaaaaanavRaxgaxhaxiaxjaxkavRaanaanavVaxlaxlaxmaxnaxoavVatxaxpaxqaxraxsapTaxraxtapWaxraxuapTaxraxvaxwaxxarxaxyanzaxzaxAaxAaxAaxBaxBaxBaxCaxDaxEaxFaxGaxGaxHaxIaxHaxGaxJaxKawtaxLaxMaxNaxOawtavjavkawvawwawwaxPaiWaiXaiXaxQaxRaaaaaaacyaaaaxSakaakaaxTakaakaaxUaxVakaaxWakaakfakaakaakaaxXaxYaxZakaagRayaaybaycaybaycaqOaydaydayeaomaihagZaoraoraorayfaqTaygayhaqTayiayjaykaylaykaymaykatkavFavIavJatkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaawUawVawVawVaynayoaypaypaypaypaypaypayoayqawVayratoaysalUaytalUaytarkalUatlatlatlatlavRayuayvaywayxayyavRavRavTavVaxlayzayzayAayBayCayDayEayFayGayHayIayGayHamfayGayHameayJayKapjayLayMaqtanzayNayOayOayOayPayPayQayRaySayTaxHaxGaxGaxGaxGaxGaxGaxJayUawtayVayWayXayWayYavjavkayZawwawwavkavkavnavnadGazaaaaaaaalVafKazbalnalnagPazcazdazdazeazfazfazgazhaziaziazjazfazkazlagRagRazmaznaznaznaznazoazpazqazqazrazsaztazuazuazvazwazxazyazzazAauqazBazCazDazCazEazCatkazFazGauyatkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaawVaynazHazHayoayoazIazIayoazIazIazIayoayoazJazKatoazLalUazMapGazNarkalUaraaraaraazOazPazQazRazQazQazRazQazQazSazTayzayzayzayzazUazVazWazXazYazZaAaaAaazZaAaaAbazZaAcaAdazZaAeaAfaqtarxaqtaAgaAhaAhaAhaAhaAhaAhaAiaAjaAkaAlaAmaxHaxGaxGaxGaxGaxGaxJaxHawtawtaAnawtawtawtavjavkawvawwawwawwaAoaApavnawBacYacYacYamEacYagRaAqakaakaaplazfaAraAsaAtaAtaAtaAuaAtaAtaAtaAvaAwaAxavAaAyawKawLaznawLaznagYaAzaAAaAAaABaAAaABaAAaAAaoraACaADayhayhaAEaAFaAGaumaAHaAIaAJaumaAKatjatkatkatkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaALayoayoayoayoayoazIazIaAMazIazIazIayoayoazJaANaAOaAPapGaoCapGaAQarkalUaARardardaASaATayxaAUazQazQazRazQazQaAVaAWaAXaAYaAZayzazUaBaaBbaBcaBdaBeaBfaBgaBhaBiaBjaBjaBfaBkaBjaBjaBlaoYarxaqtaBmaqpaBnaBoaBpaBqaBraBsaAjaAkaAlawtaBtaxHaxGaxGaBuaBuaxJaxGaBvaBwaxGaBxawtavhavjavkaByaBzaBzaBAawwawwavnadGaBBadGadGahSadGagRakaakaakaaBCazfaBDaBEaBFaBFaBFaBGaBHaBIaBIaBDaBIaBIavAaBJaBKawLaznawLaznagYaBLaAAaBMaBNaBOaBPaBQaBRaoraBSaoraBTauqaoraoraoraaaaaaacyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaawVaBUayoayoayoayoazIazIayoazIazIazIayoayoazJaBVatoaraalUaytalUaytarkalUasjaraaraazOazPazQazQazQazQazRazQazQaBWaBXaBXaBYavRaBZaCaavRavTavRaCbavRavTaCcavTavRavRaCdaCeaCfaCgaChaCiaCjarxaqtaCkaClaCmaCnaCoaCpaCqaCraCsaCtaCuawtaCvaxHaxGaCwaCxaCyaCzaxGaxHaCAaxGaCBawtavjavjaxPawwaCCawwawvawwawwaCDaCEaCEaCEaCEavpadFagRaCFaxVakaaplazfaBDaCGaCHaCIaCJaCKaCLaCMaCNaBDaBIazfavAaCOawKawLaznawLaznagYaAzaAAaCPaCQaCRaCSaCTaCUaoraCVaoraCWaCXaoraaaaaaaaaaaaacyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaCYawVawVawVaBUayoayoaCZayoayoayoayoayoaDaawVaDbatoaDcalUaytalUaytarkalUaDdaraaDeatlavRavRavRaDfavRaDgaDhayxayxaDhayxayxaDiayxaDjaDkayxayxaDlayxaDiaDmayxaDnaDoaDpaDqaDraDsaDtaDuaoYarxaqtaCkaDvaCraDwaDxaDyaDzaDAaAjaDBaDCawtaDDaxHaDEaCwaDFaDGaCzaxGaxHaDHaDIaDJawtavjaDKavkavkavkavkawvawwaDLavkazfazfaDMazfazfaDNaDOaDOaDPaDOaDQaDRaDSaDTaDUaDVaDVaDWaDVaDVaDXaBDaBIazfaDYaDZaEaaDYaDYaEbaDYaDYaEcaDYaDYaEdaEeaDYaEfaDYaDYaEgaDYaEhaEhaDYaDYaaaaaaaaaacyaaaaaaaaaaaaaaaaEiaEiaEiaEiaEiaEiaEiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaALayoayoayoayoayoazIazIaAMazIazIazIayoayoazJaANaAOaAPapGaoCapGaAQarkalUaARardardaASaATayxaAUazQazQazRazQazQaAVaAWaAXaAYaAZayzazUaBaaBbaBcaBdaBeaBfaBgaBhaBiaBjaBjaBfaBkaBjaBjaBlaoYarxaqtaBmaqpaBnaBoaBpaBqaBraBsaAjaAkaAlawtaBtaxHaxGaxGaBuaBuaxJaxGaBvaBwaxGaBxawtayPavjavkaByaBzaBzaBAawwawwavnadGaBBadGadGahSadGagRakaakaakaaBCazfaBDaBEaBFaBFaBFaBGaBHaBIaBIaBDaBIaBIavAaBJaBKawLaznawLaznagYaBLaAAaBMaBNaBOaBPaBQaBRaoraBSaoraBTauqaoraoraoraaaaaaacyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaawVaBUayoayoayoayoazIazIayoazIazIazIayoayoazJaBVatoaraalUaytalUaytarkalUasjaraaraazOazPazQazQazQazQazRazQazQaBWaBXaBXaBYavRaBZaCaavRavTavRaCbavRavTaCcavTavRavRaCdaCeaCfaCgaChaCiaCjarxaqtaCkaClaCmaCnaCoaCpaCqaCraCsaCtaCuawtaCvaxHaxGaCwaCxaCyaCzaxGaxHaCAaxGaCBawtayPavjaxPawwaCCawwawvawwawwaCDaCEaCEaCEaCEavpadFagRaCFaxVakaaplazfaBDaCGaCHaCIaCJaCKaCLaCMaCNaBDaBIazfavAaCOawKawLaznawLaznagYaAzaAAaCPaCQaCRaCSaCTaCUaoraCVaoraCWaCXaoraaaaaaaaaaaaacyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaCYawVawVawVaBUayoayoaCZayoayoayoayoayoaDaawVaDbatoaDcalUaytalUaytarkalUaDdaraaDeatlavRavRavRaDfavRaDgaDhayxayxaDhayxayxaDiayxaDjaDkayxayxaDlayxaDiaDmayxaDnaDoaDpaDqaDraDsaDtaDuaoYarxaqtaCkaDvaCraDwaDxaDyaDzaDAaAjaDBaDCawtaDDaxHaDEaCwaDFaDGaCzaxGaxHaDHaDIaxGaDJayPaDKavkavkavkavkawvawwaDLavkazfazfaDMazfazfaDNaDOaDOaDPaDOaDQaDRaDSaDTaDUaDVaDVaDWaDVaDVaDXaBDaBIazfaDYaDZaEaaDYaDYaEbaDYaDYaEcaDYaDYaEdaEeaDYaEfaDYaDYaEgaDYaEhaEhaDYaDYaaaaaaaaaacyaaaaaaaaaaaaaaaaEiaEiaEiaEiaEiaEiaEiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaCYawVawWawVawVawXaEjawVawVawWawVaEkauzatoaElapGaEmalUaytarkalUasjaraaraaEnaaaaaaalUaEoaEpaEqazRaErazQazRazQazQazQazQazQaEsazQazQaEtazQazQaEuazQaEvavRaEwaExaEyaEzaDtaCiaEAarxaqtaCkaqpaEBaECaEDaEEaEFaEGaAjaEHaAlawtaEIaEJaEJaEJaEJaEJaEKaxGaELaDHaxGaEMawtaENavjayPaEOaEPavkaEQawwawwaERaESaBIaBIaBIaBIaBIaETaEUaBIaBIaEVaEWaBDaCGaEXaEYaEZaFaaFbaFcaFdaFeaFfaFgaFhaFiaFjaFkaFlaFkaFkaFkaFmaFnaFnaFoaFnaFpaFqaFnaFraFsaFnaFnaFnaFtaDYaaaadXackaFuaanaanaanaaaaaaaEiaEiaEiaEiaEiaEiaEiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaanaqZatnaFvavLavLavLavLaFwatnaqZavNauzatoaDealUaytalUaytarkalUasjaraaraauAaaaaanalUaytavRaFxazRazQazQazRazQazQazQazQazQaEsaFyazQaEtazQazQaEuazQazQavRavkaFzaFAavkavkaFBaFCarxaqtaFDaqpaAjaAjaFEaAjaAjaAjaAjaDBaAlaFFaxHaxGaxGaxGaxGaxGaxGaxGaxGaFGaFHaFIawtaFJaFKaFLaFMaFKaFNaFOaBzaBzaFPaFQaBFaBFaBFaBFaFRaBFaBFaBFaBFaFSaBFaFTaFUaFVaFWaFXaFYaFZaGaaGbaFTaBFaGcaGdaGeaGfaGeaGeaGeaGeaGeaGgaFnaFnaFoaFnaFnaGhaGeaGiaGjaFnaFnaGkaFnaDYaaaacyaGlaGmaGmaGnaanaaaaaaaEiaEiaEiaEiaEiaEiaEiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaanaanaanaanauzauzauAauBauAaGoaGpaGqaGrauAauBauGaGsauzatoaraalUaGtalUapDaGualUasjaraaraauAaanaanalUaytavRazQazRazQazQaGvaGwazQazQavTavTavTavTavTaEtaGxaGyaEuazQazQaGzaGAawwawwaAoaGBaGCaqtarxaqtaqtaGDavjavjaGEaGFaGGaGHaGIaGJaAlaGKaxGaxGaxGaxHaxHaxHaxGaxGaGLaxGaxGaGMawtaGNavjayPaGOavjaGPawwawwawwaGQaGRaGSaGSaGSaGTaGSaGSaGSaGSaGTaGUaBIaBDaCGaGVaGWaGXaGYaGZaGWaHaaHbaHcaHdaHeaHfaHfaHfaHgaHfaHfaHfaHhaHiaHjaHkaHjaHlaHmaHjaHnaHoaHjaHpaFnaFnaDYadXaFuaHqaFnaFnaHqaanaaaaaaaEiaEiaEiaEiaEiaEiaEiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa