From 1bdc60de9d54ec54b8e07c65bfb526925e501f45 Mon Sep 17 00:00:00 2001 From: Henri215 <77684085+Henri215@users.noreply.github.com> Date: Thu, 5 Jan 2023 15:23:19 -0300 Subject: [PATCH] Tweaks to Vendomat and Artvend (#19967) --- _maps/map_files/MetaStation/MetaStation.dmm | 4 ++-- .../RandomRuins/SpaceRuins/intactemptyship.dmm | 2 +- _maps/map_files/RandomRuins/SpaceRuins/ussp.dmm | 2 +- _maps/map_files/RandomZLevels/example.dmm | 2 +- _maps/map_files/cyberiad/cyberiad.dmm | 2 +- _maps/map_files/generic/Lavaland.dmm | 2 +- code/game/machinery/vendors/generic_vendors.dm | 13 ++++++++++--- 7 files changed, 17 insertions(+), 10 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index cb676ff2eb4..a3bfee85c08 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -18577,7 +18577,7 @@ }, /area/storage/tech) "bjx" = ( -/obj/machinery/economy/vending/assist, +/obj/machinery/economy/vending/assist/free, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -69328,7 +69328,7 @@ /area/quartermaster/storage) "lCb" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/economy/vending/assist, +/obj/machinery/economy/vending/assist/free, /turf/simulated/floor/plasteel, /area/engine/engineering) "lCt" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/intactemptyship.dmm b/_maps/map_files/RandomRuins/SpaceRuins/intactemptyship.dmm index b1b61b3433d..a00c71b1e94 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/intactemptyship.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/intactemptyship.dmm @@ -41,7 +41,7 @@ /turf/simulated/floor/mineral/titanium/purple, /area/ruin/space/powered) "k" = ( -/obj/machinery/economy/vending/assist, +/obj/machinery/economy/vending/assist/free, /turf/simulated/floor/mineral/titanium/purple, /area/ruin/space/powered) "l" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm index e85d496866a..5e48b1e87c5 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm @@ -3812,7 +3812,7 @@ name = "Derelict Annex" }) "iH" = ( -/obj/machinery/economy/vending/assist, +/obj/machinery/economy/vending/assist/free, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "caution" diff --git a/_maps/map_files/RandomZLevels/example.dmm b/_maps/map_files/RandomZLevels/example.dmm index 76ce8e139bf..9645933dc60 100644 --- a/_maps/map_files/RandomZLevels/example.dmm +++ b/_maps/map_files/RandomZLevels/example.dmm @@ -758,7 +758,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/example) "bZ" = ( -/obj/machinery/economy/vending/assist, +/obj/machinery/economy/vending/assist/free, /turf/simulated/floor/plasteel, /area/awaymission/example) "ca" = ( diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index de0f361d4d0..2d96f93e55f 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -52171,7 +52171,7 @@ /turf/simulated/floor/plasteel, /area/maintenance/incinerator) "cDY" = ( -/obj/machinery/economy/vending/assist, +/obj/machinery/economy/vending/assist/free, /turf/simulated/floor/plating, /area/storage/tech) "cDZ" = ( diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm index fee477c7c67..41985eeb8f6 100644 --- a/_maps/map_files/generic/Lavaland.dmm +++ b/_maps/map_files/generic/Lavaland.dmm @@ -3015,7 +3015,7 @@ /turf/simulated/floor/plating, /area/lavaland/surface/outdoors) "fY" = ( -/obj/machinery/economy/vending/assist, +/obj/machinery/economy/vending/assist/free, /turf/simulated/floor/plating, /area/mine/cafeteria) "fZ" = ( diff --git a/code/game/machinery/vendors/generic_vendors.dm b/code/game/machinery/vendors/generic_vendors.dm index a2a5a05b529..13617be0979 100644 --- a/code/game/machinery/vendors/generic_vendors.dm +++ b/code/game/machinery/vendors/generic_vendors.dm @@ -1,11 +1,17 @@ //general-use clothing vendors, wardrobe vendors are in another file /obj/machinery/economy/vending/assist - products = list(/obj/item/assembly/prox_sensor = 5, /obj/item/assembly/igniter = 3, /obj/item/assembly/signaler = 4, - /obj/item/wirecutters = 1, /obj/item/cartridge/signal = 4) - contraband = list(/obj/item/flashlight = 5, /obj/item/assembly/timer = 2, /obj/item/assembly/voice = 2, /obj/item/assembly/health = 2) ads_list = list("Only the finest!", "Have some tools.", "The most robust equipment.", "The finest gear in space!") + products = list(/obj/item/assembly/prox_sensor = 4, /obj/item/assembly/igniter = 4, /obj/item/assembly/signaler = 4, + /obj/item/wirecutters = 2, /obj/item/cartridge/signal = 4) + contraband = list(/obj/item/flashlight = 4, /obj/item/assembly/timer = 2, /obj/item/assembly/voice = 2, /obj/item/assembly/health = 2) + prices = list(/obj/item/assembly/prox_sensor = 20, /obj/item/assembly/igniter = 20, /obj/item/assembly/signaler = 30, + /obj/item/wirecutters = 50, /obj/item/cartridge/signal = 75, /obj/item/flashlight = 40, + /obj/item/assembly/timer = 20, /obj/item/assembly/voice = 20, /obj/item/assembly/health = 20) refill_canister = /obj/item/vending_refill/assist +/obj/machinery/economy/vending/assist/free + prices = list() + /obj/machinery/economy/vending/boozeomat name = "\improper Booze-O-Mat" desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one." @@ -720,6 +726,7 @@ /obj/item/pen/red = 5) contraband = list(/obj/item/toy/crayon/mime = 1,/obj/item/toy/crayon/rainbow = 1) premium = list(/obj/item/poster/random_contraband = 5, /obj/item/pen/fancy = 2) + prices = list(/obj/item/stack/cable_coil/random = 20) /obj/machinery/economy/vending/tool name = "\improper YouTool"