From f31d1735e28c4e67ad65e3659fb5d9ec057b8cb6 Mon Sep 17 00:00:00 2001 From: killer653 Date: Wed, 9 Aug 2017 09:57:51 -0400 Subject: [PATCH] Makes 50% difference able to be picked up --- code/modules/mob/living/carbon/human/examine.dm | 3 ++- code/modules/mob/living/carbon/human/examine_vr.dm | 11 +++++++++-- code/modules/vore/resizing/resize_vr.dm | 4 ++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index e4e2d70fa9..3fdba139f2 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -310,7 +310,8 @@ msg += attempt_vr(src,"examine_weight",args) //VOREStation Code msg += attempt_vr(src,"examine_nutrition",args) //VOREStation Code msg += attempt_vr(src,"examine_bellies",args) //VOREStation Code - msg += attempt_vr(src,"examine_size",args) //VOREStation Code + msg += attempt_vr(src,"examine_pickup_size",args) //VOREStation Code + msg += attempt_vr(src,"examine_step_size",args) //VOREStation Code if(mSmallsize in mutations) msg += "[T.He] [T.is] small halfling!\n" diff --git a/code/modules/mob/living/carbon/human/examine_vr.dm b/code/modules/mob/living/carbon/human/examine_vr.dm index f88af80741..f204381bbb 100644 --- a/code/modules/mob/living/carbon/human/examine_vr.dm +++ b/code/modules/mob/living/carbon/human/examine_vr.dm @@ -141,8 +141,15 @@ return FALSE -/mob/living/carbon/human/proc/examine_size(mob/living/carbon/human/H) +/mob/living/carbon/human/proc/examine_pickup_size(mob/living/carbon/human/H) var/message = "" - if((H.get_effective_size() - src.get_effective_size()) >= 0.75) + if((H.get_effective_size() - src.get_effective_size()) >= 0.50) message = "They are small enough that you could easily pick them up!\n" return message + + +/mob/living/carbon/human/proc/examine_step_size(mob/living/carbon/human/H) + var/message = "" + if((H.get_effective_size() - src.get_effective_size()) >= 0.75) + message = "They are small enough that you could easily trample them!\n" + return message \ No newline at end of file diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm index b1997617ce..34adf2351e 100644 --- a/code/modules/vore/resizing/resize_vr.dm +++ b/code/modules/vore/resizing/resize_vr.dm @@ -124,7 +124,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 if(H.buckled) usr << "You have to unbuckle \the [H] before you pick them up." return 0 - if(size_diff >= 0.75) + if(size_diff >= 0.50) src.holder_type = /obj/item/weapon/holder/micro var/obj/item/weapon/holder/m_holder = get_scooped(H) src.holder_type = src.holder_default @@ -144,7 +144,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 // Both small! Go ahead and now_pushing = 0 return 1 - if(abs(src.get_effective_size() - tmob.get_effective_size()) >= 0.75) + if(abs(src.get_effective_size() - tmob.get_effective_size()) >= 0.50) now_pushing = 0 if(src.get_effective_size() > tmob.get_effective_size()) var/mob/living/carbon/human/H = src