borgs can mend airlocks, status examine, sinks, manuals

code/game/machinery/doors/airlock.dm

@@ -667,61 +667,58 @@ About the new airlock wires panel:
 		if (usr.machine==src)
 			usr.machine = null
 			return
-	if (!istype(usr, /mob/living/silicon))
+	if(in_range(src, usr) && istype(src.loc, /turf) && p_open)
-		if(!src.p_open)
+		usr.machine = src
-			return
+		if (href_list["wires"])
-		if ((in_range(src, usr) && istype(src.loc, /turf)))
+			var/t1 = text2num(href_list["wires"])
-			usr.machine = src
+			if (!( istype(usr.equipped(), /obj/item/weapon/wirecutters) ))
-			if (href_list["wires"])
+				usr << "You need wirecutters!"
-				var/t1 = text2num(href_list["wires"])
+				return
-				if (!( istype(usr.equipped(), /obj/item/weapon/wirecutters) ))
+			if (src.isWireColorCut(t1))
-					usr << "You need wirecutters!"
+				src.mend(t1)
-					return
+			else
-				if (src.isWireColorCut(t1))
+				src.cut(t1)
-					src.mend(t1)
+		else if (href_list["pulse"])
-				else
+			var/t1 = text2num(href_list["pulse"])
-					src.cut(t1)
+			if (!istype(usr.equipped(), /obj/item/device/multitool))
-			else if (href_list["pulse"])
+				usr << "You need a multitool!"
-				var/t1 = text2num(href_list["pulse"])
+				return
-				if (!istype(usr.equipped(), /obj/item/device/multitool))
+			if (src.isWireColorCut(t1))
-					usr << "You need a multitool!"
+				usr << "You can't pulse a cut wire."
-					return
+				return
-				if (src.isWireColorCut(t1))
+			else
-					usr << "You can't pulse a cut wire."
+				src.pulse(t1)
-					return
+		else if(href_list["signaler"])
-				else
+			var/wirenum = text2num(href_list["signaler"])
-					src.pulse(t1)
+			if(!istype(usr.equipped(), /obj/item/device/assembly/signaler))
-			else if(href_list["signaler"])
+				usr << "You need a signaller!"
-				var/wirenum = text2num(href_list["signaler"])
+				return
-				if(!istype(usr.equipped(), /obj/item/device/assembly/signaler))
+			if(src.isWireColorCut(wirenum))
-					usr << "You need a signaller!"
+				usr << "You can't attach a signaller to a cut wire."
-					return
+				return
-				if(src.isWireColorCut(wirenum))
+			var/obj/item/device/assembly/signaler/R = usr.equipped()
-					usr << "You can't attach a signaller to a cut wire."
+			if(R.secured)
-					return
+				usr << "This radio can't be attached!"
-				var/obj/item/device/assembly/signaler/R = usr.equipped()
+				return
-				if(R.secured)
+			var/mob/M = usr
-					usr << "This radio can't be attached!"
+			M.drop_item()
-					return
+			R.loc = src
-				var/mob/M = usr
+			R.airlock_wire = wirenum
-				M.drop_item()
+			src.signalers[wirenum] = R
-				R.loc = src
+		else if(href_list["remove-signaler"])
-				R.airlock_wire = wirenum
+			var/wirenum = text2num(href_list["remove-signaler"])
-				src.signalers[wirenum] = R
+			if(!(src.signalers[wirenum]))
-			else if(href_list["remove-signaler"])
+				usr << "There's no signaller attached to that wire!"
-				var/wirenum = text2num(href_list["remove-signaler"])
+				return
-				if(!(src.signalers[wirenum]))
+			var/obj/item/device/assembly/signaler/R = src.signalers[wirenum]
-					usr << "There's no signaller attached to that wire!"
+			R.loc = usr.loc
-					return
+			R.airlock_wire = null
-				var/obj/item/device/assembly/signaler/R = src.signalers[wirenum]
+			src.signalers[wirenum] = null
-				R.loc = usr.loc
-				R.airlock_wire = null
-				src.signalers[wirenum] = null
 
 		src.update_icon()
 		add_fingerprint(usr)
 		src.updateUsrDialog()
-	else
+	else if(istype(usr, /mob/living/silicon))    // unranged silicon interface
 		//AI
 		if (!src.canAIControl())
 			usr << "Airlock control connection lost!"

code/game/machinery/sink.dm

@@ -56,10 +56,15 @@
 			return
 
 		if (istype(O, /obj/item/weapon/reagent_containers/glass) || istype(O,/obj/item/weapon/reagent_containers/food/drinks))
-			O:reagents.add_reagent("water", 10)
+			if(O.reagents.total_volume < O.reagents.maximum_volume)
-			user.visible_message( \
+				O:reagents.add_reagent("water", 10)
-				"\blue [user] fills the [O] using the [src].", \
+				user.visible_message( \
-				"\blue You fill the [O] using the [src].")
+					"\blue [user] fills the [O] using the [src].", \
+					"\blue You fill the [O] using the [src].")
+			else
+				user.visible_message( \
+					"\blue [user] spills water out of the overflowing [O] into the [src].", \
+					"\blue You spill water out of the overflowing [O] into the [src].")
 			return
 		else if (istype(O, /obj/item/weapon/melee/baton))
 			var/obj/item/weapon/melee/baton/B = O

code/game/machinery/status_display.dm

@@ -13,7 +13,7 @@
 	density = 0
 	use_power = 1
 	idle_power_usage = 10
-	var/mode = 1	// 0 = Blank
+	var/mode = 0	// 0 = Blank
 					// 1 = Shuttle timer
 					// 2 = Arbitrary message(s)
 					// 3 = alert picture
@@ -52,6 +52,34 @@
 
 		update()
 
+	examine()
+		..()
+		var/msg
+		switch(mode)
+			if(0)
+				msg = "The screen is blank."
+			if(1)
+				var/time = get_shuttle_timer()
+				dd_replacetext(time, "~", ":")
+				if(time)
+					msg = "The escape shuttle countdown reads: [time]"
+			if(2)
+				if(message1 && message2)
+					msg = "The screen states the two following message. [message1] , [message2]"
+				else if(message1)
+					msg = "The screen states the following message. [message1]"
+				else if(message2)
+					msg = "The screen states the following message. [message2]"
+			if(3)
+				msg = src
+
+			if(4)
+				var/time = get_supply_shuttle_timer()
+				if(time)
+					msg = "The screen states the time until the supply shuttle arrive. \n Time remaining: [time]"
+		usr << msg
+		return
+
 
 	// set what is displayed
 

code/game/objects/items/weapons/manuals.dm

@@ -5,6 +5,9 @@
 	due_date = 0 // Game time in 1/10th seconds
 	unique = 1   // 0 - Normal book, 1 - Should not be treated as normal book, unable to be copied, unable to be modified
 
+	New()
+		if(!title)
+			title = name // make this simple for manuals
 
 /obj/item/weapon/book/manual/engineering_construction
 	name = "Station Repairs and Construction"