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

Jump to bottom

Oozelings + Slimepeople Can Get Wings from Strange Elixirs #1524

Merged
merged 2 commits into from
Apr 7, 2024
Merged

Oozelings + Slimepeople Can Get Wings from Strange Elixirs #1524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ecdb502
Slimepeople Can Get Wings from Strange Elixirs (#80019)
Thlumyn Nov 30, 2023
e4d5abc
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Apr 3, 2024
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/modules/mob/dead/new_player/sprite_accessories.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
4 changes: 3 additions & 1 deletion code/modules/mob/living/carbon/human/species_types/jellypeople.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
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 @@ -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
Binary file modified icons/mob/species/wings.dmi
View file
Open in desktop
Binary file not shown.
6 changes: 4 additions & 2 deletions monkestation/code/modules/mob/living/carbon/human/species_type/oozeling.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand Down
Loading