From 38beda4a2a4ca88d44e8da5e695db7e7d8f8bc7a Mon Sep 17 00:00:00 2001 From: Chompstation Bot Date: Mon, 16 Nov 2020 02:18:57 +0000 Subject: [PATCH] Fixes maintpred hyperspeed. --- code/modules/events/maintenance_predator_vr.dm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/code/modules/events/maintenance_predator_vr.dm b/code/modules/events/maintenance_predator_vr.dm index 40c8a98600..be0b1274e8 100644 --- a/code/modules/events/maintenance_predator_vr.dm +++ b/code/modules/events/maintenance_predator_vr.dm @@ -56,7 +56,7 @@ var/mob/living/simple_mob/newPred = new mobtype(get_turf(spawnspot)) qdel(newPred.ai_holder) newPred.ai_holder = null - newPred.movement_cooldown = 0 // Remove the needless artificial speed cap + //newPred.movement_cooldown = 0 // The "needless artificial speed cap" exists for a reason if(D.mind) D.mind.transfer_to(newPred) to_chat(D, "You are [newPred], somehow having gotten aboard the station in search of food. \ @@ -71,8 +71,14 @@ /datum/event/maintenance_predator/announce() if(prob(announceProb)) +<<<<<<< HEAD command_announcement.Announce("Unexpected biosignature detected in the maintenance tunnels of [station_name()].", "Lifesign Alert") //YW Addition: Adding named landmark for events /obj/effect/landmark/event_spawn/maintpred - name = "maint_pred" \ No newline at end of file + name = "maint_pred" +||||||| parent of 2ed936c6ee... Merge pull request #9311 from VOREStation/Verkister-patch-5 + command_announcement.Announce("Unexpected biosignature detected in the maintenance tunnels of [station_name()].", "Lifesign Alert") +======= + command_announcement.Announce("Unexpected biosignature detected in the maintenance tunnels of [station_name()].", "Lifesign Alert") +>>>>>>> 2ed936c6ee... Merge pull request #9311 from VOREStation/Verkister-patch-5