-New sprites APC sprites by TankNut!

-New wraith sprites by TankNut! -Decreased flare duration, again(!) -Made a based interact proc and changed the updateDialog to call that instead of attack_hand. This caused issues with the APC and getting the power cell out of it. I then changed all machines that had their own defined proc (that was everywhere) git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5001 316c924e-a436-60f5-8080-3fe189b3f50e
2025-12-09 16:14:13 +00:00 · 2012-11-03 14:45:29 +00:00
parent 8720dd0e69
commit b00c0c2a9f
38 changed files with 136 additions and 125 deletions
--- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
@@ -88,14 +88,14 @@ obj/machinery/atmospherics/binary/passive_gate

 			return 1

-		interact(mob/user as mob)
-			var/dat = {"<b>Power: </b><a href='?src=\ref[src];power=1'>[on?"On":"Off"]</a><br>
-						<b>Desirable output pressure: </b>
-						[round(target_pressure,0.1)]kPa | <a href='?src=\ref[src];set_press=1'>Change</a>
-						"}
+	interact(mob/user as mob)
+		var/dat = {"<b>Power: </b><a href='?src=\ref[src];power=1'>[on?"On":"Off"]</a><br>
+					<b>Desirable output pressure: </b>
+					[round(target_pressure,0.1)]kPa | <a href='?src=\ref[src];set_press=1'>Change</a>
+					"}

-			user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT>", "window=atmo_pump")
-			onclose(user, "atmo_pump")
+		user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT>", "window=atmo_pump")
+		onclose(user, "atmo_pump")

 	initialize()
 		..()
--- a/code/ATMOSPHERICS/components/binary_devices/pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm
@@ -101,14 +101,14 @@ obj/machinery/atmospherics/binary/pump

 			return 1

-		interact(mob/user as mob)
-			var/dat = {"<b>Power: </b><a href='?src=\ref[src];power=1'>[on?"On":"Off"]</a><br>
-						<b>Desirable output pressure: </b>
-						[round(target_pressure,0.1)]kPa | <a href='?src=\ref[src];set_press=1'>Change</a>
-						"}
+	interact(mob/user as mob)
+		var/dat = {"<b>Power: </b><a href='?src=\ref[src];power=1'>[on?"On":"Off"]</a><br>
+					<b>Desirable output pressure: </b>
+					[round(target_pressure,0.1)]kPa | <a href='?src=\ref[src];set_press=1'>Change</a>
+					"}

-			user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT>", "window=atmo_pump")
-			onclose(user, "atmo_pump")
+		user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT>", "window=atmo_pump")
+		onclose(user, "atmo_pump")

 	initialize()
 		..()
--- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
@@ -97,14 +97,14 @@ obj/machinery/atmospherics/binary/volume_pump

 			return 1

-		interact(mob/user as mob)
-			var/dat = {"<b>Power: </b><a href='?src=\ref[src];power=1'>[on?"On":"Off"]</a><br>
-						<b>Desirable output flow: </b>
-						[round(transfer_rate,1)]l/s | <a href='?src=\ref[src];set_transfer_rate=1'>Change</a>
-						"}
+	interact(mob/user as mob)
+		var/dat = {"<b>Power: </b><a href='?src=\ref[src];power=1'>[on?"On":"Off"]</a><br>
+					<b>Desirable output flow: </b>
+					[round(transfer_rate,1)]l/s | <a href='?src=\ref[src];set_transfer_rate=1'>Change</a>
+					"}

-			user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT>", "window=atmo_pump")
-			onclose(user, "atmo_pump")
+		user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT>", "window=atmo_pump")
+		onclose(user, "atmo_pump")



--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -102,20 +102,6 @@ var/global/list/autolathe_recipes_hidden = list( \
 			user << browse("<HTML><HEAD><TITLE>Autolathe Control Panel</TITLE></HEAD><BODY><TT>[dat]</TT></BODY></HTML>", "window=autolathe_regular")
 			onclose(user, "autolathe_regular")

-		interact(mob/user as mob)
-			if(..())
-				return
-			if (src.shocked)
-				src.shock(user,50)
-			if (src.opened)
-				wires_win(user,50)
-				return
-			if (src.disabled)
-				user << "\red You press the button, but nothing happens."
-				return
-			regular_win(user)
-			return
-
 		shock(mob/user, prb)
 			if(stat & (BROKEN|NOPOWER))		// unpowered, no shock
 				return 0
@@ -129,6 +115,20 @@ var/global/list/autolathe_recipes_hidden = list( \
 			else
 				return 0

+	interact(mob/user as mob)
+		if(..())
+			return
+		if (src.shocked)
+			src.shock(user,50)
+		if (src.opened)
+			wires_win(user,50)
+			return
+		if (src.disabled)
+			user << "\red You press the button, but nothing happens."
+			return
+		regular_win(user)
+		return
+
 	attackby(var/obj/item/O as obj, var/mob/user as mob)
 		if (stat)
 			return 1
--- a/code/game/machinery/biogenerator.dm
+++ b/code/game/machinery/biogenerator.dm
@@ -74,7 +74,7 @@
 	update_icon()
 	return

-/obj/machinery/biogenerator/proc/interact(mob/user as mob)
+/obj/machinery/biogenerator/interact(mob/user as mob)
 	if(stat & BROKEN)
 		return
 	user.set_machine(src)
--- a/code/game/machinery/bots/cleanbot.dm
+++ b/code/game/machinery/bots/cleanbot.dm
@@ -79,7 +79,7 @@
 	usr.set_machine(src)
 	interact(user)

-/obj/machinery/bot/cleanbot/proc/interact(mob/user as mob)
+/obj/machinery/bot/cleanbot/interact(mob/user as mob)
 	var/dat
 	dat += text({"
 <TT><B>Automatic Station Cleaner v1.0</B></TT><BR><BR>
--- a/code/game/machinery/bots/floorbot.dm
+++ b/code/game/machinery/bots/floorbot.dm
@@ -75,7 +75,7 @@
 	usr.set_machine(src)
 	interact(user)

-/obj/machinery/bot/floorbot/proc/interact(mob/user as mob)
+/obj/machinery/bot/floorbot/interact(mob/user as mob)
 	var/dat
 	dat += "<TT><B>Automatic Station Floor Repairer v1.0</B></TT><BR><BR>"
 	dat += "Status: <A href='?src=\ref[src];operation=start'>[src.on ? "On" : "Off"]</A><BR>"
--- a/code/game/machinery/bots/mulebot.dm
+++ b/code/game/machinery/bots/mulebot.dm
@@ -202,7 +202,7 @@
 	user.set_machine(src)
 	interact(user, 0)

-/obj/machinery/bot/mulebot/proc/interact(var/mob/user, var/ai=0)
+/obj/machinery/bot/mulebot/interact(var/mob/user, var/ai=0)
 	var/dat
 	dat += "<TT><B>Multiple Utility Load Effector Mk. III</B></TT><BR><BR>"
 	dat += "ID: [suffix]<BR>"
--- a/code/game/machinery/bots/secbot.dm
+++ b/code/game/machinery/bots/secbot.dm
@@ -102,7 +102,7 @@
 	usr.set_machine(src)
 	interact(user)

-/obj/machinery/bot/secbot/proc/interact(mob/user as mob)
+/obj/machinery/bot/secbot/interact(mob/user as mob)
 	var/dat

 	dat += text({"
--- a/code/game/machinery/camera/wires.dm
+++ b/code/game/machinery/camera/wires.dm
@@ -98,7 +98,7 @@

 	src.interact(usr)

-/obj/machinery/camera/proc/interact(mob/living/user as mob)
+/obj/machinery/camera/interact(mob/living/user as mob)
 	if(!panel_open)
 		return

--- a/code/game/machinery/computer/Operating.dm
+++ b/code/game/machinery/computer/Operating.dm
@@ -30,7 +30,7 @@
 	interact(user)


-/obj/machinery/computer/operating/proc/interact(mob/user)
+/obj/machinery/computer/operating/interact(mob/user)
 	if ( (get_dist(src, user) > 1 ) || (stat & (BROKEN|NOPOWER)) )
 		if (!istype(user, /mob/living/silicon))
 			user.unset_machine()
--- a/code/game/machinery/computer/crew.dm
+++ b/code/game/machinery/computer/crew.dm
@@ -53,67 +53,66 @@
 			return


-	proc
-		interact(mob/user)
-			if( (get_dist(src, user) > 1 ) || (stat & (BROKEN|NOPOWER)) )
-				if(!istype(user, /mob/living/silicon))
-					user.unset_machine()
-					user << browse(null, "window=powcomp")
-					return
-			user.set_machine(src)
-			src.scan()
-			var/t = "<TT><B>Crew Monitoring</B><HR>"
-			t += "<BR><A href='?src=\ref[src];update=1'>Refresh</A> "
-			t += "<A href='?src=\ref[src];close=1'>Close</A><BR>"
-			t += "<table><tr><td width='40%'>Name</td><td width='20%'>Vitals</td><td width='40%'>Position</td></tr>"
-			var/list/logs = list()
-			for(var/obj/item/clothing/under/C in src.tracked)
-				var/log = ""
-				var/turf/pos = get_turf(C)
-				if((C) && (C.has_sensor) && (pos) && (pos.z == src.z) && C.sensor_mode)
-					if(istype(C.loc, /mob/living/carbon/human))
+	interact(mob/user)
+		if( (get_dist(src, user) > 1 ) || (stat & (BROKEN|NOPOWER)) )
+			if(!istype(user, /mob/living/silicon))
+				user.unset_machine()
+				user << browse(null, "window=powcomp")
+				return
+		user.set_machine(src)
+		src.scan()
+		var/t = "<TT><B>Crew Monitoring</B><HR>"
+		t += "<BR><A href='?src=\ref[src];update=1'>Refresh</A> "
+		t += "<A href='?src=\ref[src];close=1'>Close</A><BR>"
+		t += "<table><tr><td width='40%'>Name</td><td width='20%'>Vitals</td><td width='40%'>Position</td></tr>"
+		var/list/logs = list()
+		for(var/obj/item/clothing/under/C in src.tracked)
+			var/log = ""
+			var/turf/pos = get_turf(C)
+			if((C) && (C.has_sensor) && (pos) && (pos.z == src.z) && C.sensor_mode)
+				if(istype(C.loc, /mob/living/carbon/human))

-						var/mob/living/carbon/human/H = C.loc
+					var/mob/living/carbon/human/H = C.loc

-						var/dam1 = round(H.getOxyLoss(),1)
-						var/dam2 = round(H.getToxLoss(),1)
-						var/dam3 = round(H.getFireLoss(),1)
-						var/dam4 = round(H.getBruteLoss(),1)
+					var/dam1 = round(H.getOxyLoss(),1)
+					var/dam2 = round(H.getToxLoss(),1)
+					var/dam3 = round(H.getFireLoss(),1)
+					var/dam4 = round(H.getBruteLoss(),1)

-						var/life_status = "[H.stat > 1 ? "<font color=red>Deceased</font>" : "Living"]"
-						var/damage_report = "(<font color='blue'>[dam1]</font>/<font color='green'>[dam2]</font>/<font color='orange'>[dam3]</font>/<font color='red'>[dam4]</font>)"
+					var/life_status = "[H.stat > 1 ? "<font color=red>Deceased</font>" : "Living"]"
+					var/damage_report = "(<font color='blue'>[dam1]</font>/<font color='green'>[dam2]</font>/<font color='orange'>[dam3]</font>/<font color='red'>[dam4]</font>)"

-						if(H.wear_id)
-							log += "<tr><td width='40%'>[H.wear_id.name]</td>"
-						else
-							log += "<tr><td width='40%'>Unknown</td>"
+					if(H.wear_id)
+						log += "<tr><td width='40%'>[H.wear_id.name]</td>"
+					else
+						log += "<tr><td width='40%'>Unknown</td>"

-						switch(C.sensor_mode)
-							if(1)
-								log += "<td width='15%'>[life_status]</td><td width='40%'>Not Available</td></tr>"
-							if(2)
-								log += "<td width='20%'>[life_status] [damage_report]</td><td width='40%'>Not Available</td></tr>"
-							if(3)
-								var/area/player_area = get_area(H)
-								log += "<td width='20%'>[life_status] [damage_report]</td><td width='40%'>[player_area.name] ([pos.x], [pos.y])</td></tr>"
-				logs += log
-			logs = sortList(logs)
-			for(var/log in logs)
-				t += log
-			t += "</table>"
-			t += "</FONT></PRE></TT>"
-			user << browse(t, "window=crewcomp;size=900x600")
-			onclose(user, "crewcomp")
+					switch(C.sensor_mode)
+						if(1)
+							log += "<td width='15%'>[life_status]</td><td width='40%'>Not Available</td></tr>"
+						if(2)
+							log += "<td width='20%'>[life_status] [damage_report]</td><td width='40%'>Not Available</td></tr>"
+						if(3)
+							var/area/player_area = get_area(H)
+							log += "<td width='20%'>[life_status] [damage_report]</td><td width='40%'>[player_area.name] ([pos.x], [pos.y])</td></tr>"
+			logs += log
+		logs = sortList(logs)
+		for(var/log in logs)
+			t += log
+		t += "</table>"
+		t += "</FONT></PRE></TT>"
+		user << browse(t, "window=crewcomp;size=900x600")
+		onclose(user, "crewcomp")


-		scan()
-			for(var/obj/item/clothing/under/C in world)
-				if((C.has_sensor) && (istype(C.loc, /mob/living/carbon/human)))
-					var/check = 0
-					for(var/O in src.tracked)
-						if(O == C)
-							check = 1
-							break
-					if(!check)
-						src.tracked.Add(C)
-			return 1
+	proc/scan()
+		for(var/obj/item/clothing/under/C in world)
+			if((C.has_sensor) && (istype(C.loc, /mob/living/carbon/human)))
+				var/check = 0
+				for(var/O in src.tracked)
+					if(O == C)
+						check = 1
+						break
+				if(!check)
+					src.tracked.Add(C)
+		return 1
--- a/code/game/machinery/computer/power.dm
+++ b/code/game/machinery/computer/power.dm
@@ -68,7 +68,7 @@
 		src.attack_hand(user)
 	return

-/obj/machinery/power/monitor/proc/interact(mob/user)
+/obj/machinery/power/monitor/interact(mob/user)

 	if ( (get_dist(src, user) > 1 ) || (stat & (BROKEN|NOPOWER)) )
 		if (!istype(user, /mob/living/silicon))
--- a/code/game/machinery/computer/station_alert.dm
+++ b/code/game/machinery/computer/station_alert.dm
@@ -23,7 +23,7 @@
 		return


-	proc/interact(mob/user)
+	interact(mob/user)
 		usr.set_machine(src)
 		var/dat = "<HEAD><TITLE>Current Station Alerts</TITLE><META HTTP-EQUIV='Refresh' CONTENT='10'></HEAD><BODY>\n"
 		dat += "<A HREF='?src=\ref[user];mach_close=alerts'>Close</A><br><br>"
--- a/code/game/machinery/kitchen/juicer.dm
+++ b/code/game/machinery/kitchen/juicer.dm
@@ -62,7 +62,7 @@
 	user.set_machine(src)
 	interact(user)

-/obj/machinery/juicer/proc/interact(mob/user as mob) // The microwave Menu
+/obj/machinery/juicer/interact(mob/user as mob) // The microwave Menu
 	var/is_chamber_empty = 0
 	var/is_beaker_ready = 0
 	var/processing_chamber = ""
--- a/code/game/machinery/kitchen/microwave.dm
+++ b/code/game/machinery/kitchen/microwave.dm
@@ -146,7 +146,7 @@
 *   Microwave Menu
 ********************/

-/obj/machinery/microwave/proc/interact(mob/user as mob) // The microwave Menu
+/obj/machinery/microwave/interact(mob/user as mob) // The microwave Menu
 	var/dat = ""
 	if(src.broken > 0)
 		dat = {"<TT>Bzzzzttttt</TT>"}
--- a/code/game/machinery/kitchen/smartfridge.dm
+++ b/code/game/machinery/kitchen/smartfridge.dm
@@ -89,7 +89,7 @@
 *   SmartFridge Menu
 ********************/

-/obj/machinery/smartfridge/proc/interact(mob/user as mob)
+/obj/machinery/smartfridge/interact(mob/user as mob)
 	if(!src.ispowered)
 		return

--- a/code/game/machinery/navbeacon.dm
+++ b/code/game/machinery/navbeacon.dm
@@ -132,7 +132,7 @@
 	attack_hand(var/mob/user)
 		interact(user, 0)

-	proc/interact(var/mob/user, var/ai = 0)
+	interact(var/mob/user, var/ai = 0)
 		var/turf/T = loc
 		if(T.intact)
 			return		// prevent intraction when T-scanner revealed
--- a/code/game/objects/items/blueprints.dm
+++ b/code/game/objects/items/blueprints.dm
@@ -44,7 +44,7 @@
 				return
 			edit_area()

-/obj/item/blueprints/proc/interact()
+/obj/item/blueprints/interact()
 	var/area/A = get_area()
 	var/text = {"<HTML><head><title>[src]</title></head><BODY>
 <h2>[station_name()] blueprints</h2>
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -152,7 +152,7 @@
 	var/produce_heat = 1500

 /obj/item/device/flashlight/flare/New()
-	fuel = rand(3000, 4500) // Last 10 to 15 minutes.
+	fuel = rand(1500, 2000) // Last 10 to 15 minutes.
 	..()

 /obj/item/device/flashlight/flare/process()
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -74,7 +74,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 	user.set_machine(src)
 	interact(user)

-/obj/item/device/radio/proc/interact(mob/user as mob)
+/obj/item/device/radio/interact(mob/user as mob)
 	if(!on)
 		return

--- a/code/game/objects/items/devices/uplinks.dm
+++ b/code/game/objects/items/devices/uplinks.dm
@@ -294,7 +294,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 	return 0

 // Interaction code. Gathers a list of items purchasable from the paren't uplink and displays it. It also adds a lock button.
-/obj/item/device/uplink/hidden/proc/interact(mob/user as mob)
+/obj/item/device/uplink/hidden/interact(mob/user as mob)

 	var/dat = "<body link='yellow' alink='white' bgcolor='#601414'><font color='white'>"
 	dat += src.generate_menu()
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -34,7 +34,7 @@
 /obj/item/stack/attack_self(mob/user as mob)
 	interact(user)

-/obj/item/stack/proc/interact(mob/user as mob)
+/obj/item/stack/interact(mob/user as mob)
 	if (!recipes)
 		return
 	if (!src || amount<=0)
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -79,12 +79,14 @@
 		for(var/mob/M in nearby)
 			if ((M.client && M.machine == src))
 				is_in_use = 1
-				src.attack_hand(M)
+				src.interact(M)
 		var/ai_in_use = AutoUpdateAI(src)

 		if(!ai_in_use && !is_in_use)
 			in_use = 0

+/obj/proc/interact(mob/user)
+	return

 /obj/proc/update_icon()
 	return
--- a/code/modules/assembly/assembly.dm
+++ b/code/modules/assembly/assembly.dm
@@ -46,7 +46,7 @@
 	proc/holder_movement()							//Called when the holder is moved
 		return

-	proc/interact(mob/user as mob)					//Called when attack_self is called
+	interact(mob/user as mob)					//Called when attack_self is called
 		return


--- a/code/modules/power/antimatter/control.dm
+++ b/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()
--- a/code/modules/power/apc.dm
+++ b/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

--- a/code/modules/power/generator.dm
+++ b/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")
--- a/code/modules/power/generator_type2.dm
+++ b/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")
--- a/code/modules/power/port_gen.dm
+++ b/code/modules/power/port_gen.dm
@@ -236,7 +236,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()
--- a/code/modules/power/singularity/particle_accelerator/particle_control.dm
+++ b/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()
--- a/code/modules/power/smes.dm
+++ b/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")
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -171,7 +171,6 @@
 		tracker_update(var/angle)
 		set_panels(var/cdir)
 		broken()
-		interact(mob/user)


 	New()
--- a/code/modules/reagents/Chemistry-Machinery.dm
+++ b/code/modules/reagents/Chemistry-Machinery.dm
@@ -828,7 +828,7 @@
 	user.set_machine(src)
 	interact(user)

-/obj/machinery/reagentgrinder/proc/interact(mob/user as mob) // The microwave Menu
+/obj/machinery/reagentgrinder/interact(mob/user as mob) // The microwave Menu
 	var/is_chamber_empty = 0
 	var/is_beaker_ready = 0
 	var/processing_chamber = ""
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -215,7 +215,7 @@
 		interact(user, 0)

 	// user interaction
-	proc/interact(mob/user, var/ai=0)
+	interact(mob/user, var/ai=0)

 		src.add_fingerprint(user)
 		if(stat & BROKEN)
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -49,6 +49,15 @@ should be listed in the changelog upon commit tho. Thanks. -->

 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->

+<div class="commit sansserif">
+	<h2 class="date">03 November 2012</h2>
+	<h3 class="author">TankNut updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="imageadd">New APC sprite.</li>
+		<li class="imageadd">New Wraith sprite and jaunting animation.</li>
+	</ul>
+</div>
+
 <div class="commit sansserif">
 	<h2 class="date">03 November 2012</h2>
 	<h3 class="author">WJohnston updated:</h3>
--- a/icons/mob/mob.dmi
+++ b/icons/mob/mob.dmi
--- a/icons/obj/power.dmi
+++ b/icons/obj/power.dmi