diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 02a75bcc1fa..d54b00a1a73 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -580,6 +580,8 @@ visible_message("[H] falls into [src]!") J.chasm_react(H) return + if(H.dna.species && (FLYING in H.dna.species.specflags)) + return drop(AM) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index a30a7e14ebf..79b4265a5d1 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -461,7 +461,10 @@ else icon_string = "m_[bodypart]_[S.icon_state]_[layer]" - I = image("icon" = 'icons/mob/mutant_bodyparts.dmi', "icon_state" = icon_string, "layer" =- layer) + I = image("icon" = S.icon, "icon_state" = icon_string, "layer" =- layer) + + if(S.center) + I = center_image(I,S.dimension_x,S.dimension_y) if(!(H.disabilities & HUSK)) if(!forced_colour) @@ -487,7 +490,10 @@ else icon_string = "m_[bodypart]inner_[S.icon_state]_[layer]" - I = image("icon" = 'icons/mob/mutant_bodyparts.dmi', "icon_state" = icon_string, "layer" =- layer) + I = image("icon" = S.icon, "icon_state" = icon_string, "layer" =- layer) + + if(S.center) + I = center_image(I,S.dimension_x,S.dimension_y) standing += I diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index 7f082492def..29f6e091ec0 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -57,6 +57,9 @@ var/color_src = MUTCOLORS //Currently only used by mutantparts so don't worry about hair and stuff. This is the source that this accessory will get its color from. Default is MUTCOLOR, but can also be HAIR, FACEHAIR, EYECOLOR and 0 if none. var/hasinner //Decides if this sprite has an "inner" part, such as the fleshy parts on ears. var/locked = 0 //Is this part locked from roundstart selection? Used for parts that apply effects + var/dimension_x = 32 + var/dimension_y = 32 + var/center = FALSE //Should we center the sprite? ////////////////////// // Hair Definitions // @@ -1304,15 +1307,27 @@ name = "None" icon_state = "none" +/datum/sprite_accessory/wings_open + icon = 'icons/mob/wings.dmi' + /datum/sprite_accessory/wings_open/angel name = "Angel" icon_state = "angel" color_src = 0 + dimension_x = 46 + center = TRUE + dimension_y = 34 + +/datum/sprite_accessory/wings + icon = 'icons/mob/wings.dmi' /datum/sprite_accessory/wings/angel name = "Angel" icon_state = "angel" color_src = 0 + dimension_x = 46 + center = TRUE + dimension_y = 34 locked = TRUE /datum/sprite_accessory/frills diff --git a/icons/mob/mutant_bodyparts.dmi b/icons/mob/mutant_bodyparts.dmi index 19b9a2f45f3..518a57469e5 100644 Binary files a/icons/mob/mutant_bodyparts.dmi and b/icons/mob/mutant_bodyparts.dmi differ diff --git a/icons/mob/wings.dmi b/icons/mob/wings.dmi new file mode 100644 index 00000000000..6cd4730ec86 Binary files /dev/null and b/icons/mob/wings.dmi differ