From bb464d3b16d2972a4878f0169199c892acbe5fdf Mon Sep 17 00:00:00 2001 From: Theos Date: Sun, 15 Aug 2021 09:15:46 -0400 Subject: [PATCH 1/3] fix the mindslave arrow not mindslaving --- code/game/objects/items/storage/uplink_kits.dm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index 163550862f7a..09d3e708a448 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -222,21 +222,20 @@ new /obj/item/slimecross/stabilized/green(src) //secret identity /obj/item/stand_arrow/boss - desc = "An arrow that can unleash massive potential from those stabbed by it. It has been laced with syndicate mindslave nanites." + desc = "An arrow that can unleash massive potential from those stabbed by it. It has been laced with syndicate mindslave nanites that will be linked to whoever first uses it in their hand." kill_chance = 0 arrowtype = "tech" var/datum/mind/owner can_requiem = FALSE - -/obj/item/stand_arrow/boss/Initialize() - . = ..() - for(var/mob/living/M in range(0,src)) //this is probably a bad way of doing this help - if(M?.mind?.has_antag_datum(/datum/antagonist/traitor)) //don't think I have a better way of checking - owner = M.mind +/obj/item/arrow/boss/attack_self(mob/user) + if(owner || !user.mind) + return + to_chat(user, You prick your finger on the arrow, linking the mindslave nanites to you!") + owner = user.mind /obj/item/stand_arrow/boss/attack(mob/living/M, mob/living/user) - if(owner?.current && owner.current == user && owner.current == M) //you have a holoparasite injector for this exact purpose + if(owner && owner.current == M && user == M) //you have a holoparasite injector for this exact purpose to_chat(M, "Implanting yourself with mindslave nanites is probably a bad idea...") return . = ..() From 4a1fcf9715c1c84d9b05d3ee7817b02ce76cc98f Mon Sep 17 00:00:00 2001 From: Theos Date: Sun, 15 Aug 2021 09:20:46 -0400 Subject: [PATCH 2/3] Update uplink_kits.dm --- code/game/objects/items/storage/uplink_kits.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index 09d3e708a448..9a16982fa653 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -231,7 +231,7 @@ /obj/item/arrow/boss/attack_self(mob/user) if(owner || !user.mind) return - to_chat(user, You prick your finger on the arrow, linking the mindslave nanites to you!") + to_chat(user, "You prick your finger on the arrow, linking the mindslave nanites to you!") owner = user.mind /obj/item/stand_arrow/boss/attack(mob/living/M, mob/living/user) From 70ea18c1e1dd0150a3baa2db02210e5fa14575d0 Mon Sep 17 00:00:00 2001 From: Theos Date: Sun, 15 Aug 2021 10:22:25 -0400 Subject: [PATCH 3/3] Update uplink_kits.dm --- code/game/objects/items/storage/uplink_kits.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index 9a16982fa653..c3686db75b4f 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -228,7 +228,7 @@ var/datum/mind/owner can_requiem = FALSE -/obj/item/arrow/boss/attack_self(mob/user) +/obj/item/stand_arrow/boss/attack_self(mob/user) if(owner || !user.mind) return to_chat(user, "You prick your finger on the arrow, linking the mindslave nanites to you!")