Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into medtweaks

code/game/objects/items/devices/pipe_painter.dm

@@ -0,0 +1,22 @@
+/obj/item/device/pipe_painter
+	name = "pipe painter"
+	icon = 'icons/obj/bureaucracy.dmi'
+	icon_state = "labeler1"
+	item_state = "flight"
+	var/list/modes = list("grey","red","blue","cyan","green","yellow","purple")
+	var/mode = "grey"
+
+/obj/item/device/pipe_painter/afterattack(atom/A, mob/user as mob)
+	if(!istype(A,/obj/machinery/atmospherics/pipe) || istype(A,/obj/machinery/atmospherics/pipe/tank) || istype(A,/obj/machinery/atmospherics/pipe/vent) || istype(A,/obj/machinery/atmospherics/pipe/simple/heat_exchanging) || istype(A,/obj/machinery/atmospherics/pipe/simple/insulated))
+		return
+	var/obj/machinery/atmospherics/pipe/P = A
+	P.color = mode
+	user.visible_message("<span class='notice'>[user] paints \the [P] [mode].</span>","<span class='notice'>You paint \the [P] [mode].</span>")
+	P.update_icon()
+
+/obj/item/device/pipe_painter/attack_self(mob/user as mob)
+	mode = input("Which colour do you want to use?","Pipe painter") in modes
+
+/obj/item/device/pipe_painter/examine()
+	..()
+	usr << "It is in [mode] mode."

code/game/objects/items/devices/radio/encryptionkey.dm

@@ -121,7 +121,8 @@
 	desc = "An encyption key for a radio headset.  Contains cypherkeys."
 	icon_state = "cargo_cypherkey"
 	channels = list("Supply" = 1)
+
 /obj/item/device/encryptionkey/ert
 	name = "NanoTrasen ERT Radio Encryption Key"
 	desc = "An encyption key for a radio headset.  Contains cypherkeys."
-	channels = list("Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Mining" = 1, "Cargo" = 1,)
+	channels = list("Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1)

code/game/objects/items/devices/radio/radio.dm

@@ -499,8 +499,6 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 					freq_text = "Engineering"
 				if(1359)
 					freq_text = "Security"
-//				if(1349)
-//					freq_text = "Mining"
 				if(1347)
 					freq_text = "Supply"
 			//There's probably a way to use the list var of channels in code\game\communications.dm to make the dept channels non-hardcoded, but I wasn't in an experimentive mood. --NEO

code/game/objects/items/robot/robot_upgrades.dm

@@ -32,6 +32,7 @@
 	R.icon_state = "robot"
 	del(R.module)
 	R.module = null
+	R.camera.network.Remove(list("Medical","MINE"))
 	R.updatename("Default")
 	R.status_flags |= CANPUSH
 	R.updateicon()

code/game/objects/items/weapons/implants/implant.dm

@@ -461,3 +461,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
 
 	islegal()
 		return 0
+
+/obj/item/weapon/implant/cortical
+	name = "cortical stack"
+	desc = "A fist-sized mass of biocircuits and chips."

code/game/objects/items/weapons/tanks/tank_types.dm

@@ -29,7 +29,7 @@
 		..()
 		if(air_contents.oxygen < 10)
 			usr << text("\red <B>The meter on the [src.name] indicates you are almost out of air!</B>")
-			playsound(usr, 'sound/effects/alert.ogg', 50, 1)
+			//playsound(usr, 'sound/effects/alert.ogg', 50, 1)
 
 
 /obj/item/weapon/tank/oxygen/yellow
@@ -186,4 +186,4 @@
 	..()
 	if(air_contents.nitrogen < 10)
 		usr << text("\red <B>The meter on the [src.name] indicates you are almost out of air!</B>")
-		playsound(usr, 'sound/effects/alert.ogg', 50, 1)
+		//playsound(usr, 'sound/effects/alert.ogg', 50, 1)