diff --git a/GainStation13/code/modules/mob/living/carbon/human/species_types/mootant.dm b/GainStation13/code/modules/mob/living/carbon/human/species_types/mootant.dm index c023053082..19b524fa21 100644 --- a/GainStation13/code/modules/mob/living/carbon/human/species_types/mootant.dm +++ b/GainStation13/code/modules/mob/living/carbon/human/species_types/mootant.dm @@ -6,15 +6,15 @@ id = SPECIES_MOOTANT default_color = "FFFFFF" species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,HORNCOLOR,WINGCOLOR,HAS_FLESH,HAS_BONE) - inherent_traits = list(TRAIT_CHUNKYFINGERS, TRAIT_VORACIOUS, TRAIT_LIPOLICIDE_TOLERANCE, TRAIT_PACIFISM) //chunky fingers because hooves! + inherent_traits = list(TRAIT_CHUNKYFINGERS, TRAIT_VORACIOUS, TRAIT_LIPOLICIDE_TOLERANCE, TRAIT_PACIFISM, TRAIT_MILKY) //chunky fingers because hooves! inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BEAST - mutant_bodyparts = list("mcolor" = "FFFFFF","mcolor2" = "FFFFFF","mcolor3" = "FFFFFF", "mam_snouts" = "mootant_secondary", "mam_tail" = "Husky", "mam_ears" = "mootant_secondary", "deco_wings" = "None", + mutant_bodyparts = list("mcolor" = "FFFFFF","mcolor2" = "FFFFFF","mcolor3" = "FFFFFF", "mam_snouts" = "mootant_tertiary", "mam_tail" = "Husky", "mam_ears" = "mootant_tertiary", "deco_wings" = "None", "mam_body_markings" = list(), "taur" = "None", "horns" = "None", "legs" = "Plantigrade", "meat_type" = "Mammalian") attack_verb = "claw" attack_sound = 'sound/weapons/slash.ogg' miss_sound = 'sound/weapons/slashmiss.ogg' meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/mammal - mutant_organs = list(/obj/item/organ/genital/breasts/mootant) //moo + mutant_organs = list(/obj/item/organ/genital/breasts) //moo liked_food = FRIED | DAIRY disliked_food = TOXIC | MEAT @@ -24,15 +24,15 @@ allowed_limb_ids = list("mammal","aquatic","avian") -/obj/item/organ/genital/breasts/mootant //special type of breasts that produces more - name = "mootant breasts" - desc = "Breasts of a mootant, typically characterized by greater size and productivity." - fluid_id = /datum/reagent/consumable/milk - fluid_rate = MILK_RATE_MOOTANT - fluid_mult = 2 - fluid_max_volume = 1000 - producing = TRUE - size = BREASTS_SIZE_MOOTANT +// /obj/item/organ/genital/breasts/mootant //special type of breasts that produces more +// name = "mootant breasts" +// desc = "Breasts of a mootant, typically characterized by greater size and productivity." +// fluid_id = /datum/reagent/consumable/milk +// fluid_rate = MILK_RATE_MOOTANT +// fluid_mult = 2 +// fluid_max_volume = 1000 +// producing = TRUE +// size = BREASTS_SIZE_MOOTANT //i'll throw these elsewhere xd @@ -44,8 +44,8 @@ color_src = MATRIXED matrixed_sections = MATRIX_RED -/datum/sprite_accessory/snouts/mam_snouts/mootant_secondary - name = "Mootant (Secondary)" +/datum/sprite_accessory/snouts/mam_snouts/mootant_tertiary + name = "Mootant ALT (Tertiary)" icon = 'GainStation13/icons/mob/markings/mam_snouts.dmi' icon_state = "mootanttwo" color_src = MATRIXED @@ -58,8 +58,8 @@ color_src = MATRIXED matrixed_sections = MATRIX_RED -/datum/sprite_accessory/ears/mam_ears/mootant_secondary - name = "Mootant (Secondary)" +/datum/sprite_accessory/ears/mam_ears/mootant_tertiary + name = "Mootant ALT (Tertiary)" icon_state = "mootanttwo" icon = 'GainStation13/icons/mob/markings/mam_ears.dmi' color_src = MATRIXED @@ -78,3 +78,24 @@ icon = 'GainStation13/icons/mob/markings/mam_ears.dmi' color_src = MATRIXED matrixed_sections = MATRIX_RED_BLUE + +//mutation toxin + +/datum/reagent/mutationtoxin/mootant + name = "Mootant Mutation Toxin" + description = "A glowing toxin." + color = "#ffffff" + race = /datum/species/mootant + mutationtext = "The pain subsides. You feel... milkier." + +/obj/item/organ/genital/breasts/proc/set_milky_trait(new_state,cause = "manual toggle") + if(!(genital_flags & GENITAL_FUID_PRODUCTION)) + return FALSE + if(!((HAS_TRAIT(owner,TRAIT_MILKY) && !new_state) || HAS_TRAIT(owner,TRAIT_MILKY) && new_state)) + milky_trait_state = new_state + fluid_rate = MILK_RATE_MOOTANT + fluid_max_volume = 1000 + producing = TRUE + if(cause) + owner.log_message("[src]'s lactation was [new_state ? "enabled" : "disabled"] due to [cause]", LOG_EMOTE) + return milky_trait diff --git a/GainStation13/icons/mob/markings/mam_ears.dmi b/GainStation13/icons/mob/markings/mam_ears.dmi index 7a3eabade3..840c5da152 100644 Binary files a/GainStation13/icons/mob/markings/mam_ears.dmi and b/GainStation13/icons/mob/markings/mam_ears.dmi differ diff --git a/GainStation13/icons/mob/markings/mam_snouts.dmi b/GainStation13/icons/mob/markings/mam_snouts.dmi index 588986700b..91a21b614b 100644 Binary files a/GainStation13/icons/mob/markings/mam_snouts.dmi and b/GainStation13/icons/mob/markings/mam_snouts.dmi differ diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 98d5205a20..78d847e0cd 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -289,6 +289,7 @@ #define TRAIT_METAL_CRUNCHER "metal_cruncher" #define TRAIT_WATER_SPONGE "water_sponge" #define TRAIT_FATROUSAL "fatrousal" +#define TRAIT_MILKY "milky" //basically faster milk production //GS13 Port #define TRAIT_HEADPAT_SLUT "headpat_slut" diff --git a/code/modules/arousal/genitals.dm b/code/modules/arousal/genitals.dm index 49063c422f..400f6020b5 100644 --- a/code/modules/arousal/genitals.dm +++ b/code/modules/arousal/genitals.dm @@ -56,7 +56,7 @@ generate_fluid(reagents) /obj/item/organ/genital/proc/set_aroused_state(new_state,cause = "manual toggle") - if(!(genital_flags & GENITAL_CAN_AROUSE)) + if(!(genital_flags & GENITAL_FUID_PRODUCTION)) return FALSE if(!((HAS_TRAIT(owner,TRAIT_PERMABONER) && !new_state) || HAS_TRAIT(owner,TRAIT_NEVERBONER) && new_state)) aroused_state = new_state diff --git a/tgstation.dme b/tgstation.dme index 290cdfe2fb..b493516174 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4060,6 +4060,7 @@ #include "GainStation13\code\modules\mob\living\fullness.dm" #include "GainStation13\code\modules\mob\living\nutribot.dm" #include "GainStation13\code\modules\mob\living\species.dm" +#include "GainStation13\code\modules\mob\living\carbon\human\species_types\mootant.dm" #include "GainStation13\code\modules\mob\living\vore\eating\trasheat_lists.dm" #include "GainStation13\code\modules\mod\modules\modules_fat.dm" #include "GainStation13\code\modules\power\energy_harvester.dm"