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

16
code/modules/holodeck/items.dm
View File

@@ -120,17 +120,15 @@
else
..()
/obj/structure/holohoop/CanPass(atom/movable/mover, turf/target)
if (isitem(mover) && mover.throwing)
var/obj/item/I = mover
if(istype(I, /obj/item/projectile))
return
/obj/structure/holohoop/hitby(atom/movable/AM)
if (isitem(AM) && !istype(AM,/obj/item/projectile))
if(prob(50))
I.forceMove(get_turf(src))
visible_message("<span class='warning'>Swish! [I] lands in [src].</span>")
AM.forceMove(get_turf(src))
visible_message("<span class='warning'>Swish! [AM] lands in [src].</span>")
return
else
visible_message("<span class='danger'>[I] bounces off of [src]'s rim!</span>")
return 0
visible_message("<span class='danger'>[AM] bounces off of [src]'s rim!</span>")
return ..()
else
return ..()