diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm index 9beedcd8dc..fa207d9cf4 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm @@ -492,6 +492,15 @@ // H CKEYS +//hagawaga +//Lana Xavier +/datum/gear/fluff/hagawaga_romanarmor + path = /obj/item/clothing/under/fluff/romanarmor + display_name = "Roman Legionary Armor" + description = "Basically looks like what you would expect a segmented plated armor from the early Roman Empire to look like." + ckeywhitelist = list("hagawaga") + character_name = list("Lana Xavier") + //harpsong //Harpsong /datum/gear/fluff/harpsong_1 @@ -681,6 +690,29 @@ ckeywhitelist = list("masmc") character_name = list("Kettek Ollarch") +//Moca_The_Porg1 +//Mocha +/datum/gear/fluff/mochaexploreruniform + path = /obj/item/clothing/under/fluff/mocha_uniform + display_name = "Winterized Explorer Jumpsuit" + description = "A Greenish-white uniform for operating in hazardous environments. This one is suited for colder environments." + ckeywhitelist = list("Moca_The_Porg1") + character_name = list("Mocha") + +/datum/gear/fluff/mochaexplorersuit + path = /obj/item/clothing/vest/fluff/mocha_suit + display_name = "Winterized Explorer Suit" + description = "An armoured suit for exploring harsh environments. This one seems more suited for winter." + ckeywhitelist = list("Moca_The_Porg1") + character_name = list("Mocha") + +/datum/gear/fluff/mochaexplorerhood + path = /obj/item/clothing/head/hood/mocha_hood + display_name = "Winterized Explorer Hood" + description = "An armoured hood for exploring harsh environments. This one seems fluffier." + ckeywhitelist = list("Moca_The_Porg1") + character_name = list("Mocha") + // N CKEYS //NESgamer190 /datum/gear/fluff/lucy_flask diff --git a/code/modules/vore/appearance/sprite_accessories_yw.dm b/code/modules/vore/appearance/sprite_accessories_yw.dm index a33b89cf18..89ccde1ed1 100644 --- a/code/modules/vore/appearance/sprite_accessories_yw.dm +++ b/code/modules/vore/appearance/sprite_accessories_yw.dm @@ -117,4 +117,13 @@ desc = "" icon_state = "raccoon_tail" do_colouration = 0 - color_blend_mode = ICON_MULTIPLY \ No newline at end of file + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/tail/striped_tail + icon = "icons/mob/vore/tails_yw.dmi" + name = "Striped tail, colorable" + desc = "" + icon_state = "stripedtail_colorable" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "stripedtail_colorable_w" \ No newline at end of file diff --git a/code/modules/vore/fluffstuff/custom_clothes_yw.dm b/code/modules/vore/fluffstuff/custom_clothes_yw.dm index 1e92cbaa34..c5070992e5 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_yw.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_yw.dm @@ -1485,4 +1485,61 @@ icon = 'icons/vore/custom_clothes_yw.dmi' icon_state = "srusuuniform" icon_override = 'icons/vore/custom_clothes_yw.dmi' - item_state = "srusuuniform" \ No newline at end of file + item_state = "srusuuniform" + +// ****** +// Hagawaga +// ****** +//Lana Xavier +/obj/item/clothing/under/fluff/romanarmor + name = "Roman Legionary Armor" + desc = "Basically looks like what you would expect a segmented plated armor from the early Roman Empire to look like." + icon = 'icons/vore/custom_clothes_yw.dmi' + icon_state = "hagawaga_romanarmor" + icon_override = "icons/vore/custom_clothes_yw.dmi" + item_state = "hagawaga_romanarmor" + +// ****** +// Moca_The_Porg1 +// ****** +//Mocha +/obj/item/clothing/under/fluff/mocha_uniform + name = "Winterized Explorer Jumpsuit" + desc = "A Greenish-white uniform for operating in hazardous environments. This one is suited for colder environments." + icon = 'icons/vore/custom_clothes_yw.dmi' + icon_state = "mocha_uniform" + icon_override = "icons/vore/custom_clothes_yw.dmi" + item_state = "mocha_uniform" + +/obj/item/clothing/vest/fluff/mocha_suit + name = "Winterized Explorer Suit" + desc = "An armoured suit for exploring harsh environments. This one seems more suited for winter." + icon = 'icons/vore/custom_clothes_yw.dmi' + icon_state = "mocha_suit" + icon_override = "icons/vore/custom_clothes_yw.dmi" + item_state = "mocha_suit_s" + slot_flags = SLOT_OCLOTHING + flags = THICKMATERIAL + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE + cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + siemens_coefficient = 0.9 + armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 75, rad = 35) // Inferior to sec vests in bullet/laser but better for environmental protection. + allowed = list( + /obj/item/device/flashlight, + /obj/item/weapon/gun, + /obj/item/ammo_magazine, + /obj/item/weapon/melee, + /obj/item/weapon/material/knife, + /obj/item/weapon/tank, + /obj/item/device/radio, + /obj/item/weapon/pickaxe + ) + +/obj/item/clothing/head/hood/mocha_hood + name = "Winterized Explorer Hood" + desc = "An armoured hood for exploring harsh environments. This one seems fluffier." + icon = 'icons/vore/custom_clothes_yw.dmi' + icon_state = "mocha_hood" + icon_override = "icons/vore/custom_clothes_yw.dmi" + item_state = "mocha_hood_s" diff --git a/icons/mob/vore/tails_yw.dmi b/icons/mob/vore/tails_yw.dmi index ff695baf58..613bb0ef3a 100644 Binary files a/icons/mob/vore/tails_yw.dmi and b/icons/mob/vore/tails_yw.dmi differ diff --git a/icons/vore/custom_clothes_yw.dmi b/icons/vore/custom_clothes_yw.dmi index 0fadb83547..089bd8d36c 100644 Binary files a/icons/vore/custom_clothes_yw.dmi and b/icons/vore/custom_clothes_yw.dmi differ