cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-31 09:00:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactored CollidedWith (#19541)

Browse Source 
Refactored CollidedWith()
This commit is contained in:
Fluffy
2024-06-29 10:01:18 +00:00
committed by GitHub
parent d63d63d78c
commit d8d67ebd3a
31 changed files with 317 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/recycling/sortingmachinery.dm
+15 -11
View File
@@ -312,25 +312,29 @@
/obj/machinery/disposal/deliveryChute/update()
return
/obj/machinery/disposal/deliveryChute/CollidedWith(var/atom/movable/AM) //Go straight into the chute
if(istype(AM, /obj/item/projectile) || istype(AM, /obj/effect)) return
/obj/machinery/disposal/deliveryChute/CollidedWith(atom/bumped_atom) //Go straight into the chute
. = ..()
if(istype(bumped_atom, /obj/item/projectile) || istype(bumped_atom, /obj/effect))
return
switch(dir)
if(NORTH)
if(AM.loc.y != src.loc.y+1) return
if(bumped_atom.loc.y != src.loc.y+1) return
if(EAST)
if(AM.loc.x != src.loc.x+1) return
if(bumped_atom.loc.x != src.loc.x+1) return
if(SOUTH)
if(AM.loc.y != src.loc.y-1) return
if(bumped_atom.loc.y != src.loc.y-1) return
if(WEST)
if(AM.loc.x != src.loc.x-1) return
if(bumped_atom.loc.x != src.loc.x-1) return
if(istype(AM, /obj))
var/obj/O = AM
if(istype(bumped_atom, /obj))
var/obj/O = bumped_atom
O.forceMove(src)
else if(istype(AM, /mob))
var/mob/M = AM
else if(istype(bumped_atom, /mob))
var/mob/M = bumped_atom
M.forceMove(src)
src.flush()
INVOKE_ASYNC(src, PROC_REF(flush))
/obj/machinery/disposal/deliveryChute/flush()
flushing = 1