cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-28 07:39:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update belly_obj_vr.dm

Browse Source
This commit is contained in:
Razgriz
2021-02-12 23:03:02 -07:00
committed by GitHub
parent a4c3583309
commit fcdb3c01b5
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/eating/belly_obj_vr.dm
+1 -7
View File
@@ -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