From b290fdd76a993d78a7cbfb6277963b905018d8a3 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Sun, 19 May 2024 14:25:42 -0400 Subject: [PATCH] The lance now has a very clear confirmation message on it. (#25501) * The lance now has a very clear confirmation message on it. * Update code/modules/supply/supply_console.dm Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> --------- Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> --- code/modules/supply/supply_console.dm | 6 ++++-- code/modules/supply/supply_pack.dm | 2 ++ code/modules/supply/supply_packs/pack_shuttle.dm | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/modules/supply/supply_console.dm b/code/modules/supply/supply_console.dm index 83f08bcdbd8..3ff104c8892 100644 --- a/code/modules/supply/supply_console.dm +++ b/code/modules/supply/supply_console.dm @@ -275,13 +275,15 @@ if(!P.can_order()) to_chat(user, "That cannot be ordered right now. Please try again later.") return - + if(P.are_you_sure_you_want_to_be_banned) + var/we_warned_you = tgui_alert(user, "[P.are_you_sure_you_want_to_be_banned]", "ARE YOU SURE?", list("Yes", "No")) + if(!we_warned_you || we_warned_you == "No") + return if(!P.singleton && params["multiple"]) var/num_input = tgui_input_number(user, "Amount", "How many crates?", max_value = MULTIPLE_CRATE_MAX, min_value = 1) if(isnull(num_input) || (!is_public && !is_authorized(user)) || ..()) // Make sure they dont walk away return amount = clamp(round(num_input), 1, MULTIPLE_CRATE_MAX) - var/reason = tgui_input_text(user, "Reason", "Why do you require this item?", encode = FALSE, timeout = 60 SECONDS) if(!reason || (!is_public && !is_authorized(user)) || ..()) return diff --git a/code/modules/supply/supply_pack.dm b/code/modules/supply/supply_pack.dm index 3a3ce13a8ed..a9f2bcaca46 100644 --- a/code/modules/supply/supply_pack.dm +++ b/code/modules/supply/supply_pack.dm @@ -43,6 +43,8 @@ var/list/announce_beacons = list() /// List of names for being done in TGUI var/list/ui_manifest = list() + /// If this variable is filled, this grants the user a special TGUI confirmation prompt about ordering this shuttle, before they can place the order. Similar to bag of holding. + var/are_you_sure_you_want_to_be_banned /datum/supply_packs/New() . = ..() diff --git a/code/modules/supply/supply_packs/pack_shuttle.dm b/code/modules/supply/supply_packs/pack_shuttle.dm index 2425a61026b..f00ef4cccf1 100644 --- a/code/modules/supply/supply_packs/pack_shuttle.dm +++ b/code/modules/supply/supply_packs/pack_shuttle.dm @@ -106,6 +106,7 @@ cost = 5000 //please don't order this for funny please sir template = /datum/map_template/shuttle/emergency/lance speed_factor = 1.5 //Don't need to slow down before docking + are_you_sure_you_want_to_be_banned = "If you are not an antagonist, and you are ordering this shuttle for no valid reason, you will be banned, or job banned. If you are an antagonist, ahelp for permision, unless you are a hijacker, or you will be antagonist banned. If you are unsure, ahelp now." /datum/supply_packs/abstract/shuttle/lance/on_order_confirm(datum/supply_order/order) . = ..()