Merge branch 'master' into maint_pred

code/datums/ai_laws.dm

@@ -227,9 +227,9 @@ var/global/const/base_law_type = /datum/ai_laws/nanotrasen
 		if(law == zeroth_law_borg)
 			continue
 		if(law == zeroth_law)
-			who << "<span class='danger'>[law.get_index()]. [law.law]</span>"
+			to_chat(who, "<span class='danger'>[law.get_index()]. [law.law]</span>")
 		else
-			who << "[law.get_index()]. [law.law]"
+			to_chat(who, "[law.get_index()]. [law.law]")
 
 /********************
 *	Stating Laws	*

code/datums/browser.dm

@@ -156,7 +156,7 @@
 
 	winset(user, windowid, "on-close=\".windowclose [param]\"")
 
-	//world << "OnClose [user]: [windowid] : ["on-close=\".windowclose [param]\""]"
+	//to_world("OnClose [user]: [windowid] : ["on-close=\".windowclose [param]\""]")
 
 // the on-close client verb
 // called when a browser popup window is closed after registering with proc/onclose()
@@ -168,11 +168,11 @@
 	set hidden = 1						// hide this verb from the user's panel
 	set name = ".windowclose"			// no autocomplete on cmd line
 
-	//world << "windowclose: [atomref]"
+	//to_world("windowclose: [atomref]")
 	if(atomref!="null")				// if passed a real atomref
 		var/hsrc = locate(atomref)	// find the reffed atom
 		if(hsrc)
-			//world << "[src] Topic [href] [hsrc]"
+			//to_world("[src] Topic [href] [hsrc]")
 			usr = src.mob
 			src.Topic("close=1", list("close"="1"), hsrc)	// this will direct to the atom's
 			return										// Topic() proc via client.Topic()
@@ -180,7 +180,7 @@
 	// no atomref specified (or not found)
 	// so just reset the user mob's machine var
 	if(src && src.mob)
-		//world << "[src] was [src.mob.machine], setting to null"
+		//to_world("[src] was [src.mob.machine], setting to null")
 		src.mob.unset_machine()
 	return
 

code/datums/datacore.dm

@@ -52,7 +52,7 @@
 			isactive[name] = active ? "Active" : "Inactive"
 		else
 			isactive[name] = t.fields["p_stat"]
-			//world << "[name]: [rank]"
+			//to_world("[name]: [rank]")
 			//cael - to prevent multiple appearances of a player/job combination, add a continue after each line
 		var/department = 0
 		if(real_rank in command_positions)

code/datums/helper_datums/events.dm

@@ -31,7 +31,7 @@
 	//  Arguments: event_type as text, any number of additional arguments to pass to event handler
 	//  Returns: null
 	proc/fireEvent()
-		//world << "Events in [args[1]] called"
+		//to_world("Events in [args[1]] called")
 		var/list/event = listgetindex(events,args[1])
 		if(istype(event))
 			spawn(-1)
@@ -60,7 +60,7 @@
 		return ..()
 
 	proc/Fire()
-		//world << "Event fired"
+		//to_world("Event fired")
 		if(listener)
 			call(listener,proc_name)(arglist(args))
 			return 1

code/datums/helper_datums/getrev.dm

@@ -24,10 +24,10 @@ var/global/datum/getrev/revdata = new()
 					date = unix2date(unix_time)
 			break
 
-	world.log << "Running revision:"
-	world.log << branch
-	world.log << date
-	world.log << revision
+	to_world_log("Running revision:")
+	to_world_log(branch)
+	to_world_log(date)
+	to_world_log(revision)
 
 client/verb/showrevinfo()
 	set category = "OOC"
@@ -39,6 +39,6 @@ client/verb/showrevinfo()
 		if(config.githuburl)
 			to_chat(src, "<a href='[config.githuburl]/commit/[revdata.revision]'>[revdata.revision]</a>")
 		else
-			src << revdata.revision
+			to_chat(src,revdata.revision)
 	else
 		to_chat(src, "Revision unknown")

code/datums/helper_datums/global_iterator.dm

@@ -140,7 +140,7 @@ Data storage vars:
 			arg_list = arguments
 			return 1
 		else
-//			world << "<span class='danger'>Invalid arguments supplied for [src.type], ref = \ref[src]</span>"
+//			to_world("<span class='danger'>Invalid arguments supplied for [src.type], ref = \ref[src]</span>")
 			return 0
 
 	proc/toggle_null_checks()

code/datums/helper_datums/teleport.dm

@@ -169,7 +169,7 @@
 		precision = max(rand(1,100)*bagholding.len,100)
 		if(istype(teleatom, /mob/living))
 			var/mob/living/MM = teleatom
-			MM << "<span class='danger'>The Bluespace interface on your [teleatom] interferes with the teleport!</span>"
+			to_chat(MM, "<span class='danger'>The Bluespace interface on your [teleatom] interferes with the teleport!</span>")
 	return 1
 
 /datum/teleport/instant/science/teleportChecks()
@@ -188,7 +188,7 @@
 	if(destination.z in using_map.admin_levels) //CentCom z-level
 		if(istype(teleatom, /obj/mecha))
 			var/obj/mecha/MM = teleatom
-			MM.occupant << "<span class='danger'>\The [MM] would not survive the jump to a location so far away!</span>"
+			to_chat(MM.occupant, "<span class='danger'>\The [MM] would not survive the jump to a location so far away!</span>")
 			return 0
 		if(!isemptylist(teleatom.search_contents_for(/obj/item/weapon/storage/backpack/holding)))
 			teleatom.visible_message("<span class='danger'>\The [teleatom] bounces off of the portal!</span>")

code/datums/locations/locations.dm

@@ -36,8 +36,8 @@ var/global/datum/locations/milky_way/all_locations = new()
 			choice = input(user, "Please choose a location.","Locations") as null|anything in choice.contents
 		else
 			break
-	user << choice.name
-	user << choice.desc
+	to_chat(user,choice.name)
+	to_chat(user,choice.desc)
 	return choice
 
 //	var/datum/locations/choice = input(user, "Please choose a location.","Locations") as null|anything in all_locations
@@ -46,11 +46,11 @@ var/global/datum/locations/milky_way/all_locations = new()
 
 /*
 /datum/locations/proc/show_contents()
-//	world << "[src]\n[desc]"
+//	to_world("[src]\n[desc]")
 	for(var/datum/locations/a in contents)
-		world << "[a]\n[a.parent ? "Located in [a.parent]\n" : ""][a.desc]"
+		to_world("[a]\n[a.parent ? "Located in [a.parent]\n" : ""][a.desc]")
 		a.show_contents()
-	world << "\n"
+	to_world("\n")
 
 /datum/locations/proc/count_locations()
 	var/i = 0
@@ -72,5 +72,5 @@ var/global/datum/locations/milky_way/all_locations = new()
 	set name = "Count Locations"
 	set category = "Debug"
 	var/location_number = locations.count_locations()
-	world << location_number
+	to_world(location_number)
 */

