Merge branch 'incremental_tg' r4967 (27/10/2012) into bs12_with_tgport

Conflicts:
	baystation12.dme
	code/__HELPERS/game.dm
	code/__HELPERS/type2type.dm
	code/datums/helper_datums/getrev.dm
	code/game/atoms.dm
	code/game/gamemodes/events.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/computer/atmos_alert.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/computer/cloning.dm
	code/game/machinery/computer/computer.dm
	code/game/machinery/computer/pod.dm
	code/game/machinery/computer/prisoner.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/newscaster.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/machinery/telecomms/telemonitor.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/machinery/wishgranter.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/objs.dm
	code/modules/DetectiveWork/detective_work.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/admin.dm
	code/modules/admin/verbs/adminsay.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client procs.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/flufftext/TextFilters.dm
	code/modules/mining/machine_processing.dm
	code/modules/mining/machine_stacking.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mint.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/mob.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/paperwork/photocopier.dm
	code/modules/power/gravitygenerator.dm
	html/changelog.html
	icons/mob/head.dmi
	icons/mob/human_face.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/suits.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

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

@@ -102,7 +102,7 @@
 	if ((usr.stat || usr.restrained()))
 		return
 	if (usr.contents.Find(src))
-		usr.machine = src
+		usr.set_machine(src)
 		if (href_list["remove"])
 			var/obj/item/P = locate(href_list["remove"])
 			if ((P && P.loc == src))

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

@@ -136,7 +136,7 @@
 
 /obj/item/weapon/flamethrower/attack_self(mob/user as mob)
 	if(user.stat || user.restrained() || user.lying)	return
-	user.machine = src
+	user.set_machine(src)
 	if(!ptank)
 		user << "<span class='notice'>Attach a plasma tank first!</span>"
 		return
@@ -148,11 +148,11 @@
 
 /obj/item/weapon/flamethrower/Topic(href,href_list[])
 	if(href_list["close"])
-		usr.machine = null
+		usr.unset_machine()
 		usr << browse(null, "window=flamethrower")
 		return
 	if(usr.stat || usr.restrained() || usr.lying)	return
-	usr.machine = src
+	usr.set_machine(src)
 	if(href_list["light"])
 		if(!ptank)	return
 		if(ptank.air_contents.toxins < 1)	return
@@ -168,7 +168,7 @@
 		usr.put_in_hands(ptank)
 		ptank = null
 		lit = 0
-		usr.machine = null
+		usr.unset_machine()
 		usr << browse(null, "window=flamethrower")
 	for(var/mob/M in viewers(1, loc))
 		if((M.client && M.machine == src))

code/game/objects/items/weapons/implants/implantchair.dm

@@ -32,7 +32,7 @@
 
 
 	attack_hand(mob/user as mob)
-		user.machine = src
+		user.set_machine(src)
 		var/health_text = ""
 		if(src.occupant)
 			if(src.occupant.health <= -100)
@@ -48,7 +48,7 @@
 		dat += "<B>Implants:</B> [src.implant_list.len ? "[implant_list.len]" : "<A href='?src=\ref[src];replenish=1'>Replenish</A>"]<BR>"
 		if(src.occupant)
 			dat += "[src.ready ? "<A href='?src=\ref[src];implant=1'>Implant</A>" : "Recharging"]<BR>"
-		user.machine = src
+		user.set_machine(src)
 		user << browse(dat, "window=implant")
 		onclose(user, "implant")
 

code/game/objects/items/weapons/implants/implantpad.dm

@@ -57,7 +57,7 @@
 
 
 	attack_self(mob/user as mob)
-		user.machine = src
+		user.set_machine(src)
 		var/dat = "<B>Implant Mini-Computer:</B><HR>"
 		if (src.case)
 			if(src.case.imp)
@@ -83,7 +83,7 @@
 		if (usr.stat)
 			return
 		if ((usr.contents.Find(src)) || ((in_range(src, usr) && istype(src.loc, /turf))))
-			usr.machine = src
+			usr.set_machine(src)
 			if (href_list["tracking_id"])
 				var/obj/item/weapon/implant/tracking/T = src.case.imp
 				T.id += text2num(href_list["tracking_id"])

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

@@ -12,7 +12,7 @@
 	origin_tech = "bluespace=4"
 
 /obj/item/weapon/teleportation_scroll/attack_self(mob/user as mob)
-	user.machine = src
+	user.set_machine(src)
 	var/dat = "<B>Teleportation Scroll:</B><BR>"
 	dat += "Number of uses: [src.uses]<BR>"
 	dat += "<HR>"
@@ -31,7 +31,7 @@
 	if (!( istype(H, /mob/living/carbon/human)))
 		return 1
 	if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))))
-		usr.machine = src
+		usr.set_machine(src)
 		if (href_list["spell_teleport"])
 			if (src.uses >= 1)
 				src.uses -= 1

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

@@ -205,7 +205,7 @@
 	return
 
 /obj/item/weapon/secstorage/attack_self(mob/user as mob)
-	user.machine = src
+	user.set_machine(src)
 	var/dat = text("<TT><B>[]</B><BR>\n\nLock Status: []",src, (src.locked ? "LOCKED" : "UNLOCKED"))
 	var/message = "Code"
 	if ((src.l_set == 0) && (!src.emagged) && (!src.l_setshort))

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

@@ -118,7 +118,7 @@
 /obj/item/weapon/tank/attack_self(mob/user as mob)
 	if (!(src.air_contents))
 		return
-	user.machine = src
+	user.set_machine(src)
 
 	var/using_internal
 	if(istype(loc,/mob/living/carbon))
@@ -142,7 +142,7 @@
 	if (usr.stat|| usr.restrained())
 		return
 	if (src.loc == usr)
-		usr.machine = src
+		usr.set_machine(src)
 		if (href_list["dist_p"])
 			var/cp = text2num(href_list["dist_p"])
 			src.distribute_pressure += cp

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

@@ -8,7 +8,7 @@
  * Locator
  */
 /obj/item/weapon/locator/attack_self(mob/user as mob)
-	user.machine = src
+	user.set_machine(src)
 	var/dat
 	if (src.temp)
 		dat = "[src.temp]<BR><BR><A href='byond://?src=\ref[src];temp=1'>Clear</A>"
@@ -35,7 +35,7 @@ Frequency:
 		usr << "The [src] is malfunctioning."
 		return
 	if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))))
-		usr.machine = src
+		usr.set_machine(src)
 		if (href_list["refresh"])
 			src.temp = "<B>Persistent Signal Locator</B><HR>"
 			var/turf/sr = get_turf(src)