From 6986dbc4dc94b0fd2cf7be000a0f47d7defc2e80 Mon Sep 17 00:00:00 2001 From: Archie Date: Fri, 11 Jun 2021 18:14:57 -0300 Subject: [PATCH] Fixes several things --- _maps/map_files/hyper/Diner.dmm | 6 +++--- code/modules/food_and_drinks/drinks/drinks.dm | 20 +++++++++--------- icons/obj/drinks.dmi | Bin 103812 -> 103817 bytes 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/_maps/map_files/hyper/Diner.dmm b/_maps/map_files/hyper/Diner.dmm index c067d0e0..260d1316 100644 --- a/_maps/map_files/hyper/Diner.dmm +++ b/_maps/map_files/hyper/Diner.dmm @@ -70,8 +70,8 @@ "br" = (/obj/effect/turf_decal/loading_area{dir = 6; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/cafeteria,/area/diner) "bs" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/poddoor/shutters/preopen{id = "kitchen"; name = "diner shutters"; tag = dshutters},/turf/open/floor/plating,/area/diner) "bt" = (/obj/structure/table/plasmaglass,/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/obj/item/reagent_containers/food/drinks/drinkingglass,/turf/open/floor/plasteel/dark,/area/diner) -"bu" = (/obj/structure/table/plasmaglass,/obj/machinery/chem_dispenser/drinks{dir = 8},/obj/machinery/light{dir = 4; pixel_x = 7; pixel_y = 0},/turf/open/floor/plasteel/dark,/area/diner) -"bv" = (/obj/structure/closet/secure_closet/freezer/fridge,/turf/open/floor/plasteel/dark,/area/diner) +"bu" = (/obj/structure/table/plasmaglass,/obj/machinery/chem_dispenser/drinks{dir = 8},/obj/machinery/light{dir = 4; pixel_x = 7; pixel_y = 0},/obj/structure/disposalpipe/segment,/turf/open/floor/plasteel/dark,/area/diner) +"bv" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/reagent_containers/food/condiment/flour,/obj/item/reagent_containers/food/condiment/flour,/obj/item/reagent_containers/food/condiment/flour,/turf/open/floor/plasteel/dark,/area/diner) "bw" = (/obj/structure/table/plasmaglass,/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/diner) "bx" = (/obj/machinery/disposal/bin,/obj/structure/disposalpipe/trunk{dir = 1},/turf/open/floor/plasteel/dark,/area/diner) "by" = (/obj/structure/closet/secure_closet/freezer/meat,/turf/open/floor/plasteel/dark,/area/diner) @@ -104,7 +104,7 @@ "kS" = (/turf/open/floor/plasteel{dir = 1; icon_state = "floor_trim"},/area/diner) "lm" = (/obj/structure/table/plasmaglass,/turf/open/floor/carpet/black,/area/diner) "mb" = (/obj/structure/lattice/catwalk,/obj/structure/railing{dir = 4},/obj/structure/railing{dir = 1},/turf/open/space/basic,/area/space/nearstation) -"mn" = (/obj/machinery/vending/boozeomat,/turf/closed/wall,/area/diner) +"mn" = (/obj/machinery/vending/boozeomat{req_access = null},/turf/closed/wall,/area/diner) "mV" = (/turf/open/floor/plasteel{dir = 4; icon_state = "floor_plate"},/area/diner) "nQ" = (/obj/structure/table/plasmaglass,/obj/item/reagent_containers/food/condiment/saltshaker{pixel_y = 10},/obj/item/reagent_containers/food/condiment/peppermill{pixel_x = 5; pixel_y = 4},/turf/open/floor/carpet/black,/area/diner) "op" = (/obj/structure/table/plasmaglass,/obj/item/ashtray,/turf/open/floor/carpet/black,/area/diner) diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 82f86749..f4ebd218 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -470,7 +470,7 @@ desc = "You wanted ORANGE. It gave you Lemon Lime." icon_state = "lemon-lime" list_reagents = list(/datum/reagent/consumable/lemon_lime = 30) - foodtype = FRUIT + foodtype = SUGAR | FRUIT /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime/Initialize() . = ..() @@ -481,35 +481,35 @@ desc = "Tastes like a hull breach in your mouth." icon_state = "space-up" list_reagents = list(/datum/reagent/consumable/space_up = 30) - foodtype = SUGAR | JUNKFOOD + foodtype = SUGAR /obj/item/reagent_containers/food/drinks/soda_cans/starkist name = "Star-kist" desc = "The taste of a star in liquid form. And, a bit of tuna...?" icon_state = "starkist" list_reagents = list(/datum/reagent/consumable/space_cola = 15, /datum/reagent/consumable/orangejuice = 15) - foodtype = SUGAR | FRUIT | JUNKFOOD + foodtype = SUGAR | FRUIT /obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind name = "Space Mountain Wind" desc = "Blows right through you like a space wind." icon_state = "space_mountain_wind" list_reagents = list(/datum/reagent/consumable/spacemountainwind = 30) - foodtype = SUGAR | JUNKFOOD + foodtype = SUGAR /obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko name = "Thirteen Loko" desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkenness, or even death. Please Drink Responsibly." icon_state = "thirteen_loko" list_reagents = list(/datum/reagent/consumable/ethanol/thirteenloko = 30) - foodtype = SUGAR | JUNKFOOD + foodtype = SUGAR /obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb name = "Dr. Gibb" desc = "A delicious mixture of 42 different flavors." icon_state = "dr_gibb" list_reagents = list(/datum/reagent/consumable/dr_gibb = 30) - foodtype = SUGAR | JUNKFOOD + foodtype = SUGAR /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game name = "Pwr Game" @@ -522,14 +522,14 @@ desc = "~Shake me up some of that Shambler's Juice!~" icon_state = "shamblers" list_reagents = list(/datum/reagent/consumable/shamblers = 30) - foodtype = SUGAR | JUNKFOOD + foodtype = SUGAR /obj/item/reagent_containers/food/drinks/soda_cans/grey_bull name = "Grey Bull" desc = "Grey Bull, it gives you gloves!" icon_state = "energy_drink" - list_reagents = list(/datum/reagent/consumable/grey_bull = 20) - foodtype = SUGAR | JUNKFOOD + list_reagents = list(/datum/reagent/consumable/grey_bull = 30) + foodtype = SUGAR /obj/item/reagent_containers/food/drinks/soda_cans/air name = "canned air" @@ -542,5 +542,5 @@ desc = "Unleash the ape!" icon_state = "menergy" list_reagents = list(/datum/reagent/consumable/monkey_energy = 50) - foodtype = SUGAR | JUNKFOOD + foodtype = SUGAR price = 3 diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index b0fc76df92c6ed5618abb8201cf3c901da71c062..61ad164d433c60ec8d5e22dcf76efe14b445ccc7 100644 GIT binary patch delta 2072 zcmV+z2= zi0!1)v+!n+#vqIC&3u5sE3xinF7+@aRi*s(vna(xcg+^uiot>v}tv>y1lu2H?fRUJN&1AHfp@OTm7_QOWcOs zn(|Lq?}Aue-L0;#-ffH`KmI-CR!eTHyVZyF^{4gq%i*P4J~j9WI_9AJK{qIjf0LyJus&x@LFfbh{pFiIxr1c0Qcazka_aJ(k!%QG{lmsGu z9us+V+N`1aNoiz%1BVo9meIvzqcrl@E`AxS5<#Rlrnrb|Ia15mj71VtDGDy2Hly9Z zW_t`jD%I*ZmbM46UYV9{_<-F_($F>RSvBuK@L+kD5YucqiN}2N(M2%uC~2F+Oc=WH zeHR76)*}X-Y0?f(x|75h^5CT)whyE-7&!I7TqB|Zm=dh1tplc0ATOPV9d`OM0*D3@a>qs^#4@$M2-NWq*J3O+K>|3@PSY@2f zhW^*K{MOHZv)GR-32?i{oN#!{-z3#q*bAMzf{$

_|bd#oXIDH-AOyqcH=du2ic# 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 a(3ANG8wiueEFh`qmWhKL2)7&v0d0*K*Xc