Conflicts:
	code/game/objects/items/weapons/tools.dm
	code/modules/power/cable.dm
This commit is contained in:
Zuhayr
2014-06-01 13:29:18 -04:00
committed by ZomgPonies
parent 73d9498361
commit 31a1b6e526
3 changed files with 18 additions and 58 deletions
-3
View File
@@ -43,9 +43,6 @@
target.client.eye = holder
sleep(jaunt_duration)
mobloc = get_turf(target.loc)
if(get_area(mobloc) == /area/security/armoury/gamma)
target << "A strange energy repels you!"
mobloc = originalloc
animation.loc = mobloc
target.canmove = 0
sleep(20)