Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent NPC cats from having kittens with player-controlled cats #5827

Merged
merged 1 commit into from
Mar 8, 2025
Merged

Prevent NPC cats from having kittens with player-controlled cats #5827

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Prevent NPC cats from having kittens with player-controlled cats
  • Loading branch information
@Absolucy
Absolucy committed Mar 6, 2025
commit 19cab0a29117e0acda3ffbbcba0d7da3775637ec
6 changes: 5 additions & 1 deletion code/modules/mob/living/simple_animal/simple_animal.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@
REMOVE_TRAIT(src, TRAIT_UNDENSE, BASIC_MOB_DEATH_TRAIT)

/mob/living/simple_animal/proc/make_babies() // <3 <3 <3
if(gender != FEMALE || stat || next_scan_time > world.time || !childtype || !animal_species || !SSticker.IsRoundInProgress())
if(gender != FEMALE || stat || next_scan_time > world.time || !childtype || !animal_species || !SSticker.IsRoundInProgress() || mind || key) // monkestation edit: add player check
return
next_scan_time = world.time + 400
var/alone = TRUE
Expand All @@ -474,6 +474,10 @@
for(var/mob/M in view(7, src))
if(M.stat != CONSCIOUS) //Check if it's conscious FIRST.
continue
// monkestation start: add player check
if(M.mind || M.key)
continue
// monkestation end
var/is_child = is_type_in_list(M, childtype)
if(is_child) //Check for children SECOND.
children++
Expand Down
Loading