diff --git a/hyperstation/code/modules/resize/holder_micro.dm b/hyperstation/code/modules/resize/holder_micro.dm index 22fef80b..e3612f64 100644 --- a/hyperstation/code/modules/resize/holder_micro.dm +++ b/hyperstation/code/modules/resize/holder_micro.dm @@ -68,7 +68,7 @@ var/mob/living/L = loc visible_message("[src] begins to squirm in [L]'s grasp!") if(!do_after(user, 100, target = src)) - to_chat(loc, "[L] stops resisting.") + to_chat(loc, "[src] stops resisting.") return visible_message("[src] escapes [L]!") release() @@ -106,7 +106,8 @@ return FALSE visible_message("[user] starts picking up [src].", \ "[user] starts picking you up!") - if(!do_after(user, 20, target = src)) + var/p = abs(src.get_effective_size()/user.get_effective_size() * 40) //Scale how fast the pickup will be depending on size difference + if(!do_after(user, p, target = src)) return FALSE if(user.get_active_held_item()||buckled) diff --git a/hyperstation/code/modules/resize/resizing.dm b/hyperstation/code/modules/resize/resizing.dm index bfb489f1..647de2c9 100644 --- a/hyperstation/code/modules/resize/resizing.dm +++ b/hyperstation/code/modules/resize/resizing.dm @@ -50,6 +50,7 @@ mob/living/get_effective_size() var/mob/living/carbon/C = src for(var/obj/item/organ/genital/G in C.internal_organs) G.update_appearance() + //if(src.size_multiplier >= RESIZE_A_HUGEBIG || src.size_multiplier <= RESIZE_A_TINYMICRO) Will remove clothing when too big or small. Will do later. previous_size = size_multiplier //And, change this now that we are finally done. //handle the big steppy, except nice