mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-25 22:12:58 +01:00
Stops disposal units from sucking people in (#19725)
This isn't technically a bugfix as the original PR (#19624) intended for this behaviour However, after a discussion in the code channel on the discord, I think there's near-unanimous agreement that this feature isn't wanted.
This commit is contained in:
@@ -604,22 +604,6 @@
|
||||
else
|
||||
return ..(mover, target, height, air_group)
|
||||
|
||||
/obj/machinery/disposal/CollidedWith(atom/bumped_atom)
|
||||
. = ..()
|
||||
var/atom/movable/AM = bumped_atom
|
||||
if(!istype(AM))
|
||||
return
|
||||
|
||||
if(isobj(AM))
|
||||
var/obj/O = AM
|
||||
O.forceMove(src)
|
||||
else if(ismob(AM))
|
||||
var/mob/M = AM
|
||||
if(prob(2)) // to prevent mobs being stuck in infinite loops
|
||||
to_chat(M, SPAN_WARNING("You hit the edge of the chute."))
|
||||
return
|
||||
M.forceMove(src)
|
||||
|
||||
/obj/machinery/disposal/hitby(atom/movable/hitting_atom, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum)
|
||||
if(isitem(hitting_atom))
|
||||
if(prob(75))
|
||||
|
||||
Reference in New Issue
Block a user