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] Akula have been cured of the purple skin epidemic #5107

Merged
merged 2 commits into from
Oct 16, 2024
Merged

[MIRROR] Akula have been cured of the purple skin epidemic #5107

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a4c99c
Akula have been cured of the purple skin epidemic (#4480)
vinylspiders Oct 15, 2024
bab1ac7
[MIRROR] Akula have been cured of the purple skin epidemic
Oct 15, 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
23 changes: 23 additions & 0 deletions modular_nova/modules/customization/modules/mob/living/carbon/human/species/akula.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,12 @@
equipping.equipOutfit(job.akula_outfit, visuals_only)

///Organ overwrites

// set bonus
/datum/status_effect/organ_set_bonus/carp/akula
id = "organ_set_bonus_carp_akula"
limb_overlay = null // no carpskin

//Eyes
/obj/item/organ/internal/eyes/akula
// Eyes over hair as bandaid for the low amounts of head matching hair
Expand All @@ -172,18 +178,33 @@
/obj/item/organ/internal/brain/carp/akula
name = "azulean brain"

/obj/item/organ/internal/brain/carp/akula/Initialize(mapload)
. = ..()
RemoveElement(/datum/element/organ_set_bonus, /datum/status_effect/organ_set_bonus/carp)
AddElement(/datum/element/organ_set_bonus, /datum/status_effect/organ_set_bonus/carp/akula)

//Heart
/obj/item/organ/internal/heart/carp/akula
name = "azulean heart"
organ_traits = list()

/obj/item/organ/internal/heart/carp/akula/Initialize(mapload)
. = ..()
RemoveElement(/datum/element/organ_set_bonus, /datum/status_effect/organ_set_bonus/carp)
AddElement(/datum/element/organ_set_bonus, /datum/status_effect/organ_set_bonus/carp/akula)

//Tongue
/obj/item/organ/internal/tongue/carp/akula
name = "azulean jaws"
liked_foodtypes = SEAFOOD | RAW
disliked_foodtypes = CLOTH | DAIRY
toxic_foodtypes = TOXIC

/obj/item/organ/internal/tongue/carp/akula/Initialize(mapload)
. = ..()
RemoveElement(/datum/element/organ_set_bonus, /datum/status_effect/organ_set_bonus/carp)
AddElement(/datum/element/organ_set_bonus, /datum/status_effect/organ_set_bonus/carp/akula)

/obj/item/organ/internal/tongue/carp/akula/on_mob_insert(mob/living/carbon/tongue_owner, special, movement_flags)
. = ..()
if(!ishuman(tongue_owner))
Expand All @@ -203,6 +224,8 @@
/obj/item/organ/internal/lungs/carp/akula/Initialize(mapload)
. = ..()
REMOVE_TRAIT(src, TRAIT_SPACEBREATHING, REF(src))
RemoveElement(/datum/element/organ_set_bonus, /datum/status_effect/organ_set_bonus/carp)
AddElement(/datum/element/organ_set_bonus, /datum/status_effect/organ_set_bonus/carp/akula)


// Wet_stacks handling
Expand Down
Loading