diff --git a/code/defines/obj/machinery.dm b/code/defines/obj/machinery.dm index 9c019ce4b5b..c942d904ad3 100644 --- a/code/defines/obj/machinery.dm +++ b/code/defines/obj/machinery.dm @@ -533,6 +533,7 @@ var/product_amounts = "" //String of product amounts separated by semicolons, must have amount for every path in product_paths var/product_slogans = "" //String of slogans separated by semicolons, optional var/product_hidden = "" //String of products that are hidden unless hacked. + var/product_hideamt = "" //String of hidden product amounts, separated by semicolons. Exact same as amounts. Must be left blank if hidden is. var/list/product_records = list() var/list/hidden_records = list() var/list/slogan_list = list() @@ -549,6 +550,12 @@ var/panel_open = 0 //Hacking that vending machine. Gonna get a free candy bar. var/wires = 15 +/obj/machinery/vending/assist + product_amounts = "5;3;4;1" + product_hidden = "/obj/item/device/flashlight;obj/item/device/timer" + product_paths = "/obj/item/device/prox_sensor;/obj/item/device/igniter;/obj/item/device/radio/signaler;/obj/item/weapon/wirecutters" + product_hideamt = "5;2" + /obj/machinery/vending/coffee name = "coffee machine" desc = "A Robust Coffee vending machine." @@ -558,6 +565,7 @@ product_amounts = "25" vend_delay = 34 product_hidden = "/obj/item/weapon/reagent_containers/food/drinks/cola" + product_hideamt = "5" /obj/machinery/vending/snack name = "snack machine" @@ -567,6 +575,7 @@ product_amounts = "10;10" product_slogans = "Try our new nougat bar!;Twice the calories for half the price!" product_hidden = "/obj/item/weapon/reagent_containers/food/snacks/donut" + product_hideamt = "6" /obj/machinery/vending/cigarette name = "cigarette machine" @@ -577,6 +586,7 @@ product_slogans = "Space cigs taste good like a cigarette should.;I'd rather toolbox than switch.;Smoke!;Don't believe the reports - smoke today!" vend_delay = 34 product_hidden = "/obj/item/weapon/zippo" + product_hideamt = "3" /obj/machinery/vending/medical name = "NanoMed Plus" @@ -587,6 +597,7 @@ product_paths = "/obj/item/weapon/reagent_containers/glass/bottle/antitoxin;/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline;/obj/item/weapon/reagent_containers/glass/bottle/stoxin;/obj/item/weapon/reagent_containers/glass/bottle/toxin;/obj/item/weapon/reagent_containers/syringe/antiviral;/obj/item/weapon/reagent_containers/syringe" product_amounts = "4;4;4;4;8;12" product_hidden = "/obj/item/weapon/reagent_containers/pill/tox;/obj/item/device/healthanalyzer" + product_hideamt = "3;10" /obj/machinery/vending/security name = "SecTech" @@ -598,6 +609,7 @@ product_amounts = "8;2;5" //product_amounts = "8;5;4" Old totals product_hidden = "/obj/item/clothing/head/helmet" + product_hideamt = "2" /obj/machinery/vending/hydronutrients name = "NutriMax" diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 9d8249b7396..d7e631e6c4e 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -18,14 +18,15 @@ var/list/temp_paths = dd_text2List(src.product_paths, ";") var/list/temp_amounts = dd_text2List(src.product_amounts, ";") var/list/temp_hidden = dd_text2List(src.product_hidden, ";") + var/list/temp_hideamt = dd_text2List(src.product_hideamt, ";") //Little sanity check here - if ((isnull(temp_paths)) || (isnull(temp_amounts)) || (temp_paths.len != temp_amounts.len)) + if ((isnull(temp_paths)) || (isnull(temp_amounts)) || (temp_paths.len != temp_amounts.len) || (temp_hidden.len != temp_hideamt.len)) stat |= BROKEN return src.build_inventory(temp_paths,temp_amounts) //Add hidden inventory - src.build_inventory(temp_hidden,null,1) + src.build_inventory(temp_hidden,temp_hideamt, 1) return return @@ -68,14 +69,8 @@ R.product_name = capitalize(temp.name) R.product_path = path_list[p] R.display_color = pick("red","blue","green") - - if(hidden) - R.amount = rand(1,6) - src.hidden_records += R - - else - R.amount = text2num(amt_list[p]) - src.product_records += R + R.amount = text2num(amt_list[p]) + src.product_records += R del(temp) diff --git a/goonstation.dme b/goonstation.dme index 3f42de063c8..996d86b0ee1 100644 --- a/goonstation.dme +++ b/goonstation.dme @@ -95,18 +95,6 @@ #define FILE_DIR "code/WorkInProgress/pda2" #define FILE_DIR "code/WorkInProgress/plants" #define FILE_DIR "code/WorkInProgress/recycling" -#define FILE_DIR "FromMport" -#define FILE_DIR "FromMport/cyborgs" -#define FILE_DIR "FromMport/cyborgs/defines" -#define FILE_DIR "FromMport/cyborgs/defines/silicon" -#define FILE_DIR "FromMport/cyborgs/modules" -#define FILE_DIR "FromMport/cyborgs/modules/silicon" -#define FILE_DIR "FromMport/cyborgs/modules/silicon/hivebot" -#define FILE_DIR "FromMport/cyborgs/modules/silicon/robot" -#define FILE_DIR "FromMport/updates" -#define FILE_DIR "graphics" -#define FILE_DIR "graphics/arcane-circles-images" -#define FILE_DIR "graphics/serverguide" #define FILE_DIR "icons" #define FILE_DIR "icons/effects" #define FILE_DIR "icons/misc" diff --git a/maps/trunkmap.dmm b/maps/trunkmap.dmm index 74960f8a3e9..828630c02f1 100644 --- a/maps/trunkmap.dmm +++ b/maps/trunkmap.dmm @@ -1819,7 +1819,7 @@ "aIY" = (/obj/grille,/obj/window/reinforced/north,/obj/window/reinforced/west,/obj/window/reinforced/east,/turf/simulated/floor/plating,/area/hallway/primary/central) "aIZ" = (/obj/table{icon_state = "tabledir"; dir = 4},/obj/item/weapon/cable_coil{pixel_x = 2; pixel_y = -2},/obj/item/weapon/cable_coil,/obj/item/weapon/screwdriver,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/turf/simulated/floor,/area/storage/primary) "aJa" = (/turf/simulated/floor,/area/storage/primary) -"aJb" = (/obj/machinery/vending{desc = "A standard vending machine."; product_amounts = "5;3;4;1"; product_hidden = "/obj/item/device/flashlight;/obj/item/device/timer"; product_paths = "/obj/item/device/prox_sensor;/obj/item/device/igniter;/obj/item/device/radio/signaler;/obj/item/weapon/wirecutters"; product_slogans = "Please make your selection."},/turf/simulated/floor,/area/storage/primary) +"aJb" = (/obj/machinery/vending/assist,/turf/simulated/floor,/area/storage/primary) "aJc" = (/obj/item/weapon/crowbar,/obj/table{icon_state = "tabledir"; dir = 10},/obj/item/device/prox_sensor,/turf/simulated/floor,/area/storage/primary) "aJd" = (/obj/table{icon_state = "tabledir"; dir = 6},/obj/machinery/camera{network = "SS13"; c_tag = "Secure Storage"},/obj/item/weapon/storage/utilitybelt,/turf/simulated/floor,/area/storage/primary) "aJe" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=4"; location = "Tool Storage"},/turf/simulated/floor{icon_state = "bot"},/area/storage/primary)