From 8b8da05663029934e65b7ac8ec8298315b70535f Mon Sep 17 00:00:00 2001 From: Kirie Saito <77302679+Kitsunemitsu@users.noreply.github.com> Date: Fri, 31 May 2024 12:02:18 -0400 Subject: [PATCH] Allows for randomized gamemodes in the future (#2111) * adds rng gamemodes Update abnormalities.dm Update ticker.dm Makes AIB from Lobotomy Corp update Update management.dm Update lobotomy-corp13.dme adds joke abnos Revert "adds rng gamemodes" This reverts commit b7fd12d7113a7a4c380d02ad22055c6f994fa550. * Update ticker.dm --- code/controllers/subsystem/ticker.dm | 14 +++++--------- .../abnormality/aleph/army_in_black.dm | 1 + 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index cfd6af629786..e6b38dc59e65 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -249,16 +249,12 @@ SUBSYSTEM_DEF(ticker) if(SSmaptype.maptype in SSmaptype.combatmaps) if(!(istype(mode, /datum/game_mode/combat))) mode = new /datum/game_mode/combat - -// Among Us. - else if(SSmaptype.maptype == "skeld") - // mode = new /datum/game_mode/traitor - toggle_ooc(FALSE) // Turn it off - CONFIG_SET(flag/norespawn, 1) - else - if(!istype(mode, /datum/game_mode/management)) - mode = new /datum/game_mode/management/classic + var/choosingmode = pick(/datum/game_mode/management/classic, + // /datum/game_mode/management/pure, + // /datum/game_mode/management/branch + ) + mode = new choosingmode CHECK_TICK diff --git a/code/modules/mob/living/simple_animal/abnormality/aleph/army_in_black.dm b/code/modules/mob/living/simple_animal/abnormality/aleph/army_in_black.dm index 6d6c8e5e6c6e..a5450bce3a6c 100644 --- a/code/modules/mob/living/simple_animal/abnormality/aleph/army_in_black.dm +++ b/code/modules/mob/living/simple_animal/abnormality/aleph/army_in_black.dm @@ -51,6 +51,7 @@ GLOBAL_LIST_EMPTY(army) /mob/living/simple_animal/hostile/abnormality/khz = 1.5, /mob/living/simple_animal/hostile/abnormality/mhz = 1.5, ) + abnormality_origin = ABNORMALITY_ORIGIN_LOBOTOMY //Unique variables var/death_counter = 0