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 aaffc0389d..554b7edfdb 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/wings.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/wings.dm @@ -30,7 +30,7 @@ // Decorative wings /datum/sprite_accessory/deco_wings icon = 'icons/mob/wings.dmi' - + /datum/sprite_accessory/deco_wings/plain name = "Plain" icon_state = "plain" @@ -96,10 +96,13 @@ name = "Snow" icon_state = "snow" - /datum/sprite_accessory/deco_wings/angel name = "Angel" icon_state = "angel" + color_src = 0 + dimension_x = 46 + center = TRUE + dimension_y = 34 /datum/sprite_accessory/deco_wings/none name = "None" @@ -155,7 +158,6 @@ /datum/sprite_accessory/insect_wings/punished name = "Burnt Off" icon_state = "punished" - locked = TRUE /datum/sprite_accessory/insect_wings/firewatch name = "Firewatch" diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 01f7ecb6bd..1f843483ee 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -13,19 +13,19 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) //Species Icon Drawing Offsets - Pixel X, Pixel Y, Aka X = Horizontal and Y = Vertical, from bottom left corner var/list/offset_features = list( - OFFSET_UNIFORM = list(0,0), - OFFSET_ID = list(0,0), - OFFSET_GLOVES = list(0,0), - OFFSET_GLASSES = list(0,0), - OFFSET_EARS = list(0,0), - OFFSET_SHOES = list(0,0), - OFFSET_S_STORE = list(0,0), - OFFSET_FACEMASK = list(0,0), - OFFSET_HEAD = list(0,0), - OFFSET_EYES = list(0,0), - OFFSET_LIPS = list(0,0), - OFFSET_BELT = list(0,0), - OFFSET_BACK = list(0,0), + OFFSET_UNIFORM = list(0,0), + OFFSET_ID = list(0,0), + OFFSET_GLOVES = list(0,0), + OFFSET_GLASSES = list(0,0), + OFFSET_EARS = list(0,0), + OFFSET_SHOES = list(0,0), + OFFSET_S_STORE = list(0,0), + OFFSET_FACEMASK = list(0,0), + OFFSET_HEAD = list(0,0), + OFFSET_EYES = list(0,0), + OFFSET_LIPS = list(0,0), + OFFSET_BELT = list(0,0), + OFFSET_BACK = list(0,0), OFFSET_HAIR = list(0,0), OFFSET_FHAIR = list(0,0), OFFSET_SUIT = list(0,0), @@ -422,8 +422,8 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) facial_overlay.alpha = hair_alpha if(OFFSET_FHAIR in H.dna.species.offset_features) - facial_overlay.pixel_x += H.dna.species.offset_features[OFFSET_FHAIR][1] - facial_overlay.pixel_y += H.dna.species.offset_features[OFFSET_FHAIR][2] + facial_overlay.pixel_x += H.dna.species.offset_features[OFFSET_FHAIR][1] + facial_overlay.pixel_y += H.dna.species.offset_features[OFFSET_FHAIR][2] standing += facial_overlay @@ -814,6 +814,8 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) bodypart = "snout" if(bodypart == "xenohead") bodypart = "xhead" + if(bodypart == "insect_wings" || bodypart == "deco_wings") + bodypart = "insect_wings" if(S.gender_specific) accessory_overlay.icon_state = "[g]_[bodypart]_[S.icon_state]_[layertext]" @@ -885,7 +887,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) accessory_overlay.color = husklist if(OFFSET_MUTPARTS in H.dna.species.offset_features) - accessory_overlay.pixel_x += H.dna.species.offset_features[OFFSET_MUTPARTS][1] + accessory_overlay.pixel_x += H.dna.species.offset_features[OFFSET_MUTPARTS][1] accessory_overlay.pixel_y += H.dna.species.offset_features[OFFSET_MUTPARTS][2] standing += accessory_overlay @@ -901,7 +903,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) inner_accessory_overlay = center_image(inner_accessory_overlay, S.dimension_x, S.dimension_y) if(OFFSET_MUTPARTS in H.dna.species.offset_features) - inner_accessory_overlay.pixel_x += H.dna.species.offset_features[OFFSET_MUTPARTS][1] + inner_accessory_overlay.pixel_x += H.dna.species.offset_features[OFFSET_MUTPARTS][1] inner_accessory_overlay.pixel_y += H.dna.species.offset_features[OFFSET_MUTPARTS][2] standing += inner_accessory_overlay @@ -944,11 +946,11 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) if(HORNCOLOR) extra_accessory_overlay.color = "#[H.horn_color]" - + if(OFFSET_MUTPARTS in H.dna.species.offset_features) - extra_accessory_overlay.pixel_x += H.dna.species.offset_features[OFFSET_MUTPARTS][1] + extra_accessory_overlay.pixel_x += H.dna.species.offset_features[OFFSET_MUTPARTS][1] extra_accessory_overlay.pixel_y += H.dna.species.offset_features[OFFSET_MUTPARTS][2] - + standing += extra_accessory_overlay if(S.extra2) //apply the extra overlay, if there is one @@ -985,7 +987,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) extra2_accessory_overlay.color = "#[H.horn_color]" if(OFFSET_MUTPARTS in H.dna.species.offset_features) - extra2_accessory_overlay.pixel_x += H.dna.species.offset_features[OFFSET_MUTPARTS][1] + extra2_accessory_overlay.pixel_x += H.dna.species.offset_features[OFFSET_MUTPARTS][1] extra2_accessory_overlay.pixel_y += H.dna.species.offset_features[OFFSET_MUTPARTS][2] standing += extra2_accessory_overlay