Teleporter has a cancel button.

Improved the admin player panel.
Disposals now work right with things thrown at them.
Nuke upgraded to use realtime.
This commit is contained in:
SkyMarshal
2012-02-28 13:39:51 -07:00
parent 90c976a8e4
commit 02002054de
9 changed files with 112 additions and 53 deletions
+4 -2
View File
@@ -439,8 +439,10 @@
del(H)
CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if (istype(mover,/obj/item) && !istype(mover,/obj/item/weapon/dummy))
if (istype(mover,/obj/item))
var/obj/item/I = mover
if(!mover.throwing)
return ..()
if(prob(75))
I.loc = src
for(var/mob/M in viewers(src))
@@ -450,7 +452,7 @@
M.show_message("\the [I] bounces off of \the [src]'s rim!", 3)
return 0
else
return ..(mover, target, height, air_group)
return ..()
//The toilet does not need to pressurized but can only handle small items.
//You can also choke people by dunking them into the toilet.