Drone message fix, let robots unbuckle

bfilia · Oct 5, 2015 · f9adb09 · f9adb09
1 parent fdc3578
commit f9adb09
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git 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
@@ -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
@@ -361,11 +361,6 @@ var/const/POS_HEADER = {"<html>
 	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
@@ -284,9 +284,9 @@
 	src << "<br><b>You are a maintenance drone, a tiny-brained robotic repair machine</b>."
 	src << "You have no individual will, no personality, and no drives or urges other than your laws."
 	src << "Use <b>;</b> to talk to other drones, and <b>say</b> to speak silently to your nearby fellows."
-	src << "Remember,  you are <b>lawed against interference with the crew</b>. Also remember, <b>you DO NOT take orders from the AI.</b>"
+	src << "Remember, you are <b>lawed against interference with the crew</b>. Also remember, <b>you DO NOT take orders from the AI.</b>"
 	src << "<b>Don't invade their worksites, don't steal their resources, don't tell them about the changeling in the toilets.</b>"
-	src << "<b>If a crewmember has noticed you, <i>you are probably breaking your first law</i></b>."
+	src << "<b>Make sure crew members do not notice you.</b>."
 
 /*
 	sprite["Default"] = "repairbot"