From fcdb3c01b5dea22fd661c046c32135f296be01d6 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Fri, 12 Feb 2021 23:03:02 -0700 Subject: [PATCH] Update belly_obj_vr.dm --- code/modules/vore/eating/belly_obj_vr.dm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index 5188cace72..69a637a027 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -162,7 +162,6 @@ "is_wet", "wet_loop", "belly_fullscreen", -<<<<<<< HEAD "disable_hud", "reagent_mode_flags", //CHOMP start of variables from CHOMP "reagentbellymode", @@ -188,13 +187,8 @@ "fullness3_messages", "fullness4_messages", "fullness5_messages", - "vorespawn_blacklist" //CHOMP end of variables from CHOMP -||||||| parent of 337c472feb... Merge pull request #9666 from Verkister/eggpanel - "disable_hud" -======= - "disable_hud", + "vorespawn_blacklist", //CHOMP end of variables from CHOMP "egg_type" ->>>>>>> 337c472feb... Merge pull request #9666 from Verkister/eggpanel ) /*These have been pulled from the above list as these were chomp edits for liquid belly stuff. This needs to be ported back in for TGUI port