mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
Fixes maintpred hyperspeed.
This commit is contained in:
@@ -56,7 +56,7 @@
|
|||||||
var/mob/living/simple_mob/newPred = new mobtype(get_turf(spawnspot))
|
var/mob/living/simple_mob/newPred = new mobtype(get_turf(spawnspot))
|
||||||
qdel(newPred.ai_holder)
|
qdel(newPred.ai_holder)
|
||||||
newPred.ai_holder = null
|
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)
|
if(D.mind)
|
||||||
D.mind.transfer_to(newPred)
|
D.mind.transfer_to(newPred)
|
||||||
to_chat(D, "<span class='notice'>You are <b>[newPred]</b>, somehow having gotten aboard the station in search of food. \
|
to_chat(D, "<span class='notice'>You are <b>[newPred]</b>, somehow having gotten aboard the station in search of food. \
|
||||||
@@ -71,8 +71,14 @@
|
|||||||
|
|
||||||
/datum/event/maintenance_predator/announce()
|
/datum/event/maintenance_predator/announce()
|
||||||
if(prob(announceProb))
|
if(prob(announceProb))
|
||||||
|
<<<<<<< HEAD
|
||||||
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")
|
||||||
|
|
||||||
//YW Addition: Adding named landmark for events
|
//YW Addition: Adding named landmark for events
|
||||||
/obj/effect/landmark/event_spawn/maintpred
|
/obj/effect/landmark/event_spawn/maintpred
|
||||||
name = "maint_pred"
|
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
|
||||||
|
|||||||
Reference in New Issue
Block a user