diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm index afe48ab3fb..0ee131bc14 100644 --- a/code/modules/reagents/reagent_containers/bottle.dm +++ b/code/modules/reagents/reagent_containers/bottle.dm @@ -77,6 +77,11 @@ desc = "A small bottle of charcoal, which removes toxins and other chemicals from the bloodstream." list_reagents = list("charcoal" = 30) +/obj/item/reagent_containers/glass/bottle/cryoxadone + name = "cryoxadone bottle" + desc = "A small bottle of cryoxadone, heals most types of damage when used in extremely cold enviornments." + list_reagents = list("cryoxadone" = 30) + /obj/item/reagent_containers/glass/bottle/mutagen name = "unstable mutagen bottle" desc = "A small bottle of unstable mutagen. Randomly changes the DNA structure of whoever comes in contact." diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 7ca5f74492..f2307cad3e 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -21,6 +21,12 @@ /obj/item/clothing/under/kilt = 3, /obj/item/clothing/under/overalls = 3, /obj/item/clothing/under/sl_suit = 3, + /obj/item/clothing/under/bb_sweater = 3, + /obj/item/clothing/under/bb_sweater/black = 3, + /obj/item/clothing/under/bb_sweater/purple = 3, + /obj/item/clothing/under/bb_sweater/green = 3, + /obj/item/clothing/under/bb_sweater/red = 3, + /obj/item/clothing/under/bb_sweater/blue = 3, /obj/item/clothing/under/pants/jeans = 5, /obj/item/clothing/under/pants/classicjeans = 5, /obj/item/clothing/under/pants/camo = 3, @@ -117,7 +123,8 @@ /obj/item/clothing/under/jabroni = 2, /obj/item/clothing/suit/vapeshirt = 2, /obj/item/clothing/under/geisha = 4, - /obj/item/clothing/accessory/syndi_pokadots = 4) + /obj/item/clothing/accessory/syndi_pokadots = 4, + /obj/item/clothing/under/keyholesweater = 3) premium = list(/obj/item/clothing/under/suit_jacket/checkered = 4, /obj/item/clothing/head/mailman = 2, /obj/item/clothing/under/rank/mailman = 2, diff --git a/code/modules/vending/drinnerware.dm b/code/modules/vending/drinnerware.dm index 0cd68e818a..1c29fff137 100644 --- a/code/modules/vending/drinnerware.dm +++ b/code/modules/vending/drinnerware.dm @@ -6,7 +6,7 @@ products = list(/obj/item/storage/bag/tray = 8, /obj/item/kitchen/fork = 6, /obj/item/kitchen/knife = 6, - /obj/item/kitchen/rollingpin = 2, + /obj/item/kitchen/rollingpin = 4, /obj/item/reagent_containers/food/drinks/drinkingglass = 8, /obj/item/clothing/suit/apron/chef = 2, /obj/item/storage/box/cups = 2, @@ -17,7 +17,13 @@ /obj/item/reagent_containers/food/condiment/saltshaker = 5, /obj/item/reagent_containers/food/condiment/peppermill = 5, /obj/item/reagent_containers/glass/bowl = 30) - contraband = list(/obj/item/kitchen/rollingpin = 2, - /obj/item/kitchen/knife/butcher = 2) + contraband = list( + /obj/item/reagent_containers/food/snacks/monkeycube = 1, + /obj/item/kitchen/knife/butcher = 2, + /obj/item/reagent_containers/syringe = 3) + premium = list( + /obj/item/reagent_containers/food/condiment/enzyme = 1, + /obj/item/reagent_containers/food/condiment/soysauce = 1, + /obj/item/reagent_containers/glass/bottle/cryoxadone = 2) // Bartender can literally make this with upgraded parts, or it gets stolen from medical. armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) resistance_flags = FIRE_PROOF diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm index c8d9035998..efb0905f6b 100644 --- a/code/modules/vending/snack.dm +++ b/code/modules/vending/snack.dm @@ -11,9 +11,16 @@ /obj/item/reagent_containers/food/snacks/no_raisin = 6, /obj/item/reagent_containers/food/snacks/spacetwinkie = 6, /obj/item/reagent_containers/food/snacks/cheesiehonkers = 6) - contraband = list(/obj/item/reagent_containers/food/snacks/syndicake = 6) - premium = list(/obj/item/storage/box/donkpockets = 1, - /obj/item/reagent_containers/food/snacks/poppypretzel = 3) + contraband = list( + /obj/item/reagent_containers/food/snacks/cracker = 12, + /obj/item/reagent_containers/food/snacks/beans = 2, + /obj/item/reagent_containers/food/snacks/honeybar = 6, + /obj/item/reagent_containers/food/snacks/syndicake = 6) + premium = list( + /obj/item/reagent_containers/food/snacks/lollipop = 2, + /obj/item/reagent_containers/food/snacks/spiderlollipop = 2, + /obj/item/reagent_containers/food/snacks/chococoin = 1, + /obj/item/storage/box/donkpockets = 2) refill_canister = /obj/item/vending_refill/snack var/chef_compartment_access = "28" //ACCESS_KITCHEN diff --git a/modular_citadel/code/game/machinery/vending.dm b/modular_citadel/code/game/machinery/vending.dm index a71175c345..53fe6a8f56 100755 --- a/modular_citadel/code/game/machinery/vending.dm +++ b/modular_citadel/code/game/machinery/vending.dm @@ -43,6 +43,7 @@ vend_reply = "Have fun, you shameless pervert!" products = list( /obj/item/clothing/under/maid = 5, + /obj/item/clothing/under/janimaid = 5, /obj/item/clothing/neck/petcollar = 5, /obj/item/clothing/neck/petcollar/choker = 5, /obj/item/clothing/neck/petcollar/leather = 5, @@ -51,6 +52,7 @@ /obj/item/clothing/mask/muzzle = 4, /obj/item/clothing/under/stripper_pink = 3, /obj/item/clothing/under/stripper_green = 3, + /obj/item/clothing/under/gear_harness = 10, /obj/item/dildo/custom = 5, /obj/item/electropack/shockcollar = 3, /obj/item/assembly/signaler = 3 @@ -60,6 +62,7 @@ /obj/item/key/collar = 2, /obj/item/clothing/head/kitty = 3, /obj/item/clothing/head/rabbitears = 3, + /obj/item/clothing/under/keyholesweater = 2, /obj/item/clothing/under/mankini = 2, /obj/item/clothing/under/jabroni = 2, /obj/item/dildo/flared/huge = 3, @@ -68,7 +71,6 @@ ) premium = list( /obj/item/clothing/accessory/skullcodpiece/fake = 3, - /obj/item/clothing/under/gear_harness = 10, /obj/item/reagent_containers/glass/bottle/hexacrocin = 10 ) refill_canister = /obj/item/vending_refill/kink