diff --git a/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm b/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm index 6c510807b4..4e5f010964 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm @@ -243,6 +243,10 @@ icon_state = "none" relevant_layers = null +/datum/sprite_accessory/insect_fluff/brown + name = "Brown" + icon_state = "brown" + /datum/sprite_accessory/insect_fluff/punished name = "Burnt Off" icon_state = "punished" @@ -271,6 +275,10 @@ name = "Deathshead" icon_state = "deathhead" +/datum/sprite_accessory/insect_fluff/featherymoth + name = "Feathery Moth" + icon_state = "featherymoth" + /datum/sprite_accessory/insect_fluff/firewatch name = "Firewatch" icon_state = "firewatch" @@ -291,18 +299,22 @@ name = "Moon Fly" icon_state = "moonfly" -/datum/sprite_accessory/insect_fluff/oakworm - name = "Oak Worm" - icon_state = "oakworm" - /datum/sprite_accessory/insect_fluff/plain name = "Plain" icon_state = "plain" +/datum/sprite_accessory/insect_fluff/plasmafire + name = "Plasma Fire" + icon_state = "plasmafire" + /datum/sprite_accessory/insect_fluff/poison name = "Poison" icon_state = "poison" +/datum/sprite_accessory/insect_fluff/oakworm + name = "Oak Worm" + icon_state = "oakworm" + /datum/sprite_accessory/insect_fluff/ragged name = "Ragged" icon_state = "ragged" @@ -311,6 +323,10 @@ name = "Reddish" icon_state = "redish" +/datum/sprite_accessory/insect_fluff/rosy + name = "Rosy" + icon_state = "rosy" + /datum/sprite_accessory/insect_fluff/royal name = "Royal" icon_state = "royal" @@ -325,4 +341,4 @@ /datum/sprite_accessory/insect_fluff/witchwing name = "Witch Wing" - icon_state = "witchwing" + icon_state = "witchwing" \ No newline at end of file diff --git a/code/modules/mob/dead/new_player/sprite_accessories/wings.dm b/code/modules/mob/dead/new_player/sprite_accessories/wings.dm index 37ef2a7d19..d81005f293 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/wings.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/wings.dm @@ -58,30 +58,86 @@ dimension_y = 34 relevant_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER, BODY_FRONT_LAYER) -/datum/sprite_accessory/deco_wings/atlas - name = "Atlas" - icon_state = "atlas" +//nonmoth wings /datum/sprite_accessory/deco_wings/bat name = "Bat" icon_state = "bat" /datum/sprite_accessory/deco_wings/bee - name = "Bee" + name = "Large Bee" icon_state = "bee" -/datum/sprite_accessory/deco_wings/deathhead - name = "Deathshead" - icon_state = "deathhead" +/datum/sprite_accessory/deco_wings/bee2 + name = "Small Bee" + icon_state = "beewings" + +/datum/sprite_accessory/deco_wings/dragon + name = "Dragon" + icon_state = "dragon" + +/datum/sprite_accessory/deco_wings/dragonfly + name = "Dragonfly" + icon_state = "dragonfly" /datum/sprite_accessory/deco_wings/fairy name = "Fairy" icon_state = "fairy" -/datum/sprite_accessory/deco_wings/feathery - name = "Feathery" +/datum/sprite_accessory/deco_wings/featheredwing + name = "Feathered" icon_state = "feathery" +/datum/sprite_accessory/deco_wings/featheredwingmedium + name = "Medium Feathered" + icon_state = "feathered3" + +/datum/sprite_accessory/deco_wings/featheredwinglarge + name = "Large Feathered" + icon_state = "feathered2" + +/datum/sprite_accessory/deco_wings/harpywings + name = "Harpy" + icon_state = "harpywings" + +/datum/sprite_accessory/deco_wings/roboticwing + name = "Robotic" + icon_state = "drago" + +/datum/sprite_accessory/deco_wings/succubusblack + name = "Succubus Black" + icon_state = "succubusblack" + +/datum/sprite_accessory/deco_wings/succubuspurple + name = "Succubus Purple" + icon_state = "succubuspurple" + +/datum/sprite_accessory/deco_wings/succubusred + name = "Succubus Red" + icon_state = "succubusred" + +/datum/sprite_accessory/deco_wings/xenobackplate + name = "Xenomorph Backplate" + icon_state = "snagbackplate" + +//moth wings + +/datum/sprite_accessory/deco_wings/atlas + name = "Atlas" + icon_state = "atlas" + +/datum/sprite_accessory/deco_wings/brown + name = "Brown" + icon_state = "brown" + +/datum/sprite_accessory/deco_wings/deathhead + name = "Deathshead" + icon_state = "deathhead" + +/datum/sprite_accessory/deco_wings/featherymoth + name = "Feathery Moth Wings" + icon_state = "featherymoth" + /datum/sprite_accessory/deco_wings/firewatch name = "Firewatch" icon_state = "firewatch" @@ -90,6 +146,10 @@ name = "Gothic" icon_state = "gothic" +/datum/sprite_accessory/deco_wings/jungle + name = "Jungle" + icon_state = "jungle" + /datum/sprite_accessory/deco_wings/lovers name = "Lovers" icon_state = "lovers" @@ -106,10 +166,18 @@ name = "Moon Fly" icon_state = "moonfly" +/datum/sprite_accessory/deco_wings/oakworm + name = "Oak Worm" + icon_state = "oakworm" + /datum/sprite_accessory/deco_wings/plain name = "Plain" icon_state = "plain" +/datum/sprite_accessory/deco_wings/plasmafire + name = "Plasma Fire" + icon_state = "plasmafire" + /datum/sprite_accessory/deco_wings/poison name = "Poison" icon_state = "poison" @@ -126,6 +194,10 @@ name = "Reddish" icon_state = "redish" +/datum/sprite_accessory/deco_wings/rosy + name = "Rosy" + icon_state = "rosy" + /datum/sprite_accessory/deco_wings/royal name = "Royal" icon_state = "royal" @@ -138,54 +210,95 @@ name = "White Fly" icon_state = "whitefly" -/datum/sprite_accessory/deco_wings/oakworm - name = "Oak Worm" - icon_state = "oakworm" - /datum/sprite_accessory/deco_wings/witchwing name = "Witch Wing" icon_state = "witchwing" -/datum/sprite_accessory/deco_wings/jungle - name = "Jungle" - icon_state = "jungle" - //INSECT WINGS /datum/sprite_accessory/insect_wings icon = 'icons/mob/wings.dmi' color_src = WINGCOLOR relevant_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER) - -/datum/sprite_accessory/insect_wings/none - name = "None" - icon_state = "none" - relevant_layers = null - -/datum/sprite_accessory/insect_wings/atlas - name = "Atlas" - icon_state = "atlas" - +//non insect wings /datum/sprite_accessory/insect_wings/bat name = "Bat" icon_state = "bat" /datum/sprite_accessory/insect_wings/bee - name = "Bee" + name = "Bee Wings 1" icon_state = "bee" -/datum/sprite_accessory/insect_wings/deathhead - name = "Deathshead" - icon_state = "deathhead" +/datum/sprite_accessory/insect_wings/bee2 + name = "Bee Wings 2" + icon_state = "beewings" + +/datum/sprite_accessory/insect_wings/dragon + name = "Dragon Wings" + icon_state = "dragon" + +/datum/sprite_accessory/insect_wings/dragonfly + name = "Dragonfly" + icon_state = "dragonfly" /datum/sprite_accessory/insect_wings/fairy name = "Fairy" icon_state = "fairy" -/datum/sprite_accessory/insect_wings/feathery - name = "Feathery" +/datum/sprite_accessory/insect_wings/featheredwing + name = "Feathered Wings, Colorable" icon_state = "feathery" +/datum/sprite_accessory/insect_wings/featheredwingmedium + name = "Medium Feathered Wings, colorable" + icon_state = "feathered3" + +/datum/sprite_accessory/insect_wings/featheredwinglarge + name = "Large Feathered Wings (colorable)" + icon_state = "feathered2" + +/datum/sprite_accessory/insect_wings/harpywings + name = "Harpy Wings" + icon_state = "harpywings" + +/datum/sprite_accessory/insect_wings/roboticwing + name = "Robotic Wings" + icon_state = "drago" + +/datum/sprite_accessory/insect_wings/succubusblack + name = "Succubus Wings Black" + icon_state = "succubusblack" + +/datum/sprite_accessory/insect_wings/succubuspurple + name = "Succubus Wings Purple" + icon_state = "succubuspurple" + +/datum/sprite_accessory/insect_wings/succubusred + name = "Succubus Wings Red" + icon_state = "succubusred" + +/datum/sprite_accessory/insect_wings/xenobackplate + name = "Xenomorph Backplate" + icon_state = "snagbackplate" + +//moth wings + +/datum/sprite_accessory/insect_wings/atlas + name = "Atlas" + icon_state = "atlas" + +/datum/sprite_accessory/insect_wings/brown + name = "Brown" + icon_state = "brown" + +/datum/sprite_accessory/insect_wings/deathhead + name = "Deathshead" + icon_state = "deathhead" + +/datum/sprite_accessory/insect_wings/featherymoth + name = "Feathery Moth Wings" + icon_state = "featherymoth" + /datum/sprite_accessory/insect_wings/firewatch name = "Firewatch" icon_state = "firewatch" @@ -222,6 +335,10 @@ name = "Plain" icon_state = "plain" +/datum/sprite_accessory/insect_wings/plasmafire + name = "Plasma Fire" + icon_state = "plasmafire" + /datum/sprite_accessory/insect_wings/poison name = "Poison" icon_state = "poison" @@ -238,6 +355,10 @@ name = "Reddish" icon_state = "redish" +/datum/sprite_accessory/insect_wings/rosy + name = "Rosy" + icon_state = "rosy" + /datum/sprite_accessory/insect_wings/royal name = "Royal" icon_state = "royal" @@ -265,45 +386,25 @@ icon_state = "none" relevant_layers = null -/datum/sprite_accessory/insect_markings/reddish - name = "Reddish" - icon_state = "reddish" - -/datum/sprite_accessory/insect_markings/royal - name = "Royal" - icon_state = "royal" - -/datum/sprite_accessory/insect_markings/gothic - name = "Gothic" - icon_state = "gothic" - -/datum/sprite_accessory/insect_markings/whitefly - name = "White Fly" - icon_state = "whitefly" - -/datum/sprite_accessory/insect_markings/lovers - name = "Lovers" - icon_state = "lovers" - -/datum/sprite_accessory/insect_markings/punished - name = "Punished" - icon_state = "punished" +/datum/sprite_accessory/insect_markings/deathhead + name = "Deathshead" + icon_state = "deathhead" /datum/sprite_accessory/insect_markings/firewatch name = "Firewatch" icon_state = "firewatch" -/datum/sprite_accessory/insect_markings/deathhead - name = "Deathshead" - icon_state = "deathhead" +/datum/sprite_accessory/insect_markings/gothic + name = "Gothic" + icon_state = "gothic" -/datum/sprite_accessory/insect_markings/poison - name = "Poison" - icon_state = "poison" +/datum/sprite_accessory/insect_markings/jungle + name = "Jungle" + icon_state = "jungle" -/datum/sprite_accessory/insect_markings/ragged - name = "Ragged" - icon_state = "ragged" +/datum/sprite_accessory/insect_markings/lovers + name = "Lovers" + icon_state = "lovers" /datum/sprite_accessory/insect_markings/moonfly name = "Moon Fly" @@ -313,10 +414,42 @@ name = "Oak Worm" icon_state = "oakworm" -/datum/sprite_accessory/insect_markings/jungle - name = "Jungle" - icon_state = "jungle" +/datum/sprite_accessory/insect_markings/poison + name = "Poison" + icon_state = "poison" + +/datum/sprite_accessory/insect_markings/punished + name = "Punished" + icon_state = "punished" + +/datum/sprite_accessory/insect_markings/ragged + name = "Ragged" + icon_state = "ragged" + +/datum/sprite_accessory/insect_markings/reddish + name = "Reddish" + icon_state = "reddish" + +/datum/sprite_accessory/insect_markings/royal + name = "Royal" + icon_state = "royal" + +/datum/sprite_accessory/insect_markings/whitefly + name = "White Fly" + icon_state = "whitefly" /datum/sprite_accessory/insect_markings/witchwing name = "Witch Wing" icon_state = "witchwing" + +//DONATOR WINGS + +/datum/sprite_accessory/deco_wings/eyestalks + name = "gazer eyestalks" + icon_state = "eyestalks" + //ckeys_allowed = list("liquidfirefly","seiga") //At request. + +/datum/sprite_accessory/insect_wings/eyestalks + name = "gazer eyestalks" + icon_state = "eyestalks" + //ckeys_allowed = list("liquidfirefly","seiga") //At request. diff --git a/icons/mob/wings.dmi b/icons/mob/wings.dmi index 4523403344..7ed45c1ed9 100644 Binary files a/icons/mob/wings.dmi and b/icons/mob/wings.dmi differ