Fixes for the shuttle.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3357 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
vageyenaman@gmail.com
2012-03-24 22:06:20 +00:00
parent 260e8ffd75
commit 7171544d6f
2 changed files with 3236 additions and 3232 deletions

View File

@@ -4,6 +4,7 @@
var/affect_ghosts = 0 var/affect_ghosts = 0
var/stopper = 1 // stops throwers var/stopper = 1 // stops throwers
invisibility = 101 // nope cant see this shit invisibility = 101 // nope cant see this shit
anchored = 1
/obj/step_trigger/proc/Trigger(var/atom/movable/A) /obj/step_trigger/proc/Trigger(var/atom/movable/A)
return 0 return 0
@@ -31,7 +32,8 @@
var/curtiles = 0 var/curtiles = 0
var/stopthrow = 0 var/stopthrow = 0
for(var/obj/step_trigger/thrower/T in orange(2, src)) for(var/obj/step_trigger/thrower/T in orange(2, src))
if(T.affecting.Find(A)) if(A in T.affecting)
world << "can't trigger"
return return
if(ismob(A)) if(ismob(A))
@@ -43,7 +45,6 @@
while(A && !stopthrow) while(A && !stopthrow)
if(tiles) if(tiles)
if(curtiles >= tiles) if(curtiles >= tiles)
affecting.Remove(A)
break break
curtiles++ curtiles++
@@ -53,12 +54,10 @@
for(var/obj/step_trigger/T in get_step(A, direction)) for(var/obj/step_trigger/T in get_step(A, direction))
if(T.stopper && T != src) if(T.stopper && T != src)
stopthrow = 1 stopthrow = 1
affecting.Remove(A)
else else
for(var/obj/step_trigger/teleporter/T in get_step(A, direction)) for(var/obj/step_trigger/teleporter/T in get_step(A, direction))
if(T.stopper) if(T.stopper)
stopthrow = 1 stopthrow = 1
affecting.Remove(A)
var/predir = A.dir var/predir = A.dir
step(A, direction) step(A, direction)
@@ -67,6 +66,8 @@
sleep(speed) sleep(speed)
affecting.Remove(A)
if(ismob(A)) if(ismob(A))
var/mob/M = A var/mob/M = A
if(immobilize) if(immobilize)

File diff suppressed because it is too large Load Diff