cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 23:17:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tweaks to Vendomat and Artvend (#19967)

Browse Source
This commit is contained in:
Henri215
2023-01-05 12:23:19 -06:00
committed by GitHub
parent e747881be5
commit 1bdc60de9d
7 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/MetaStation/MetaStation.dmm
+2 -2
View File
@@ -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" = (
_maps/map_files/RandomRuins/SpaceRuins/intactemptyship.dmm
+1 -1
View File
@@ -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" = (
_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm
+1 -1
View File
@@ -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"
_maps/map_files/RandomZLevels/example.dmm
+1 -1
View File
@@ -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" = (
_maps/map_files/cyberiad/cyberiad.dmm
+1 -1
View File
@@ -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" = (
_maps/map_files/generic/Lavaland.dmm
+1 -1
View File
@@ -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" = (
code/game/machinery/vendors/generic_vendors.dm
Vendored
+10 -3
View File
@@ -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"