Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Tails can be wagged without starting with a tail #7463

Merged
Amelia0010 merged 5 commits into from
Jan 2, 2020
Merged

Tails can be wagged without starting with a tail #7463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
73e185a
E (#11)
SomeguyManperson Nov 26, 2019
b01c8cb
Revert "E (#11)" (#12)
SomeguyManperson Nov 26, 2019
0561415
Merge branch 'master' of https://github.com/SomeguyManperson/Yogstation
SomeguyManperson Dec 30, 2019
a20d00e
what hath god wrought
SomeguyManperson Dec 31, 2019
315054a
unrequired
SomeguyManperson Dec 31, 2019
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
25 changes: 23 additions & 2 deletions code/modules/mob/living/carbon/human/species.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,9 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if(flying_species)
HandleFlight(H)

//I wag in death
/datum/species/proc/spec_death(gibbed, mob/living/carbon/human/H)
stop_wagging_tail(H)
return

/datum/species/proc/auto_equip(mob/living/carbon/human/H)
Expand Down Expand Up @@ -1701,6 +1703,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
ToggleFlight(H)
flyslip(H)
. = stunmod * H.physiology.stun_mod * amount
stop_wagging_tail(H)

//////////////
//Space Move//
Expand All @@ -1721,14 +1724,32 @@ GLOBAL_LIST_EMPTY(roundstart_races)
////////////////

/datum/species/proc/can_wag_tail(mob/living/carbon/human/H)
return FALSE
return (H.getorganslot(ORGAN_SLOT_TAIL))

/datum/species/proc/is_wagging_tail(mob/living/carbon/human/H)
return FALSE
return ("waggingtail_human" in mutant_bodyparts) || ("waggingtail_lizard" in mutant_bodyparts)

/datum/species/proc/start_wagging_tail(mob/living/carbon/human/H)
if("tail_human" in mutant_bodyparts)
mutant_bodyparts -= "tail_human"
mutant_bodyparts |= "waggingtail_human"
if("tail_lizard" in mutant_bodyparts)
mutant_bodyparts -= "tail_lizard"
mutant_bodyparts -= "spines"
mutant_bodyparts |= "waggingtail_lizard"
mutant_bodyparts |= "waggingspines"
H.update_body()

/datum/species/proc/stop_wagging_tail(mob/living/carbon/human/H)
if("waggingtail_human" in mutant_bodyparts)
mutant_bodyparts -= "waggingtail_human"
mutant_bodyparts |= "tail_human"
if("waggingtail_lizard" in mutant_bodyparts)
mutant_bodyparts -= "waggingtail_lizard"
mutant_bodyparts -= "waggingspines"
mutant_bodyparts |= "tail_lizard"
mutant_bodyparts |= "spines"
H.update_body()

///////////////
//FLIGHT SHIT//
Expand Down
26 changes: 0 additions & 26 deletions code/modules/mob/living/carbon/human/species_types/felinid.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,32 +15,6 @@
return TRUE

//Curiosity killed the cat's wagging tail.
/datum/species/human/felinid/spec_death(gibbed, mob/living/carbon/human/H)
if(H)
stop_wagging_tail(H)

/datum/species/human/felinid/spec_stun(mob/living/carbon/human/H,amount)
if(H)
stop_wagging_tail(H)
. = ..()

/datum/species/human/felinid/can_wag_tail(mob/living/carbon/human/H)
return ("tail_human" in mutant_bodyparts) || ("waggingtail_human" in mutant_bodyparts)

/datum/species/human/felinid/is_wagging_tail(mob/living/carbon/human/H)
return ("waggingtail_human" in mutant_bodyparts)

/datum/species/human/felinid/start_wagging_tail(mob/living/carbon/human/H)
if("tail_human" in mutant_bodyparts)
mutant_bodyparts -= "tail_human"
mutant_bodyparts |= "waggingtail_human"
H.update_body()

/datum/species/human/felinid/stop_wagging_tail(mob/living/carbon/human/H)
if("waggingtail_human" in mutant_bodyparts)
mutant_bodyparts -= "waggingtail_human"
mutant_bodyparts |= "tail_human"
H.update_body()

/datum/species/human/felinid/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load)
if(ishuman(C))
Expand Down
32 changes: 0 additions & 32 deletions code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,38 +40,6 @@

return randname

//I wag in death
/datum/species/lizard/spec_death(gibbed, mob/living/carbon/human/H)
if(H)
stop_wagging_tail(H)

/datum/species/lizard/spec_stun(mob/living/carbon/human/H,amount)
if(H)
stop_wagging_tail(H)
. = ..()

/datum/species/lizard/can_wag_tail(mob/living/carbon/human/H)
return ("tail_lizard" in mutant_bodyparts) || ("waggingtail_lizard" in mutant_bodyparts)

/datum/species/lizard/is_wagging_tail(mob/living/carbon/human/H)
return ("waggingtail_lizard" in mutant_bodyparts)

/datum/species/lizard/start_wagging_tail(mob/living/carbon/human/H)
if("tail_lizard" in mutant_bodyparts)
mutant_bodyparts -= "tail_lizard"
mutant_bodyparts -= "spines"
mutant_bodyparts |= "waggingtail_lizard"
mutant_bodyparts |= "waggingspines"
H.update_body()

/datum/species/lizard/stop_wagging_tail(mob/living/carbon/human/H)
if("waggingtail_lizard" in mutant_bodyparts)
mutant_bodyparts -= "waggingtail_lizard"
mutant_bodyparts -= "waggingspines"
mutant_bodyparts |= "tail_lizard"
mutant_bodyparts |= "spines"
H.update_body()

/*
Lizard subspecies: ASHWALKERS
*/
Expand Down