Merge remote-tracking branch 'ParadiseSS13/master' into uid_patch

code/game/machinery/camera/camera.dm

@@ -163,6 +163,10 @@
 
 	// OTHER
 	else if((istype(I, /obj/item/paper) || istype(I, /obj/item/pda)) && isliving(user))
+		if (!can_use())
+			to_chat(user, "<span class='warning'>You can't show something to a disabled camera!</span>")
+			return
+
 		var/mob/living/U = user
 		var/obj/item/paper/X = null
 		var/obj/item/pda/PDA = null

code/game/objects/items/tools/multitool.dm

@@ -25,7 +25,7 @@
 	var/shows_wire_information = FALSE // shows what a wire does if set to TRUE
 	var/obj/machinery/buffer // simple machine buffer for device linkage
 
-/obj/item/multitool/proc/IsBufferA(var/typepath)
+/obj/item/multitool/proc/IsBufferA(typepath)
 	if(!buffer)
 		return 0
 	return istype(buffer,typepath)
@@ -41,12 +41,11 @@
 	to_chat(user, "<span class='notice'>You load [M] into [src]'s internal buffer.</span>")
 	return TRUE
 
-// Syndicate device disguised as a multitool; it will turn red when an AI camera is nearby.
-
 /obj/item/multitool/Destroy()
 	buffer = null
 	return ..()
 
+// Syndicate device disguised as a multitool; it will turn red when an AI camera is nearby.
 /obj/item/multitool/ai_detect
 	var/track_cooldown = 0
 	var/track_delay = 10 //How often it checks for proximity

code/modules/examine/descriptions/weapons.dm

@@ -8,12 +8,10 @@
 
 //This contains a lot of copypasta but I'm told it's better then a lot of New()s appending the var.
 /obj/item/gun
-	description_info = "This is a gun.  To fire the weapon, have your gun mode set to 'fire', \
-	then click where you want to fire."
+	description_info = "This is a gun."
 
 /obj/item/gun/energy
-	description_info = "This is an energy weapon.  To fire the weapon, have your gun mode set to 'fire', \
-	then click where you want to fire.  Most energy weapons can fire through windows harmlessly.  To recharge this weapon, use a weapon recharger."
+	description_info = "This is an energy weapon. Most energy weapons can fire through windows harmlessly.  To recharge this weapon, use a weapon recharger."
 
 /obj/item/gun/energy/kinetic_accelerator/crossbow
 	description_info = "This is an energy weapon.  To fire the weapon, have your gun mode set to 'fire', \
@@ -22,42 +20,34 @@
 	addition to toxins.  The energy crossbow recharges itself slowly, and can be concealed in your pocket or bag."
 
 /obj/item/gun/energy/gun
-	description_info = "This is an energy weapon.  To fire the weapon, have your gun mode set to 'fire', \
-	then click where you want to fire.  Most energy weapons can fire through windows harmlessly.  To switch between stun and lethal, click the weapon \
+	description_info = "This is an energy weapon. Most energy weapons can fire through windows harmlessly.  To switch between stun and lethal, click the weapon \
 	in your hand.  To recharge this weapon, use a weapon recharger."
 
 /obj/item/gun/energy/gun/advtaser
-	description_info = "This is an energy weapon.  To fire the weapon, have your gun mode set to 'fire', \
-	then click where you want to fire. To recharge this weapon, use a weapon recharger. \
+	description_info = "This is an energy weapon. To recharge this weapon, use a weapon recharger. \
 	To switch between insta-stun and disabler beams, click the weapon in your hand. This weapon can only fire through glass if it is set to disabler beams."
 
 /obj/item/gun/energy/nuclear
-	description_info = "This is an energy weapon.  To fire the weapon, have your gun mode set to 'fire', \
-	then click where you want to fire.  Most energy weapons can fire through windows harmlessly.  To switch between stun and lethal, click the weapon \
+	description_info = "This is an energy weapon. Most energy weapons can fire through windows harmlessly.  To switch between stun and lethal, click the weapon \
 	in your hand.  Unlike most weapons, this weapon recharges itself."
 
 /obj/item/gun/energy/captain
-	description_info = "This is an energy weapon.  To fire the weapon, have your gun mode set to 'fire', \
-	then click where you want to fire.  Most energy weapons can fire through windows harmlessly. Unlike most weapons, this weapon recharges itself."
+	description_info = "This is an energy weapon. Most energy weapons can fire through windows harmlessly. Unlike most weapons, this weapon recharges itself."
 
 /obj/item/gun/energy/sniperrifle
-	description_info = "This is an energy weapon.  To fire the weapon, have your gun mode set to 'fire', \
-	then click where you want to fire.  Most energy weapons can fire through windows harmlessly.  To recharge this weapon, use a weapon recharger. \
+	description_info = "This is an energy weapon. Most energy weapons can fire through windows harmlessly.  To recharge this weapon, use a weapon recharger. \
 	To use the scope, use the appropriate verb in the object tab."
 
 /obj/item/gun/projectile
-	description_info = "This is a ballistic weapon.  To fire the weapon, have your gun mode set to 'fire', \
-	then click where you want to fire.  To reload, click the weapon in your hand to unload (if needed), then add the appropriate ammo.  The description \
+	description_info = "This is a ballistic weapon. To reload, click the weapon in your hand to unload (if needed), then add the appropriate ammo.  The description \
 	will tell you what caliber you need."
 
 /obj/item/gun/projectile/shotgun/pump
-	description_info = "This is a ballistic weapon.  To fire the weapon, have your gun mode set to 'fire', \
-	then click where you want to fire.  After firing, you will need to pump the gun, by clicking on the gun in your hand.  To reload, load more shotgun \
+	description_info = "This is a ballistic weapon. After firing, you will need to pump the gun, by clicking on the gun in your hand.  To reload, load more shotgun \
 	shells into the gun."
 
 /obj/item/toy/russian_revolver/trick_revolver //oh no
-	description_info = "This is a ballistic weapon.  To fire the weapon, have your gun mode set to 'fire', \
-	then click where you want to fire.  To reload, click the weapon in your hand to unload (if needed), then add the appropriate ammo.  The description \
+	description_info = "This is a ballistic weapon. To reload, click the weapon in your hand to unload (if needed), then add the appropriate ammo.  The description \
 	will tell you what caliber you need."
 
 //*******

code/modules/research/xenobiology/xenobio_camera.dm

@@ -18,7 +18,7 @@
 		return
 
 /obj/machinery/computer/camera_advanced/xenobio
-	name = "Slime management console"
+	name = "slime management console"
 	desc = "A computer used for remotely handling slimes."
 	networks = list("SS13")
 	circuit = /obj/item/circuitboard/xenobiology
@@ -174,9 +174,9 @@
 		return
 	var/obj/item/multitool/M = I
 	if(istype(M.buffer, /obj/machinery/monkey_recycler))
-		M.set_multitool_buffer(user, src)
 		connected_recycler = M.buffer
 		connected_recycler.connected += src
+		to_chat(user, "<span class='notice'>You link [src] to the recycler stored in the [M]'s buffer.</span>")
 
 /datum/action/innate/slime_place
 	name = "Place Slimes"