From 2b94ff7e1b4a28f270c5104f526893405f559a0a Mon Sep 17 00:00:00 2001 From: VerySoft Date: Tue, 30 Aug 2022 04:34:10 -0400 Subject: [PATCH] further fixes --- code/game/objects/micro_structures.dm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/code/game/objects/micro_structures.dm b/code/game/objects/micro_structures.dm index 400c5210e6..486f12f641 100644 --- a/code/game/objects/micro_structures.dm +++ b/code/game/objects/micro_structures.dm @@ -128,7 +128,8 @@ var/mob/living/carbon/human/h = user var/mob/living/l = grabbed if(isliving(grabbed)) - l.attempt_to_scoop(h) + if(!l.attempt_to_scoop(h)) + l.forceMove(get_turf(src.loc)) else var/atom/movable/whatever = grabbed whatever.forceMove(get_turf(src.loc)) @@ -140,7 +141,8 @@ var/mob/living/simple_mob/a = user var/mob/living/l = grabbed if(!a.has_hands || isliving(grabbed)) - l.attempt_to_scoop(user) + if(!l.attempt_to_scoop(a)) + l.forceMove(get_turf(src.loc)) else var/atom/movable/whatever = grabbed whatever.forceMove(get_turf(src.loc)) @@ -316,6 +318,8 @@ var/mob/living/l = grabbed if(isliving(grabbed)) l.attempt_to_scoop(h) + if(!l.attempt_to_scoop(h)) + l.forceMove(get_turf(src.loc)) else var/atom/movable/whatever = grabbed whatever.forceMove(get_turf(src.loc)) @@ -327,7 +331,8 @@ var/mob/living/simple_mob/a = usr var/mob/living/l = grabbed if(!a.has_hands || isliving(grabbed)) - l.attempt_to_scoop(usr) + if(!l.attempt_to_scoop(a)) + l.forceMove(get_turf(src.loc)) else var/atom/movable/whatever = grabbed whatever.forceMove(get_turf(src.loc))