Merge pull request #14136 from Heroman3003/altevian-thanksgiving

Adds more altevian things
This commit is contained in:
Casey
2022-11-26 17:40:57 -05:00
committed by CHOMPStation2
parent 343c2757c3
commit 10e697c6fe
9 changed files with 65 additions and 4 deletions

View File

@@ -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"
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"

View File

@@ -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 = "A comfortable official suit for altevian command officers."
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)"

View File

@@ -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"
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"

View File

@@ -3556,11 +3556,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)

View File

@@ -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)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 212 KiB

After

Width:  |  Height:  |  Size: 215 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 622 KiB

After

Width:  |  Height:  |  Size: 627 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB