diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm
index b1792a5a6b3..e5b3488e6d3 100644
--- a/code/game/machinery/bots/ed209bot.dm
+++ b/code/game/machinery/bots/ed209bot.dm
@@ -231,8 +231,6 @@ Auto Patrol: []"},
continue
if (istype(C, /mob/living/carbon/human))
threatlevel = src.assess_perp(C)
- else if ((istype(C, /mob/living/carbon/monkey)) && (C.client) && (ticker.mode.name == "monkey"))
- threatlevel = 4
//src.speak(C.real_name + text(": threat: []", threatlevel))
if (threatlevel < 4 )
continue
@@ -638,8 +636,6 @@ Auto Patrol: []"},
if (istype(C, /mob/living/carbon/human))
src.threatlevel = src.assess_perp(C)
- else if ((istype(C, /mob/living/carbon/monkey)) && (C.client) && (ticker.mode.name == "monkey"))
- src.threatlevel = 4
if (!src.threatlevel)
continue
diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm
index 9e72fb08979..c0fb82d88eb 100644
--- a/code/game/machinery/igniter.dm
+++ b/code/game/machinery/igniter.dm
@@ -14,9 +14,7 @@
return src.attack_hand(user)
/obj/machinery/igniter/attack_paw(mob/user as mob)
- if ((ticker && ticker.mode.name == "monkey"))
- return src.attack_hand(user)
- return
+ return src.attack_hand(user)
/obj/machinery/igniter/attack_hand(mob/user as mob)
if(..())
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index db84ff75a83..2b366c473f2 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -204,7 +204,7 @@ Class Procs:
return 1
if(usr.restrained() || usr.lying || usr.stat)
return 1
- if(!(ishuman(usr) || issilicon(usr) || (ismonkey(usr) && ticker && ticker.mode.name == "monkey")))
+ if(!(ishuman(usr) || issilicon(usr)))
usr << "You don't have the dexterity to do this!"
return 1
@@ -245,7 +245,7 @@ Class Procs:
return 1
if ( ! (istype(usr, /mob/living/carbon/human) || \
istype(usr, /mob/living/silicon) || \
- istype(usr, /mob/living/carbon/monkey) && ticker && ticker.mode.name == "monkey") )
+ istype(usr, /mob/living/carbon/monkey)) )
usr << "You don't have the dexterity to do this!"
return 1
/*
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index d377e3a3190..3c5ba610865 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -27,7 +27,7 @@
if ( ! (istype(user, /mob/living/carbon/human) || \
istype(user, /mob/living/silicon) || \
- istype(user, /mob/living/carbon/monkey) && ticker && ticker.mode.name == "monkey") )
+ istype(user, /mob/living/carbon/monkey)) )
user << "\red You don't have the dexterity to do this!"
return 1
diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm
index e93425f412b..dfea7361533 100644
--- a/code/modules/mob/living/carbon/monkey/monkey.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey.dm
@@ -370,7 +370,5 @@
/mob/living/carbon/monkey/IsAdvancedToolUser()//Unless its monkey mode monkeys cant use advanced tools
- if(!ticker) return 0
- if(!ticker.mode.name == "monkey") return 0
- return 1
+ return 0
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 603b4a7e060..9735c4fbaa4 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -353,7 +353,7 @@
update_overlay |= APC_UPOVERLAY_ENVIRON1
else if(environ==2)
update_overlay |= APC_UPOVERLAY_ENVIRON2
-
+
var/results = 0
if(last_update_state == update_state && last_update_overlay == update_overlay)
@@ -773,7 +773,7 @@
return 0
if ( ! (istype(user, /mob/living/carbon/human) || \
istype(user, /mob/living/silicon) || \
- istype(user, /mob/living/carbon/monkey) /*&& ticker && ticker.mode.name == "monkey"*/) )
+ istype(user, /mob/living/carbon/monkey)) )
user << "\red You don't have the dexterity to use this [src]!"
return 0
if(user.restrained())