From 9b5cb78a4070bd79b3b1bc52aff6aa4f7f8f9349 Mon Sep 17 00:00:00 2001 From: Casey Date: Thu, 18 Nov 2021 16:38:20 -0500 Subject: [PATCH 1/2] Adds vorepanel save doublecheck for non-slot chars --- code/modules/vore/eating/vorepanel_vr.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index 2cbc7a81c4..ccb6d5618b 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -379,7 +379,11 @@ return set_attr(usr, params) if("saveprefs") +<<<<<<< HEAD if(host.real_name != host.client.prefs.real_name || !ishuman(host) && !issilicon(host)) +======= + if(host.real_name != host.client.prefs.real_name || (!ishuman(host) && !issilicon(host))) +>>>>>>> f3851e19a3... Merge pull request #11820 from Verkister/patch-98 var/choice = tgui_alert(usr, "Warning: Saving your vore panel while playing what is very-likely not your normal character will overwrite whatever character you have loaded in character setup. Maybe this is your 'playing a simple mob' slot, though. Are you SURE you want to overwrite your current slot with these vore bellies?", "WARNING!", list("No, abort!", "Yes, save.")) if(choice != "Yes, save.") return TRUE From 8b61d3ca7a06d04778428299e77e6814838046bd Mon Sep 17 00:00:00 2001 From: Razgriz Date: Fri, 10 Dec 2021 01:55:43 -0700 Subject: [PATCH 2/2] powder that makes you say yes --- code/modules/vore/eating/vorepanel_vr.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index ccb6d5618b..38b1a0dedb 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -379,11 +379,7 @@ return set_attr(usr, params) if("saveprefs") -<<<<<<< HEAD - if(host.real_name != host.client.prefs.real_name || !ishuman(host) && !issilicon(host)) -======= if(host.real_name != host.client.prefs.real_name || (!ishuman(host) && !issilicon(host))) ->>>>>>> f3851e19a3... Merge pull request #11820 from Verkister/patch-98 var/choice = tgui_alert(usr, "Warning: Saving your vore panel while playing what is very-likely not your normal character will overwrite whatever character you have loaded in character setup. Maybe this is your 'playing a simple mob' slot, though. Are you SURE you want to overwrite your current slot with these vore bellies?", "WARNING!", list("No, abort!", "Yes, save.")) if(choice != "Yes, save.") return TRUE