Skip to content

Commit

Permalink
Codifies male goats not having an udder (tgstation#79722)
Browse files Browse the repository at this point in the history
## About The Pull Request

This was addressed in tgstation#78759 (1b1fde4)
and reviewed (and merged even though I didn't respond to it, oh well),
but I half-assed it because the whole point was to prevent male goats
from having an udder, but I only added it to the subtype of Pete i made
in that PR. Let's expand that to all male goats now.
## Why It's Good For The Game

It doesn't make biological nor morphological sense as to why a male goat
can provide milk. Ideally this should be like this for all animals
(because that's real life) but that's a later issue with further balance
implication.

I think it's still an interesting idea that Nanotrasen will just send
you any old goat despite it being "useless" beyond being very good at
eating plants. Maybe cargo should have a way to guarantee getting a
female goat in the future? It's just like real life where zoos and farms
have to constantly dealw ith female animals (such as giraffes or other
exotic stuff) tending to be far rarer/cost far more than their male
variants due to the potential to generate offspring (there's more nuance
to husbandry than this but just play along)... and in space, every
animal is "exotic".

It still remains possible to biogenerate milk, which tends to be far
faster than feeding/milking goats- which is something that the cook
should have access to anyways.
## Changelog
:cl:
balance: Male Goats should no longer spawn with an udder, instead of it
just being Pete.
/:cl:

---------

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
  • Loading branch information
san7890 and Ghommie authored Nov 15, 2023
1 parent 87e70f9 commit 7fce8cd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 3 additions & 1 deletion code/modules/mob/living/basic/farm_animals/goat/_goat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,10 @@

INVOKE_ASYNC(src, PROC_REF(eat_plant), edible_plants)

/// When invoked, adds an udder. Overridden on subtypes
/// When invoked, adds an udder when applicable. Male goats do not have udders.
/mob/living/basic/goat/proc/add_udder()
if(gender == MALE)
return
AddComponent(/datum/component/udder)

/// Proc that handles dealing with the various types of plants we might eat. Assumes that a valid list of type(s) will be passed in.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,3 @@
if((bodytemperature < T20C) || istype(goat_area, /area/station/service/kitchen/coldroom))
. += span_notice("[p_They()] [p_do()]n't seem to be too bothered about the cold.") // special for pete

/mob/living/basic/goat/pete/add_udder()
return //no thank you

0 comments on commit 7fce8cd

Please sign in to comment.