diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index d29e6769dd2..803404db065 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -1382,6 +1382,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/vending/pets name = "Pet Supply Crate" contains = list(/obj/item/weapon/vending_refill/crittercare, + /obj/item/weapon/vending_refill/crittercare, /obj/item/weapon/vending_refill/crittercare) cost = 15 containername = "pet supply crate" diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 9956c38cc54..afd9b292aed 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1243,7 +1243,7 @@ desc = "A vending machine for art supplies." product_slogans = "Stop by for all your artistic needs!;Color the floors with crayons, not blood!;Don't be a starving artist, use ArtVend. ;Don't fart, do art!" product_ads = "Just like Kindergarten!;Now with 1000% more vibrant colors!;Screwing with the janitor was never so easy!;Creativity is at the heart of every spessman." - vend_delay = 34 + vend_delay = 15 icon_state = "artvend" products = list(/obj/item/stack/cable_coil/random = 10,/obj/item/device/camera = 4,/obj/item/device/camera_film = 6, /obj/item/weapon/storage/photo_album = 2,/obj/item/stack/wrapping_paper = 4,/obj/item/stack/packageWrap = 4, @@ -1258,16 +1258,14 @@ desc = "A vending machine for pet supplies." product_slogans = "Stop by for all your animal's needs!;Cuddly pets deserve a stylish collar!;Pets in space, what could be more adorable?;Freshest fish eggs in the system!;Rocks are the perfect pet, buy one today!" product_ads = "House-training costs extra!;Now with 1000% more cat hair!;Allergies are a sign of weakness!;Dogs are man's best friend. Remember that Vulpkanin!; Heat lamps for Unathi!; Vox-y want a cracker?" - vend_delay = 34 + vend_delay = 15 icon_state = "crittercare" - products = list(/obj/item/clothing/accessory/petcollar = 5, /obj/item/weapon/fish_net = 5, /obj/item/weapon/fishfood = 5, - /obj/item/weapon/tank_brush = 5, /obj/item/weapon/egg_scoop = 5, /obj/item/fish_eggs/goldfish = 5, + products = list(/obj/item/clothing/accessory/petcollar = 5, /obj/item/weapon/storage/aquatic_kit =5, /obj/item/fish_eggs/goldfish = 5, /obj/item/fish_eggs/clownfish = 5, /obj/item/fish_eggs/shark = 5, /obj/item/fish_eggs/feederfish = 10, /obj/item/fish_eggs/salmon = 5, /obj/item/fish_eggs/catfish = 5, /obj/item/fish_eggs/glofish = 5, /obj/item/fish_eggs/electric_eel = 5, /obj/item/fish_eggs/shrimp = 10, /obj/item/toy/pet_rock = 5, ) - prices = list(/obj/item/clothing/accessory/petcollar = 50, /obj/item/weapon/fish_net = 15, /obj/item/weapon/fishfood = 15, - /obj/item/weapon/tank_brush = 15, /obj/item/weapon/egg_scoop = 15, /obj/item/fish_eggs/goldfish = 10, + prices = list(/obj/item/clothing/accessory/petcollar = 50, /obj/item/weapon/storage/aquatic_kit = 60, /obj/item/fish_eggs/goldfish = 10, /obj/item/fish_eggs/clownfish = 10, /obj/item/fish_eggs/shark = 10, /obj/item/fish_eggs/feederfish = 5, /obj/item/fish_eggs/salmon = 10, /obj/item/fish_eggs/catfish = 10, /obj/item/fish_eggs/glofish = 10, /obj/item/fish_eggs/electric_eel = 10, /obj/item/fish_eggs/shrimp = 5, /obj/item/toy/pet_rock = 100, diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index b6d6b382736..f6690ac0a1d 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -340,3 +340,23 @@ ..() update_icon() + + +///Aquatic Starter Kit + +/obj/item/weapon/storage/aquatic_kit + name = "aquatic starter kit" + desc = "It's a starter kit box for an acquarium." + icon_state = "AquaticKit" + throw_speed = 2 + throw_range = 8 + +/obj/item/weapon/storage/aquatic_kit/full + desc = "It's a starter kit for an acquarium; includes 1 tank brush, 1 egg scoop, 1 fish net, and 1 container of fish food." + +/obj/item/weapon/storage/aquatic_kit/full/New() + ..() + new /obj/item/weapon/egg_scoop(src) + new /obj/item/weapon/fish_net(src) + new /obj/item/weapon/tank_brush(src) + new /obj/item/weapon/fishfood(src) \ No newline at end of file diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index f07d2ed5139..b74424a5485 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