Bug fixes

code/_onclick/ai.dm

@@ -145,7 +145,10 @@
 		Topic("aiDisable=7", list("aiDisable"="7"), 1)
 	return
 
-/atom/proc/AICtrlClick()
+/atom/proc/AICtrlClick(var/mob/living/silicon/ai/user)
+	if(user.holo)
+		var/obj/machinery/hologram/holopad/H = user.holo
+		H.face_atom(src)	
 	return
 
 /obj/machinery/door/airlock/AICtrlClick() // Bolts doors

code/game/machinery/bots/bots.dm

@@ -56,6 +56,7 @@
 	#define FLOOR_BOT			3	// Floorbots
 	#define CLEAN_BOT			4	// Cleanbots
 	#define MED_BOT				5	// Medibots
+	var/bot_type_name = "Bot"
 
 	#define DEFAULT_SCAN_RANGE		7	//default view range for finding targets.
 

code/game/machinery/bots/cleanbot.dm

@@ -41,6 +41,7 @@
 	radio_frequency = SRV_FREQ //Service
 	radio_name = "Service"
 	bot_type = CLEAN_BOT
+	bot_type_name = "Cleanbot"
 	bot_filter = RADIO_CLEANBOT
 
 /obj/machinery/bot/cleanbot/New()
@@ -236,7 +237,7 @@ text("<A href='?src=\ref[src];power=1'>[on ? "On" : "Off"]</A>"))
 	icon_state = "cleanbot-c"
 	visible_message("<span class='notice'>[src] begins to clean up [target]</span>")
 	mode = BOT_CLEANING
-	spawn(50)
+	spawn(25)
 		if(mode == BOT_CLEANING)
 			qdel(target)
 			anchored = 0

code/game/machinery/bots/ed209bot.dm

@@ -36,6 +36,7 @@
 	radio_frequency = SEC_FREQ
 	radio_name = "Security"
 	bot_type = SEC_BOT
+	bot_type_name = "ED-209"
 	bot_filter = RADIO_SECBOT
 
 	//List of weapons that secbots will not arrest for

code/game/machinery/bots/floorbot.dm

@@ -52,6 +52,7 @@
 	radio_frequency = ENG_FREQ //Engineering channel
 	radio_name = "Engineering"
 	bot_type = FLOOR_BOT
+	bot_type_name = "Floorbot"
 	bot_filter = RADIO_FLOORBOT
 	var/process_type //Determines what to do when process_scan() recieves a target. See process_scan() for details.
 	#define HULL_BREACH		1
@@ -272,9 +273,9 @@
 		if(path.len == 0)
 			if(!istype(target, /turf/))
 				var/turf/TL = get_turf(target)
-				path = AStar(loc, TL, /turf/proc/AdjacentTurfsSpace, /turf/proc/Distance, 0, 30, id=botcard)
+				path = get_path_to(loc, TL, /turf/proc/AdjacentTurfsSpace, /turf/proc/Distance, 0, 30, id=botcard)
 			else
-				path = AStar(loc, target, /turf/proc/AdjacentTurfsSpace, /turf/proc/Distance, 0, 30, id=botcard)
+				path = get_path_to(loc, target, /turf/proc/AdjacentTurfsSpace, /turf/proc/Distance, 0, 30, id=botcard)
 
 			if(!bot_move(target))
 				add_to_ignore(target)
@@ -309,7 +310,7 @@
 					anchored = 0
 					mode = BOT_IDLE
 					target = null
-			path = new()
+			path = list()
 			return
 
 	oldloc = loc
@@ -346,9 +347,8 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target)
 				result = F
 		if(FIX_TILE)	//Selects only damaged floors.
 			F = scan_target
-			if(istype(F, /turf))
-				if(F.broken || F.burnt)
-					result = F
+			if(istype(F) && (F.broken || F.burnt))
+				result = F
 		if(TILE_EMAG) //Emag mode! Rip up the floor and cause breaches to space!
 			F = scan_target
 			if(!istype(F, /turf/simulated/floor/plating))
