diff --git a/code/controllers/subsystem/dynamic/dynamic_ruleset_midround.dm b/code/controllers/subsystem/dynamic/dynamic_ruleset_midround.dm index 2feceaef761..71a13ce4350 100644 --- a/code/controllers/subsystem/dynamic/dynamic_ruleset_midround.dm +++ b/code/controllers/subsystem/dynamic/dynamic_ruleset_midround.dm @@ -467,6 +467,7 @@ midround_type = LIGHT_MIDROUND false_alarm_able = TRUE pref_flag = ROLE_BLOOD_WORM_INFESTATION + jobban_flag = ROLE_BLOOD_WORM candidate_role = "Blood Worm" ruleset_flags = RULESET_INVADER weight = 2 // For reference, Nightmare has a weight of 5. diff --git a/code/modules/admin/sql_ban_system.dm b/code/modules/admin/sql_ban_system.dm index ec8d931c0b2..f9b1895e60a 100644 --- a/code/modules/admin/sql_ban_system.dm +++ b/code/modules/admin/sql_ban_system.dm @@ -373,20 +373,26 @@ ROLE_MIND_TRANSFER, ROLE_POSIBRAIN, ROLE_SENTIENCE, + ROLE_RECOVERED_CREW, ), "Antagonist Positions" = list( ROLE_ABDUCTOR, ROLE_ALIEN, ROLE_BLOB, + ROLE_BLOOD_WORM, ROLE_BROTHER, ROLE_CHANGELING, ROLE_CULTIST, + ROLE_FUGITIVE, + ROLE_FUGITIVE_HUNTER, + ROLE_GLITCH, ROLE_HERETIC, ROLE_HIVE, ROLE_MALF, ROLE_NINJA, ROLE_OPERATIVE, ROLE_OVERTHROW, + ROLE_PARADOX_CLONE, ROLE_REV, ROLE_REVENANT, ROLE_REV_HEAD, @@ -395,8 +401,8 @@ ROLE_SPY, ROLE_SYNDICATE, ROLE_TRAITOR, - ROLE_WIZARD, ROLE_VOIDWALKER, + ROLE_WIZARD, ), ) for(var/department in long_job_lists) diff --git a/code/modules/antagonists/blood_worm/actions/cocoon.dm b/code/modules/antagonists/blood_worm/actions/cocoon.dm index 22b89c677af..d84a6681912 100644 --- a/code/modules/antagonists/blood_worm/actions/cocoon.dm +++ b/code/modules/antagonists/blood_worm/actions/cocoon.dm @@ -327,7 +327,7 @@ candidates = SSpolling.poll_ghost_candidates( question = "Would you like to become a newly hatched blood worm? (x[num_hatchlings])", role = ROLE_BLOOD_WORM_INFESTATION, - check_jobban = ROLE_BLOOD_WORM_INFESTATION, + check_jobban = ROLE_BLOOD_WORM, poll_time = cocoon_time, ignore_category = POLL_IGNORE_BLOOD_WORM, alert_pic = cocoon_type, // The hatchling icon is too small, and a well-cropped juvenile icon is already used for the main spawn event. diff --git a/code/modules/antagonists/blood_worm/blood_worm_antag.dm b/code/modules/antagonists/blood_worm/blood_worm_antag.dm index 8804d60c7b4..b2604917b27 100644 --- a/code/modules/antagonists/blood_worm/blood_worm_antag.dm +++ b/code/modules/antagonists/blood_worm/blood_worm_antag.dm @@ -98,4 +98,5 @@ /datum/antagonist/blood_worm/infestation pref_flag = ROLE_BLOOD_WORM_INFESTATION + jobban_flag = ROLE_BLOOD_WORM show_in_antagpanel = FALSE diff --git a/code/modules/clothing/head/mind_monkey_helmet.dm b/code/modules/clothing/head/mind_monkey_helmet.dm index 0020c43f2c9..a16dd7f08e6 100644 --- a/code/modules/clothing/head/mind_monkey_helmet.dm +++ b/code/modules/clothing/head/mind_monkey_helmet.dm @@ -52,7 +52,7 @@ playsound(src, 'sound/machines/ping.ogg', 30, TRUE) RegisterSignal(magnification, COMSIG_SPECIES_LOSS, PROC_REF(make_fall_off)) polling = TRUE - var/mob/chosen_one = SSpolling.poll_ghosts_for_target(check_jobban = ROLE_MONKEY_HELMET, poll_time = 5 SECONDS, checked_target = magnification, ignore_category = POLL_IGNORE_MONKEY_HELMET, alert_pic = magnification, role_name_text = "mind-magnified monkey") + var/mob/chosen_one = SSpolling.poll_ghosts_for_target(check_jobban = ROLE_SENTIENCE, poll_time = 5 SECONDS, checked_target = magnification, ignore_category = POLL_IGNORE_MONKEY_HELMET, alert_pic = magnification, role_name_text = "mind-magnified monkey") polling = FALSE if(!magnification) return