Merge pull request #9607 from Ghommie/Ghommie-cit271

Unmodularize events
2019-10-25 20:07:48 -07:00
parent c37088a767 238fca4e59
commit 9b7b2ce0b2
5 changed files with 3 additions and 7 deletions
@@ -4,6 +4,7 @@
 	weight = 10
 	max_occurrences = 1

+	earliest_start = 60 MINUTES
 	min_players = 40

 	gamemode_blacklist = list("blob") //Just in case a blob survives that long
@@ -36,10 +36,11 @@
 	projectilesound = 'sound/weapons/emitter.ogg'
 	maxHealth = 50
 	health = 50
+	gold_core_spawnable = NO_SPAWN
 	var/allowed_projectile_types = list(/obj/item/projectile/magic/change, /obj/item/projectile/magic/animate, /obj/item/projectile/magic/resurrection,
 	/obj/item/projectile/magic/death, /obj/item/projectile/magic/teleport, /obj/item/projectile/magic/door, /obj/item/projectile/magic/aoe/fireball,
 	/obj/item/projectile/magic/spellblade, /obj/item/projectile/magic/arcane_barrage)
-	
+
 /mob/living/simple_animal/hostile/carp/ranged/Initialize()
 	projectiletype = pick(allowed_projectile_types)
 	. = ..()
@@ -1,2 +0,0 @@
-/datum/round_event_control/blob
-  earliest_start = 60 MINUTES
@@ -1,2 +0,0 @@
-/mob/living/simple_animal/hostile/carp/ranged
-    gold_core_spawnable = NO_SPAWN
@@ -3064,8 +3064,6 @@
 #include "modular_citadel\code\modules\custom_loadout\custom_items.dm"
 #include "modular_citadel\code\modules\custom_loadout\load_to_mob.dm"
 #include "modular_citadel\code\modules\custom_loadout\read_from_file.dm"
-#include "modular_citadel\code\modules\events\blob.dm"
-#include "modular_citadel\code\modules\events\wizard\magicarp.dm"
 #include "modular_citadel\code\modules\food_and_drinks\snacks\meat.dm"
 #include "modular_citadel\code\modules\integrated_electronics\subtypes\manipulation.dm"
 #include "modular_citadel\code\modules\jobs\dresscode_values.dm"