From 991885dfab3110c257e8839fd67d8bb1af0ff528 Mon Sep 17 00:00:00 2001 From: Molti Date: Wed, 8 Feb 2023 11:23:51 -0600 Subject: [PATCH 1/4] CarkFetishContent --- .../mob/living/carbon/human/species_types/lizardpeople.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index c71e102b3a0e..0515da743956 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -30,6 +30,7 @@ species_language_holder = /datum/language_holder/lizard var/heat_stunmod = 0 var/last_heat_stunmod = 0 + var/regrowtimer smells_like = "putrid scales" @@ -89,6 +90,12 @@ H.emote("wag") if(-1) stop_wagging_tail(H) + if(!regrowtimer && !("waggingtail_lizard" in mutant_bodyparts) && !("tail_lizard" in mutant_bodyparts)) + regrowtimer = addtimer(CALLBACK(src, .proc/regrow_tail), 30 MINUTES, TIMER_UNIQUE) + +/datum/species/lizard/proc/regrow_tail() + if(!("waggingtail_lizard" in mutant_bodyparts) && !("tail_lizard" in mutant_bodyparts)) + mutant_bodyparts |= "tail_lizard" /datum/species/lizard/get_species_description() return /*"The militaristic Lizardpeople hail originally from Tizira, but have grown \ From e2e425addac14389929a55fb7800b9d0a1bd7205 Mon Sep 17 00:00:00 2001 From: Molti Date: Wed, 8 Feb 2023 17:22:51 -0600 Subject: [PATCH 2/4] 20 minutes and chat message --- .../mob/living/carbon/human/species_types/lizardpeople.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index 0515da743956..ccd685c707aa 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -91,11 +91,12 @@ if(-1) stop_wagging_tail(H) if(!regrowtimer && !("waggingtail_lizard" in mutant_bodyparts) && !("tail_lizard" in mutant_bodyparts)) - regrowtimer = addtimer(CALLBACK(src, .proc/regrow_tail), 30 MINUTES, TIMER_UNIQUE) + regrowtimer = addtimer(CALLBACK(src, .proc/regrow_tail, H), 20 MINUTES, TIMER_UNIQUE) -/datum/species/lizard/proc/regrow_tail() +/datum/species/lizard/proc/regrow_tail(mob/living/carbon/human/H) if(!("waggingtail_lizard" in mutant_bodyparts) && !("tail_lizard" in mutant_bodyparts)) mutant_bodyparts |= "tail_lizard" + H.visible_message("[H]'s tail regrows.","You feel your tail regrow.") /datum/species/lizard/get_species_description() return /*"The militaristic Lizardpeople hail originally from Tizira, but have grown \ From c40b20829e1dff9cbcf5d85adb9c10b6e91f4158 Mon Sep 17 00:00:00 2001 From: Molti Date: Fri, 10 Feb 2023 10:03:52 -0600 Subject: [PATCH 3/4] no dead lizards --- .../mob/living/carbon/human/species_types/lizardpeople.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index ccd685c707aa..a477e33a0b29 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -94,7 +94,7 @@ regrowtimer = addtimer(CALLBACK(src, .proc/regrow_tail, H), 20 MINUTES, TIMER_UNIQUE) /datum/species/lizard/proc/regrow_tail(mob/living/carbon/human/H) - if(!("waggingtail_lizard" in mutant_bodyparts) && !("tail_lizard" in mutant_bodyparts)) + if(!("waggingtail_lizard" in mutant_bodyparts) && !("tail_lizard" in mutant_bodyparts) && H.stat != DEAD) mutant_bodyparts |= "tail_lizard" H.visible_message("[H]'s tail regrows.","You feel your tail regrow.") From fe876cf07718fabfd38d1d44c17fa5c4056695e4 Mon Sep 17 00:00:00 2001 From: Molti Date: Fri, 10 Feb 2023 10:06:10 -0600 Subject: [PATCH 4/4] optimization --- .../mob/living/carbon/human/species_types/lizardpeople.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index a477e33a0b29..593a0c91aa15 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -90,11 +90,11 @@ H.emote("wag") if(-1) stop_wagging_tail(H) - if(!regrowtimer && !("waggingtail_lizard" in mutant_bodyparts) && !("tail_lizard" in mutant_bodyparts)) + if(!H.getorganslot(ORGAN_SLOT_TAIL) && !regrowtimer) regrowtimer = addtimer(CALLBACK(src, .proc/regrow_tail, H), 20 MINUTES, TIMER_UNIQUE) /datum/species/lizard/proc/regrow_tail(mob/living/carbon/human/H) - if(!("waggingtail_lizard" in mutant_bodyparts) && !("tail_lizard" in mutant_bodyparts) && H.stat != DEAD) + if(!H.getorganslot(ORGAN_SLOT_TAIL) && H.stat != DEAD) mutant_bodyparts |= "tail_lizard" H.visible_message("[H]'s tail regrows.","You feel your tail regrow.")