@@ -373,7 +373,7 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target)
 	anchored = 1
 	icon_state = "floorbot-c"
 	if(istype(target_turf, /turf/space/)) //If we are fixing an area not part of pure space, it is
-		visible_message("<span class='notice'> [targetdirection ? "[src] begins installing a bridge plating." : "[src] begins to repair the hole."] </span>")
+		visible_message("<span class='notice'>[targetdirection ? "[src] begins installing a bridge plating." : "[src] begins to repair the hole."] </span>")
 		mode = BOT_REPAIRING
 		spawn(50)
 			if(mode == BOT_REPAIRING)
@@ -388,32 +388,18 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target)
 				target = null
 	else
 		var/turf/simulated/floor/F = target_turf
-		if(F.burnt || F.broken)
-			mode = BOT_REPAIRING
-			visible_message("<span class='notice'> [src] begins repairing the floor.</span>")
-			spawn(50)
-				if(mode == BOT_REPAIRING)
-					F.burnt = 0
-					F.broken = 0
-					F.icon_state = "floor"
-					mode = BOT_IDLE
-					amount -= 1
-					updateicon()
-					anchored = 0
-					target = null
-		else
-			mode = BOT_REPAIRING
-			visible_message("<span class='notice'> [src] begins repairing the floor.</span>")
-			spawn(50)
-				if(mode == BOT_REPAIRING)
-					F.burnt = 0
-					F.broken = 0
-					target_turf.ChangeTurf(/turf/simulated/floor)
-					mode = BOT_IDLE
-					amount -= 1
-					updateicon()
-					anchored = 0
-					target = null
+		mode = BOT_REPAIRING
+		visible_message("<span class='notice'>[src] begins repairing the floor.</span>")
+		spawn(50)
+			if(mode == BOT_REPAIRING)
+				F.broken = 0
+				F.burnt = 0
+				F.ChangeTurf(/turf/simulated/floor)
+				mode = BOT_IDLE
+				amount -= 1
+				updateicon()
+				anchored = 0
+				target = null
 
 /obj/machinery/bot/floorbot/proc/eattile(var/obj/item/stack/tile/plasteel/T)
 	if(!istype(T, /obj/item/stack/tile/plasteel))

code/game/machinery/bots/medbot.dm

@@ -41,6 +41,7 @@
 	var/treat_virus = 1 //If on, the bot will attempt to treat viral infections, curing them if possible.
 	var/shut_up = 0 //self explanatory :)
 	bot_type = MED_BOT
+	bot_type_name = "Medbot"
 	bot_filter = RADIO_MEDBOT
 
 /obj/machinery/bot/medbot/syndicate

code/game/machinery/bots/mulebot.dm

@@ -23,6 +23,7 @@ var/global/mulebot_count = 0
 	beacon_freq = 1400
 	control_freq = 1447
 	bot_type = MULE_BOT
+	bot_type_name = "MULEbot"
 	bot_filter = RADIO_MULEBOT
 
 	suffix = ""

code/game/machinery/bots/secbot.dm

@@ -28,6 +28,7 @@
 	radio_frequency = SEC_FREQ //Security channel
 	radio_name = "Security"
 	bot_type = SEC_BOT
+	bot_type_name = "Secbot"
 	bot_filter = RADIO_SECBOT
 
 	//List of weapons that secbots will not arrest for

code/game/machinery/camera/tracking.dm

@@ -155,7 +155,7 @@
 		else
 			src << "\red You've failed to open an airlock for [target]"
 		return
-/mob/living/silicon/ai/proc/ai_actual_track(mob/living/target as mob)
+/mob/living/silicon/ai/proc/ai_actual_track(atom/target as mob|obj)
 	if(!istype(target))	return
 	var/mob/living/silicon/ai/U = usr
 

code/game/machinery/hologram.dm

@@ -81,13 +81,13 @@ var/const/HOLOPAD_MODE = 0
 
 /*This is the proc for special two-way communication between AI and holopad/people talking near holopad.
 For the other part of the code, check silicon say.dm. Particularly robot talk.*/
