Merge branch 'incremental_tg' r5067 into bs12_with_tgport

removed extraneous admin attack messages, temporarily disabled much moderator stuff (will be re-enabled in future updates)

Conflicts:
	baystation12.dme
	code/__HELPERS/type2type.dm
	code/controllers/configuration.dm
	code/datums/datumvars.dm
	code/datums/helper_datums/getrev.dm
	code/defines/obj.dm
	code/game/gamemodes/events/black_hole.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/job.dm
	code/game/jobs/job_controller.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/machinery/turrets.dm
	code/game/machinery/wishgranter.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/turfs/turf.dm
	code/game/verbs/ooc.dm
	code/global.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/admin.dm
	code/modules/admin/admin_memo.dm
	code/modules/admin/admin_verbs.dm
	code/modules/admin/holder2.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/adminpm.dm
	code/modules/admin/verbs/diagnostics.dm
	code/modules/assembly/igniter.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/suits/jobs.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/mob/new_player/preferences.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/photocopier.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/modules/reagents/Chemistry-Machinery.dm
	code/setup.dm
	code/stylesheet.dm
	code/world.dm
	config/admins.txt
	config/config.txt
	html/changelog.html
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
	icons/turf/areas.dmi

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

code/modules/power/antimatter/control.dm

@@ -260,7 +260,7 @@
 	return
 
 
-/obj/machinery/power/am_control_unit/proc/interact(mob/user)
+/obj/machinery/power/am_control_unit/interact(mob/user)
 	if((get_dist(src, user) > 1) || (stat & (BROKEN|NOPOWER)))
 		if(!istype(user, /mob/living/silicon/ai))
 			user.unset_machine()

code/modules/power/apc.dm

@@ -438,10 +438,12 @@
 /obj/machinery/power/apc/attack_hand(mob/user)
 //	if (!can_use(user)) This already gets called in interact() and in topic()
 //		return
+	if(!user)
+		return
 	src.add_fingerprint(user)
-	if(opened && (!issilicon(user)))
+	if(usr == user && opened && (!issilicon(user)))
 		if(cell)
-			usr.put_in_hands(cell)
+			user.put_in_hands(cell)
 			cell.add_fingerprint(user)
 			cell.updateicon()
 
@@ -450,7 +452,7 @@
 			//user << "You remove the power cell."
 			charging = 0
 			src.updateicon()
-			return
+		return
 	if(stat & (BROKEN|MAINT))
 		return
 
@@ -488,7 +490,7 @@
 
 
 
-/obj/machinery/power/apc/proc/interact(mob/user)
+/obj/machinery/power/apc/interact(mob/user)
 	if(!user)
 		return
 

code/modules/power/engine.dm

@@ -21,12 +21,12 @@
 /turf/simulated/floor/engine/ex_act(severity)
 	switch(severity)
 		if(1.0)
-			ReplaceWithSpace()
+			ChangeTurf(/turf/space)
 			del(src)
 			return
 		if(2.0)
 			if (prob(50))
-				ReplaceWithSpace()
+				ChangeTurf(/turf/space)
 				del(src)
 				return
 		else
@@ -34,7 +34,7 @@
 
 /turf/simulated/floor/engine/blob_act()
 	if (prob(25))
-		ReplaceWithSpace()
+		ChangeTurf(/turf/space)
 		del(src)
 		return
 	return

code/modules/power/generator.dm

@@ -121,7 +121,7 @@
 	interact(user)
 
 
-/obj/machinery/power/generator/proc/interact(mob/user)
+/obj/machinery/power/generator/interact(mob/user)
 	if ( (get_dist(src, user) > 1 ) && (!istype(user, /mob/living/silicon/ai)))
 		user.unset_machine()
 		user << browse(null, "window=teg")

code/modules/power/generator_type2.dm

@@ -98,7 +98,7 @@
 	interact(user)
 
 
