diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 9c35751867b..c6955de4116 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -701,6 +701,28 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C refill_canister = /obj/item/weapon/vending_refill/snack var/chef_compartment_access = "28" +/obj/machinery/vending/snack/random + name = "\improper Random Snackies" + desc = "Uh oh!" + +/obj/machinery/vending/snack/random/New() + ..() + var/T = pick(subtypesof(/obj/machinery/vending/snack) - /obj/machinery/vending/snack/random) + new T(get_turf(src)) + qdel(src) + +/obj/machinery/vending/snack/blue + icon_state = "snackblue" + +/obj/machinery/vending/snack/orange + icon_state = "snackorange" + +/obj/machinery/vending/snack/green + icon_state = "snackgreen" + +/obj/machinery/vending/snack/teal + icon_state = "snackteal" + /obj/machinery/vending/sustenance name = "\improper Sustenance Vendor" desc = "A vending machine which vends food, as required by section 47-C of the NT's Prisoner Ethical Treatment Agreement." @@ -725,12 +747,67 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C product_ads = "Refreshing!;Hope you're thirsty!;Over 1 million drinks sold!;Thirsty? Why not cola?;Please, have a drink!;Drink up!;The best drinks in space." products = list(/obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola = 10,/obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_mountain_wind = 10, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/dr_gibb = 10,/obj/item/weapon/reagent_containers/food/drinks/soda_cans/starkist = 10, - /obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_up = 10, + /obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_up = 10,/obj/item/weapon/reagent_containers/food/drinks/soda_cans/pwr_game = 10, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/lemon_lime = 10) - contraband = list(/obj/item/weapon/reagent_containers/food/drinks/soda_cans/thirteenloko = 6) + contraband = list(/obj/item/weapon/reagent_containers/food/drinks/soda_cans/thirteenloko = 6,/obj/item/weapon/reagent_containers/food/drinks/soda_cans/shamblers = 6) premium = list(/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola = 1) refill_canister = /obj/item/weapon/vending_refill/cola +/obj/machinery/vending/cola/random + name = "\improper Random Drinkies" + desc = "Uh oh!" + +/obj/machinery/vending/cola/random/New() + ..() + var/T = pick(subtypesof(/obj/machinery/vending/cola) - /obj/machinery/vending/cola/random) + new T(get_turf(src)) + qdel(src) + +/obj/machinery/vending/cola/blue + icon_state = "Cola_Machine" + +/obj/machinery/vending/cola/black + icon_state = "cola_black" + +/obj/machinery/vending/cola/red + icon_state = "cola_red" + name = "\improper Space Cola Vendor" + desc = "It vends cola, in space." + product_slogans = "Cola in space!" + +/obj/machinery/vending/cola/space_up + icon_state = "space_up" + name = "\improper Space-up! Vendor" + desc = "Indulge in an explosion of flavor." + product_slogans = "Space-up! Like a hull breach in your mouth." + +/obj/machinery/vending/cola/starkist + icon_state = "starkist" + name = "\improper Star-kist Vendor" + desc = "The taste of a star in liquid form." + product_slogans = "Drink the stars! Star-kist!" + +/obj/machinery/vending/cola/sodie + icon_state = "soda" + +/obj/machinery/vending/cola/pwr_game + icon_state = "pwr_game" + name = "/improper Pwr Game Vendor" + desc = "You want it, we got it. Brought to you in partnership with Vlad's Salads." + product_slogans = "The POWER that gamers crave! PWR GAME!" + +/obj/machinery/vending/cola/shamblers + name = "\improper Shambler's Vendor" + desc = "~Shake me up some of that Shambler's Juice!~" + icon_state = "shamblers_juice" + products = list(/obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola = 10,/obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_mountain_wind = 10, + /obj/item/weapon/reagent_containers/food/drinks/soda_cans/dr_gibb = 10,/obj/item/weapon/reagent_containers/food/drinks/soda_cans/starkist = 10, + /obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_up = 10,/obj/item/weapon/reagent_containers/food/drinks/soda_cans/pwr_game = 10, + /obj/item/weapon/reagent_containers/food/drinks/soda_cans/lemon_lime = 10,/obj/item/weapon/reagent_containers/food/drinks/soda_cans/shamblers = 10) + product_slogans = "~Shake me up some of that Shambler's Juice!~" + product_ads = "Refreshing!;Jyrbv dv lg jfdv fw kyrk Jyrdscvi'j Alztv!;Over 1 trillion souls drank!;Thirsty? Nyp efk uizeb kyv uribevjj?;Kyv Jyrdscvi uizebj kyv ezxyk!;Drink up!;Krjkp." + + //This one's from bay12 /obj/machinery/vending/cart name = "\improper PTech" diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index 13c21315176..0400fcffe66 100644 --- a/code/game/objects/effects/contraband.dm +++ b/code/game/objects/effects/contraband.dm @@ -1,7 +1,7 @@ //########################## POSTERS ################################## -#define NUM_OF_POSTER_DESIGNS 36 // contraband posters +#define NUM_OF_POSTER_DESIGNS 44 // contraband posters #define NUM_OF_POSTER_DESIGNS_LEGIT 35 // corporate approved posters @@ -54,7 +54,15 @@ list(name = "- Punch Shit", desc = " Fight things for no reason, like a man!"), list(name = "- The Griffin", desc = " The Griffin commands you to be the worst you can be. Will you?"), list(name = "- Lizard", desc = " This lewd poster depicts a lizard preparing to mate."), list(name = "- Free Drone", desc = " This poster commemorates the bravery of the rogue drone banned by CentComm."), -list(name = "- Busty Backdoor Xeno Babes 6", desc = " Get a load, or give, of these all natural Xenos!") ) +list(name = "- Busty Backdoor Xeno Babes 6", desc = " Get a load, or give, of these all natural Xenos!"), +list(name = "- Robust Softdrinks", desc = " Robust Softdrinks: More robust than a toolbox to the head!"), +list(name = "- Shambler's Juice", desc = "~Shake me up some of that Shambler's Juice!~"), +list(name = "- Pwr Game", desc = "The POWER that gamers CRAVE! In partnership with Vlad's Salad."), +list(name = "- Sun-kist", desc = "Drink the stars!"), +list(name = "- Space Cola", desc = "Your favorite cola, in space."), +list(name = "- Space-Up!", desc = "Sucked out into space by the FLAVOR!"), +list(name = "- Kudzu", desc = "A poster advertising a movie about plants. How dangerous could they possibly be?"), +list(name = "- Masked Men", desc = "A poster advertising a movie about some masked men.") ) // LEGIT diff --git a/code/game/objects/items/weapons/vending_items.dm b/code/game/objects/items/weapons/vending_items.dm index 415455b5699..a1d85277cd8 100644 --- a/code/game/objects/items/weapons/vending_items.dm +++ b/code/game/objects/items/weapons/vending_items.dm @@ -51,8 +51,8 @@ /obj/item/weapon/vending_refill/cola machine_name = "Robust Softdrinks" icon_state = "refill_cola" - charges = list(20, 2, 1)//of 60 standard, 6 contraband, 1 premium - init_charges = list(20, 2, 1) + charges = list(30, 4, 1)//of 90 standard, 12 contraband, 1 premium + init_charges = list(30, 4, 1) /obj/item/weapon/vending_refill/cigarette machine_name = "ShadyCigs Deluxe" diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index ac74d4274fc..8b50a66906d 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -351,7 +351,7 @@ name = "Lemon-Lime Soda" /obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_up - name = "Space-Up" + name = "Space-Up!" desc = "Tastes like a hull breach in your mouth." icon_state = "space-up" list_reagents = list("space_up" = 30) @@ -380,4 +380,14 @@ icon_state = "dr_gibb" list_reagents = list("dr_gibb" = 30) +/obj/item/weapon/reagent_containers/food/drinks/soda_cans/pwr_game + name = "Pwr Game" + desc = "The only drink with the PWR that true gamers crave." + icon_state = "purple_can" + list_reagents = list("pwr_game" = 30) +/obj/item/weapon/reagent_containers/food/drinks/soda_cans/shamblers + name = "Shambler's Juice" + desc = "~Shake me up some of that Shambler's Juice!~" + icon_state = "shamblers" + list_reagents = list("shamblers" = 30) \ No newline at end of file diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm index a3c076a81da..1ac5b3edfaf 100644 --- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm +++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm @@ -265,6 +265,14 @@ icon_state = "space-up_glass" name = "glass of Space-up" desc = "Space-up. It helps you keep your cool." + if("pwr_game") + icon_state = "glass_red" + name = "glass of Pwr Game" + desc = "Goes well with a Vlad's salad." + if("shamblers") + icon_state = "glass_red" + name = "glass of Shambler's Juice" + desc = "Mmm mm, shambly." if("lemon_lime") icon_state = "glass_yellow" name = "glass of Lemon-Lime" @@ -648,7 +656,7 @@ /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/filled/cola name = "Space Cola" list_reagents = list("cola" = 50) - + /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola name = "Nuka Cola" list_reagents = list("nuka_cola" = 50) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 9c2b2229929..8e4a9ddb8bd 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -317,6 +317,8 @@ "tonic", "sodawater", "lemon_lime", + "pwr_game", + "shamblers", "sugar", "orangejuice", "limejuice", diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index bbb2ac17db8..a9947515e17 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -392,6 +392,27 @@ M.bodytemperature = max(310, M.bodytemperature - (8 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 ..() +/datum/reagent/consumable/pwr_game + name = "Pwr Game" + description = "The only drink with the PWR that true gamers crave." + id = "pwr_game" + color = "#9385bf" // rgb: 58, 52, 75 + +/datum/reagent/consumable/pwr_game/on_mob_life(mob/living/M) + if (M.bodytemperature > 310) + M.bodytemperature = max(310, M.bodytemperature - (8 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 + ..() + +/datum/reagent/consumable/shamblers + name = "Shambler's Juice" + description = "~Shake me up some of that Shambler's Juice!~" + id = "shamblers" + color = "#f00060" // rgb: 94, 0, 38 + +/datum/reagent/consumable/shamblers/on_mob_life(mob/living/M) + if (M.bodytemperature > 310) + M.bodytemperature = max(310, M.bodytemperature - (8 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 + ..() /datum/reagent/consumable/sodawater name = "Soda Water" id = "sodawater" diff --git a/icons/obj/computer.dmi b/icons/obj/computer.dmi index 2a26590dff3..6034e54b05e 100644 Binary files a/icons/obj/computer.dmi and b/icons/obj/computer.dmi differ diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi index cb495d2febd..f0912c136ef 100644 Binary files a/icons/obj/contraband.dmi and b/icons/obj/contraband.dmi differ diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index c03eef34975..a62f1db360c 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi index e8131065047..4ce9d864c87 100644 Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index b6ca3266ad8..59eafa4a6af 100644 Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