diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 267319b80c..3d53a053f0 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -755,7 +755,7 @@ products = list(/obj/item/weapon/reagent_containers/food/snacks/candy = 6,/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 6,/obj/item/weapon/reagent_containers/food/snacks/chips =6, /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 6,/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 6,/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie = 6, /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 6, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 6, /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 3) - contraband = list(/obj/item/weapon/reagent_containers/food/snacks/syndicake = 6) + contraband = list(/obj/item/weapon/reagent_containers/food/snacks/syndicake = 6,/obj/item/weapon/reagent_containers/food/snacks/unajerky = 6,) prices = list(/obj/item/weapon/reagent_containers/food/snacks/candy = 1,/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 5,/obj/item/weapon/reagent_containers/food/snacks/chips = 1, /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 2,/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 1,/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie = 1, /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 1, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 2, /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 4) diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 7fb09e116c..3d9c4ea140 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -35,6 +35,10 @@ name = "Scaredy's Private Reserve Beef Jerky" icon_state = "sosjerky" +/obj/item/trash/unajerky + name = "Moghes Imported Sissalik Jerky" + icon_state = "unathitinred" + /obj/item/trash/syndi_cakes name = "syndi cakes" icon_state = "syndi_cakes" diff --git a/code/modules/economy/price_list.dm b/code/modules/economy/price_list.dm index 6e101a0cde..265481709d 100644 --- a/code/modules/economy/price_list.dm +++ b/code/modules/economy/price_list.dm @@ -471,6 +471,9 @@ /obj/item/weapon/reagent_containers/food/snacks/sosjerky price_tag = 2 +/obj/item/weapon/reagent_containers/food/snacks/unajerky + price_tag = 12 + /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers price_tag = 1 diff --git a/code/modules/reagents/reagent_containers/food/lunch.dm b/code/modules/reagents/reagent_containers/food/lunch.dm index 1ab8cf3a43..1c82f6cded 100644 --- a/code/modules/reagents/reagent_containers/food/lunch.dm +++ b/code/modules/reagents/reagent_containers/food/lunch.dm @@ -16,6 +16,7 @@ var/list/lunchables_snacks_ = list(/obj/item/weapon/reagent_containers/food/snac /obj/item/weapon/reagent_containers/food/snacks/muffin, /obj/item/weapon/reagent_containers/food/snacks/popcorn, /obj/item/weapon/reagent_containers/food/snacks/sosjerky, + /obj/item/weapon/reagent_containers/food/snacks/unajerky, /obj/item/weapon/reagent_containers/food/snacks/no_raisin, /obj/item/weapon/reagent_containers/food/snacks/spacetwinkie, /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers, diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 5ea2372731..3191442be8 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -3429,3 +3429,17 @@ /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks/New() ..() bitesize = 3 + +/obj/item/weapon/reagent_containers/food/snacks/unajerky + name = "Moghes Imported Sissalik Jerky" + icon_state = "unathitinred" + desc = "An incredibly well made jerky, shipped in all the way from Moghes." + trash = /obj/item/trash/unajerky + filling_color = "#631212" + center_of_mass = list("x"=15, "y"=9) + +/obj/item/weapon/reagent_containers/food/snacks/unajerky/New() + ..() + reagents.add_reagent("protein", 8) + reagents.add_reagent("capsaicin", 2) + bitesize = 2 diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 9f5106f0ae..8df487ad3c 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi index 9b8a5c2584..4585d41d70 100644 Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