From 69191297625af8d1013ce0ffa9996aee83a045b4 Mon Sep 17 00:00:00 2001 From: gonenoculer5 Date: Sun, 31 Oct 2021 17:35:43 -0500 Subject: [PATCH] Fixes gandalfs jank. (#9152) [dopamine noises] --- .../objects/items/circuitboards/machine_circuitboards.dm | 3 ++- modular_skyrat/modules/salon/code/barbervend.dm | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index b7ffab700c1..19e90d870b1 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -557,7 +557,8 @@ /obj/machinery/vending/tool = "YouTool", /obj/machinery/vending/custom = "Custom Vendor", /obj/machinery/vending/dorms = "LustWish", //SKYRAT EDIT CHANGE - ERP UPDATE - ORIGINAL: /obj/machinery/vending/dorms = "KinkVend" - /obj/machinery/vending/access/command = "Command Outfitting Station") //SKYRAT EDIT ADDITION + /obj/machinery/vending/access/command = "Command Outfitting Station", //SKYRAT EDIT ADDITION + /obj/machinery/vending/barbervend = "Fab-O-Vend") //SKYRAT EDIT ADDITION /obj/item/circuitboard/machine/vendor/attackby(obj/item/I, mob/user, params) if(I.tool_behaviour == TOOL_SCREWDRIVER) diff --git a/modular_skyrat/modules/salon/code/barbervend.dm b/modular_skyrat/modules/salon/code/barbervend.dm index 1c3e03a83fe..55d006f202f 100644 --- a/modular_skyrat/modules/salon/code/barbervend.dm +++ b/modular_skyrat/modules/salon/code/barbervend.dm @@ -5,6 +5,7 @@ icon_state = "barbervend" product_slogans = "Spread the colour, like butter, onto toast... Onto their hair.; Sometimes, I dream about dyes...; Paint 'em up and call me Mr. Painter.; Look brother, I'm a vendomat, I solve practical problems." product_ads = "Cut 'em all!; To sheds!; Hair be gone!; Prettify!; Beautify!" + vend_reply = "Come again!; Buy another!; Dont you love your new look?" req_access = list(ACCESS_BARBER) refill_canister = /obj/item/vending_refill/barbervend products = list( @@ -24,7 +25,11 @@ /obj/item/razor = 1, /obj/item/storage/box/perfume = 1, ) + refill_canister = /obj/item/vending_refill/barbervend + default_price = PAYCHECK_ASSISTANT + extra_price = PAYCHECK_HARD + payment_department = ACCOUNT_SRV /obj/item/vending_refill/barbervend - name = "barber vend resupply" - + machine_name = "barber vend resupply" + icon_state = "refill_snack" //generic item refill because there isnt one sprited yet.