Revert "?"

This reverts commit c6b5bac0d8.
2020-07-04 21:39:23 -07:00
parent c6b5bac0d8
commit 45a14f16d4
871 changed files with 96125 additions and 411183 deletions
@@ -123,7 +123,9 @@
 		trauma = _trauma
 	return ..()

-/mob/living/split_personality/Life()
+/mob/living/split_personality/BiologicalLife(seconds, times_fired)
+	if(!(. = ..()))
+		return
 	if(QDELETED(body))
 		qdel(src) //in case trauma deletion doesn't already do it

@@ -132,8 +134,6 @@
 		trauma.switch_personalities()
 		qdel(trauma)

-	..()
-
 /mob/living/split_personality/Login()
 	..()
 	to_chat(src, "<span class='notice'>As a split personality, you cannot do anything but observe. However, you will eventually gain control of your body, switching places with the current personality.</span>")