Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Slimepeople Can Get Wings from Strange Elixirs #1062

Merged
merged 1 commit into from
Dec 10, 2023
Merged

[MIRROR] Slimepeople Can Get Wings from Strange Elixirs #1062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions code/datums/sprite_accessories.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2049,6 +2049,21 @@
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/human/species/lizard/lizard_misc.dmi'

Expand Down
6 changes: 3 additions & 3 deletions code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
is_dimorphic = TRUE
dmg_overlay_type = null
burn_modifier = 0.5 // = 1/2x generic burn damage
wing_types = NONE
wing_types = list(/obj/item/organ/external/wings/functional/slime)

/obj/item/bodypart/arm/left/jelly
biological_state = (BIO_FLESH|BIO_BLOODED)
Expand Down Expand Up @@ -130,7 +130,7 @@
biological_state = (BIO_FLESH|BIO_BLOODED)
limb_id = SPECIES_SLIMEPERSON
is_dimorphic = TRUE
wing_types = NONE
wing_types = list(/obj/item/organ/external/wings/functional/slime)

/obj/item/bodypart/arm/left/slime
biological_state = (BIO_FLESH|BIO_BLOODED)
Expand Down Expand Up @@ -159,7 +159,7 @@
biological_state = (BIO_FLESH|BIO_BLOODED)
limb_id = SPECIES_LUMINESCENT
is_dimorphic = TRUE
wing_types = NONE
wing_types = list(/obj/item/organ/external/wings/functional/slime)

/obj/item/bodypart/arm/left/luminescent
biological_state = (BIO_FLESH|BIO_BLOODED)
Expand Down
6 changes: 6 additions & 0 deletions code/modules/surgery/organs/external/wings/functional_wings.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,3 +210,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
Binary file modified icons/mob/human/species/wings.dmi
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions modular_skyrat/modules/customization/modules/surgery/organs/wings.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,3 +104,6 @@

/obj/item/organ/external/wings/functional/robotic
bodypart_overlay = /datum/bodypart_overlay/mutant/wings/functional

/obj/item/organ/external/wings/functional/slime
bodypart_overlay = /datum/bodypart_overlay/mutant/wings/functional
Loading