From 518c54c061350cd9ea39a6f5ed96b26162785d23 Mon Sep 17 00:00:00 2001 From: keronshb Date: Thu, 16 Sep 2021 15:52:53 -0400 Subject: [PATCH] Adds the correct hijack --- code/modules/antagonists/swarmer/swarmer_event.dm | 1 + code/modules/events/abductor.dm | 3 ++- code/modules/events/alien_infestation.dm | 2 +- code/modules/events/blob.dm | 4 ++-- code/modules/events/nightmare.dm | 2 +- code/modules/events/operative.dm | 1 + code/modules/events/pirates.dm | 1 + code/modules/events/space_dragon.dm | 1 + code/modules/ninja/ninja_event.dm | 2 +- 9 files changed, 11 insertions(+), 6 deletions(-) diff --git a/code/modules/antagonists/swarmer/swarmer_event.dm b/code/modules/antagonists/swarmer/swarmer_event.dm index 43ac07cba9..3df7e6c0e9 100644 --- a/code/modules/antagonists/swarmer/swarmer_event.dm +++ b/code/modules/antagonists/swarmer/swarmer_event.dm @@ -5,6 +5,7 @@ max_occurrences = 1 //Only once okay fam earliest_start = 30 MINUTES min_players = 35 + dynamic_should_hijack = TRUE /datum/round_event/spawn_swarmer diff --git a/code/modules/events/abductor.dm b/code/modules/events/abductor.dm index 41aab20a11..9411fe40a5 100755 --- a/code/modules/events/abductor.dm +++ b/code/modules/events/abductor.dm @@ -4,7 +4,8 @@ weight = 10 max_occurrences = 1 min_players = 30 - gamemode_blacklist = list("nuclear","wizard","revolution","dynamic") + dynamic_should_hijack = TRUE + gamemode_blacklist = list("nuclear","wizard","revolution") /datum/round_event/ghost_role/abductor minimum_required = 2 diff --git a/code/modules/events/alien_infestation.dm b/code/modules/events/alien_infestation.dm index 993577cb30..456bdd558e 100644 --- a/code/modules/events/alien_infestation.dm +++ b/code/modules/events/alien_infestation.dm @@ -2,9 +2,9 @@ name = "Alien Infestation" typepath = /datum/round_event/ghost_role/alien_infestation weight = 5 - gamemode_blacklist = list("dynamic") min_players = 25 max_occurrences = 1 + dynamic_should_hijack = TRUE /datum/round_event/ghost_role/alien_infestation announceWhen = 400 diff --git a/code/modules/events/blob.dm b/code/modules/events/blob.dm index 67cd88efdf..f4c81d765f 100644 --- a/code/modules/events/blob.dm +++ b/code/modules/events/blob.dm @@ -6,8 +6,8 @@ earliest_start = 40 MINUTES min_players = 35 - - gamemode_blacklist = list("blob","dynamic") //Just in case a blob survives that long + dynamic_should_hijack = TRUE + gamemode_blacklist = list("blob") /datum/round_event/ghost_role/blob announceWhen = -1 diff --git a/code/modules/events/nightmare.dm b/code/modules/events/nightmare.dm index 97a10c930a..62f9c88d49 100644 --- a/code/modules/events/nightmare.dm +++ b/code/modules/events/nightmare.dm @@ -3,7 +3,7 @@ typepath = /datum/round_event/ghost_role/nightmare max_occurrences = 1 min_players = 20 - gamemode_blacklist = list("dynamic") + dynamic_should_hijack = TRUE /datum/round_event/ghost_role/nightmare minimum_required = 1 diff --git a/code/modules/events/operative.dm b/code/modules/events/operative.dm index 6ef693a886..4ad307731e 100644 --- a/code/modules/events/operative.dm +++ b/code/modules/events/operative.dm @@ -3,6 +3,7 @@ typepath = /datum/round_event/ghost_role/operative weight = 0 //Admin only max_occurrences = 1 + dynamic_should_hijack = TRUE /datum/round_event/ghost_role/operative minimum_required = 1 diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm index 2d848ed4e3..b43f1ac556 100644 --- a/code/modules/events/pirates.dm +++ b/code/modules/events/pirates.dm @@ -5,6 +5,7 @@ max_occurrences = 1 min_players = 10 earliest_start = 30 MINUTES + dynamic_should_hijack = TRUE gamemode_blacklist = list("nuclear") #define PIRATES_ROGUES "Rogues" diff --git a/code/modules/events/space_dragon.dm b/code/modules/events/space_dragon.dm index 7b242f1dfe..35687bb7ed 100644 --- a/code/modules/events/space_dragon.dm +++ b/code/modules/events/space_dragon.dm @@ -4,6 +4,7 @@ weight = 8 max_occurrences = 1 min_players = 20 + dynamic_should_hijack = TRUE /datum/round_event/ghost_role/space_dragon minimum_required = 1 diff --git a/code/modules/ninja/ninja_event.dm b/code/modules/ninja/ninja_event.dm index bc3c445731..b6539a6952 100644 --- a/code/modules/ninja/ninja_event.dm +++ b/code/modules/ninja/ninja_event.dm @@ -14,7 +14,7 @@ Contents: typepath = /datum/round_event/ghost_role/ninja max_occurrences = 1 earliest_start = 40 MINUTES - gamemode_blacklist = list("dynamic") + dynamic_should_hijack = TRUE min_players = 15 /datum/round_event/ghost_role/ninja