code/datums/looping_sounds/machinery_sounds.dm

@@ -51,7 +51,7 @@
 	start_sound = 'sound/machines/air_pump/airpumpstart.ogg'
 	start_length = 10
 	mid_sounds = list('sound/machines/air_pump/airpumpidle.ogg' = 1)
-	mid_length = 4
+	mid_length = 70
 	end_sound = 'sound/machines/air_pump/airpumpshutdown.ogg'
 	volume = 15
 	pref_check = /datum/client_preference/air_pump_noise

code/datums/mind.dm

@@ -78,7 +78,7 @@
 
 /datum/mind/proc/transfer_to(mob/living/new_character)
 	if(!istype(new_character))
-		world.log << "## DEBUG: transfer_to(): Some idiot has tried to transfer_to() a non mob/living mob. Please inform Carn"
+		to_world_log("## DEBUG: transfer_to(): Some idiot has tried to transfer_to() a non mob/living mob. Please inform Carn")
 	if(current)					//remove ourself from our old body's mind variable
 		if(changeling)
 			current.remove_changeling_powers()
@@ -161,7 +161,7 @@
 			if(antag.add_antagonist(src, 1, 1, 0, 1, 1)) // Ignore equipment and role type for this.
 				log_admin("[key_name_admin(usr)] made [key_name(src)] into a [antag.role_text].")
 			else
-				usr << "<span class='warning'>[src] could not be made into a [antag.role_text]!</span>"
+				to_chat(usr, "<span class='warning'>[src] could not be made into a [antag.role_text]!</span>")
 
 	else if(href_list["remove_antagonist"])
 		var/datum/antagonist/antag = all_antag_types[href_list["remove_antagonist"]]
@@ -198,7 +198,7 @@
 			return
 		if(mind)
 			mind.ambitions = sanitize(new_ambition)
