diff --git a/code/game/machinery/vending/BODA.dm b/code/game/machinery/vending/BODA.dm index 145b46874f2..b63413708fb 100644 --- a/code/game/machinery/vending/BODA.dm +++ b/code/game/machinery/vending/BODA.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/machines/vending/sovietsoda.dmi' icon_state = "sovietsoda" - light_color = COLOR_RED + light_color = "#FFDCA2" vending_sound = SFX_VENDING_GENERIC diff --git a/code/game/machinery/vending/_vending.dm b/code/game/machinery/vending/_vending.dm index dc650006ceb..bf153e4eb2d 100644 --- a/code/game/machinery/vending/_vending.dm +++ b/code/game/machinery/vending/_vending.dm @@ -98,7 +98,7 @@ set_light(0) return FALSE - set_light(0.65, 0.1, 1, 2, light_color) + set_light(1, 0.5, 2, 3.5, light_color) return TRUE /obj/machinery/vending/Initialize(mapload) diff --git a/code/game/machinery/vending/boozeomat.dm b/code/game/machinery/vending/boozeomat.dm index f76fd0ef997..8b94bc25f5f 100644 --- a/code/game/machinery/vending/boozeomat.dm +++ b/code/game/machinery/vending/boozeomat.dm @@ -5,6 +5,7 @@ icon = 'icons/obj/machines/vending/boozeomat.dmi' icon_state = "boozeomat" + light_color = "#69A6C6" req_access = list(access_bar) diff --git a/code/game/machinery/vending/cigarette.dm b/code/game/machinery/vending/cigarette.dm index d9d9d0bfd96..53b89092ab6 100644 --- a/code/game/machinery/vending/cigarette.dm +++ b/code/game/machinery/vending/cigarette.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/machines/vending/cigs.dmi' icon_state = "cigs" - light_color = COLOR_RED + light_color = "#54A496" vend_delay = 30 use_alt_icons = TRUE diff --git a/code/game/machinery/vending/coat.dm b/code/game/machinery/vending/coat.dm index 87663049c03..1c2d7bea080 100644 --- a/code/game/machinery/vending/coat.dm +++ b/code/game/machinery/vending/coat.dm @@ -4,6 +4,7 @@ icon = 'icons/obj/machines/vending/theater.dmi' icon_state = "Theater" + light_color = "#CA7732" vend_delay = 21 use_vend_state = TRUE diff --git a/code/game/machinery/vending/coffee.dm b/code/game/machinery/vending/coffee.dm index 32b0fab1c31..8977f622de5 100644 --- a/code/game/machinery/vending/coffee.dm +++ b/code/game/machinery/vending/coffee.dm @@ -5,6 +5,7 @@ icon = 'icons/obj/machines/vending/coffee.dmi' icon_state = "coffee" + light_color = COLOR_GREEN_GRAY idle_power_usage = 211 WATTS //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan. vend_power_usage = 85 KILO WATTS //85 kJ to heat a 250 mL cup of coffee diff --git a/code/game/machinery/vending/cola.dm b/code/game/machinery/vending/cola.dm index bdac7f2f6e5..42502618a23 100644 --- a/code/game/machinery/vending/cola.dm +++ b/code/game/machinery/vending/cola.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/machines/vending/cola.dmi' icon_state = "Cola_Machine" - light_color = COLOR_RED_GRAY + light_color = "#EC2F2F" idle_power_usage = 211 WATTS //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan. diff --git a/code/game/machinery/vending/engineering.dm b/code/game/machinery/vending/engineering.dm index 5b57ea6e0f9..5b11fa5a954 100644 --- a/code/game/machinery/vending/engineering.dm +++ b/code/game/machinery/vending/engineering.dm @@ -2,8 +2,11 @@ /obj/machinery/vending/tool name = "YouTool" desc = "Tools for tools." + icon_state = "tool" icon = 'icons/obj/machines/vending/engi.dmi' + light_color = COLOR_GREEN_GRAY + use_vend_state = TRUE gen_rand_amount = FALSE vend_delay = 11 @@ -31,8 +34,11 @@ /obj/machinery/vending/engivend name = "Engi-Vend" desc = "Spare tool vending. What? Did you expect some witty description?" + icon_state = "engivend" icon = 'icons/obj/machines/vending/engi.dmi' + light_color = "#6DBBBC" + use_vend_state = TRUE vend_delay = 21 req_one_access = list(access_atmospherics, access_engine_equip) @@ -59,6 +65,7 @@ icon = 'icons/obj/machines/vending/engi.dmi' icon_state = "engi" + light_color = COLOR_GREEN_GRAY req_one_access = list(access_atmospherics, access_engine_equip) diff --git a/code/game/machinery/vending/fashion.dm b/code/game/machinery/vending/fashion.dm index 083063ea1bd..623d84f7bbb 100644 --- a/code/game/machinery/vending/fashion.dm +++ b/code/game/machinery/vending/fashion.dm @@ -5,6 +5,7 @@ icon_state = "Theater" icon = 'icons/obj/machines/vending/theater.dmi' + light_color = "#CA7732" vend_delay = 15 vend_reply = "Absolutely smashing!" diff --git a/code/game/machinery/vending/fitness.dm b/code/game/machinery/vending/fitness.dm index 6b69da04498..7879071a0d1 100644 --- a/code/game/machinery/vending/fitness.dm +++ b/code/game/machinery/vending/fitness.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/machines/vending/fitness.dmi' icon_state = "fitness" - light_color = COLOR_LIGHT_CYAN + light_color = "#EAEAEA" vend_delay = 6 use_vend_state = TRUE diff --git a/code/game/machinery/vending/games.dm b/code/game/machinery/vending/games.dm index 3e71129dad6..ec7b72b510b 100644 --- a/code/game/machinery/vending/games.dm +++ b/code/game/machinery/vending/games.dm @@ -5,6 +5,7 @@ icon = 'icons/obj/machines/vending/games.dmi' icon_state = "games" + light_color = "#57FFE4" vend_delay = 15 product_slogans = "Escape to a fantasy world!;Fuel your gambling addiction!;Ruin your friendships!" diff --git a/code/game/machinery/vending/hydro.dm b/code/game/machinery/vending/hydro.dm index acee3728a30..fff9ca4c5a5 100644 --- a/code/game/machinery/vending/hydro.dm +++ b/code/game/machinery/vending/hydro.dm @@ -4,8 +4,11 @@ desc = "A plant nutrients vendor." product_slogans = "Aren't you glad you don't have to fertilize the natural way?;Now with 50% less stink!;Plants are people too!" product_ads = "We like plants!;Don't you want some?;The greenest thumbs ever.;We like big plants.;Soft soil..." + icon_state = "nutri" icon = 'icons/obj/machines/vending/nutri.dmi' + light_color = "#6DBBBC" + use_vend_state = TRUE gen_rand_amount = FALSE vend_delay = 26 @@ -33,6 +36,7 @@ icon_state = "seeds" icon = 'icons/obj/machines/vending/seeds.dmi' + light_color = "#7BB491" vend_delay = 13 use_vend_state = TRUE diff --git a/code/game/machinery/vending/kitchen.dm b/code/game/machinery/vending/kitchen.dm index f25b44683cb..bb6216fad10 100644 --- a/code/game/machinery/vending/kitchen.dm +++ b/code/game/machinery/vending/kitchen.dm @@ -5,6 +5,7 @@ icon_state = "dinnerware" icon = 'icons/obj/machines/vending/dinnerware.dmi' + light_color = "#D6F1FF" use_vend_state = TRUE product_ads = "Mm, food stuffs!;Food and food accessories.;Get your plates!;You like forks?;I like forks.;Woo, utensils.;You don't really need these..." diff --git a/code/game/machinery/vending/medical.dm b/code/game/machinery/vending/medical.dm index 205fd1645f8..71749c0f322 100644 --- a/code/game/machinery/vending/medical.dm +++ b/code/game/machinery/vending/medical.dm @@ -5,7 +5,7 @@ icon_state = "med" icon = 'icons/obj/machines/vending/med.dmi' - light_color = COLOR_RED_LIGHT + light_color = "#EABBBB" req_access = list(access_medical_equip) idle_power_usage = 211 WATTS //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan. @@ -53,6 +53,7 @@ icon = 'icons/obj/machines/vending/wallmed.dmi' icon_state = "wallmed" + light_color = "#EABBBB" density = FALSE @@ -84,6 +85,7 @@ icon = 'icons/obj/machines/vending/wallmed.dmi' icon_state = "wallmed" + light_color = "#EABBBB" density = FALSE diff --git a/code/game/machinery/vending/robotics.dm b/code/game/machinery/vending/robotics.dm index ff9a3a039f0..3fce4f9f93c 100644 --- a/code/game/machinery/vending/robotics.dm +++ b/code/game/machinery/vending/robotics.dm @@ -6,6 +6,7 @@ icon_state = "robotics" icon = 'icons/obj/machines/vending/engi.dmi' + light_color = "#E4E4C6" req_access = list(access_robotics) diff --git a/code/game/machinery/vending/security.dm b/code/game/machinery/vending/security.dm index 118f95b80e9..0d5212ec3a9 100644 --- a/code/game/machinery/vending/security.dm +++ b/code/game/machinery/vending/security.dm @@ -5,6 +5,7 @@ icon = 'icons/obj/machines/vending/sec.dmi' icon_state = "sec" + light_color = "#F75D5D" vend_delay = 20 use_alt_icons = TRUE diff --git a/code/game/machinery/vending/snack.dm b/code/game/machinery/vending/snack.dm index d3d21022485..a2c7f1f4555 100644 --- a/code/game/machinery/vending/snack.dm +++ b/code/game/machinery/vending/snack.dm @@ -5,6 +5,7 @@ icon = 'icons/obj/machines/vending/snack.dmi' icon_state = "snack" + light_color = "#FF9900" vend_delay = 25 use_vend_state = TRUE @@ -96,8 +97,11 @@ desc = "A snack machine manufactured by Getmore Chocolate Corporation, specifically for hospitals." product_slogans = "Try our new Hema-2-Gen bar!;Twice the health for half the price!" product_ads = "The healthiest!;Award-winning chocolate bars!;Mmm! So good!;Oh my god it's so juicy!;Have a snack.;Snacks are good for you!;Have some more Getmore!;Best quality snacks straight from mars.;We love chocolate!;Try our new jerky!" + icon_state = "snackmed" use_vend_state = TRUE + light_color = "#B8D4CB" + vend_delay = 25 component_types = list(/obj/item/vending_cartridge/medbay) legal = list( /obj/item/reagent_containers/food/grown/apple = 10, diff --git a/code/game/machinery/vending/wizard.dm b/code/game/machinery/vending/wizard.dm index 5bf9b1ad34b..d11214ee9af 100644 --- a/code/game/machinery/vending/wizard.dm +++ b/code/game/machinery/vending/wizard.dm @@ -5,6 +5,7 @@ icon = 'icons/obj/machines/vending/theater.dmi' icon_state = "MagiVend" + light_color = "#FDC145" vend_delay = 15 vend_reply = "Have an enchanted evening!" diff --git a/icons/obj/machines/vending/theater.dmi b/icons/obj/machines/vending/theater.dmi index 20f14818321..6e075ae9eff 100644 Binary files a/icons/obj/machines/vending/theater.dmi and b/icons/obj/machines/vending/theater.dmi differ