diff --git a/code/WorkInProgress/pomf/spacepods/equipment.dm b/code/WorkInProgress/pomf/spacepods/equipment.dm
index 2c3a673c703..d4995b9fde5 100644
--- a/code/WorkInProgress/pomf/spacepods/equipment.dm
+++ b/code/WorkInProgress/pomf/spacepods/equipment.dm
@@ -1,3 +1,49 @@
+/obj/item/device/spacepod_equipment/weaponry/proc/fire_weapons()
+
+	if(my_atom.next_firetime > world.time)
+		usr << "<span class='warning'>Your weapons are recharging.</span>"
+		return
+	var/turf/firstloc
+	var/turf/secondloc
+	if(!my_atom.equipment_system || !my_atom.equipment_system.weapon_system)
+		usr << "<span class='warning'>Missing equipment or weapons.</span>"
+		my_atom.verbs -= text2path("[type]/proc/fire_weapons")
+		return
+	my_atom.battery.use(shot_cost)
+	var/olddir
+	for(var/i = 0; i < shots_per; i++)
+		if(olddir != dir)
+			switch(dir)
+				if(NORTH)
+					firstloc = get_step(src, NORTH)
+					secondloc = get_step(firstloc,EAST)
+				if(SOUTH)
+					firstloc = get_turf(src)
+					secondloc = get_step(firstloc,EAST)
+				if(EAST)
+					firstloc = get_turf(src)
+					firstloc = get_step(firstloc, EAST)
+					secondloc = get_step(firstloc,NORTH)
+				if(WEST)
+					firstloc = get_turf(src)
+					secondloc = get_step(firstloc,NORTH)
+		olddir = dir
+		var/obj/item/projectile/projone = new projectile_type(firstloc)
+		var/obj/item/projectile/projtwo = new projectile_type(secondloc)
+		projone.starting = get_turf(src)
+		projone.shot_from = src
+		projone.firer = usr
+		projone.def_zone = "chest"
+		projtwo.starting = get_turf(src)
+		projtwo.shot_from = src
+		projtwo.firer = usr
+		projtwo.def_zone = "chest"
+		spawn()
+			playsound(src, fire_sound, 50, 1)
+			projone.dumbfire(dir)
+			projtwo.dumbfire(dir)
+		sleep(1)
+	my_atom.next_firetime = world.time + fire_delay
 
 /datum/spacepod/equipment
 	var/obj/spacepod/my_atom
@@ -12,6 +58,7 @@
 
 /obj/item/device/spacepod_equipment
 	name = "equipment"
+	var/obj/spacepod/my_atom
 // base item for spacepod weapons
 
 /obj/item/device/spacepod_equipment/weaponry
@@ -33,6 +80,14 @@
 	shot_cost = 10
 	fire_sound = "sound/weapons/Taser.ogg"
 
+/obj/item/device/spacepod_equipment/weaponry/taser/proc/fire_weapon_system()
+	set category = "Spacepod"
+	set name = "Fire Taser System"
+	set desc = "Fire ze tasers!"
+	set src = usr.loc
+
+	fire_weapons()
+
 /obj/item/device/spacepod_equipment/weaponry/taser/burst
 	name = "\improper taser system"
 	desc = "A weak taser system for space pods, this one fires 3 at a time."
@@ -47,4 +102,12 @@
 	projectile_type = "/obj/item/projectile/beam"
 	shot_cost = 15
 	fire_sound = 'sound/weapons/Laser.ogg'
-	fire_delay = 25
\ No newline at end of file
+	fire_delay = 25
+
+/obj/item/device/spacepod_equipment/weaponry/laser/proc/fire_weapon_system()
+	set category = "Spacepod"
+	set name = "Fire Laser System"
+	set desc = "Fire ze lasers!"
+	set src = usr.loc
+
+	fire_weapons()
\ No newline at end of file
diff --git a/code/game/machinery/computer/power.dm b/code/game/machinery/computer/power.dm
index 0ed916b3bcf..1f58c9659b0 100644
--- a/code/game/machinery/computer/power.dm
+++ b/code/game/machinery/computer/power.dm
@@ -10,8 +10,14 @@
 	use_power = 2
 	idle_power_usage = 20
 	active_power_usage = 80
-	luminosity = 2
+	l_color = "#D7DF01"
 
+/obj/machinery/power/monitor/power_change()
+	..()
+	if(!(stat & (BROKEN|NOPOWER)))
+		SetLuminosity(3)
+	else
+		SetLuminosity(0)
 //fix for issue 521, by QualityVan.
 //someone should really look into why circuits have a powernet var, it's several kinds of retarded.
 /obj/machinery/power/monitor/New()
diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm
index aa13a5e8a27..49238fdb993 100644
--- a/code/game/machinery/telecomms/logbrowser.dm
+++ b/code/game/machinery/telecomms/logbrowser.dm
@@ -1,9 +1,18 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
+/obj/machinery/computer/telecomms
+	l_color = "#50A900"
+	power_change()
+		..()
+		if(!(stat & (BROKEN|NOPOWER)))
+			SetLuminosity(3)
+		else
+			SetLuminosity(0)
 
 /obj/machinery/computer/telecomms/server
 	name = "Telecommunications Server Monitor"
 	icon_state = "comm_logs"
 
+
 	var/screen = 0				// the screen number:
 	var/list/servers = list()	// the servers located by the computer
 	var/obj/machinery/telecomms/server/SelectedServer
@@ -15,6 +24,7 @@
 
 	req_access = list(access_tcomsat)
 
+
 	attack_hand(mob/user as mob)
 		if(stat & (BROKEN|NOPOWER))
 			return
diff --git a/icons/obj/vehicles.dmi b/icons/obj/vehicles.dmi
index a7da230679c..e437e2e0eeb 100644
Binary files a/icons/obj/vehicles.dmi and b/icons/obj/vehicles.dmi differ