Merge branch 'master' into synctesting

2018-04-08 03:41:50 +00:00
parent 87365ee74b 43baad50f1
commit 5f81921fa6
5 changed files with 26 additions and 20 deletions
@@ -31,8 +31,8 @@ Thus, the two variables affect pump operation are set in New():

 /obj/machinery/atmospherics/components/binary/pump/on
 	on = TRUE
-	icon_state = "pump_on"
-
+	icon_state = "pump_on_map"
+	
 /obj/machinery/atmospherics/components/binary/pump/Destroy()
 	SSradio.remove_object(src,frequency)
 	if(radio_connection)
@@ -35,7 +35,7 @@ Thus, the two variables affect pump operation are set in New():

 /obj/machinery/atmospherics/components/binary/volume_pump/on
 	on = TRUE
-	icon_state = "volpump_on"
+	icon_state = "volpump_on_map"

 /obj/machinery/atmospherics/components/binary/volume_pump/update_icon_nopipes()
 	if(!is_operational())