diff --git a/code/game/objects/banners.dm b/code/game/objects/banners.dm index 0e4aaef6d8..f8a4e078bf 100644 --- a/code/game/objects/banners.dm +++ b/code/game/objects/banners.dm @@ -31,7 +31,17 @@ desc = "A banner with the symbol of the Solar Confederate Government." catalogue_data = list(/datum/category_item/catalogue/information/organization/solgov) +<<<<<<< HEAD //VOREStation Removal //CHOMP re-addition. Seriously? You commented this out for your lore? What's wrong with JUST NOT SPAWNING IT or something. +======= +/obj/item/weapon/banner/altevian + name = "\improper Altevian Hegemony Banner" + icon_state = "banner-altevian" + desc = "A banner that flies for the pride of the hegemony." + //catalogue_data = list(/datum/category_item/catalogue/information/organization/altevian_hegemony) // TODO? + +/* //VOREStation Removal +>>>>>>> b235d3c27e... Merge pull request #13750 from Heroman3003/altevian-foodstuff-2 /obj/item/weapon/banner/virgov name = "\improper VirGov banner" icon_state = "banner-virgov" diff --git a/code/game/objects/items/trash_vr.dm b/code/game/objects/items/trash_vr.dm index bb18141f4f..1f6cf5d3a8 100644 --- a/code/game/objects/items/trash_vr.dm +++ b/code/game/objects/items/trash_vr.dm @@ -44,4 +44,19 @@ /obj/item/trash/ratjuice name = "\improper Space-Safe Meal package" icon = 'icons/obj/trash_vr.dmi' - icon_state = "altevian_juice-trash" \ No newline at end of file + icon_state = "altevian_juice-trash" + +/obj/item/trash/ratfruitcake + name = "\improper Flavor Unit package" + icon = 'icons/obj/trash_vr.dmi' + icon_state = "altevian_fruitcake-trash" + +/obj/item/trash/ratpackburger + name = "\improper Prepackaged Meal Tray" + icon = 'icons/obj/trash_vr.dmi' + icon_state = "altevian_pack_burger-trash" + +/obj/item/trash/ratpackcheese + name = "\improper Prepackaged Meal Tray" + icon = 'icons/obj/trash_vr.dmi' + icon_state = "altevian_pack_cheese-trash" \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 3041af9e90..14cc60208d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -194,6 +194,11 @@ path = /obj/item/clothing/suit/storage/apron/overalls cost = 1 +/datum/gear/suit/altevian_apron + display_name = "crafters pride apron" + path = /obj/item/clothing/suit/storage/apron/altevian + cost = 1 + /datum/gear/suit/cyberpunk display_name = "cyberpunk jacket" path = /obj/item/clothing/suit/cyberpunk diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index d2ba4b26d9..1341af1b69 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -19,6 +19,12 @@ icon_state = "apron_white" item_state_slots = list(slot_r_hand_str = "apronchef", slot_l_hand_str = "apronchef") +/obj/item/clothing/suit/storage/apron/altevian + name = "Multi-purpose Crafters' Pride" + desc = "An apron designed by the space faring species that can hold an array of tools and other trinkets. It's made with a high-quality material." + icon_state = "apron_altevian" + item_state_slots = list(slot_r_hand_str = null, slot_l_hand_str = null) + //Captain /obj/item/clothing/suit/captunic name = "site manager's parade tunic" diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm index dbe287f9df..668208216b 100644 --- a/code/modules/economy/vending_machines_vr.dm +++ b/code/modules/economy/vending_machines_vr.dm @@ -3548,8 +3548,14 @@ product_ads = "Perfectly edible!;Squeaky clean foods!;Cheesed to meet you!;Made for spacers, by spacers, of spacers!" products = list(/obj/item/weapon/reagent_containers/food/snacks/ratprotein = 15, /obj/item/weapon/reagent_containers/food/snacks/ratveggies = 15, - /obj/item/weapon/reagent_containers/food/snacks/ratliquid = 15) + /obj/item/weapon/reagent_containers/food/snacks/ratliquid = 15, + /obj/item/weapon/reagent_containers/food/snacks/ratfruitcake = 15, + /obj/item/weapon/reagent_containers/food/snacks/ratpackburger = 8, + /obj/item/weapon/reagent_containers/food/snacks/ratpackcheese = 8) prices = list(/obj/item/weapon/reagent_containers/food/snacks/ratprotein = 8, /obj/item/weapon/reagent_containers/food/snacks/ratveggies = 8, - /obj/item/weapon/reagent_containers/food/snacks/ratliquid = 8) + /obj/item/weapon/reagent_containers/food/snacks/ratliquid = 8, + /obj/item/weapon/reagent_containers/food/snacks/ratfruitcake = 8, + /obj/item/weapon/reagent_containers/food/snacks/ratpackburger = 10, + /obj/item/weapon/reagent_containers/food/snacks/ratpackcheese = 10) diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 11d7a172dc..5ecf883da5 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -34,6 +34,8 @@ var/package_trash /// Packaged meals switch to this state when opened, if set var/package_open_state + /// Packaged meals that have opening animation + var/package_opening_state /// If this is canned. If true, it will print a message and ask you to open it var/canned = FALSE @@ -269,6 +271,8 @@ user.put_in_hands(T) if(package_open_state) icon_state = package_open_state + if(package_opening_state) + flick(package_opening_state, src) /obj/item/weapon/reagent_containers/food/snacks/proc/uncan(mob/user) canned = FALSE diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm index 23935f6207..3ba39dc3ad 100644 --- a/code/modules/food/food/snacks_vr.dm +++ b/code/modules/food/food/snacks_vr.dm @@ -826,3 +826,38 @@ /obj/item/weapon/reagent_containers/food/snacks/ratsteak/Initialize() . = ..() reagents.add_reagent("protein", 3) + +/obj/item/weapon/reagent_containers/food/snacks/ratfruitcake + name = "Premade Fruit Block" + desc = "A block of processed material that is infused with a mix of fruits and matter of such." + icon = 'icons/obj/food_vr.dmi' + icon_state = "altevian_fruitcake" + package_open_state = "altevian_fruitcake-open" + package = TRUE + trash = /obj/item/trash/ratfruitcake + nutriment_amt = 2 + nutriment_desc = list("fruitiness" = 4) + +/obj/item/weapon/reagent_containers/food/snacks/ratpackburger + name = "Altevian Prepackaged Meal - Burger" + desc = "A unique twist on what most know as MREs. This seems to be made with using bluespace tech and other methods of preserving an items freshness that it's like someone just ordered this from a restaurant just minutes ago. This one seems to be of burger and fries!" + icon = 'icons/obj/food_vr.dmi' + icon_state = "altevian_pack_burger" + package_open_state = "altevian_pack_burger-open" + package_opening_state = "altevian_pack_burger-opening" + package = TRUE + trash = /obj/item/trash/ratpackburger + nutriment_amt = 2 + nutriment_desc = list("fresh buns" = 2, "burger patty" = 4, "pickles" = 1) + +/obj/item/weapon/reagent_containers/food/snacks/ratpackcheese + name = "Generations Novelty Packaged Wedge" + desc = "Using the popular method of packaging that altevians use, they seemed to also use it for other methods. This one appears to have no real markings on it, save for its different coloring, and an image of the altevian emblem." + icon = 'icons/obj/food_vr.dmi' + icon_state = "altevian_pack_cheese" + package_open_state = "altevian_pack_cheese-open" + package_opening_state = "altevian_pack_cheese-opening" + package = TRUE + trash = /obj/item/trash/ratpackcheese + nutriment_amt = 2 + nutriment_desc = list("gourmand cheese" = 4) diff --git a/icons/inventory/suit/item.dmi b/icons/inventory/suit/item.dmi index 81ec437202..75feb5ee12 100644 Binary files a/icons/inventory/suit/item.dmi and b/icons/inventory/suit/item.dmi differ diff --git a/icons/inventory/suit/mob.dmi b/icons/inventory/suit/mob.dmi index 0e4a4ba3e1..045cdaf302 100644 Binary files a/icons/inventory/suit/mob.dmi and b/icons/inventory/suit/mob.dmi differ diff --git a/icons/obj/food_vr.dmi b/icons/obj/food_vr.dmi index f40c7061f9..54be219b75 100644 Binary files a/icons/obj/food_vr.dmi and b/icons/obj/food_vr.dmi differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 74e690e18b..6b748673b5 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/icons/obj/trash_vr.dmi b/icons/obj/trash_vr.dmi index 5df83d142b..0c4803f3ee 100644 Binary files a/icons/obj/trash_vr.dmi and b/icons/obj/trash_vr.dmi differ