From 8b47786556bd5abae25494da41fd42fd8bdac69d Mon Sep 17 00:00:00 2001 From: Blue Wildrose Date: Tue, 13 Apr 2021 00:53:55 -0700 Subject: [PATCH] Pirate stuff and comm console fixes --- .../game/machinery/computer/communications.dm | 16 +++++++++++++--- code/modules/events/pirates.dm | 4 +++- icons/obj/machines/dominator.dmi | Bin 8394 -> 9182 bytes .../tgui/interfaces/CommunicationsConsole.js | 4 ++-- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 34528960b8..048247c630 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -102,8 +102,14 @@ if ("answerMessage") if (!authenticated(usr)) return - var/answer_index = text2num(params["answer"]) - var/message_index = text2num(params["message"]) + var/answer_index = params["answer"] + var/message_index = params["message"] + + // If either of these aren't numbers, then bad voodoo. + if(!isnum(answer_index) || !isnum(message_index)) + message_admins("[ADMIN_LOOKUPFLW(usr)] provided an invalid index type when replying to a message on [src] [ADMIN_JMP(src)]. This should not happen. Please check with a maintainer and/or consult tgui logs.") + CRASH("Non-numeric index provided when answering comms console message.") + if (!answer_index || !message_index || answer_index < 1 || message_index < 1) return var/datum/comm_message/message = messages[message_index] @@ -156,7 +162,11 @@ if ("deleteMessage") if (!authenticated(usr)) return - var/message_index = text2num(params["message"]) + var/message_index = params["message"] + + if(!isnum(message_index)) + message_admins("[ADMIN_LOOKUPFLW(usr)] provided an invalid index type when deleting a message on [src] [ADMIN_JMP(src)]. This should not happen. Please check with a maintainer and/or consult tgui logs.") + CRASH("Non-numeric index provided when deleting comms console message.") if (!message_index) return LAZYREMOVE(messages, LAZYACCESS(messages, message_index)) diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm index c55413f52e..d07f426bb0 100644 --- a/code/modules/events/pirates.dm +++ b/code/modules/events/pirates.dm @@ -66,7 +66,7 @@ SScommunications.send_message(threat_msg,unique = TRUE) /datum/round_event/pirates/proc/answered() - if(threat_msg && threat_msg.answered == 1) + if(threat_msg?.answered == 1) var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR) if(D) if(D.adjust_money(-payoff)) @@ -75,6 +75,8 @@ return else priority_announce("Trying to cheat us? You'll regret this!",sender_override = ship_name) + else if(threat_msg?.answered == 2) + priority_announce("You won't pay? Fine then, we'll take those credits by force!",sender_override = ship_name) if(!shuttle_spawned) spawn_shuttle() else diff --git a/icons/obj/machines/dominator.dmi b/icons/obj/machines/dominator.dmi index 3718fc4f837c35cea7bffafbbf004a7e44c86bb3..1b4622f1fb6b96746ad87549b00cb0b72c36ebbe 100644 GIT binary patch literal 9182 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 Z87-x7K0;X*{Br`JrKYD^df)ct{{WvtqZ$AJ diff --git a/tgui/packages/tgui/interfaces/CommunicationsConsole.js b/tgui/packages/tgui/interfaces/CommunicationsConsole.js index 958111bd7f..a9b07a8f36 100644 --- a/tgui/packages/tgui/interfaces/CommunicationsConsole.js +++ b/tgui/packages/tgui/interfaces/CommunicationsConsole.js @@ -641,7 +641,7 @@ export const PageMessages = (props, context) => { color={message.answered === answerIndex + 1 ? "good" : undefined} key={answerIndex} onClick={message.answered ? undefined : () => act("answerMessage", { - message: messageIndex + 1, + message: parseInt(messageIndex, 10) + 1, answer: answerIndex + 1, })} /> @@ -664,7 +664,7 @@ export const PageMessages = (props, context) => { content="Delete" color="red" onClick={() => act("deleteMessage", { - message: messageIndex + 1, + message: parseInt(messageIndex, 10) + 1, })} /> )}>