-/obj/machinery/hologram/holopad/hear_talk(mob/living/M, text)
+/obj/machinery/hologram/holopad/hear_talk(mob/living/M, text, verb)
 	if(M&&hologram&&master)//Master is mostly a safety in case lag hits or something.
 		if(!master.say_understands(M))//The AI will be able to understand most mobs talking through the holopad.
 			text = stars(text)
 		var/name_used = M.GetVoice()
 		//This communication is imperfect because the holopad "filters" voices and is only designed to connect to the master only.
-		var/rendered = "<i><span class='game say'>Holopad received, <span class='name'>[name_used]</span> <span class='message'>[M.say_quote(text)]</span></span></i>"
+		var/rendered = "<i><span class='game say'>Holopad received, <span class='name'>[name_used]</span> [verb], <span class='message'>\"[text]\"</span></span></i>"
 		master.show_message(rendered, 2)
 	return
 
@@ -101,7 +101,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 	hologram.SetLuminosity(2)	//hologram lighting
 	SetLuminosity(2)			//pad lighting
 	icon_state = "holopad1"
-	A.current = src
+	A.holo = src
 	master = A//AI is the master.
 	use_power = 2//Active power usage.
 	return 1
@@ -109,8 +109,8 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 /obj/machinery/hologram/holopad/proc/clear_holo()
 //	hologram.SetLuminosity(0)//Clear lighting.	//handled by the lighting controller when its ower is deleted
 	del(hologram)//Get rid of hologram.
-	if(master.current == src)
-		master.current = null
+	if(master.holo == src)
+		master.holo = null
 	master = null//Null the master, since no-one is using it now.
 	SetLuminosity(0)			//pad lighting (hologram lighting will be handled automatically since its owner was deleted)
 	icon_state = "holopad0"
@@ -141,6 +141,25 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 		hologram.loc = get_turf(master.eyeobj)
 
 	return 1