-			mind.current << "<span class='warning'>Your ambitions have been changed by higher powers, they are now: [mind.ambitions]</span>"
+			to_chat(mind.current, "<span class='warning'>Your ambitions have been changed by higher powers, they are now: [mind.ambitions]</span>")
 		log_and_message_admins("made [key_name(mind.current)]'s ambitions be '[mind.ambitions]'.")
 
 	else if (href_list["obj_edit"] || href_list["obj_add"])
@@ -344,10 +344,10 @@
 						if(I in organs.implants)
 							qdel(I)
 							break
-				H << "<span class='notice'><font size =3><B>Your loyalty implant has been deactivated.</B></font></span>"
+				to_chat(H, "<span class='notice'><font size =3><B>Your loyalty implant has been deactivated.</B></font></span>")
 				log_admin("[key_name_admin(usr)] has de-loyalty implanted [current].")
 			if("add")
-				H << "<span class='danger'><font size =3>You somehow have become the recepient of a loyalty transplant, and it just activated!</font></span>"
+				to_chat(H, "<span class='danger'><font size =3>You somehow have become the recepient of a loyalty transplant, and it just activated!</font></span>")
 				H.implant_loyalty(override = TRUE)
 				log_admin("[key_name_admin(usr)] has loyalty implanted [current].")
 			else
@@ -410,9 +410,9 @@
 
 	else if (href_list["obj_announce"])
 		var/obj_count = 1
-		current << "<font color='blue'>Your current objectives:</font>"
+		to_chat(current, "<font color='blue'>Your current objectives:</font>")
 		for(var/datum/objective/objective in objectives)
-			current << "<B>Objective #[obj_count]</B>: [objective.explanation_text]"
+			to_chat(current, "<B>Objective #[obj_count]</B>: [objective.explanation_text]")
 			obj_count++
 	edit_memory()
 
@@ -490,7 +490,7 @@
 		if(ticker)
 			ticker.minds += mind
 		else
-			world.log << "## DEBUG: mind_initialize(): No ticker ready yet! Please inform Carn"
+			to_world_log("## DEBUG: mind_initialize(): No ticker ready yet! Please inform Carn")
 	if(!mind.name)	mind.name = real_name
 	mind.current = src
 	if(player_is_antag(mind))

code/datums/progressbar.dm

@@ -29,7 +29,7 @@
 	return ..()
 
 /datum/progressbar/proc/update(progress)
-	//world << "Update [progress] - [goal] - [(progress / goal)] - [((progress / goal) * 100)] - [round(((progress / goal) * 100), 5)]"
+	//to_world("Update [progress] - [goal] - [(progress / goal)] - [((progress / goal) * 100)] - [round(((progress / goal) * 100), 5)]")
 	if (!user || !user.client)
 		shown = 0
 		return

code/datums/recipe.dm

@@ -123,7 +123,7 @@
 // food-related
 /datum/recipe/proc/make_food(var/obj/container as obj)
 	if(!result)
-		world << "<span class='danger'>Recipe [type] is defined without a result, please bug report this.</span>"
+		to_world("<span class='danger'>Recipe [type] is defined without a result, please bug report this.</span>")
 		return
 	var/obj/result_obj = new result(container)
 	if(istype(container, /obj/machinery))

code/datums/supplypacks/hospitality.dm

@@ -55,7 +55,8 @@
 			/obj/item/pizzabox/margherita,
 			/obj/item/pizzabox/mushroom,
 			/obj/item/pizzabox/meat,
-			/obj/item/pizzabox/vegetable
+			/obj/item/pizzabox/vegetable,
+			/obj/item/pizzabox/pineapple
 			)
 	name = "Surprise pack of five pizzas"
 	cost = 15

code/datums/wires/alarm.dm

@@ -26,24 +26,24 @@ var/const/AALARM_WIRE_AALARM = 16
 		if(AALARM_WIRE_IDSCAN)
 			if(!mended)
 				A.locked = 1
-				//world << "Idscan wire cut"
+				//to_world("Idscan wire cut")
 
 		if(AALARM_WIRE_POWER)
 			A.shock(usr, 50)
 			A.shorted = !mended
 			A.update_icon()
-			//world << "Power wire cut"
+			//to_world("Power wire cut")
 
 		if (AALARM_WIRE_AI_CONTROL)
 			if (A.aidisabled == !mended)
 				A.aidisabled = mended
