From bdfcc014f79456e0b2370f99a696ea5b42ed8a45 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Sun, 24 Jan 2021 17:43:25 +0100 Subject: [PATCH] Adding reset owner feature and modulus operandi ala cadyn --- code/game/objects/items/sahoc_ch.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/sahoc_ch.dm b/code/game/objects/items/sahoc_ch.dm index 73cf1b7540..69674eb59b 100644 --- a/code/game/objects/items/sahoc_ch.dm +++ b/code/game/objects/items/sahoc_ch.dm @@ -35,11 +35,11 @@ attackby(obj/item/W, mob/user) if(istype(W, /obj/item/weapon/pen)) - colorindex += 1 - if(colorindex >= 6) - colorindex = 0 + colorindex = (colorindex + 1) % 6 icon_state = "mobcap[colorindex]" update_icon() + if(istype(W, /obj/item/weapon/card/id)) + capsuleowner = null ..() /obj/item/device/buttonofnormal/proc/nonrandom() //Secret ball randmoizer rig code @@ -146,4 +146,4 @@ H.resize(chaos/100) H.updateicon() else - return 1 \ No newline at end of file + return 1