From 2e68aaee5158c07393eefaf34d7605b747afbe56 Mon Sep 17 00:00:00 2001 From: Nyks Date: Wed, 7 Apr 2021 06:07:05 +0300 Subject: [PATCH] Definitely works now --- code/__defines/misc_vr.dm | 18 +++++++++--------- code/modules/admin/verbs/resize.dm | 2 +- code/modules/vore/resizing/resize_vr.dm | 2 ++ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/code/__defines/misc_vr.dm b/code/__defines/misc_vr.dm index 67edbeb1bf0..55973cdafc3 100644 --- a/code/__defines/misc_vr.dm +++ b/code/__defines/misc_vr.dm @@ -67,12 +67,12 @@ #define MAT_PLASTITANIUMGLASS "plastitanium glass" #define MAT_GOLDHULL "gold hull" -#define RESIZE_HUGE = 2 -#define RESIZE_BIG = 1.5 -#define RESIZE_NORMAL = 1 -#define RESIZE_SMALL = 0.5 -#define RESIZE_TINY = 0.25 -#define RESIZE_A_HUGEBIG = (RESIZE_HUGE + RESIZE_BIG) / 2 -#define RESIZE_A_BIGNORMAL = (RESIZE_BIG + RESIZE_NORMAL) / 2 -#define RESIZE_A_NORMALSMALL = (RESIZE_NORMAL + RESIZE_SMALL) / 2 -#define RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 \ No newline at end of file +#define RESIZE_HUGE 2 +#define RESIZE_BIG 1.5 +#define RESIZE_NORMAL 1 +#define RESIZE_SMALL 0.5 +#define RESIZE_TINY 0.25 +#define RESIZE_A_HUGEBIG (RESIZE_HUGE + RESIZE_BIG) / 2 +#define RESIZE_A_BIGNORMAL (RESIZE_BIG + RESIZE_NORMAL) / 2 +#define RESIZE_A_NORMALSMALL (RESIZE_NORMAL + RESIZE_SMALL) / 2 +#define RESIZE_A_SMALLTINY (RESIZE_SMALL + RESIZE_TINY) / 2 \ No newline at end of file diff --git a/code/modules/admin/verbs/resize.dm b/code/modules/admin/verbs/resize.dm index 7fa1d40d847..dddaeb9ec13 100644 --- a/code/modules/admin/verbs/resize.dm +++ b/code/modules/admin/verbs/resize.dm @@ -7,7 +7,7 @@ var/size_multiplier = input(usr, "Input size multiplier.", "Resize", 1) L.resize(size_multiplier, TRUE, TRUE) - if(size_multiplier in range(RESIZE_TINY, RESIZE_HUGE)) + if(size_multiplier >= RESIZE_TINY && size_multiplier <= RESIZE_HUGE) L.size_uncapped = FALSE else L.size_uncapped = TRUE diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm index 27c903f22c3..85c398f6e81 100644 --- a/code/modules/vore/resizing/resize_vr.dm +++ b/code/modules/vore/resizing/resize_vr.dm @@ -61,6 +61,8 @@ GLOBAL_VAR(size_uncapped_mobs_timer) return TRUE /proc/add_to_uncapped_list(var/mob/living/L) + if(L.size_uncapped = TRUE) + return if(!GLOB.size_uncapped_mobs.len) GLOB.size_uncapped_mobs_timer = addtimer(CALLBACK(GLOBAL_PROC, .check_uncapped_list), 2 SECONDS, TIMER_LOOP | TIMER_UNIQUE | TIMER_STOPPABLE) GLOB.size_uncapped_mobs |= weakref(L)