diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 361719c78d..c267f9fb7d 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -16325,7 +16325,7 @@ /obj/docking_port/stationary{ dwidth = 1; height = 4; - id = "pod4_away"; + id = "pod_4_away"; name = "recovery ship"; width = 3 }, @@ -16335,7 +16335,7 @@ /obj/docking_port/stationary{ dwidth = 1; height = 4; - id = "pod3_away"; + id = "pod_3_away"; name = "recovery ship"; width = 3 }, @@ -16485,7 +16485,7 @@ dir = 4; dwidth = 1; height = 4; - id = "pod2_away"; + id = "pod_2_away"; name = "recovery ship"; width = 3 }, 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/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index 6b5e24089d..00df078d0b 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -67,6 +67,9 @@ to_chat(user, "You put [I] in [src].") update_icon() +/obj/structure/tank_dispenser/attack_robot(mob/user) + return _try_interact(user) + /obj/structure/tank_dispenser/ui_state(mob/user) return GLOB.physical_state diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm index 0dc4ea1b02..388a4fdac0 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/html/changelog.html b/html/changelog.html index 87e11098e1..061437dcb9 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -5,7 +5,7 @@ + + @@ -24,7 +24,7 @@
Traditional Games Space Station 13
- +

Forum | Wiki | Source

@@ -42,11 +42,11 @@
@@ -55,6 +55,14 @@ +

BlueWildrose updated:

+ +

skodai updated:

+

14 April 2021

Hatterhat updated:

diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index f1c564688f..d2be2f4697 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -29614,3 +29614,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. 2021-04-15: SandPoot: - bugfix: You can do interactions on mobs lacking a mind again. + BlueWildrose: + - bugfix: Fixed escape pods not docking at Centcom + skodai: + - imageadd: Resprited the icons for the sushi, onigiri, tuna can and sea weed. diff --git a/html/changelogs/AutoChangeLog-pr-14602.yml b/html/changelogs/AutoChangeLog-pr-14602.yml new file mode 100644 index 0000000000..ae6198a537 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14602.yml @@ -0,0 +1,7 @@ +author: "BlueWildrose" +delete-after: True +changes: + - bugfix: "(TGport-Timberpoes) You can once again pay off the pirate event from the communications console without it silently failing for no obvious reason." + - bugfix: "Fixed being unable to delete messages from the communication consoles message list save for the one on the bottom." + - bugfix: "The data siphon that the space pirates have will no longer go invisible when it begins siphoning." + - bugfix: "If the space pirate's \"offer\" has been rejected, there is now announcement feedback for if this does happen." diff --git a/html/changelogs/AutoChangeLog-pr-14605.yml b/html/changelogs/AutoChangeLog-pr-14605.yml new file mode 100644 index 0000000000..301311673e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14605.yml @@ -0,0 +1,4 @@ +author: "DeltaFire15" +delete-after: True +changes: + - bugfix: "Borgs can now use tank dispensers (again?)" diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index bb426aed20..15afa25006 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ diff --git a/icons/obj/machines/dominator.dmi b/icons/obj/machines/dominator.dmi index 3718fc4f83..1b4622f1fb 100644 Binary files a/icons/obj/machines/dominator.dmi and b/icons/obj/machines/dominator.dmi differ 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, })} /> )}>