From a8742c57990ee2e72fb09a8d20af533005504e2b Mon Sep 17 00:00:00 2001 From: deathride58 Date: Thu, 4 Jan 2018 13:00:44 -0500 Subject: [PATCH] fixes swarmer event disable regression, modularizes flyperson-only hulk --- code/datums/mutations/hulk.dm | 2 +- modular_citadel/code/datums/mutations/hulk.dm | 2 ++ .../code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm | 3 +++ tgstation.dme | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 modular_citadel/code/datums/mutations/hulk.dm create mode 100644 modular_citadel/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm diff --git a/code/datums/mutations/hulk.dm b/code/datums/mutations/hulk.dm index 666c910557..9340361930 100644 --- a/code/datums/mutations/hulk.dm +++ b/code/datums/mutations/hulk.dm @@ -5,7 +5,7 @@ get_chance = 15 lowest_value = 256 * 12 text_gain_indication = "Your muscles hurt!" - species_allowed = list("fly") //no skeleton/lizard hulk + species_allowed = list("human") //no skeleton/lizard hulk health_req = 25 /datum/mutation/human/hulk/on_acquiring(mob/living/carbon/human/owner) diff --git a/modular_citadel/code/datums/mutations/hulk.dm b/modular_citadel/code/datums/mutations/hulk.dm new file mode 100644 index 0000000000..601238707d --- /dev/null +++ b/modular_citadel/code/datums/mutations/hulk.dm @@ -0,0 +1,2 @@ +/datum/mutation/human/hulk + species_allowed = list("fly") \ No newline at end of file diff --git a/modular_citadel/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm b/modular_citadel/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm new file mode 100644 index 0000000000..5dfe1dfcbd --- /dev/null +++ b/modular_citadel/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm @@ -0,0 +1,3 @@ +/datum/round_event_control/spawn_swarmer + weight = 0 + max_occurrences = 0 \ No newline at end of file diff --git a/tgstation.dme b/tgstation.dme index 004e45370b..3d05d32bcf 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2480,6 +2480,8 @@ #include "modular_citadel\polychromic_clothes.dm" #include "modular_citadel\simplemob_vore_values.dm" #include "modular_citadel\code\datums\uplink_items_cit.dm" +#include "modular_citadel\code\datums\mutations\hulk.dm" +#include "modular_citadel\code\game\gamemodes\miniantags\bot_swarm\swarmer_event.dm" #include "modular_citadel\code\game\machinery\Sleeper.dm" #include "modular_citadel\code\game\objects\items\handcuffs.dm" #include "modular_citadel\code\game\objects\items\devices\PDA\PDA.dm"