diff --git a/code/modules/mob/dead/new_player/sprite_accessories.dm b/code/modules/mob/dead/new_player/sprite_accessories.dm index 57e6d8f0b8d7..90b147e0aff1 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories.dm @@ -2030,6 +2030,21 @@ MONKESTATION EDIT center = TRUE dimension_y = 32 +/datum/sprite_accessory/wings/slime + name = "Slime" + icon_state = "slime" + dimension_x = 96 + center = TRUE + dimension_y = 32 + locked = TRUE + +/datum/sprite_accessory/wings_open/slime + name = "Slime" + icon_state = "slime" + dimension_x = 96 + center = TRUE + dimension_y = 32 + /datum/sprite_accessory/frills icon = 'icons/mob/species/lizard/lizard_misc.dmi' diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index 2bf465dc8705..d20174543871 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -15,8 +15,9 @@ EYECOLOR, ) inherent_traits = list( + TRAIT_CAN_USE_FLIGHT_POTION, TRAIT_TOXINLOVER, - TRAIT_NOBLOOD, + TRAIT_NOBLOOD ) mutanttongue = /obj/item/organ/internal/tongue/jelly mutantlungs = /obj/item/organ/internal/lungs/slime @@ -36,6 +37,7 @@ inherent_factions = list(FACTION_SLIME) species_language_holder = /datum/language_holder/jelly ass_image = 'icons/ass/assslime.png' + wing_types = list(/obj/item/organ/external/wings/functional/slime) bodypart_overrides = list( BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/jelly, diff --git a/code/modules/surgery/organs/external/wings/functional_wings.dm b/code/modules/surgery/organs/external/wings/functional_wings.dm index 0298cecde4cb..ae3fbe349e52 100644 --- a/code/modules/surgery/organs/external/wings/functional_wings.dm +++ b/code/modules/surgery/organs/external/wings/functional_wings.dm @@ -199,3 +199,9 @@ name = "fly wings" desc = "Fly as a fly." sprite_accessory_override = /datum/sprite_accessory/wings/fly + +///slime wings, which relate to slimes. +/obj/item/organ/external/wings/functional/slime + name = "slime wings" + desc = "How does something so squishy even fly?" + sprite_accessory_override = /datum/sprite_accessory/wings/slime diff --git a/icons/mob/species/wings.dmi b/icons/mob/species/wings.dmi index 0cc2b1224fae..bc0b870573e8 100644 Binary files a/icons/mob/species/wings.dmi and b/icons/mob/species/wings.dmi differ diff --git a/monkestation/code/modules/mob/living/carbon/human/species_type/oozeling.dm b/monkestation/code/modules/mob/living/carbon/human/species_type/oozeling.dm index 1a2948ec05a1..3a546c7477f2 100644 --- a/monkestation/code/modules/mob/living/carbon/human/species_type/oozeling.dm +++ b/monkestation/code/modules/mob/living/carbon/human/species_type/oozeling.dm @@ -10,12 +10,13 @@ HAIR,FACEHAIR, ) inherent_traits = list( + TRAIT_CAN_USE_FLIGHT_POTION, TRAIT_TOXINLOVER, TRAIT_NOFIRE, //TRAIT_ALWAYS_CLEAN, TRAIT_EASYDISMEMBER, - TRAIT_NOBLOOD, - ) + TRAIT_NOBLOOD + ) hair_color = "mutcolor" hair_alpha = 150 @@ -33,6 +34,7 @@ //swimming_component = /datum/component/swimming/dissolve toxic_food = NONE disliked_food = NONE + wing_types = list(/obj/item/organ/external/wings/functional/slime) bodypart_overrides = list( BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/oozeling,