From 43ed6b41f9f543575cfce9cef6c0b6de19bed849 Mon Sep 17 00:00:00 2001 From: Dahlular Date: Fri, 10 Jul 2020 23:50:10 -0600 Subject: [PATCH 1/2] fixes stepping under interactions and allows more size pref sizes unga dunga --- code/__DEFINES/citadel_defines.dm | 5 +++-- hyperstation/code/modules/resize/resizing.dm | 22 ++++++++++---------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/code/__DEFINES/citadel_defines.dm b/code/__DEFINES/citadel_defines.dm index a01884e5..0f2e94db 100644 --- a/code/__DEFINES/citadel_defines.dm +++ b/code/__DEFINES/citadel_defines.dm @@ -69,9 +69,10 @@ #define BREASTS_SIZE_HUGE 16 #define BREASTS_SIZE_MASSIVE 17 #define BREASTS_SIZE_GIGA 25 + //Bodysize Limits -#define MIN_BODYSIZE 80 -#define MAX_BODYSIZE 120 +#define MIN_BODYSIZE 50 +#define MAX_BODYSIZE 150 #define BREASTS_SIZE_MIN BREASTS_SIZE_A #define BREASTS_SIZE_DEF BREASTS_SIZE_D diff --git a/hyperstation/code/modules/resize/resizing.dm b/hyperstation/code/modules/resize/resizing.dm index 86254176..605a3e64 100644 --- a/hyperstation/code/modules/resize/resizing.dm +++ b/hyperstation/code/modules/resize/resizing.dm @@ -63,12 +63,12 @@ mob/living/get_effective_size() to_chat(tmob,"[H] steps over you carefully!") return 1 - //Smaller person stepping under a larger person - if(tmob.get_effective_size() > get_effective_size()) - H.forceMove(tmob.loc) - now_pushing = 0 - micro_step_under(tmob) - return 1 + //Smaller person stepping under a larger person + if(abs(tmob.get_effective_size()/get_effective_size()) <= 2) + H.forceMove(tmob.loc) + now_pushing = 0 + micro_step_under(tmob) + return 1 //Stepping on disarm intent -- TO DO, OPTIMIZE ALL OF THIS SHIT /mob/living/proc/handle_micro_bump_other(var/mob/living/tmob) @@ -136,11 +136,11 @@ mob/living/get_effective_size() tmob.mob_pickup_micro_feet(H) return 1 - if(tmob.get_effective_size() > get_effective_size()) - H.forceMove(tmob.loc) - now_pushing = 0 - micro_step_under(tmob) - return 1 + if(abs(tmob.get_effective_size()/get_effective_size()) <= 2) + H.forceMove(tmob.loc) + now_pushing = 0 + micro_step_under(tmob) + return 1 //smaller person stepping under another person... TO DO, fix and allow special interactions with naga legs to be seen /mob/living/proc/micro_step_under(var/mob/living/tmob) From 33f69de6a0a74d460eafde1c21cdece916e04969 Mon Sep 17 00:00:00 2001 From: Dahlular Date: Sat, 11 Jul 2020 01:09:03 -0600 Subject: [PATCH 2/2] Further fixes --- hyperstation/code/modules/resize/resizing.dm | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/hyperstation/code/modules/resize/resizing.dm b/hyperstation/code/modules/resize/resizing.dm index 605a3e64..41b78119 100644 --- a/hyperstation/code/modules/resize/resizing.dm +++ b/hyperstation/code/modules/resize/resizing.dm @@ -63,12 +63,12 @@ mob/living/get_effective_size() to_chat(tmob,"[H] steps over you carefully!") return 1 - //Smaller person stepping under a larger person - if(abs(tmob.get_effective_size()/get_effective_size()) <= 2) - H.forceMove(tmob.loc) - now_pushing = 0 - micro_step_under(tmob) - return 1 + //Smaller person stepping under a larger person + if(abs(tmob.get_effective_size()/get_effective_size()) >= 2) + H.forceMove(tmob.loc) + now_pushing = 0 + micro_step_under(tmob) + return 1 //Stepping on disarm intent -- TO DO, OPTIMIZE ALL OF THIS SHIT /mob/living/proc/handle_micro_bump_other(var/mob/living/tmob) @@ -136,11 +136,11 @@ mob/living/get_effective_size() tmob.mob_pickup_micro_feet(H) return 1 - if(abs(tmob.get_effective_size()/get_effective_size()) <= 2) - H.forceMove(tmob.loc) - now_pushing = 0 - micro_step_under(tmob) - return 1 + if(abs(tmob.get_effective_size()/get_effective_size()) >= 2) + H.forceMove(tmob.loc) + now_pushing = 0 + micro_step_under(tmob) + return 1 //smaller person stepping under another person... TO DO, fix and allow special interactions with naga legs to be seen /mob/living/proc/micro_step_under(var/mob/living/tmob)