cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverts "world.time -> world.timeofday" in mob movement code. Hopefully this stops people freezing at midnight GMT.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4818 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
johnsonmt88@gmail.com
2012-10-06 13:24:34 +00:00
parent 5a3af8cefe
commit a3b99bccfa
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/mob/mob_movement.dm
View File

@@ -234,9 +234,7 @@
if(moving) return 0
if(move_delay >= 864000) move_delay -= 864000
if(world.timeofday < move_delay) return
if(world.time < move_delay) return
if(!mob) return
@@ -283,7 +281,7 @@
src << "\blue You're restrained! You can't move!"
return 0
move_delay = world.timeofday//set move delay
move_delay = world.time//set move delay
switch(mob.m_intent)
if("run")
@@ -306,7 +304,7 @@
moving = 1
//Something with pulling things
if(locate(/obj/item/weapon/grab, mob))
move_delay = max(move_delay, world.timeofday + 7)
move_delay = max(move_delay, world.time + 7)
var/list/L = mob.ret_grab()
if(istype(L, /list))
if(L.len == 2)
@@ -364,12 +362,12 @@
for(var/obj/item/weapon/grab/G in mob.grabbed_by)
if((G.state == 1)&&(!grabbing.Find(G.assailant))) del(G)
if(G.state == 2)
move_delay = world.timeofday + 10
move_delay = world.time + 10
if(!prob(25)) return 1
mob.visible_message("\red [mob] has broken free of [G.assailant]'s grip!")
del(G)
if(G.state == 3)
move_delay = world.timeofday + 10
move_delay = world.time + 10
if(!prob(5)) return 1
mob.visible_message("\red [mob] has broken free of [G.assailant]'s headlock!")
del(G)