diff --git a/code/modules/mob/living/carbon/human/species_types/android.dm b/code/modules/mob/living/carbon/human/species_types/android.dm index 10bf9b7f4816..bebb0971acc2 100644 --- a/code/modules/mob/living/carbon/human/species_types/android.dm +++ b/code/modules/mob/living/carbon/human/species_types/android.dm @@ -5,7 +5,8 @@ NO_DNA_COPY, NOTRANSSTING, NO_UNDERWEAR, - NOHUSK + NOHUSK, + HAIR, // monke edit: allow them to have hair (it's the future, why not) ) inherent_traits = list( TRAIT_CAN_USE_FLIGHT_POTION, @@ -15,7 +16,7 @@ TRAIT_NOCLONELOSS, TRAIT_NOFIRE, TRAIT_NOHUNGER, - TRAIT_NOMETABOLISM, + /* TRAIT_NOMETABOLISM, */ // monkestation edit: making androids closer to IPCs TRAIT_PIERCEIMMUNE, TRAIT_RADIMMUNE, TRAIT_RESISTCOLD, @@ -25,6 +26,7 @@ TRAIT_TOXIMMUNE, TRAIT_NOBLOOD, TRAIT_VIRUSIMMUNE, + TRAIT_REVIVES_BY_HEALING, // monkestation edit: making androids closer to IPCs ) inherent_biotypes = MOB_ROBOTIC|MOB_HUMANOID @@ -47,8 +49,8 @@ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT reagent_tag = PROCESS_SYNTHETIC // They don't HAVE a liver, but if they did, they'd have synthetic chem processing. special_step_sounds = list('sound/effects/servostep.ogg') - - + + bodypart_overrides = list( BODY_ZONE_HEAD = /obj/item/bodypart/head/robot/android, @@ -69,7 +71,7 @@ /// Taken from TGstation. /datum/species/android/create_pref_traits_perks() var/list/to_add = list() - + to_add += list( list( SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, 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 d20174543871..7093b8f8b7cb 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -13,11 +13,14 @@ species_traits = list( MUTCOLORS, EYECOLOR, + HAIR, // monke edit: allow them to have hair (it's the future, why not) ) + hair_color = "mutcolor" + hair_alpha = 150 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 diff --git a/code/modules/mob/living/carbon/human/species_types/skeletons.dm b/code/modules/mob/living/carbon/human/species_types/skeletons.dm index 3fa5ed1a7674..400438fc8790 100644 --- a/code/modules/mob/living/carbon/human/species_types/skeletons.dm +++ b/code/modules/mob/living/carbon/human/species_types/skeletons.dm @@ -10,6 +10,7 @@ NO_DNA_COPY, NO_UNDERWEAR, NOHUSK, + HAIR, // monke edit: allow them to have hair (it's the future, why not) ) inherent_traits = list( TRAIT_CAN_USE_FLIGHT_POTION, diff --git a/code/modules/mob/living/carbon/human/species_types/zombies.dm b/code/modules/mob/living/carbon/human/species_types/zombies.dm index b7f9b81de523..c420d355e009 100644 --- a/code/modules/mob/living/carbon/human/species_types/zombies.dm +++ b/code/modules/mob/living/carbon/human/species_types/zombies.dm @@ -10,6 +10,7 @@ species_traits = list( NOZOMBIE, NOTRANSSTING, + HAIR, // monke edit: allow them to have hair (it's the future, why not) ) inherent_traits = list( // SHARED WITH ALL ZOMBIES diff --git a/monkestation/code/modules/mob/living/carbon/human/species_type/android.dm b/monkestation/code/modules/mob/living/carbon/human/species_type/android.dm index bfc58ce4ccbb..0a6333246aa5 100644 --- a/monkestation/code/modules/mob/living/carbon/human/species_type/android.dm +++ b/monkestation/code/modules/mob/living/carbon/human/species_type/android.dm @@ -1,3 +1,10 @@ +/datum/species/android + mutanteyes = /obj/item/organ/internal/eyes/synth + mutantbrain = /obj/item/organ/internal/brain/synth + mutantstomach = /obj/item/organ/internal/stomach/cybernetic/tier2 + mutantliver = /obj/item/organ/internal/liver/cybernetic/tier2 + mutantappendix = null + /datum/species/android/get_scream_sound(mob/living/carbon/human/human) return 'monkestation/sound/voice/screams/silicon/scream_silicon.ogg' diff --git a/monkestation/code/modules/mob/living/carbon/human/species_type/skeletons.dm b/monkestation/code/modules/mob/living/carbon/human/species_type/skeletons.dm index 4069b891fb53..bd27a5997bc4 100644 --- a/monkestation/code/modules/mob/living/carbon/human/species_type/skeletons.dm +++ b/monkestation/code/modules/mob/living/carbon/human/species_type/skeletons.dm @@ -16,6 +16,7 @@ NO_DNA_COPY, NO_UNDERWEAR, NOHUSK, + HAIR, ) inherent_traits = list( TRAIT_CAN_USE_FLIGHT_POTION,