From e414b036abd068f07f98ee3078cc4820ab77d37a Mon Sep 17 00:00:00 2001 From: Razgriz Date: Mon, 1 Feb 2021 18:45:13 -0700 Subject: [PATCH] Fix conflict and adds chomp comments to vorespawn_blacklist --- code/modules/vore/eating/vorepanel_vr.dm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index 0e4f392091..0b902e82bc 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -158,7 +158,7 @@ "belly_fullscreen" = selected.belly_fullscreen, "possible_fullscreens" = icon_states('icons/mob/screen_full_vore.dmi'), "vorespawn_blacklist" = selected.vorespawn_blacklist - ) + ) //CHOMP Addition: vorespawn blacklist data["selected"]["addons"] = list() for(var/flag_name in selected.mode_flag_list) @@ -929,16 +929,11 @@ qdel(host.vore_selected) host.vore_selected = host.vore_organs[1] . = TRUE -<<<<<<< HEAD - if("b_vorespawn_blacklist") + + if("b_vorespawn_blacklist") //CHOMP Addition host.vore_selected.vorespawn_blacklist = !host.vore_selected.vorespawn_blacklist . = TRUE -||||||| parent of 5dd99a1257... Merge pull request #9622 from Verkister/eastercameearly - -======= - ->>>>>>> 5dd99a1257... Merge pull request #9622 from Verkister/eastercameearly if(.) unsaved_changes = TRUE @@ -1113,4 +1108,4 @@ if(new_message) host.vore_selected.set_reagent_messages(new_message,"full5") . = TRUE -//CHOMPedit end \ No newline at end of file +//CHOMPedit end