-				//world << "AI Control Wire Cut"
+				//to_world("AI Control Wire Cut")
 
 		if(AALARM_WIRE_SYPHON)
 			if(!mended)
 				A.mode = 3 // AALARM_MODE_PANIC
 				A.apply_mode()
-				//world << "Syphon Wire Cut"
+				//to_world("Syphon Wire Cut")
 
 		if(AALARM_WIRE_AALARM)
 			if (A.alarm_area.atmosalert(2, A))
@@ -55,10 +55,10 @@ var/const/AALARM_WIRE_AALARM = 16
 	switch(index)
 		if(AALARM_WIRE_IDSCAN)
 			A.locked = !A.locked
-		//	world << "Idscan wire pulsed"
+		//	to_world("Idscan wire pulsed")
 
 		if (AALARM_WIRE_POWER)
-		//	world << "Power wire pulsed"
+		//	to_world("Power wire pulsed")
 			if(A.shorted == 0)
 				A.shorted = 1
 				A.update_icon()
@@ -70,7 +70,7 @@ var/const/AALARM_WIRE_AALARM = 16
 
 
 		if (AALARM_WIRE_AI_CONTROL)
-		//	world << "AI Control wire pulsed"
+		//	to_world("AI Control wire pulsed")
 			if (A.aidisabled == 0)
 				A.aidisabled = 1
 			A.updateDialog()
@@ -79,7 +79,7 @@ var/const/AALARM_WIRE_AALARM = 16
 					A.aidisabled = 0
 
 		if(AALARM_WIRE_SYPHON)
-		//	world << "Syphon wire pulsed"
+		//	to_world("Syphon wire pulsed")
 			if(A.mode == 1) // AALARM_MODE_SCRUB
 				A.mode = 3 // AALARM_MODE_PANIC
 			else
@@ -87,7 +87,7 @@ var/const/AALARM_WIRE_AALARM = 16
 			A.apply_mode()
 
 		if(AALARM_WIRE_AALARM)
-		//	world << "Aalarm wire pulsed"
+		//	to_world("Aalarm wire pulsed")
 			if (A.alarm_area.atmosalert(0, A))
 				A.post_alert(0)
 			A.update_icon()

code/datums/wires/robot.dm

@@ -26,7 +26,7 @@ var/const/BORG_WIRE_CAMERA = 16
 		if(BORG_WIRE_LAWCHECK) //Cut the law wire, and the borg will no longer receive law updates from its AI
 			if(!mended)
 				if (R.lawupdate == 1)
-					R << "LawSync protocol engaged."
+					to_chat(R, "LawSync protocol engaged.")
 					R.show_laws()
 			else
 				if (R.lawupdate == 0 && !R.emagged)
@@ -59,7 +59,7 @@ var/const/BORG_WIRE_CAMERA = 16
 		if (BORG_WIRE_CAMERA)
 			if(!isnull(R.camera) && R.camera.can_use() && !R.scrambledcodes)
 				R.visible_message("[R]'s camera lense focuses loudly.")
-				R << "Your camera lense focuses loudly."
+				to_chat(R, "Your camera lense focuses loudly.")
 
 		if(BORG_WIRE_LOCKED_DOWN)
 			R.SetLockdown(!R.lockdown) // Toggle

code/datums/wires/wires.dm

@@ -122,7 +122,7 @@ var/list/wireColours = list("red", "blue", "green", "darkred", "orange", "brown"
 					CutWireColour(colour)
 					playsound(holder, I.usesound, 20, 1)
 				else
-					L << "<span class='error'>You need wirecutters!</span>"
+					to_chat(L, "<span class='error'>You need wirecutters!</span>")
 
 			else if(href_list["pulse"])
 				if(istype(I, /obj/item/device/multitool))
@@ -130,7 +130,7 @@ var/list/wireColours = list("red", "blue", "green", "darkred", "orange", "brown"
 					PulseColour(colour)
 					playsound(holder, 'sound/weapons/empty.ogg', 20, 1)
 				else
-					L << "<span class='error'>You need a multitool!</span>"
+					to_chat(L, "<span class='error'>You need a multitool!</span>")
 
 			else if(href_list["attach"])
 				var/colour = href_list["attach"]
@@ -146,7 +146,7 @@ var/list/wireColours = list("red", "blue", "green", "darkred", "orange", "brown"
 						L.drop_item()
 						Attach(colour, I)
 					else
-						L << "<span class='error'>You need a remote signaller!</span>"
+						to_chat(L, "<span class='error'>You need a remote signaller!</span>")