From 72ddaa2ded52206ce6812b05fe810023eb7c04b2 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Tue, 4 Feb 2020 23:56:27 -0700
Subject: [PATCH] Update swimming.dm

---
 code/datums/elements/swimming.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/datums/elements/swimming.dm b/code/datums/elements/swimming.dm
index eeabc465ed..62a1f1840d 100644
--- a/code/datums/elements/swimming.dm
+++ b/code/datums/elements/swimming.dm
@@ -3,10 +3,10 @@
 	element_flags = ELEMENT_DETACH
 
 /datum/element/swimming/Attach(datum/target)
-	if(!isliving(target))
-		return ELEMENT_INCOMPATIBLE
 	if((. = ..()) == ELEMENT_INCOMPATIBLE)
 		return
+	if(!isliving(target))
+		return ELEMENT_INCOMPATIBLE
 	RegisterSignal(target, COMSIG_IS_SWIMMING, .proc/is_swimming)
 	RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/check_valid)