diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index c8ef4a346ca..95b38874c63 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -277,7 +277,9 @@ to destroy them and players will be able to make replacements. "CargoDrobe" = /obj/machinery/economy/vending/cargodrobe, "ChefDrobe" = /obj/machinery/economy/vending/chefdrobe, "BarDrobe" = /obj/machinery/economy/vending/bardrobe, - "HydroDrobe" = /obj/machinery/economy/vending/hydrodrobe) + "HydroDrobe" = /obj/machinery/economy/vending/hydrodrobe, + "JaniDrobe" = /obj/machinery/economy/vending/janidrobe, + "LawDrobe" = /obj/machinery/economy/vending/lawdrobe) var/static/list/unique_vendors = list( "ShadyCigs Ultra" = /obj/machinery/economy/vending/cigarette/beach, "SyndiMed Plus" = /obj/machinery/economy/vending/wallmed/syndicate) diff --git a/code/game/machinery/vendors/wardrobe_vendors.dm b/code/game/machinery/vendors/wardrobe_vendors.dm index 3f93c550757..98639606cd7 100644 --- a/code/game/machinery/vendors/wardrobe_vendors.dm +++ b/code/game/machinery/vendors/wardrobe_vendors.dm @@ -573,3 +573,69 @@ /obj/item/storage/backpack/satchel_hyd = 50, /obj/item/storage/backpack/duffel/hydro = 50) refill_canister = /obj/item/vending_refill/hydrodrobe + +/obj/machinery/economy/vending/janidrobe + name = "\improper JaniDrobe" + desc = "A self cleaning vending machine capable of dispensing clothing for janitors." + icon_state = "janidrobe" + icon_lightmask = "base_drobe" + icon_panel = "drobe" + icon_broken = "base_drobe" + icon_off = "base_drobe" + ads_list = list("Come and get your janitorial clothing, now endorsed by janitors everywhere!") + vend_reply = "Thank you for using the JaniDrobe!" + products = list(/obj/item/clothing/under/rank/civilian/janitor = 3, + /obj/item/clothing/head/soft/purple = 3, + /obj/item/clothing/gloves/color/black = 3, + /obj/item/clothing/shoes/galoshes = 3, + /obj/item/storage/belt/janitor = 3) + contraband = list(/obj/item/toy/figure/crew/janitor = 1) + prices = list(/obj/item/clothing/under/rank/civilian/janitor = 50, + /obj/item/clothing/head/soft/purple = 20, + /obj/item/clothing/gloves/color/black = 20, + /obj/item/clothing/shoes/galoshes = 20, + /obj/item/storage/belt/janitor = 75) + refill_canister = /obj/item/vending_refill/janidrobe + +/obj/machinery/economy/vending/lawdrobe + name = "\improper LawDrobe" + desc = "Objection! This wardrobe dispenses the rule of law... and lawyer clothing." + icon_state = "lawdrobe" + icon_lightmask = "base_drobe" + icon_panel = "drobe" + icon_broken = "base_drobe" + icon_off = "base_drobe" + ads_list = list("OBJECTION! Get the rule of law for yourself!") + vend_reply = "Thank you for using the LawDrobe!" + products = list(/obj/item/clothing/under/rank/civilian/internalaffairs = 2, + /obj/item/clothing/under/rank/civilian/lawyer/bluesuit = 2, + /obj/item/clothing/under/rank/civilian/lawyer/purple = 2, + /obj/item/clothing/under/rank/civilian/lawyer/black = 2, + /obj/item/clothing/under/rank/civilian/lawyer/red = 2, + /obj/item/clothing/under/rank/civilian/lawyer/blue = 2, + /obj/item/clothing/under/suit/female = 2, + /obj/item/clothing/suit/storage/internalaffairs = 2, + /obj/item/clothing/suit/storage/lawyer/bluejacket = 2, + /obj/item/clothing/suit/storage/lawyer/purpjacket = 2, + /obj/item/clothing/shoes/laceup = 2, + /obj/item/clothing/shoes/black = 2, + /obj/item/clothing/shoes/brown = 2, + /obj/item/clothing/glasses/sunglasses/big = 2, + /obj/item/clothing/accessory/lawyers_badge = 2) + contraband = list(/obj/item/toy/figure/crew/lawyer = 1) + prices = list(/obj/item/clothing/under/rank/civilian/internalaffairs = 50, + /obj/item/clothing/under/rank/civilian/lawyer/bluesuit = 50, + /obj/item/clothing/under/rank/civilian/lawyer/purple = 50, + /obj/item/clothing/under/rank/civilian/lawyer/black = 50, + /obj/item/clothing/under/rank/civilian/lawyer/red = 50, + /obj/item/clothing/under/rank/civilian/lawyer/blue = 50, + /obj/item/clothing/under/suit/female = 50, + /obj/item/clothing/suit/storage/internalaffairs = 75, + /obj/item/clothing/suit/storage/lawyer/bluejacket = 75, + /obj/item/clothing/suit/storage/lawyer/purpjacket = 75, + /obj/item/clothing/shoes/laceup = 30, + /obj/item/clothing/shoes/black = 20, + /obj/item/clothing/shoes/brown = 20, + /obj/item/clothing/glasses/sunglasses/big = 30, + /obj/item/clothing/accessory/lawyers_badge = 50) + refill_canister = /obj/item/vending_refill/lawdrobe diff --git a/code/game/objects/items/weapons/vending_items.dm b/code/game/objects/items/weapons/vending_items.dm index d4ec9dac064..093b42505c0 100644 --- a/code/game/objects/items/weapons/vending_items.dm +++ b/code/game/objects/items/weapons/vending_items.dm @@ -208,3 +208,11 @@ /obj/item/vending_refill/hydrodrobe machine_name = "HydroDrobe" icon_state = "refill_clothes" + +/obj/item/vending_refill/janidrobe + machine_name = "JaniDrobe" + icon_state = "refill_clothes" + +/obj/item/vending_refill/lawdrobe + machine_name = "LawDrobe" + icon_state = "refill_clothes" diff --git a/code/modules/supply/supply_packs/pack_miscellaneous.dm b/code/modules/supply/supply_packs/pack_miscellaneous.dm index bb82459583f..4d0f5667ec2 100644 --- a/code/modules/supply/supply_packs/pack_miscellaneous.dm +++ b/code/modules/supply/supply_packs/pack_miscellaneous.dm @@ -444,7 +444,9 @@ cost = 50 contains = list(/obj/item/vending_refill/bardrobe, /obj/item/vending_refill/chefdrobe, - /obj/item/vending_refill/hydrodrobe) + /obj/item/vending_refill/hydrodrobe, + /obj/item/vending_refill/janidrobe, + /obj/item/vending_refill/lawdrobe) containername = "service clothing vendor crate" /datum/supply_packs/misc/vending/clothingvendor/cargo diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index 9f39e6def2a..79475940766 100755 Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