mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-24 20:47:43 +01:00
Fix some phased shadekin interactions (#19587)
* block those * disposals * wheelchair incorp check * fix those * not the issue --------- Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
@@ -269,6 +269,8 @@
|
||||
// mouse drop another mob or self
|
||||
//
|
||||
/obj/machinery/disposal/MouseDrop_T(atom/dropping, mob/user, src_location, over_location, src_control, over_control, params)
|
||||
if(user.is_incorporeal())
|
||||
return
|
||||
if(isliving(dropping))
|
||||
stuff_mob_in(dropping, user)
|
||||
else if(isobj(dropping) && isturf(dropping.loc))
|
||||
@@ -334,6 +336,8 @@
|
||||
/obj/machinery/disposal/attack_hand(mob/user)
|
||||
if(stat & BROKEN)
|
||||
return
|
||||
if(user.is_incorporeal())
|
||||
return
|
||||
|
||||
if(user && user.loc == src)
|
||||
to_chat(user, span_red("You cannot reach the controls from inside."))
|
||||
@@ -352,6 +356,8 @@
|
||||
if(user.canUseTopic) //Later...
|
||||
return
|
||||
*/
|
||||
if(user.is_incorporeal())
|
||||
return
|
||||
if(get_dist(user, src) > 1 || user.loc == src || user.stat) //Until the above exists...
|
||||
return
|
||||
flush = !flush
|
||||
@@ -420,6 +426,8 @@
|
||||
set src in oview(1)
|
||||
set category = "Object"
|
||||
set name = "Force Eject"
|
||||
if(usr.is_incorporeal())
|
||||
return
|
||||
if(flushing)
|
||||
return
|
||||
eject()
|
||||
|
||||
Reference in New Issue
Block a user