diff --git a/code/game/objects/items/trash_vr.dm b/code/game/objects/items/trash_vr.dm index 1f6cf5d3a8c..17cf91d1768 100644 --- a/code/game/objects/items/trash_vr.dm +++ b/code/game/objects/items/trash_vr.dm @@ -59,4 +59,9 @@ /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 + icon_state = "altevian_pack_cheese-trash" + +/obj/item/trash/ratpackturkey + name = "\improper Prepackaged Meal Tray" + icon = 'icons/obj/trash_vr.dmi' + icon_state = "altevian_pack_turkey-trash" \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm b/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm index e7e4a45a561..f7334182d0c 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm @@ -122,6 +122,21 @@ "red emblem" = /obj/item/clothing/accessory/altevian_badge/aquila/hydrogen) gear_tweaks += new/datum/gear_tweak/path(sortAssoc(badges)) +/datum/gear/suit/altevian_officer_suit + description = "An emblem commonly seen worn by the altevians for their work operations." + display_name = "altevian officer's suit selection, site manager" + whitelisted = SPECIES_ALTEVIAN + allowed_roles = list("Site Manager") + sort_category = "Xenowear" + +/datum/gear/suit/altevian_officer_suit/New() + ..() + var/list/suits = list() + for(var/ratsuit in typesof(/obj/item/clothing/suit/captunic/capjacket/altevian_admiral)) + var/obj/item/clothing/suit/captunic/capjacket/altevian_admiral/specific_ratsuit = ratsuit + suits[initial(specific_ratsuit.name)] = specific_ratsuit + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(suits)) + // Taur stuff /datum/gear/suit/taur/drake_cloak display_name = "drake cloak (Drake-taur)" diff --git a/code/modules/clothing/suits/miscellaneous_vr.dm b/code/modules/clothing/suits/miscellaneous_vr.dm index bf34f15826e..b2c9e176d1b 100644 --- a/code/modules/clothing/suits/miscellaneous_vr.dm +++ b/code/modules/clothing/suits/miscellaneous_vr.dm @@ -146,4 +146,31 @@ name = "cyberpunk vest" desc = "A high tech looking vest. It's made out of tough materials, and can protect fairly well against bullets. Wake the fuck up, Samurai." - icon_state = "cyberpunk_recolor" \ No newline at end of file + icon_state = "cyberpunk_recolor" + species_restricted = list(SPECIES_ALTEVIAN) + +// Altevian admiralty stuff +/obj/item/clothing/suit/captunic/capjacket/altevian_admiral // Subtype of capjacket because A) it makes sense and B) conviniently matching stats + name = "altevian officer's suit" + desc = "Formal attire worn by officers and bridge crew from the Altevian Hegemony. The material is made of high quality silk and provides maximum comfort and breathing room for those that are working double shifts all the time." + icon_state = "altevian-admiral" + +/obj/item/clothing/suit/captunic/capjacket/altevian_admiral/gray + name = "gray altevian officer's suit" + icon_state = "altevian-admiral-gray" + +/obj/item/clothing/suit/captunic/capjacket/altevian_admiral/white + name = "white altevian officer's suit" + icon_state = "altevian-admiral-white" + +/obj/item/clothing/suit/captunic/capjacket/altevian_admiral/dark + name = "dark altevian officer's suit" + icon_state = "altevian-admiral-dark" + +/obj/item/clothing/suit/captunic/capjacket/altevian_admiral/olive + name = "olive altevian officer's suit" + icon_state = "altevian-admiral-olive" + +/obj/item/clothing/suit/captunic/capjacket/altevian_admiral/yellow + name = "yellow altevian officer's suit" + icon_state = "altevian-admiral-yellow" \ No newline at end of file diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm index bdcd33c4a41..58d01d002ea 100644 --- a/code/modules/economy/vending_machines_vr.dm +++ b/code/modules/economy/vending_machines_vr.dm @@ -3458,11 +3458,13 @@ /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) + /obj/item/weapon/reagent_containers/food/snacks/ratpackcheese = 8, + /obj/item/weapon/reagent_containers/food/snacks/ratpackturkey = 2) 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/ratfruitcake = 8, /obj/item/weapon/reagent_containers/food/snacks/ratpackburger = 10, - /obj/item/weapon/reagent_containers/food/snacks/ratpackcheese = 10) + /obj/item/weapon/reagent_containers/food/snacks/ratpackcheese = 10, + /obj/item/weapon/reagent_containers/food/snacks/ratpackturkey = 200) diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm index b1e3e878c2c..f5c276d887d 100644 --- a/code/modules/food/food/snacks_vr.dm +++ b/code/modules/food/food/snacks_vr.dm @@ -861,3 +861,15 @@ trash = /obj/item/trash/ratpackcheese nutriment_amt = 2 nutriment_desc = list("gourmand cheese" = 4) + +/obj/item/weapon/reagent_containers/food/snacks/ratpackturkey + name = "Compact Holiday Special Bird" + desc = "A great gift for holidays for assorted species. This contains a full freshly cooked turkey. Open and enjoy. Courtesy of altevian packaging" + icon = 'icons/obj/food_vr.dmi' + icon_state = "altevian_pack_turkey" + package_open_state = "altevian_pack_turkey-open" + package_opening_state = "altevian_pack_turkey-opening" + package = TRUE + trash = /obj/item/trash/ratpackturkey + nutriment_amt = 18 + nutriment_desc = list("high-quality poultry" = 4) diff --git a/icons/inventory/suit/item.dmi b/icons/inventory/suit/item.dmi index 75feb5ee122..541a40a4b3b 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 045cdaf3024..6b6ffed503e 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 54be219b753..6dc23e9275c 100644 Binary files a/icons/obj/food_vr.dmi and b/icons/obj/food_vr.dmi differ diff --git a/icons/obj/trash_vr.dmi b/icons/obj/trash_vr.dmi index 0c4803f3ee0..740fd0abc64 100644 Binary files a/icons/obj/trash_vr.dmi and b/icons/obj/trash_vr.dmi differ