Reverts throwing and cigarette code for fear of trout. Also updates object paths.

This commit is contained in:
Ren Erthilo
2012-04-21 17:09:29 +01:00
parent fb0a8b0769
commit 43d36dec6e
6 changed files with 39 additions and 148 deletions
+5 -5
View File
@@ -455,20 +455,20 @@
del(H)
CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if (istype(mover,/obj/item) && mover.throwing)
if (istype(mover,/obj/item))
var/obj/item/I = mover
if(istype(I, /obj/item/weapon/dummy) || istype(I, /obj/item/projectile))
return
if(!mover.throwing)
return ..()
if(prob(75))
I.loc = src
for(var/mob/M in viewers(src))
M.show_message("\the [I] lands in \the [src].", 3)
else
for(var/mob/M in viewers(src))
M.show_message("\the [I] bounces off of \the [src]'s rim!.", 3)
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.