diff --git a/code/game/antagonist/antagonist.dm b/code/game/antagonist/antagonist.dm index db0ebc19eee..84f270bad44 100644 --- a/code/game/antagonist/antagonist.dm +++ b/code/game/antagonist/antagonist.dm @@ -88,7 +88,7 @@ return 1 // Get the raw list of potential players. -/datum/antagonist/proc/build_candidate_list(var/ghosts_only) +/datum/antagonist/proc/build_candidate_list(var/ghosts_only, var/allow_animals = 0) candidates = list() // Clear. // Prune restricted status. Broke it up for readability. @@ -96,6 +96,8 @@ for(var/datum/mind/player in ticker.mode.get_players_for_role(role_type, id)) if(ghosts_only && !istype(player.current, /mob/dead)) log_debug("[key_name(player)] is not eligible to become a [role_text]: Only ghosts may join as this role!") + else if(!allow_animals && isanimal(player.current)) + log_debug("[key_name(player)] is not eligible to become a [role_text]: Simple animals cannot be this role!") else if(player.special_role) log_debug("[key_name(player)] is not eligible to become a [role_text]: They already have a special role ([player.special_role])!") else if (player in pending_antagonists) diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm index f5cf4bbe850..4114a639b9b 100644 --- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm +++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm @@ -26,6 +26,7 @@ health = 10 maxHealth = 10 + hunger_enabled = 0 attacktext = "shocked" melee_damage_lower = 1 diff --git a/html/changelogs/skull132-simple_animals.yml b/html/changelogs/skull132-simple_animals.yml new file mode 100644 index 00000000000..0c15eaaf17b --- /dev/null +++ b/html/changelogs/skull132-simple_animals.yml @@ -0,0 +1,13 @@ +author: Skull132 + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Spider bots no longer become hungry." + - bugfix: "Simple animals (like mice) can no longer become antags."