From dca2e93209e1e68a4c1cdc6eb9b48206c4b0e6b0 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 31 Mar 2020 11:00:26 -0400 Subject: [PATCH] VS: Conflict Resolution + VS Changes Makes soft vendors work again Conflict Resolution II Fixes Shelter Capsule Vendor Note to self remember quotations Bad Lynx stop forgetting quotes! --- code/game/machinery/vending.dm | 12 +------ code/game/machinery/vending_vr.dm | 25 ++++++--------- code/modules/food/kitchen/smartfridge.dm | 30 +++++++----------- code/modules/mining/shelter_atoms.dm | 4 +-- code/modules/nifsoft/nif_softshop.dm | 12 +++---- .../dispenser/dispenser_presets_vr.dm | 4 --- icons/obj/survival_pod_vend.dmi | Bin 1888 -> 2190 bytes icons/obj/vending_vr.dmi | Bin 114192 -> 114190 bytes maps/tether/tether_things.dm | 1 - 9 files changed, 30 insertions(+), 58 deletions(-) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index c508d2c81e..fec24c137a 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -4,7 +4,7 @@ /obj/machinery/vending name = "Vendomat" desc = "A generic vending machine." - icon = 'icons/obj/vending_vr.dmi' //VOREStation Edit - Eris vending machine sprites + icon = 'icons/obj/vending.dmi' icon_state = "generic" anchored = 1 density = 1 @@ -777,12 +777,7 @@ /obj/machinery/vending/cola name = "Robust Softdrinks" desc = "A softdrink vendor provided by Robust Industries, LLC." -<<<<<<< HEAD - icon_state = "Cola_Machine" //VOREStation Edit - icon_vend = "Cola_Machine-purchase" //VOREStation Edit -======= icon_state = "Cola_Machine" ->>>>>>> 636062b... Merge pull request #6858 from VOREStation/pol-bayvend product_slogans = "Robust Softdrinks: More robust than a toolbox to the head!" 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/cans/cola = 10,/obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind = 10, @@ -934,12 +929,7 @@ 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..." -<<<<<<< HEAD - icon_state = "nutri" - //icon_deny = "nutri-deny" //VOREStation Removal - It doesn't even have an access list, when would it deny people? -======= icon_state = "nutri_generic" ->>>>>>> 636062b... Merge pull request #6858 from VOREStation/pol-bayvend products = list(/obj/item/weapon/reagent_containers/glass/bottle/eznutrient = 6,/obj/item/weapon/reagent_containers/glass/bottle/left4zed = 4,/obj/item/weapon/reagent_containers/glass/bottle/robustharvest = 3,/obj/item/weapon/plantspray/pests = 20, /obj/item/weapon/reagent_containers/syringe = 5,/obj/item/weapon/reagent_containers/glass/beaker = 4,/obj/item/weapon/storage/bag/plants = 5) premium = list(/obj/item/weapon/reagent_containers/glass/bottle/ammonia = 10,/obj/item/weapon/reagent_containers/glass/bottle/diethylamine = 5) diff --git a/code/game/machinery/vending_vr.dm b/code/game/machinery/vending_vr.dm index bb17588660..29d13d033d 100644 --- a/code/game/machinery/vending_vr.dm +++ b/code/game/machinery/vending_vr.dm @@ -27,6 +27,7 @@ name = "Dinnerware" desc = "A kitchen and restaurant equipment vendor." 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..." + icon = 'icons/obj/vending_vr.dmi' icon_state = "dinnerware" products = list( /obj/item/weapon/tray = 8, @@ -55,8 +56,7 @@ /obj/machinery/vending/food name = "Food-O-Mat" desc = "A technological marvel, supposedly able to cook or mix a large variety of food or drink." - icon_state = "boozeomat" - icon_deny = "boozeomat-deny" + icon_state = "hotfood" products = list(/obj/item/weapon/tray = 8, /obj/item/weapon/material/kitchen/utensil/fork = 6, /obj/item/weapon/material/knife/plastic = 6, @@ -89,8 +89,6 @@ /obj/machinery/vending/food/arojoan //Fluff vendor for the lewd houseboat. name = "Custom Food-O-Mat" desc = "Do you think Joan cooks? Of course not. Lazy squirrel!" - icon_state = "boozeomat" - icon_deny = "boozeomat-deny" products = list(/obj/item/weapon/tray = 6, /obj/item/weapon/material/kitchen/utensil/fork = 6, /obj/item/weapon/material/knife/plastic = 6, @@ -121,6 +119,7 @@ desc = "A self-defense equipment vending machine. When you need to take care of that clown." product_slogans = "The best defense is good offense!;Buy for your whole family today!;Nobody can outsmart bullet!;God created man - Frozen Star made them EQUAL!;Nobody can outsmart bullet!;Stupidity can be cured! By LEAD.;Dead kids can't bully your children!" product_ads = "Stunning!;Take justice in your own hands!;LEADearship!" + icon = 'icons/obj/vending_vr.dmi' icon_state = "weapon" products = list(/obj/item/device/flash = 6,/obj/item/weapon/reagent_containers/spray/pepper = 6, /obj/item/weapon/gun/projectile/olivaw = 5, /obj/item/weapon/gun/projectile/giskard = 5, /obj/item/ammo_magazine/mg/cl32/rubber = 20) contraband = list(/obj/item/weapon/reagent_containers/food/snacks/syndicake = 6) @@ -136,6 +135,7 @@ name = "Blood-Onator" desc = "Freezer-vendor for storage and quick dispensing of blood packs" product_ads = "The true life juice!;Vampire's choice!;Home-grown blood only!;Donate today, be saved tomorrow!;Approved by Zeng-Hu Pharmaceuticals Incorporated!; Curse you, Vey-Med artificial blood!" + icon = 'icons/obj/vending_vr.dmi' icon_state = "blood" idle_power_usage = 211 req_access = list(access_medical) @@ -151,6 +151,7 @@ name = "Fingers and Toes" desc = "A special vendor for gloves and shoes!" product_ads = "Do you have fingers and toes? COVER THEM UP!;Show me your toes! Wait. NO DON'T! BUY NEW SHOES!;Don't leave prints, BUY SOME GLOVES!;Remember to check your shoes for micros! You don't have to let them out, but just check for them!;Fingers and Toes is not liable for micro entrapment or abuse under the feet of our patrons.!;This little piggy went WE WE WE all the way down to FINGERS AND TOES to pick up some sweet new gloves and shoes." + icon = 'icons/obj/vending_vr.dmi' icon_state = "glovesnshoes" products = list(/obj/item/clothing/gloves/evening = 5, /obj/item/clothing/gloves/fingerless = 5, @@ -278,7 +279,6 @@ desc = "A vendor using compressed matter cartridges to store large amounts of basic station uniforms." product_ads = "Don't get caught naked!;Pick up your uniform!;Using compressed matter cartridges and VERY ETHICAL labor practices, we bring you the uniforms you need!;No uniform? No problem!;We've got your covered!;The Basics is not responsible for being crushed under the amount of things inside our machines. DO NOT VEND IN EXCESS!!" icon_state = "loadout" - icon_vend = "loadout-purchase" vend_delay = 16 products = list(/obj/item/device/pda = 50, /obj/item/device/radio/headset = 50, @@ -307,7 +307,6 @@ desc = "A special vendor for accessories." product_ads = "Want shinies? We have the shinies.;Need that special something to complete your outfit? We have what you need!;Ditch that old dull dangly something you've got and pick up one of our shinies!;Bracelets, collars, scarfs rings and more! We have the fancy things you need!;Does your pet need a collar? We don't judge! Keep them in line with one of one of ours!;Top of the line materials! 'Hand crafted' goods!" icon_state = "accessory" - icon_vend = "accessory-purchase" vend_delay = 6 products = list(/obj/item/clothing/accessory = 5, /obj/item/clothing/accessory/armband/med/color = 10, @@ -537,7 +536,6 @@ desc = "A special vendor using compressed matter cartridges to store large amounts of clothing." product_ads = "Tired of your grey jumpsuit? Spruce yourself up!;We have the outfit for you!;Don't let that grey jumpsuit get you down, get a ROBUST outfit right now!;Using compressed matter catridges and VERY ETHICAL labor practices to bring YOU the clothing you crave!;Are you sure you want to go to work in THAT?;All of our wares have a whole TWO pockets!" icon_state = "clothing" - icon_vend = "clothing-purchase" vend_delay = 16 products = list(/obj/item/clothing/under/bathrobe = 5, /obj/item/clothing/under/dress/black_corset = 5, @@ -881,7 +879,6 @@ desc = "A special vendor for devices and gadgets." product_ads = "You can't RESIST our great deals!;Feeling disconnected? We have a gadget for you!;You know you have the capacity to buy our capacitors!;FILL THAT HOLE IN YOUR HEART WITH OUR PLASTIC DISTRACTIONS!!!;Devices for everyone! Chips Co.!;ROBUST INVENTORY, GREAT PRICES! ;DON'T FORGET THE oyPAD 13s PRO! ON SALE NOW, ONLY ONE THOUSAND THALERS!" icon_state = "gadgets" - icon_vend = "gadgets-purchase" vend_delay = 11 products = list(/obj/item/clothing/suit/circuitry = 1, /obj/item/clothing/head/circuitry = 1, @@ -961,7 +958,6 @@ desc = "A special vendor using compressed matter cartridges to store large amounts of overwear!" product_ads = "Dress your best! It's what big D would want.;Overwear for all occasions!;Big D has what you need if what you need is some form of jacket!;Need a new hoodie? Bid D has you covered.;Big D says you need a new suit!;Big D smiles when he sees you in one of his coats!" icon_state = "suit" - icon_vend = "suit-purchase" vend_delay = 16 products = list(/obj/item/clothing/suit/storage/apron = 5, /obj/item/clothing/suit/storage/flannel/aqua = 5, @@ -1308,14 +1304,9 @@ /obj/item/seeds/whitebeetseed = 3, /obj/item/seeds/wabback = 2) -//TFF 19/12/19 - Brig version of a Nutrimax /obj/machinery/vending/hydronutrients/brig name = "Brig NutriMax" desc = "A plant nutrients vendor. Seems some items aren't included." - 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_deny = "nutri-deny" products = list(/obj/item/weapon/reagent_containers/glass/bottle/eznutrient = 6,/obj/item/weapon/reagent_containers/glass/bottle/left4zed = 4,/obj/item/weapon/reagent_containers/glass/bottle/robustharvest = 3,/obj/item/weapon/plantspray/pests = 20, /obj/item/weapon/reagent_containers/glass/beaker = 4,/obj/item/weapon/storage/bag/plants = 5) premium = list(/obj/item/weapon/reagent_containers/glass/bottle/ammonia = 10,/obj/item/weapon/reagent_containers/glass/bottle/diethylamine = 5) @@ -1332,4 +1323,8 @@ /obj/machinery/vending/emergencyfood/filled products = list(/obj/item/weapon/storage/box/wings/tray = 40) - contraband = list(/obj/item/weapon/storage/box/wings/tray = 20) \ No newline at end of file + contraband = list(/obj/item/weapon/storage/box/wings/tray = 20) + +/obj/machinery/vending/cola/soft + icon = 'icons/obj/vending_vr.dmi' + icon_state = "Cola_Machine" diff --git a/code/modules/food/kitchen/smartfridge.dm b/code/modules/food/kitchen/smartfridge.dm index b58e3d48df..c798ed3875 100644 --- a/code/modules/food/kitchen/smartfridge.dm +++ b/code/modules/food/kitchen/smartfridge.dm @@ -13,15 +13,8 @@ idle_power_usage = 5 active_power_usage = 100 flags = NOREACT -<<<<<<< HEAD var/max_n_of_items = 999 // Sorry but the BYOND infinite loop detector doesn't look things over 1000. //VOREStation Edit - Non-global //var/global/max_n_of_items = 999 // Sorry but the BYOND infinite loop detector doesn't look things over 1000. - var/icon_on = "smartfridge" - var/icon_off = "smartfridge-off" - var/icon_panel = "smartfridge-panel" -======= - var/global/max_n_of_items = 999 // Sorry but the BYOND infinite loop detector doesn't look things over 1000. ->>>>>>> 636062b... Merge pull request #6858 from VOREStation/pol-bayvend var/list/item_records = list() var/datum/stored_item/currently_vending = null //What we're putting out of the machine. var/seconds_electrified = 0; @@ -221,17 +214,18 @@ is_off = "-off" // Fridge contents - switch(contents.len) - if(0) - add_overlay("empty[is_off]") - if(1 to 2) - add_overlay("[icon_contents]-1[is_off]") - if(3 to 5) - add_overlay("[icon_contents]-2[is_off]") - if(6 to 8) - add_overlay("[icon_contents]-3[is_off]") - else - add_overlay("[icon_contents]-4[is_off]") + if(contents) //VOREStation Edit - Some fridges do not have visible contents + switch(contents.len) + if(0) + add_overlay("empty[is_off]") + if(1 to 2) + add_overlay("[icon_contents]-1[is_off]") + if(3 to 5) + add_overlay("[icon_contents]-2[is_off]") + if(6 to 8) + add_overlay("[icon_contents]-3[is_off]") + else + add_overlay("[icon_contents]-4[is_off]") // Fridge top var/image/top = image(icon, "[icon_base]-top") diff --git a/code/modules/mining/shelter_atoms.dm b/code/modules/mining/shelter_atoms.dm index 55734dfb54..90403853a9 100644 --- a/code/modules/mining/shelter_atoms.dm +++ b/code/modules/mining/shelter_atoms.dm @@ -222,9 +222,9 @@ name = "survival pod storage" desc = "A heated storage unit." icon_state = "donkvendor" + icon_base = "donkvendor" + icon_contents = null icon = 'icons/obj/survival_pod_vend.dmi' - icon_on = "donkvendor" - icon_off = "donkvendor" light_range = 5 light_power = 1.2 light_color = "#DDFFD3" diff --git a/code/modules/nifsoft/nif_softshop.dm b/code/modules/nifsoft/nif_softshop.dm index fe9da85ba3..2af77f43ad 100644 --- a/code/modules/nifsoft/nif_softshop.dm +++ b/code/modules/nifsoft/nif_softshop.dm @@ -6,8 +6,6 @@ icon = 'icons/obj/machines/ar_elements.dmi' icon_state = "proj" - icon_vend = "beacon_yes" - icon_deny = "beacon_no" products = list() contraband = list() @@ -98,7 +96,7 @@ var/mob/living/carbon/human/H = user if(!H.nif || !H.nif.stat == NIF_WORKING) to_chat(H, "[src] seems unable to connect to your NIF...") - flick(icon_deny,entopic.my_image) + flick("[icon_state]-deny",entopic.my_image) return FALSE return ..() @@ -126,7 +124,7 @@ if((href_list["vend"]) && (vend_ready) && (!currently_vending)) if((!allowed(usr)) && !emagged && scan_id) //For SECURE VENDING MACHINES YEAH to_chat(usr, "Access denied.") //Unless emagged of course - flick(icon_deny,entopic.my_image) + flick("[icon_state]-deny",entopic.my_image) return var/key = text2num(href_list["vend"]) @@ -143,7 +141,7 @@ var/list/usr_access = usr.GetAccess() if(!has_access(soft_access, list(), usr_access) && !emagged) to_chat(usr, "You aren't authorized to buy [initial(path.name)].") - flick(icon_deny,entopic.my_image) + flick("[icon_state]-deny",entopic.my_image) return if(R.price <= 0) @@ -174,7 +172,7 @@ var/mob/living/carbon/human/H = user if((!allowed(usr)) && !emagged && scan_id && istype(H)) //For SECURE VENDING MACHINES YEAH to_chat(usr, "Purchase not allowed.") //Unless emagged of course - flick(icon_deny,entopic.my_image) + flick("[icon_state]-deny",entopic.my_image) return vend_ready = 0 //One thing at a time!! status_message = "Installing..." @@ -207,7 +205,7 @@ spawn(vend_delay) R.amount-- new R.item_path(H.nif) - flick(icon_vend,entopic.my_image) + flick("[icon_state]-vend",entopic.my_image) if(has_logs) do_logging(R, user, 1) diff --git a/code/modules/reagents/dispenser/dispenser_presets_vr.dm b/code/modules/reagents/dispenser/dispenser_presets_vr.dm index 3a3d0031ff..bf7f85688d 100644 --- a/code/modules/reagents/dispenser/dispenser_presets_vr.dm +++ b/code/modules/reagents/dispenser/dispenser_presets_vr.dm @@ -1,7 +1,5 @@ /obj/machinery/chemical_dispenser/xenoflora name = "xenoflora chem dispenser" - icon = 'icons/obj/chemical_vr.dmi' - icon_state = "dispenser-small-green" ui_title = "Xenoflora Chemical Dispenser" dispense_reagents = list( "water", "sugar", "ethanol", "radium", "ammonia", "diethylamine", "plantbgone", "mutagen", "calcium" @@ -22,8 +20,6 @@ /obj/machinery/chemical_dispenser/biochemistry name = "bioproduct dispenser" - icon = 'icons/obj/chemical_vr.dmi' - icon_state = "dispenser-small" ui_title = "Bioproduct Dispenser" dispense_reagents = list( "nutriment", "protein", "milk" diff --git a/icons/obj/survival_pod_vend.dmi b/icons/obj/survival_pod_vend.dmi index 2c8b6d57758aeb0e4171700e35a05ef30b802df0..88c71b3866a45c94c4c6d2feeafe839de9562747 100644 GIT binary patch literal 2190 zcmV;92yyp`P)V=-0C=30%drZ=Fce1NIrk}k+F4O6ZdoKnGPLhd$&Crc8%RUMw|8*WA=??g z)8jhc>gT3KAm9Vr*{28|;r zpO+_p`v=`QmUoL!-na03PAf~xQCZwS-(#E&%w*{U)Ph%b7NKj+000NMNkl zJs`WVv-3J$ua{sjSTtBY{=N79u&z7S?Ew8Wl6s)7NRE0v5Li43U z75#ocH*fw?ixp)Km#bQvQu(Bo>#w@s@8`*r;eyAA&No>smZW|JG&K0=?d=7?;c)G` zFw>s;cy{U+3-}CQE4q>KAzxN zG)b-9wBvYeE`ejS6Q@s~Wq4TDSbB-fm#kJhq0kHfX0sVUgEwDpv@2F)2_18CoeW%s;hHrfucmTzgJgR2!*EkI0ST0YWX?w z^w#C8t1IcH7NF;4OGLgDk1yu!jM-d{&1&Pkrv&d&E5WHakH%kc{)fAZ&E|5}S=HJt z#1oZYa24cs*!l69lUzJr%Bx3gxEwJg+Y2t#muPXRbt9u(AHx$$tu@5Q#+iH`%gfN; z07c~&yZ~!!>qL|Y-C-a(2c}ehw*rt}igkwz#S#!iVqzsh}cr1@TE{FeZx@Kz3SQ(zGSwxg0c!T ziN#fBqDf}$rtRayW)cglj6PdrQl8Ycmn+fv(z%nV-@y5W1Ph7u+e!7HNjdX?tZ>_S zD>#7Yd}(AReS^@igWK9#ft_u^vz5IizkmNh!MdXJr4w!&kUIjdUAqQ=EX(+OK4dw4 zZA~T<$z)PX)jU<|iwLjRyKM(V=bLJ3+!|FK0RXpdeLz=N7Z1k1Y99`q3b(Q;XcX^#Sj^^DaQna}a=7EO!Ko#Mfp3q(%Y2LL!MQ%RC$# z;KZ9hrRj~gFag27dz@&#!bsmeyv{!zBCY+%*k{(TzI`c0F)`2k-mGxln}`zjP%_j*xv&{ObIckyGujh3UU1EN=pURphUW_ejBfw^}5sSrgQqlR_?ot-x z6U;ol%VKag>HSo=!hJc~XoFQH5P)0p~`ESGY-@L7r&wm?+OQ}fR@MOOebvm6w^Cci>3TAg= zr&8C>>5TNTS1))`q6y~X2`a5+TK=-&e91ol9rjWQbZL0U$V}y1@B00IAoabZ_3&W; z=Huz_FKaf|h2~4gN^;kxBO41vb|G^bhr{Vp$@j6U%U*_UawDe=k@!;2TJf-aayTk8 zI-u?p#{&^wEi1?Sik*jn+y`Ky@}*Bd{j*8mKzn<8hr{9eM=|iWw$_YksQ*oLmY8vu zlv5|Yfa=t1xf`E+Y|3s!G=51=E1U9qz1sIIh0;QuQ2zn=e5no1BPPqk#_ohcY>$@F65b%b#su!Q%B8LfTm5zAOw zZgPs@_YN4m3fhkzvHSNQ@cZA6^WjH6e)k)hFTQFmns2oBtw-#`k9?dw`5K@9s}-v) z{k(s-{Qr*Z;^g)~`_?1&{tcPy@Bf63pMS#BsW*$}8?Alm5o>E};M1& literal 1888 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 diff --git a/maps/tether/tether_things.dm b/maps/tether/tether_things.dm index af5e75f0e0..a104a92998 100644 --- a/maps/tether/tether_things.dm +++ b/maps/tether/tether_things.dm @@ -330,7 +330,6 @@ var/global/list/latejoin_tram = list() name = "Airlock NanoMed" desc = "Wall-mounted Medical Equipment dispenser. This limited-use version dispenses antitoxins with mild painkillers for surface EVAs." icon_state = "wallmed" - icon_deny = "wallmed-deny" density = 0 //It is wall-mounted, and thus, not dense. --Superxpdude products = list(/obj/item/weapon/reagent_containers/pill/airlock = 10,/obj/item/device/healthanalyzer = 1) contraband = list(/obj/item/weapon/reagent_containers/pill/tox = 2)