+	
+// Simple helper to face what you clicked on, in case it should be needed in more than one place
+/obj/machinery/hologram/holopad/proc/face_atom(var/atom/A)
+	if( !hologram || !A || !hologram.x || !hologram.y || !A.x || !A.y ) return
+	var/dx = A.x - hologram.x
+	var/dy = A.y - hologram.y
+	if(!dx && !dy) // Wall items are graphically shifted but on the floor
+		if(A.pixel_y > 16)		hologram.dir = NORTH
+		else if(A.pixel_y < -16)hologram.dir = SOUTH
+		else if(A.pixel_x > 16)	hologram.dir = EAST
+		else if(A.pixel_x < -16)hologram.dir = WEST
+		return
+
+	if(abs(dx) < abs(dy))
+		if(dy > 0)	hologram.dir = NORTH
+		else		hologram.dir = SOUTH
+	else
+		if(dx > 0)	hologram.dir = EAST
+		else		hologram.dir = WEST
 
 /*
  * Hologram
@@ -153,23 +172,17 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 	active_power_usage = 100
 	var/obj/effect/overlay/hologram//The projection itself. If there is one, the instrument is on, off otherwise.
 
-/obj/machinery/hologram/power_change()
-	if (powered())
-		stat &= ~NOPOWER
-	else
-		stat |= ~NOPOWER
-
 //Destruction procs.
 /obj/machinery/hologram/ex_act(severity)
 	switch(severity)
 		if(1.0)
-			qdel(src)
+			del(src)
 		if(2.0)
 			if (prob(50))
-				qdel(src)
+				del(src)
 		if(3.0)
 			if (prob(5))
-				qdel(src)
+				del(src)
 	return
 
 /obj/machinery/hologram/blob_act()
@@ -180,7 +193,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 	del(src)
 	return
 
-/obj/machinery/hologram/Destroy()
+/obj/machinery/hologram/Del()
 	if(hologram)
 		src:clear_holo()
 	..()
@@ -213,4 +226,4 @@ Holographic project of everything else.
 	name = "hologram projector"
 	desc = "It makes a hologram appear...with magnets or something..."
 	icon = 'icons/obj/stationobjs.dmi'
-	icon_state = "hologram0"
+	icon_state = "hologram0"

code/game/machinery/recharger.dm

@@ -81,7 +81,7 @@
 			var/obj/item/weapon/melee/baton/B = charging
 			if(B.bcell && B.bcell.charge < B.bcell.maxcharge)
 				B.bcell.charge += 1750
-				icon_state = "recharger1"
+				icon_state = icon_state_charging
 				use_power(2000)
 			else
 				icon_state = icon_state_charged

code/game/objects/items/stacks/medical.dm

@@ -12,13 +12,11 @@
 
 /obj/item/stack/medical/attack(mob/living/carbon/M as mob, mob/user as mob)
 	if (!istype(M))
-		user << "\red \The [src] cannot be applied to [M]!"
+		user << "<span class='danger'>\The [src] cannot be applied to [M]!</span>"
 		return 1
 
-	if ( ! (istype(user, /mob/living/carbon/human) || \
-			istype(user, /mob/living/silicon) || \
-			istype(user, /mob/living/carbon/monkey) && ticker && ticker.mode.name == "monkey") )
-		user << "\red You don't have the dexterity to do this!"
+	if (!(istype(user, /mob/living/carbon/human) || istype(user, /mob/living/silicon) || istype(user, /mob/living/carbon/monkey) && ticker && ticker.mode.name == "monkey"))
+		user << "<span class='danger'>You don't have the dexterity to do this!</span>"
 		return 1
 
 	if (istype(M, /mob/living/carbon/human))
@@ -27,33 +25,30 @@
 
 		if(affecting.display_name == "head")
 			if(H.head && istype(H.head,/obj/item/clothing/head/helmet/space))
-				user << "\red You can't apply [src] through [H.head]!"
+				user << "<span class='danger'>You can't apply [src] through [H.head]!</span>"
 				return 1
 		else
 			if(H.wear_suit && istype(H.wear_suit,/obj/item/clothing/suit/space))
-				user << "\red You can't apply [src] through [H.wear_suit]!"
+				user << "<span class='danger'>You can't apply [src] through [H.wear_suit]!</span>"
 				return 1
 
 		if(affecting.status & ORGAN_ROBOT)
-			user << "\red This isn't useful at all on a robotic limb.."
+			user << "<span class='danger'>This can't be used on a robotic limb.</span>"
 			return 1
 
 		if(affecting.status & ORGAN_PEG)
-			user << "\red This isn't useful at all on a peg limb. It's fucking wood."
+			user << "<span class='danger'>This can't be used on a peg limb.</span>"
 			return 1
 
 		H.UpdateDamageIcon()
 
 	else
-
 		M.heal_organ_damage((src.heal_brute/2), (src.heal_burn/2))
-		user.visible_message( \
-			"\blue [M] has been applied with [src] by [user].", \
-			"\blue You apply \the [src] to [M]." \
-		)
+		user.visible_message("<span class='notice'>[M] has been applied with [src] by [user].</span>","<span class='notice'>You apply \the [src] to [M].</span>")
 		use(1)
 
 	M.updatehealth()
+	
 /obj/item/stack/medical/bruise_pack
 	name = "roll of gauze"
 	singular_name = "gauze length"
@@ -80,21 +75,19 @@
 					if (W.current_stage <= W.max_bleeding_stage)
 						user.visible_message( 	"\blue [user] bandages \the [W.desc] on [M]'s [affecting.display_name].", \
 										"\blue You bandage \the [W.desc] on [M]'s [affecting.display_name]." )
-						//H.add_side_effect("Itch")
 					else if (istype(W,/datum/wound/bruise))
 						user.visible_message( 	"\blue [user] places a bruise patch over \the [W.desc] on [M]'s [affecting.display_name].", \
 										"\blue You place a bruise patch over \the [W.desc] on [M]'s [affecting.display_name]." )
 					else
 						user.visible_message( 	"\blue [user] places a bandaid over \the [W.desc] on [M]'s [affecting.display_name].", \
 										"\blue You place a bandaid over \the [W.desc] on [M]'s [affecting.display_name]." )
-				use(1)
-		else
-			if (can_operate(H))        //Checks if mob is lying down on table for surgery
-				if (do_surgery(H,user,src))
-					return
-			else
-				user << "<span class='notice'>The [affecting.display_name] is cut open, you'll need more than a bandage!</span>"
 
+					affecting.heal_damage(src.heal_brute, src.heal_burn, 0)							
+					use(1)
+		else
+			M.heal_organ_damage((src.heal_brute/2), (src.heal_burn/2))
+			use(1)
+			
 /obj/item/stack/medical/ointment
 	name = "ointment"
 	desc = "Used to treat those nasty burns."
@@ -119,6 +112,7 @@
 			else
 				user.visible_message( 	"\blue [user] salves the wounds on [M]'s [affecting.display_name].", \
 										"\blue You salve the wounds on [M]'s [affecting.display_name]." )
+				affecting.heal_damage(src.heal_brute, src.heal_burn, 0)											
 				use(1)
 		else
 			if (can_operate(H))        //Checks if mob is lying down on table for surgery

code/modules/client/preferences.dm

@@ -307,9 +307,9 @@ datum/preferences
 				dat += "<table><tr><td width='340px' height='300px' valign='top'>"
 				dat += "<h2>General Settings</h2>"
 				dat += "<b>UI Style:</b> <a href='?_src_=prefs;preference=ui'><b>[UI_style]</b></a><br>"
-				dat += "<b>Custom UI</b>(recommended for White UI):<br>"
-				dat += "-Color: <a href='?_src_=prefs;preference=UIcolor'><b>[UI_style_color]</b></a> <table style='display:inline;' bgcolor='[UI_style_color]'><tr><td>__</td></tr></table><br>"
-				dat += "-Alpha(transparence): <a href='?_src_=prefs;preference=UIalpha'><b>[UI_style_alpha]</b></a><br>"
+				dat += "<b>Custom UI settings:</b><br>"
+				dat += "<b>Color:</b> <a href='?_src_=prefs;preference=UIcolor'><b>[UI_style_color]</b></a> <table style='display:inline;' bgcolor='[UI_style_color]'><tr><td>__</td></tr></table><br>"
+				dat += "<b>Alpha (transparency):</b> <a href='?_src_=prefs;preference=UIalpha'><b>[UI_style_alpha]</b></a><br>"
 				dat += "<b>Play admin midis:</b> <a href='?_src_=prefs;preference=hear_midis'><b>[(sound & SOUND_MIDI) ? "Yes" : "No"]</b></a><br>"
 				dat += "<b>Play lobby music:</b> <a href='?_src_=prefs;preference=lobby_music'><b>[(sound & SOUND_LOBBY) ? "Yes" : "No"]</b></a><br>"
 				dat += "<b>Randomized Character Slot:</b> <a href='?_src_=prefs;preference=randomslot'><b>[randomslot ? "Yes" : "No"]</b></a><br>"

code/modules/client/preferences_toggles.dm

@@ -148,10 +148,10 @@
 	var/UI_style_new = input(usr, "Select a style, we recommend White for customization") in list("White", "Midnight", "Orange", "old")
 	if(!UI_style_new) return
 
-	var/UI_style_alpha_new = input(usr, "Select a new alpha(transparence) parametr for UI, between 50 and 255") as num
+	var/UI_style_alpha_new = input(usr, "Select a new alpha (transparency) parameter for UI, between 50 and 255") as num
 	if(!UI_style_alpha_new | !(UI_style_alpha_new <= 255 && UI_style_alpha_new >= 50)) return
 
-	var/UI_style_color_new = input(usr, "Choose your UI color, dark colors are not recommended!") as color|null
+	var/UI_style_color_new = input(usr, "Choose your UI color. Dark colors are not recommended!") as color|null
 	if(!UI_style_color_new) return
 
 	//update UI

code/modules/mob/living/silicon/ai/ai.dm

@@ -451,6 +451,13 @@ var/list/ai_list = list()
 			A.ai_actual_track(target)
 		return
 		
+	if (href_list["trackbot"])
+		var/obj/machinery/bot/target = locate(href_list["trackbot"]) in aibots
+		var/mob/living/silicon/ai/A = locate(href_list["track2"]) in mob_list
+		if(A && target)
+			A.ai_actual_track(target)
+		return
+				
 	if (href_list["callbot"]) //Command a bot to move to a selected location.
 		Bot = locate(href_list["callbot"]) in aibots
 		if(!Bot || Bot.remote_disabled || src.control_disabled)
@@ -578,17 +585,18 @@ var/list/ai_list = list()
 	var/d
 	var/area/bot_area
 	d += "<A HREF=?src=\ref[src];botrefresh=\ref[Bot]>Query network status</A><br>"
-	d += "<table width='100%'><tr><td width='40%'><h3>Name</h3></td><td width='30%'><h3>Status</h3></td><td width='30%'><h3>Location</h3></td><td width='10%'><h3>Control</h3></td></tr>"
+	d += "<table width='100%'><tr><td width='40%'><h3>Name</h3></td><td width='20%'><h3>Status</h3></td><td width='30%'><h3>Location</h3></td><td width='10%'><h3>Control</h3></td></tr>"
 
 	for (Bot in aibots)
 		if(Bot.z == ai_Zlevel && !Bot.remote_disabled) //Only non-emagged bots on the same Z-level are detected!
 			bot_area = get_area(Bot)
-			d += "<tr><td width='30%'>[Bot.hacked ? "<span class='bad'>(!) </span>[Bot.name]" : Bot.name]</td>"
+			d += "<tr><td width='30%'>[Bot.hacked ? "<span class='bad'>(!) </span>[Bot.name]" : Bot.name] ([Bot.bot_type_name])</td>"
 			//If the bot is on, it will display the bot's current mode status. If the bot is not mode, it will just report "Idle". "Inactive if it is not on at all.
-			d += "<td width='30%'>[Bot.on ? "[Bot.mode ? "<span class='average'>[ Bot.mode_name[Bot.mode] ]</span>": "<span class='good'>Idle</span>"]" : "<span class='bad'>Inactive</span>"]</td>"
+			d += "<td width='20%'>[Bot.on ? "[Bot.mode ? "<span class='average'>[ Bot.mode_name[Bot.mode] ]</span>": "<span class='good'>Idle</span>"]" : "<span class='bad'>Inactive</span>"]</td>"
 			d += "<td width='30%'>[bot_area.name]</td>"
 			d += "<td width='10%'><A HREF=?src=\ref[src];interface=\ref[Bot]>Interface</A></td>"
 			d += "<td width='10%'><A HREF=?src=\ref[src];callbot=\ref[Bot]>Call</A></td>"
+			d += "<td width='10%'><a href='byond://?src=\ref[src];track2=\ref[src];trackbot=\ref[Bot]'>Track</A></td>"
 			d += "</tr>"
 			d = format_text(d)
 

code/modules/mob/living/silicon/ai/freelook/eye.dm

@@ -49,9 +49,8 @@
 		if(ai.client)
 			ai.client.eye = src
 		//Holopad
-		if(istype(ai.current, /obj/machinery/hologram/holopad))
-			var/obj/machinery/hologram/holopad/H = ai.current
-			H.move_hologram()
+		if(ai.holo)
+			ai.holo.move_hologram()
 
 
 /mob/aiEye/Move()
@@ -66,6 +65,7 @@
 	var/sprint = 10
 	var/cooldown = 0
 	var/acceleration = 1
+	var/obj/machinery/hologram/holopad/holo = null
 
 
 // Intiliaze the eye by assigning it's "ai" variable to us. Then set it's loc to us.

code/modules/reagents/Chemistry-Reagents.dm

@@ -2662,18 +2662,6 @@ datum
 				..()
 				return
 
-			Del()
-				if (istype(holder.my_atom,/mob/living))
-					var/mob/living/M as mob
-					var/to_remove = 0
-					if (holder.has_reagent("anti_toxin"))
-						to_remove = min(holder.get_reagent_amount("anti_toxin"),data)
-						holder.remove_reagent("anti_toxin", to_remove, 0)
-						data -= to_remove
-					if(M)
-						M.adjustToxLoss((data-1)*rand(2,4))
-				..()
-
 		psilocybin
 			name = "Psilocybin"
 			id = "psilocybin"