From 4d9fe600ba25f51627dbbf8c3903278d7b9a5bf9 Mon Sep 17 00:00:00 2001 From: Gary Lafortune Date: Fri, 26 Jul 2019 19:17:35 -0500 Subject: [PATCH 1/4] Makes IAAs spawn with a cyanide dental implant --- .../antagonists/traitor/IAA/internal_affairs.dm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/code/modules/antagonists/traitor/IAA/internal_affairs.dm b/code/modules/antagonists/traitor/IAA/internal_affairs.dm index 20c32bfca5b3..7279f8b59d09 100644 --- a/code/modules/antagonists/traitor/IAA/internal_affairs.dm +++ b/code/modules/antagonists/traitor/IAA/internal_affairs.dm @@ -30,6 +30,15 @@ /datum/antagonist/traitor/internal_affairs/on_gain() START_PROCESSING(SSprocessing, src) + + //Gives Cyanide dental implant + var/obj/item/reagent_containers/pill/cyanide/cyan = new + owner.current.transferItemToLoc(cyan, target, TRUE) + var/datum/action/item_action/hands_free/activate_pill/P = new(cyan) + P.button.name = "Activate [cyan.name]" + P.target = cyan + P.Grant(owner.curren)//The pill never actually goes in an inventory slot, so the owner doesn't inherit actions from it + .=..() /datum/antagonist/traitor/internal_affairs/on_removal() STOP_PROCESSING(SSprocessing,src) @@ -246,6 +255,7 @@ to_chat(owner.current, "While you have a license to kill, unneeded property damage or loss of employee life will lead to your contract being terminated.") to_chat(owner.current, "For the sake of plausible deniability, you have been equipped with an array of captured Syndicate weaponry available via uplink.") + to_chat(owner.current, "If deemed necessary, you may use your cyanide-laced dental implant to ensure the secrecy of your operation.") to_chat(owner.current, "Finally, watch your back. Your target has friends in high places, and intel suggests someone may have taken out a contract of their own to protect them.") owner.announce_objectives() From 5daa60c9f8abb637c7536d72d96416096ab61935 Mon Sep 17 00:00:00 2001 From: Gary Lafortune Date: Sat, 27 Jul 2019 00:23:39 -0500 Subject: [PATCH 2/4] Makes the flavortext more assertive --- code/modules/antagonists/traitor/IAA/internal_affairs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/traitor/IAA/internal_affairs.dm b/code/modules/antagonists/traitor/IAA/internal_affairs.dm index 7279f8b59d09..5d977da22172 100644 --- a/code/modules/antagonists/traitor/IAA/internal_affairs.dm +++ b/code/modules/antagonists/traitor/IAA/internal_affairs.dm @@ -255,7 +255,7 @@ to_chat(owner.current, "While you have a license to kill, unneeded property damage or loss of employee life will lead to your contract being terminated.") to_chat(owner.current, "For the sake of plausible deniability, you have been equipped with an array of captured Syndicate weaponry available via uplink.") - to_chat(owner.current, "If deemed necessary, you may use your cyanide-laced dental implant to ensure the secrecy of your operation.") + to_chat(owner.current, "If your secrecy is compromised, you must use your cyanide-laced dental implant to ensure the secrecy of this operation.") to_chat(owner.current, "Finally, watch your back. Your target has friends in high places, and intel suggests someone may have taken out a contract of their own to protect them.") owner.announce_objectives() From 159daa9fb96d312db2fa704cefbffeed69cc67d2 Mon Sep 17 00:00:00 2001 From: Gary Lafortune Date: Sat, 27 Jul 2019 07:20:57 -0500 Subject: [PATCH 3/4] Does the Ling and Asv9's code reviews --- code/modules/antagonists/traitor/IAA/internal_affairs.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/antagonists/traitor/IAA/internal_affairs.dm b/code/modules/antagonists/traitor/IAA/internal_affairs.dm index 5d977da22172..28aa2974ae5d 100644 --- a/code/modules/antagonists/traitor/IAA/internal_affairs.dm +++ b/code/modules/antagonists/traitor/IAA/internal_affairs.dm @@ -33,11 +33,11 @@ //Gives Cyanide dental implant var/obj/item/reagent_containers/pill/cyanide/cyan = new - owner.current.transferItemToLoc(cyan, target, TRUE) + owner.current.transferItemToLoc(cyan, owner, TRUE) var/datum/action/item_action/hands_free/activate_pill/P = new(cyan) P.button.name = "Activate [cyan.name]" P.target = cyan - P.Grant(owner.curren)//The pill never actually goes in an inventory slot, so the owner doesn't inherit actions from it + P.Grant(owner.current)//The pill never actually goes in an inventory slot, so the owner doesn't inherit actions from it .=..() /datum/antagonist/traitor/internal_affairs/on_removal() From f64b30f4fceb5373fc1466ec86b8d05cefab31ac Mon Sep 17 00:00:00 2001 From: Gary Lafortune Date: Sat, 27 Jul 2019 07:21:24 -0500 Subject: [PATCH 4/4] Makes using the cyanide pill not actually mandatory --- code/modules/antagonists/traitor/IAA/internal_affairs.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/antagonists/traitor/IAA/internal_affairs.dm b/code/modules/antagonists/traitor/IAA/internal_affairs.dm index 28aa2974ae5d..f4b7f0ca0fe4 100644 --- a/code/modules/antagonists/traitor/IAA/internal_affairs.dm +++ b/code/modules/antagonists/traitor/IAA/internal_affairs.dm @@ -255,7 +255,6 @@ to_chat(owner.current, "While you have a license to kill, unneeded property damage or loss of employee life will lead to your contract being terminated.") to_chat(owner.current, "For the sake of plausible deniability, you have been equipped with an array of captured Syndicate weaponry available via uplink.") - to_chat(owner.current, "If your secrecy is compromised, you must use your cyanide-laced dental implant to ensure the secrecy of this operation.") to_chat(owner.current, "Finally, watch your back. Your target has friends in high places, and intel suggests someone may have taken out a contract of their own to protect them.") owner.announce_objectives()