From 370a529ace2eb181c7faa5eac4997d4ce282b32e Mon Sep 17 00:00:00 2001 From: Wisemonster <87689371+Wisemonster@users.noreply.github.com> Date: Fri, 5 Jun 2026 11:55:34 -0400 Subject: [PATCH] Changes slaughter/laughter demons to use sentient mob pref (#96342) --- code/controllers/subsystem/dynamic/dynamic_ruleset_midround.dm | 2 +- code/modules/antagonists/_common/antag_spawner.dm | 2 +- code/modules/antagonists/wizard/slaughter_antag.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/controllers/subsystem/dynamic/dynamic_ruleset_midround.dm b/code/controllers/subsystem/dynamic/dynamic_ruleset_midround.dm index 71a13ce4350..8631eaf4670 100644 --- a/code/controllers/subsystem/dynamic/dynamic_ruleset_midround.dm +++ b/code/controllers/subsystem/dynamic/dynamic_ruleset_midround.dm @@ -1032,7 +1032,7 @@ candidate_role = "Slaughter Demon" // preview_antag_datum = /datum/antagonist/slaughter // Doesn't actually have its own pref midround_type = HEAVY_MIDROUND - jobban_flag = ROLE_ALIEN + jobban_flag = ROLE_SENTIENCE ruleset_flags = RULESET_INVADER weight = 0 min_pop = 20 diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm index d45b0f0a37c..ed7f8ffeec2 100644 --- a/code/modules/antagonists/_common/antag_spawner.dm +++ b/code/modules/antagonists/_common/antag_spawner.dm @@ -272,7 +272,7 @@ return if(used) return - var/mob/chosen_one = SSpolling.poll_ghosts_for_target(check_jobban = ROLE_ALIEN, role = ROLE_ALIEN, poll_time = 5 SECONDS, checked_target = src, alert_pic = demon_type, jump_target = src, role_name_text = initial(demon_type.name)) + var/mob/chosen_one = SSpolling.poll_ghosts_for_target(check_jobban = ROLE_SENTIENCE, role = ROLE_SENTIENCE, poll_time = 5 SECONDS, checked_target = src, alert_pic = demon_type, jump_target = src, role_name_text = initial(demon_type.name)) if(chosen_one) if(used || QDELETED(src)) return diff --git a/code/modules/antagonists/wizard/slaughter_antag.dm b/code/modules/antagonists/wizard/slaughter_antag.dm index effd5d2abf6..bce27599c8c 100644 --- a/code/modules/antagonists/wizard/slaughter_antag.dm +++ b/code/modules/antagonists/wizard/slaughter_antag.dm @@ -3,7 +3,7 @@ roundend_category = "demons" show_name_in_check_antagonists = TRUE ui_name = "AntagInfoDemon" - pref_flag = ROLE_ALIEN + pref_flag = ROLE_SENTIENCE show_in_antagpanel = FALSE show_to_ghosts = TRUE antagpanel_category = ANTAG_GROUP_WIZARDS