diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index f8b62099442..e49f6782062 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -35,6 +35,7 @@
 	minbodytemp = 0
 	has_unlimited_silicon_privilege = 1
 	sentience_type = SENTIENCE_ARTIFICIAL
+	status_flags = NONE //no default canpush
 
 	var/obj/machinery/bot_core/bot_core = null
 	var/bot_core_type = /obj/machinery/bot_core
@@ -660,10 +661,6 @@ Pass a positive integer as an argument to override a bot's default speed.
 		if(D.check_access(access_card))
 			D.open()
 			frustration = 0
-	else if((istype(M, /mob/living/)) && (!anchored))
-		var/mob/living/Mb = M
-		loc = Mb.loc
-		frustration = 0
 
 /mob/living/simple_animal/bot/proc/show_controls(mob/M)
 	users |= M
@@ -727,7 +724,6 @@ Pass a positive integer as an argument to override a bot's default speed.
 // Machinery to simplify topic and access calls
 /obj/machinery/bot_core
 	use_power = 0
-	interact_offline = 1 //DEBUG
 	var/mob/living/simple_animal/bot/owner = null
 
 /obj/machinery/bot_core/New(loc)
diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
index 9fbf47d1509..925ffbfbe14 100644
--- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
@@ -135,6 +135,7 @@ Auto Patrol[]"},
 	switch(href_list["operation"])
 		if ("idcheck")
 			idcheck = !idcheck
+			update_controls()
 		if("weaponscheck")
 			weaponscheck = !weaponscheck
 			update_controls()
@@ -500,14 +501,11 @@ Auto Patrol[]"},
 	else
 		..(Proj)
 
-/mob/living/simple_animal/bot/ed209/bluetag/New()//If desired, you spawn red and bluetag bots easily
-	new /mob/living/simple_animal/bot/ed209(get_turf(src),null,"b")
-	qdel(src)
+/mob/living/simple_animal/bot/ed209/bluetag
+	lasercolor = "b"
 
-
-/mob/living/simple_animal/bot/ed209/redtag/New()
-	new /mob/living/simple_animal/bot/ed209(get_turf(src),null,"r")
-	qdel(src)
+/mob/living/simple_animal/bot/ed209/redtag
+	lasercolor = "r"
 
 /mob/living/simple_animal/bot/ed209/UnarmedAttack(atom/A)
 	if(iscarbon(A))
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index d49073e4bcf..0f8b9849e76 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -4,11 +4,12 @@
 	icon = 'icons/obj/aibots.dmi'
 	icon_state = "secbot0"
 	layer = 5
-	density = 1
+	density = 0
 	anchored = 0
 	health = 25
 	maxHealth = 25
 	damage_coeff = list(BRUTE = 0.5, BURN = 0.7, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
+	pass_flags = PASSMOB
 
 	radio_key = /obj/item/device/encryptionkey/headset_sec
 	radio_channel = "Security" //Security channel
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index e53304b5381..4773aafbce5 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -280,6 +280,10 @@
 	if(damage_coeff[BURN])
 		adjustBruteLoss(amount*damage_coeff[BURN])
 
+/mob/living/simple_animal/adjustOxyLoss(amount)
+	if(damage_coeff[OXY])
+		adjustBruteLoss(amount*damage_coeff[OXY])
+
 /mob/living/simple_animal/adjustToxLoss(amount)
 	if(damage_coeff[TOX])
 		..(amount*damage_coeff[TOX])
@@ -508,4 +512,4 @@
 	if(nest)
 		nest.spawned_mobs -= src
 	nest = null
-	return ..()
+	return ..()