Merge branch 'Bubberstation:master' into master

modular_zubbers/code/modules/storyteller/_events/voidwalker.dm

@@ -0,0 +1,39 @@
+// TG did not cook this antag into the event system. So I had to make my own
+
+/datum/round_event_control/voidwalker
+	name = "Spawn Void Walker"
+	typepath = /datum/round_event/ghost_role/void_walker
+	max_occurrences = 1
+	weight = 3
+	earliest_start = 20 MINUTES
+	min_players = 30
+	dynamic_should_hijack = TRUE
+	category = EVENT_CATEGORY_ENTITIES
+	description = "A Void Walker that drags people out of the station and into the abyss"
+
+/datum/round_event/ghost_role/void_walker
+	minimum_required = 30
+	fakeable = FALSE
+	role_name = "Void Walker"
+
+/datum/round_event/ghost_role/void_walker/spawn_role()
+	var/spawn_location = find_space_spawn()
+	if(isnull(spawn_location))
+		return MAP_ERROR
+
+	var/mob/chosen_one = SSpolling.poll_ghost_candidates(check_jobban = ROLE_VOIDWALKER, role = ROLE_VOIDWALKER, alert_pic = /obj/item/cosmic_skull, jump_target = spawn_location, role_name_text = "Void Walker", amount_to_pick = 1)
+	if(isnull(chosen_one))
+		return NOT_ENOUGH_PLAYERS
+	var/datum/mind/player_mind = new /datum/mind(chosen_one.key)
+	player_mind.active = TRUE
+
+	var/mob/living/carbon/human/walker = new (spawn_location)
+	player_mind.transfer_to(walker)
+	player_mind.set_assigned_role(SSjob.GetJobType(/datum/job/voidwalker))
+	player_mind.add_antag_datum(/datum/antagonist/voidwalker)
+	walker.set_species(/datum/species/voidwalker)
+	playsound(walker, 'sound/magic/ethereal_exit.ogg', 50, TRUE, -1)
+	message_admins("[ADMIN_LOOKUPFLW(walker)] has been made into a Voidwalker by the midround event.")
+	walker.log_message("[key_name(walker)] was spawned as a Voidwalker by an event.", LOG_GAME)
+	spawned_mobs += walker
+	return SUCCESSFUL_SPAWN

modular_zubbers/code/modules/storyteller/event_defines/major/major_overrides.dm

@@ -61,3 +61,7 @@
 /datum/round_event_control/fugitives
 	track = EVENT_TRACK_MAJOR
 	tags = list(TAG_COMBAT)
+
+/datum/round_event_control/voidwalker
+	track = EVENT_TRACK_MAJOR
+	tags = list(TAG_COMBAT, TAG_SPOOKY, TAG_SPACE)

tgstation.dme

@@ -9092,7 +9092,8 @@
 #include "modular_zubbers\code\modules\storyteller\gamemode.dm"
 #include "modular_zubbers\code\modules\storyteller\scheduled_event.dm"
 #include "modular_zubbers\code\modules\storyteller\storyteller_vote.dm"
-#include "modular_zubbers\code\modules\storyteller\event_defines\_event.dm"
+#include "modular_zubbers\code\modules\storyteller\_events\_event.dm"
+#include "modular_zubbers\code\modules\storyteller\_events\voidwalker.dm"
 #include "modular_zubbers\code\modules\storyteller\event_defines\disabled_event_overrides.dm"
 #include "modular_zubbers\code\modules\storyteller\event_defines\major\major_overrides.dm"
 #include "modular_zubbers\code\modules\storyteller\event_defines\moderate\moderate_overrides.dm"