diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm
index 86d7b5ac00d..8cbe56b2d3b 100644
--- a/code/game/machinery/alarm.dm
+++ b/code/game/machinery/alarm.dm
@@ -607,9 +607,6 @@
src.add_hiddenprint(user)
return ui_interact(user)
-/obj/machinery/alarm/attack_robot(mob/user)
- return attack_ai(user)
-
/obj/machinery/alarm/attack_ghost(user as mob)
if(stat & (BROKEN|MAINT))
return
diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm
index 14f9f42ec06..a4e9739868d 100644
--- a/code/game/objects/buckling.dm
+++ b/code/game/objects/buckling.dm
@@ -12,6 +12,11 @@
. = ..()
if(can_buckle && buckled_mob)
return user_unbuckle_mob(user)
+
+/atom/movable/attack_robot(mob/living/user)
+ . = ..()
+ if(can_buckle && buckled_mob && Adjacent(user)) // attack_robot is called on all ranges, so the Adjacent check is needed
+ return user_unbuckle_mob(user)
/atom/movable/MouseDrop_T(mob/living/M, mob/living/user)
. = ..()
diff --git a/code/modules/economy/POS.dm b/code/modules/economy/POS.dm
index 7b1c885ff10..5a107e8f11a 100644
--- a/code/modules/economy/POS.dm
+++ b/code/modules/economy/POS.dm
@@ -361,11 +361,6 @@ var/const/POS_HEADER = {"
else
overlays += "pos-standby"
-/obj/machinery/pos/attack_robot(var/mob/user)
-// if(isMoMMI(user))
-// return attack_hand(user)
- return ..()
-
/obj/machinery/pos/attack_hand(var/mob/user)
user.set_machine(src)
var/logindata=""
diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index ba419f16b5c..cbc449410fc 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -284,9 +284,9 @@
src << "
You are a maintenance drone, a tiny-brained robotic repair machine."
src << "You have no individual will, no personality, and no drives or urges other than your laws."
src << "Use ; to talk to other drones, and say to speak silently to your nearby fellows."
- src << "Remember, you are lawed against interference with the crew. Also remember, you DO NOT take orders from the AI."
+ src << "Remember, you are lawed against interference with the crew. Also remember, you DO NOT take orders from the AI."
src << "Don't invade their worksites, don't steal their resources, don't tell them about the changeling in the toilets."
- src << "If a crewmember has noticed you, you are probably breaking your first law."
+ src << "Make sure crew members do not notice you.."
/*
sprite["Default"] = "repairbot"