diff --git a/code/game/objects/items/implants/implant.dm b/code/game/objects/items/implants/implant.dm
index 482cfb0d8e..5cb59d7087 100644
--- a/code/game/objects/items/implants/implant.dm
+++ b/code/game/objects/items/implants/implant.dm
@@ -4,7 +4,7 @@
icon_state = "generic" //Shows up as the action button icon
actions_types = list(/datum/action/item_action/hands_free/activate)
var/activated = TRUE //1 for implant types that can be activated, 0 for ones that are "always on" like mindshield implants
- var/mob/living/imp_in = null
+ var/mob/living/carbon/imp_in = null //It's not like simplemobs or silicons can use implants anyway.
item_color = "b"
var/allow_multiple = FALSE
var/uses = -1
diff --git a/code/game/objects/items/implants/implant_misc.dm b/code/game/objects/items/implants/implant_misc.dm
index d600ccf879..45f2c9d42d 100644
--- a/code/game/objects/items/implants/implant_misc.dm
+++ b/code/game/objects/items/implants/implant_misc.dm
@@ -40,12 +40,16 @@
imp_in.SetUnconscious(0)
imp_in.adjustStaminaLoss(-150)
imp_in.stuttering = 0
+ imp_in.updatehealth()
+ imp_in.update_stamina()
imp_in.resting = 0
+ imp_in.lying = 0
imp_in.update_canmove()
imp_in.reagents.add_reagent("synaptizine", 10)
imp_in.reagents.add_reagent("omnizine", 10)
imp_in.reagents.add_reagent("stimulants", 10)
+
if(!uses)
qdel(src)
diff --git a/code/modules/antagonists/changeling/powers/adrenaline.dm b/code/modules/antagonists/changeling/powers/adrenaline.dm
index a015158fcf..2d34115575 100644
--- a/code/modules/antagonists/changeling/powers/adrenaline.dm
+++ b/code/modules/antagonists/changeling/powers/adrenaline.dm
@@ -11,7 +11,7 @@
action_background_icon_state = "bg_ling"
//Recover from stuns.
-/obj/effect/proc_holder/changeling/adrenaline/sting_action(mob/living/user)
+/obj/effect/proc_holder/changeling/adrenaline/sting_action(mob/living/carbon/user)
to_chat(user, "Energy rushes through us.[user.lying ? " We arise." : ""]")
user.SetSleeping(0)
user.SetUnconscious(0)
@@ -21,7 +21,11 @@
user.reagents.add_reagent("changelinghaste", 2) //For a really quick burst of speed
user.adjustStaminaLoss(-150)
user.stuttering = 0
+ user.updatehealth()
+ user.update_stamina()
user.resting = 0
+ user.lying = 0
user.update_canmove()
+
return TRUE
diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm
index 02e11ca8b3..d7a04d175d 100644
--- a/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm
+++ b/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm
@@ -10,7 +10,10 @@
H.SetUnconscious(0)
H.adjustStaminaLoss(-150)
H.stuttering = 0
+ H.updatehealth()
+ H.update_stamina()
H.resting = 0
+ H.lying = 0
H.update_canmove()
H.reagents.add_reagent("synaptizine", 10)
@@ -18,6 +21,7 @@
H.reagents.add_reagent("stimulants", 10)
H.say(pick("A CORNERED FOX IS MORE DANGEROUS THAN A JACKAL!","HURT ME MOOORRREEE!","IMPRESSIVE!"), forced = "ninjaboost")
+
a_boost--
to_chat(H, "There are [a_boost] adrenaline boosts remaining.")
s_coold = 3
diff --git a/tgstation.dme b/tgstation.dme
index 5b4c4eabe5..dab8da2846 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -9,7 +9,6 @@
// END_FILE_DIR
// BEGIN_PREFERENCES
-#define DEBUG
// END_PREFERENCES
// BEGIN_INCLUDE