Merge pull request #10537 from mwerezak/mapping-fixes

Fixes and mapping

code/game/machinery/atmoalter/portable_atmospherics.dm

@@ -163,6 +163,13 @@
 	var/last_power_draw = 0
 	var/obj/item/weapon/cell/cell
 
+/obj/machinery/portable_atmospherics/powered/powered()
+	if(use_power) //using area power
+		return ..()
+	if(cell && cell.charge)
+		return 1
+	return 0
+
 /obj/machinery/portable_atmospherics/powered/attackby(obj/item/I, mob/user)
 	if(istype(I, /obj/item/weapon/cell))
 		if(cell)
@@ -176,6 +183,7 @@
 		cell = C
 		C.loc = src
 		user.visible_message("\blue [user] opens the panel on [src] and inserts [C].", "\blue You open the panel on [src] and insert [C].")
+		power_change()
 		return
 
 	if(istype(I, /obj/item/weapon/screwdriver))
@@ -187,8 +195,8 @@
 		cell.add_fingerprint(user)
 		cell.loc = src.loc
 		cell = null
+		power_change()
 		return
-
 	..()
 
 /obj/machinery/portable_atmospherics/proc/log_open()

code/game/machinery/atmoalter/pump.dm

@@ -102,6 +102,7 @@
 
 		//ran out of charge
 		if (!cell.charge)
+			power_change()
 			update_icon()
 
 	src.updateDialog()

code/game/machinery/atmoalter/scrubber.dm

@@ -77,6 +77,7 @@
 
 		//ran out of charge
 		if (!cell.charge)
+			power_change()
 			update_icon()
 
 	//src.update_icon()
@@ -147,7 +148,6 @@
 	volume = 50000
 	volume_rate = 5000
 
-	chan
 	use_power = 1
 	idle_power_usage = 500		//internal circuitry, friction losses and stuff
 	active_power_usage = 100000	//100 kW ~ 135 HP

code/game/machinery/spaceheater.dm

@@ -32,6 +32,11 @@
 		user << "The charge meter reads [cell ? round(cell.percent(),1) : 0]%"
 	return
 
+/obj/machinery/space_heater/powered()
+	if(cell && cell.charge)
+		return 1
+	return 0
+
 /obj/machinery/space_heater/emp_act(severity)
 	if(stat & (BROKEN|NOPOWER))
 		..(severity)
@@ -56,6 +61,7 @@
 					C.add_fingerprint(usr)
 
 					user.visible_message("\blue [user] inserts a power cell into [src].", "\blue You insert the power cell into [src].")
+					power_change()
 		else
 			user << "The hatch must be open to insert a power cell."
 			return
@@ -125,6 +131,7 @@
 					usr.put_in_hands(cell)
 					cell.add_fingerprint(usr)
 					cell = null
+					power_change()
 
 
 			if("cellinstall")
@@ -135,7 +142,7 @@
 						cell = C
 						C.loc = src
 						C.add_fingerprint(usr)
-
+						power_change()
 						usr.visible_message("\blue [usr] inserts \the [C] into \the [src].", "\blue You insert \the [C] into \the [src].")
 
 		updateDialog()
@@ -176,4 +183,5 @@
 				env.merge(removed)
 		else
 			on = 0
+			power_change()
 			update_icon()

code/modules/clothing/head/soft_caps.dm

@@ -2,7 +2,6 @@
 	name = "cargo cap"
 	desc = "It's a peaked cap in a tasteless yellow color."
 	icon_state = "cargosoft"
-	flags = HEADCOVERSEYES
 	item_state = "helmet"
 	var/flipped = 0
 	siemens_coefficient = 0.9