More funshit

2021-01-20 18:23:28 +02:00
parent 3737c52df8
commit 16e0b85b44
13 changed files with 73 additions and 54 deletions
@@ -65,14 +65,14 @@ SUBSYSTEM_DEF(throwing)
 	var/last_move = 0

 /datum/thrownthing/Destroy()
+	if(HAS_TRAIT_FROM(thrownthing, TRAIT_SPOOKY_THROW, "revenant"))
+		REMOVE_TRAIT(thrownthing, TRAIT_SPOOKY_THROW, "revenant")
 	SSthrowing.processing -= thrownthing
 	thrownthing.throwing = null
 	thrownthing = null
 	target = null
 	thrower = null
 	callback = null
-	if(HAS_TRAIT(thrownthing, TRAIT_SPOOKY_THROW)
-		REMOVE_TRAIT(thrownthing, TRAIT_SPOOKY_THROW)
 	return ..()

 /datum/thrownthing/proc/tick()