-/obj/machinery/power/generator_type2/proc/interact(mob/user)
+/obj/machinery/power/generator_type2/interact(mob/user)
 	if ( (get_dist(src, user) > 1 ) && (!istype(user, /mob/living/silicon/ai)))
 		user.unset_machine()
 		user << browse(null, "window=teg")

code/modules/power/port_gen.dm

@@ -246,7 +246,7 @@ display round(lastgen) and plasmatank amount
 /obj/machinery/power/port_gen/pacman/attack_paw(mob/user as mob)
 	interact(user)
 
-/obj/machinery/power/port_gen/pacman/proc/interact(mob/user)
+/obj/machinery/power/port_gen/pacman/interact(mob/user)
 	if (get_dist(src, user) > 1 )
 		if (!istype(user, /mob/living/silicon/ai))
 			user.unset_machine()

code/modules/power/singularity/particle_accelerator/particle_control.dm

@@ -202,7 +202,7 @@
 	return 1
 
 
-/obj/machinery/particle_accelerator/control_box/proc/interact(mob/user)
+/obj/machinery/particle_accelerator/control_box/interact(mob/user)
 	if((get_dist(src, user) > 1) || (stat & (BROKEN|NOPOWER)))
 		if(!istype(user, /mob/living/silicon))
 			user.unset_machine()

code/modules/power/singularity/singularity.dm

@@ -289,7 +289,7 @@ var/global/list/uneatable = list(
 					continue
 				if(O.invisibility == 101)
 					src.consume(O)
-		T.ReplaceWithSpace()
+		T.ChangeTurf(/turf/space)
 		gain = 2
 	src.energy += gain
 	return
@@ -302,10 +302,10 @@ var/global/list/uneatable = list(
 	if(target && prob(60))
 		movement_dir = get_dir(src,target) //moves to a singulo beacon, if there is one
 	else if(!(movement_dir in cardinal))
-		movement_dir = pick(NORTH, SOUTH, EAST, WEST)
+		movement_dir = pick(NORTH, EAST, WEST, SOUTH)
 
 	if(movement_dir == last_failed_movement)
-		var/list/L = new/list(NORTH, SOUTH, EAST, WEST)
+		var/list/L = new/list(NORTH, EAST, WEST, SOUTH)
 		L.Remove(last_failed_movement)
 		movement_dir = pick(L)
 
@@ -505,7 +505,7 @@ var/global/list/uneatable = list(
 					continue
 				if(O.invisibility == 101)
 					src.consume(O)
-		A:ReplaceWithSpace()
+		A:ChangeTurf(/turf/space)
 	return
 
 /obj/machinery/singularity/narsie/ex_act() //No throwing bombs at it either. --NEO

code/modules/power/smes.dm

@@ -178,7 +178,7 @@
 	interact(user)
 
 
-/obj/machinery/power/smes/proc/interact(mob/user)
+/obj/machinery/power/smes/interact(mob/user)
 	if(get_dist(src, user) > 1 && !istype(user, /mob/living/silicon/ai))
 		user.unset_machine()
 		user << browse(null, "window=smes")

code/modules/power/solar.dm

@@ -171,7 +171,6 @@
 		tracker_update(var/angle)
 		set_panels(var/cdir)
 		broken()
-		interact(mob/user)
 
 
 	New()

code/modules/power/turbine.dm

@@ -142,24 +142,7 @@
 			src.interact(M)
 	AutoUpdateAI(src)
 
-
-/obj/machinery/power/turbine/attack_ai(mob/user)
-
-	if(stat & (BROKEN|NOPOWER))
-		return
-
-	interact(user)
-
-/obj/machinery/power/turbine/attack_hand(mob/user)
-
-	add_fingerprint(user)
-
-	if(stat & (BROKEN|NOPOWER))
-		return
-
-	interact(user)
-
-/obj/machinery/power/turbine/proc/interact(mob/user)
+/obj/machinery/power/turbine/interact(mob/user)
 
 	if ( (get_dist(src, user) > 1 ) || (stat & (NOPOWER|BROKEN)) && (!istype(user, /mob/living/silicon/ai)) )
 		user.machine = null