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

Update vorepanel_vr.dm

Browse Source
This commit is contained in:
Nadyr
2021-03-06 05:32:31 -05:00
committed by GitHub
parent 420ea64e30
commit 971ac1ff40
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/eating/vorepanel_vr.dm
-6
View File
@@ -965,7 +965,6 @@
. = TRUE
if(.)
<<<<<<< HEAD
unsaved_changes = TRUE
//CHOMPedit start: liquid belly procs
@@ -1140,8 +1139,3 @@
host.vore_selected.set_reagent_messages(new_message,"full5")
. = TRUE
//CHOMPedit end
||||||| parent of 013ff5ebd4... Merge pull request #9853 from Verkister/patch-37
unsaved_changes = TRUE
=======
unsaved_changes = TRUE
>>>>>>> 013ff5ebd4... Merge pull request #9853 from Verkister/patch-37