From 249248669558a51f1e34c8b7ee54b3b9911d8a3f Mon Sep 17 00:00:00 2001 From: Chompstation Bot Date: Thu, 8 Apr 2021 16:29:57 +0000 Subject: [PATCH 1/2] Fix missing resize pref copy, move resize define --- code/modules/mob/living/living_defines_vr.dm | 5 ++++ code/modules/vore/eating/living_vr.dm | 9 ++++-- code/modules/vore/eating/vore_vr.dm | 30 ++++++++++++++------ 3 files changed, 32 insertions(+), 12 deletions(-) diff --git a/code/modules/mob/living/living_defines_vr.dm b/code/modules/mob/living/living_defines_vr.dm index 6964193c5c..e4c517730d 100644 --- a/code/modules/mob/living/living_defines_vr.dm +++ b/code/modules/mob/living/living_defines_vr.dm @@ -5,9 +5,14 @@ var/ooc_notes = null appearance_flags = TILE_BOUND|PIXEL_SCALE|KEEP_TOGETHER var/hunger_rate = DEFAULT_HUNGER_FACTOR +<<<<<<< HEAD var/resizable = TRUE var/size_uncapped = FALSE //Determines if a mob's size obedies the resize cap, used for adminbus resize. +||||||| parent of 867ad3c601... Merge pull request #10101 from VOREStation/Arokha/prefbits + var/resizable = TRUE +======= +>>>>>>> 867ad3c601... Merge pull request #10101 from VOREStation/Arokha/prefbits //custom say verbs var/custom_say = null var/custom_ask = null diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 358856cd58..6a5e7b47e6 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -3,7 +3,8 @@ var/digestable = TRUE // Can the mob be digested inside a belly? var/devourable = TRUE // Can the mob be devoured at all? var/feeding = TRUE // Can the mob be vorishly force fed or fed to others? - var/absorbable = TRUE // Are you allowed to absorb this person? TFF addition 14/12/19 + var/absorbable = TRUE // Are you allowed to absorb this person? + var/resizable = TRUE // Can other people resize you? (Usually ignored for self-resizes) var/digest_leave_remains = FALSE // Will this mob leave bones/skull/etc after the melty demise? var/allowmobvore = TRUE // Will simplemobs attempt to eat the mob? var/showvoreprefs = TRUE // Determines if the mechanical vore preferences button will be displayed on the mob or not. @@ -228,7 +229,8 @@ P.digestable = src.digestable P.devourable = src.devourable P.feeding = src.feeding - P.absorbable = src.absorbable //TFF 14/12/19 - choose whether allowing absorbing + P.absorbable = src.absorbable + P.resizable = src.resizable P.digest_leave_remains = src.digest_leave_remains P.allowmobvore = src.allowmobvore P.vore_taste = src.vore_taste @@ -269,7 +271,8 @@ digestable = P.digestable devourable = P.devourable feeding = P.feeding - absorbable = P.absorbable //TFF 14/12/19 - choose whether allowing absorbing + absorbable = P.absorbable + resizable = P.resizable digest_leave_remains = P.digest_leave_remains allowmobvore = P.allowmobvore vore_taste = P.vore_taste diff --git a/code/modules/vore/eating/vore_vr.dm b/code/modules/vore/eating/vore_vr.dm index 5a69bc9dc9..e64bcebbdf 100644 --- a/code/modules/vore/eating/vore_vr.dm +++ b/code/modules/vore/eating/vore_vr.dm @@ -45,20 +45,25 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE //Actual preferences var/digestable = TRUE var/devourable = TRUE +<<<<<<< HEAD +||||||| parent of 867ad3c601... Merge pull request #10101 from VOREStation/Arokha/prefbits + var/resizable = TRUE +======= + var/absorbable = TRUE +>>>>>>> 867ad3c601... Merge pull request #10101 from VOREStation/Arokha/prefbits var/feeding = TRUE - var/absorbable = TRUE //TFF 14/12/19 - choose whether allowing absorbing - var/digest_leave_remains = FALSE - var/allowmobvore = TRUE - var/list/belly_prefs = list() - var/vore_taste = "nothing in particular" - var/vore_smell = "nothing in particular" - var/permit_healbelly = TRUE - var/show_vore_fx = TRUE var/can_be_drop_prey = FALSE var/can_be_drop_pred = FALSE + var/digest_leave_remains = FALSE + var/allowmobvore = TRUE + var/permit_healbelly = TRUE + + var/resizable = TRUE + var/show_vore_fx = TRUE var/step_mechanics_pref = FALSE var/pickup_pref = TRUE +<<<<<<< HEAD //CHOMP stuff var/receive_reagents = FALSE @@ -66,6 +71,13 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE var/latejoin_vore = FALSE +||||||| parent of 867ad3c601... Merge pull request #10101 from VOREStation/Arokha/prefbits +======= + var/list/belly_prefs = list() + var/vore_taste = "nothing in particular" + var/vore_smell = "nothing in particular" + +>>>>>>> 867ad3c601... Merge pull request #10101 from VOREStation/Arokha/prefbits //Mechanically required var/path var/slot @@ -130,7 +142,7 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE digestable = json_from_file["digestable"] devourable = json_from_file["devourable"] feeding = json_from_file["feeding"] - absorbable = json_from_file["absorbable"] //TFF 14/12/19 - choose whether allowing absorbing + absorbable = json_from_file["absorbable"] digest_leave_remains = json_from_file["digest_leave_remains"] allowmobvore = json_from_file["allowmobvore"] vore_taste = json_from_file["vore_taste"] From 8ae34f69de8cc64a4d24b28993b0bd86cffef6b8 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Sun, 11 Apr 2021 04:24:31 -0400 Subject: [PATCH 2/2] Update vore_vr.dm --- code/modules/vore/eating/vore_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vore/eating/vore_vr.dm b/code/modules/vore/eating/vore_vr.dm index 88ae8a5c3b..ba5938f336 100644 --- a/code/modules/vore/eating/vore_vr.dm +++ b/code/modules/vore/eating/vore_vr.dm @@ -46,7 +46,7 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE var/digestable = TRUE var/devourable = TRUE var/absorbable = TRUE - var/resizable = TRUE + var/feeding = TRUE var/can_be_drop_prey = FALSE var/can_be_drop_pred = FALSE var/digest_leave_remains = FALSE