shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes more CanPass misuse (#30493)

Browse Source 
* Fixes more CanPass misuse

* Let's not give wrong impression

* spans
This commit is contained in:
AnturK
2017-09-10 02:40:23 +02:00
committed by CitadelStationBot
parent 1769b0272a
commit 317958fb5c
4 changed files with 46 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/recycling/disposal-unit.dm
+14 -16
View File
@@ -335,20 +335,18 @@
eject()
. = TRUE
/obj/machinery/disposal/bin/CanPass(atom/movable/mover, turf/target)
if (isitem(mover) && mover.throwing)
var/obj/item/I = mover
if(istype(I, /obj/item/projectile))
return
/obj/machinery/disposal/bin/hitby(atom/movable/AM)
if(isitem(AM) && AM.CanEnterDisposals())
if(prob(75))
I.forceMove(src)
visible_message("<span class='notice'>[I] lands in [src].</span>")
AM.forceMove(src)
visible_message("<span class='notice'>[AM] lands in [src].</span>")
update_icon()
else
visible_message("<span class='notice'>[I] bounces off of [src]'s rim!</span>")
return 0
visible_message("<span class='notice'>[AM] bounces off of [src]'s rim!</span>")
return ..()
else
return ..(mover, target)
return ..()
/obj/machinery/disposal/bin/flush()
..()
@@ -457,12 +455,12 @@
trunk.linked = src // link the pipe trunk to self
/obj/machinery/disposal/deliveryChute/place_item_in_disposal(obj/item/I, mob/user)
if(I.disposalEnterTry())
if(I.CanEnterDisposals())
..()
flush()
/obj/machinery/disposal/deliveryChute/CollidedWith(atom/movable/AM) //Go straight into the chute
if(!AM.disposalEnterTry())
if(!AM.CanEnterDisposals())
return
switch(dir)
if(NORTH)
@@ -485,16 +483,16 @@
M.forceMove(src)
flush()
/atom/movable/proc/disposalEnterTry()
/atom/movable/proc/CanEnterDisposals()
return 1
/obj/item/projectile/disposalEnterTry()
/obj/item/projectile/CanEnterDisposals()
return
/obj/effect/disposalEnterTry()
/obj/effect/CanEnterDisposals()
return
/obj/mecha/disposalEnterTry()
/obj/mecha/CanEnterDisposals()
return
/obj/machinery/disposal/deliveryChute/newHolderDestination(obj/structure/disposalholder/H)