From abdda91ea0ac9ef19d604a2fbef0a4a88ba9024c Mon Sep 17 00:00:00 2001
From: tralezab <spamqetuo2@gmail.com>
Date: Tue, 18 Feb 2020 19:08:53 -0800
Subject: [PATCH] ok

---
 code/game/objects/items/chrono_eraser.dm | 7 ++++++-
 code/game/objects/items/clown_items.dm   | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/items/chrono_eraser.dm b/code/game/objects/items/chrono_eraser.dm
index a2557d56879..082e02c587b 100644
--- a/code/game/objects/items/chrono_eraser.dm
+++ b/code/game/objects/items/chrono_eraser.dm
@@ -172,9 +172,12 @@
 	var/mutable_appearance/mob_underlay
 	var/preloaded = 0
 	var/RPpos = null
+	var/attached = TRUE //if the gun arg isn't included initially, then the chronofield will work without one
 
 /obj/structure/chrono_field/Initialize(mapload, mob/living/target, obj/item/gun/energy/chrono_gun/G)
-	if(target && isliving(target) && G)
+	if(target && isliving(target))
+		if(!G)
+			attached = FALSE
 		target.forceMove(src)
 		captured = target
 		var/icon/mob_snapshot = getFlatIcon(target)
@@ -234,6 +237,8 @@
 				else
 					gun = null
 					return .()
+			else if(!attached)
+				tickstokill--
 			else
 				tickstokill++
 	else
diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm
index 49406ed3ab9..91673b6fccd 100644
--- a/code/game/objects/items/clown_items.dm
+++ b/code/game/objects/items/clown_items.dm
@@ -83,7 +83,7 @@
 /obj/item/soap/omega/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is using [src] to clean themselves from the timeline! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	new /obj/structure/chrono_field(user.loc, user)
-	return
+	return MANUAL_SUICIDE
 
 /obj/item/paper/fluff/stations/soap
 	name = "ancient janitorial poem"