diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index f709232afe9..4b941823595 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -1208,7 +1208,7 @@ return if(href_list[VV_HK_DEADCHAT_PLAYS] && check_rights(R_FUN)) - if(tgui_alert(usr, "Allow deadchat to control [src] via chat commands?", "Deadchat Plays [src]", list("Allow", "Cancel")) == "Cancel") + if(tgui_alert(usr, "Allow deadchat to control [src] via chat commands?", "Deadchat Plays [src]", list("Allow", "Cancel")) != "Allow") return // Alert is async, so quick sanity check to make sure we should still be doing this. diff --git a/code/game/machinery/computer/launchpad_control.dm b/code/game/machinery/computer/launchpad_control.dm index b987204b19b..1762d574593 100644 --- a/code/game/machinery/computer/launchpad_control.dm +++ b/code/game/machinery/computer/launchpad_control.dm @@ -221,7 +221,7 @@ return current_pad.display_name = new_name if("remove") - if(usr && tgui_alert(usr, "Are you sure?", "Unlink Launchpad", list("I'm Sure", "Abort")) != "Abort") + if(usr && tgui_alert(usr, "Are you sure?", "Unlink Launchpad", list("I'm Sure", "Abort")) == "I'm Sure") launchpads -= current_pad selected_id = null . = TRUE diff --git a/code/game/machinery/computer/mechlaunchpad.dm b/code/game/machinery/computer/mechlaunchpad.dm index 817492eefe7..53a8dcbfaaa 100644 --- a/code/game/machinery/computer/mechlaunchpad.dm +++ b/code/game/machinery/computer/mechlaunchpad.dm @@ -154,7 +154,7 @@ return current_pad.display_name = new_name if("remove") - if(usr && tgui_alert(usr, "Are you sure?", "Unlink Orbital Pad", list("I'm Sure", "Abort")) != "Abort") + if(usr && tgui_alert(usr, "Are you sure?", "Unlink Orbital Pad", list("I'm Sure", "Abort")) == "I'm Sure") mechpads -= current_pad LAZYREMOVE(current_pad.consoles, src) selected_id = null diff --git a/code/game/machinery/launch_pad.dm b/code/game/machinery/launch_pad.dm index f7d29f2fafb..c799dfdf158 100644 --- a/code/game/machinery/launch_pad.dm +++ b/code/game/machinery/launch_pad.dm @@ -385,7 +385,7 @@ our_pad.display_name = new_name if("remove") . = TRUE - if(usr && tgui_alert(usr, "Are you sure?", "Unlink Launchpad", list("I'm Sure", "Abort")) != "Abort") + if(usr && tgui_alert(usr, "Are you sure?", "Unlink Launchpad", list("I'm Sure", "Abort")) == "I'm Sure") our_pad = null if("launch") sending = TRUE diff --git a/tgui/packages/tgui/interfaces/AlertModal.js b/tgui/packages/tgui/interfaces/AlertModal.js index 21ede6acf97..9570dbf976d 100644 --- a/tgui/packages/tgui/interfaces/AlertModal.js +++ b/tgui/packages/tgui/interfaces/AlertModal.js @@ -71,8 +71,7 @@ export class AlertModal extends Component { 0}> + height={150}> {timeout && }