diff --git a/GainStation13/code/game/objects/items/docility_implant.dm b/GainStation13/code/game/objects/items/docility_implant.dm index 6c6b56349b..bfb23b227f 100644 --- a/GainStation13/code/game/objects/items/docility_implant.dm +++ b/GainStation13/code/game/objects/items/docility_implant.dm @@ -66,14 +66,24 @@ TRAIT_LIVESTOCK, TRAIT_NO_MISC, TRAIT_NORUNNING, + TRAIT_MILKY, ) - /// What is the name of the mob before we change it? - var/stored_name = "" - /// What name do we want to give the mob before adding the randomized number - var/name_to_give = "Livestock" - /// How much do we want to modifiy the productivity stats of the mob's current sex organs by? - var/productivity_mult = 4 +/obj/item/implant/docile/livestock/justfat + name = "hacked livestock implant" + required_fatness = FATNESS_LEVEL_FAT + traits_list = list( + TRAIT_WEIGHT_LOSS_IMMUNE, + TRAIT_PACIFISM, + TRAIT_CLUMSY, + TRAIT_FAT_GOOD, + TRAIT_HEAVY_SLEEPER, + TRAIT_DOCILE, + TRAIT_LIVESTOCK, + TRAIT_NO_MISC, + TRAIT_NORUNNING, + TRAIT_MILKY, + ) /obj/item/implant/docile/livestock/can_be_implanted_in(mob/living/target) . = ..() @@ -132,3 +142,8 @@ name = "implant case - 'Livestock'" desc = "A glass case containing a livestock implant. Functions similar to the docility implant, but changes the implantee's name and makes them even more helpless. cannot be combined with the docility implant." imp_type = /obj/item/implant/docile/livestock + +/obj/item/implantcase/docile/livestock/justfat + name = "implant case - 'Livestock - hacked ver'" + desc = "A glass case containing a livestock implant. Functions similar to the docility implant, but changes the implantee's name and makes them even more helpless. cannot be combined with the docility implant. This one seems to apply to people who are just fat, rather than immobile." + imp_type = /obj/item/implant/docile/livestock/justfat 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 19b524fa21..1e6625326f 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 @@ -1,7 +1,7 @@ -/mob/living/carbon/human/species/mootant - race = /datum/species/mootant +/mob/living/carbon/human/species/mammal/mootant + race = /datum/species/mammal/mootant -/datum/species/mootant +/datum/species/mammal/mootant //WIP species name = "Mootant" id = SPECIES_MOOTANT default_color = "FFFFFF" @@ -24,19 +24,6 @@ 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 - - -//i'll throw these elsewhere xd - /datum/sprite_accessory/snouts/mam_snouts/mootant name = "Mootant" icon = 'GainStation13/icons/mob/markings/mam_snouts.dmi' @@ -83,19 +70,7 @@ /datum/reagent/mutationtoxin/mootant name = "Mootant Mutation Toxin" - description = "A glowing toxin." + description = "A milk-colored toxin." color = "#ffffff" - race = /datum/species/mootant + race = /datum/species/mammal/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/code/__DEFINES/citadel_defines.dm b/code/__DEFINES/citadel_defines.dm index 82cecb5536..a5b36e862e 100644 --- a/code/__DEFINES/citadel_defines.dm +++ b/code/__DEFINES/citadel_defines.dm @@ -149,10 +149,3 @@ #define FARTING_NOISES (1<<17) //GS13 #define BURPING_NOISES (1<<18) //GS13 - -//GS13 - special values for mootants -#define BREASTS_SIZE_MOOTANT "e" -#define BREASTS_VOLUME_BASE_MOOTANT 200 -#define MILK_RATE_MOOTANT 20 -#define MILK_RATE_MULT_MOOTANT 3 -#define MILK_EFFICIENCY_MOOTANT 3 diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index eec20f9815..faf2d54e82 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -88,7 +88,7 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list( #define isethereal(A) (is_species(A, /datum/species/ethereal)) #define isvampire(A) (is_species(A,/datum/species/vampire)) //gs13 species -#define ismootant(A) (is_species(A,/datum/species/mootant)) +#define ismootant(A) (is_species(A,/datum/species/mammal/mootant)) #define ismush(A) (is_species(A, /datum/species/mush)) #define isshadow(A) (is_species(A, /datum/species/shadow)) diff --git a/code/modules/arousal/genitals.dm b/code/modules/arousal/genitals.dm index 400f6020b5..db2227a457 100644 --- a/code/modules/arousal/genitals.dm +++ b/code/modules/arousal/genitals.dm @@ -193,6 +193,10 @@ aroused_state = FALSE /obj/item/organ/genital/proc/generate_fluid(datum/reagents/R) + //GS13 milky trait + var/milky_mult = 2 + if(owner != null && HAS_TRAIT(owner, TRAIT_MILKY)) + milky_mult += 2 var/amount = clamp((fluid_rate * ((world.time - last_orgasmed) / (10 SECONDS)) * fluid_mult),0,fluid_max_volume) R.clear_reagents() R.maximum_volume = fluid_max_volume @@ -202,6 +206,7 @@ R.add_reagent(linked_organ.fluid_id,amount) return TRUE + /obj/item/organ/genital/proc/update_link() if(owner) if(linked_organ)