Merge remote-tracking branch 'upstream/dev' into attack-cleanup2

Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm

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

@@ -1042,7 +1042,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 
 /obj/item/device/pda/proc/new_message(var/sending_unit, var/sender, var/sender_job, var/message)
 	var/reception_message = "\icon[src] <b>Message from [sender] ([sender_job]), </b>\"[message]\" (<a href='byond://?src=\ref[src];choice=Message;notap=[istype(loc, /mob/living/silicon)];skiprefresh=1;target=\ref[sending_unit]'>Reply</a>)"
-	new_info(message_silent, newstone, reception_message)
+	new_info(message_silent, ttone, reception_message)
 
 	log_pda("[usr] (PDA: [sending_unit]) sent \"[message]\" to [name]")
 	new_message = 1

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

@@ -140,7 +140,8 @@
 	name = "flare"
 	desc = "A red standard-issue flare. There are instructions on the side reading 'pull cord, make light'."
 	w_class = 2.0
-	brightness_on = 7 // Pretty bright.
+	brightness_on = 8 // Pretty bright.
+	light_power = 3
 	light_color = "#e58775"
 	icon_state = "flare"
 	item_state = "flare"

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

@@ -135,7 +135,7 @@
 
 /obj/machinery/camera/spy
 	// These cheap toys are accessible from the mercenary camera console as well
-	network = list("NUKE")
+	network = list(NETWORK_MERCENARY)
 
 /obj/machinery/camera/spy/New()
 	..()

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

@@ -7,13 +7,13 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 */
 
 /obj/item/device/uplink
-	var/welcome 			// Welcoming menu message
-	var/uses 				// Numbers of crystals
-	var/list/ItemsCategory	// List of categories with lists of items
-	var/list/ItemsReference	// List of references with an associated item
-	var/list/nanoui_items	// List of items for NanoUI use
-	var/nanoui_menu = 0		// The current menu we are in
-	var/list/nanoui_data = new // Additional data for NanoUI use
+	var/welcome = "Welcome, Operative"	// Welcoming menu message
+	var/uses 							// Numbers of crystals
+	var/list/ItemsCategory				// List of categories with lists of items
+	var/list/ItemsReference				// List of references with an associated item
+	var/list/nanoui_items				// List of items for NanoUI use
+	var/nanoui_menu = 0					// The current menu we are in
+	var/list/nanoui_data = new 			// Additional data for NanoUI use
 
 	var/list/purchase_log = new
 	var/datum/mind/uplink_owner = null
@@ -22,11 +22,12 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 /obj/item/device/uplink/nano_host()
 	return loc
 
-/obj/item/device/uplink/New(var/location, var/datum/mind/owner)
+/obj/item/device/uplink/New(var/location, var/datum/mind/owner, var/telecrystals = DEFAULT_TELECRYSTAL_AMOUNT)
 	..()
 	src.uplink_owner = owner
 	purchase_log = list()
 	world_uplinks += src
+	uses = telecrystals
 
 /obj/item/device/uplink/Destroy()
 	world_uplinks -= src
@@ -212,4 +213,4 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 /obj/item/device/radio/headset/uplink/New()
 	..()
 	hidden_uplink = new(src)
-	hidden_uplink.uses = 10
+	hidden_uplink.uses = DEFAULT_TELECRYSTAL_AMOUNT

code/game/objects/items/weapons/storage/secure.dm

@@ -169,42 +169,6 @@
 		src.add_fingerprint(user)
 		return
 
-	//I consider this worthless but it isn't my code so whatever.  Remove or uncomment.
-	/*attack(mob/M as mob, mob/living/user as mob)
-		if ((CLUMSY in user.mutations) && prob(50))
-			user << "<span class='warning'>The [src] slips out of your hand and hits your head.</span>"
-			user.take_organ_damage(10)
-			user.Paralyse(2)
-			return
-
-		M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been attacked with [src.name] by [user.name] ([user.ckey])</font>")
-		user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to attack [M.name] ([M.ckey])</font>")
-
-		log_attack("<font color='red'>[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])</font>")
-
-		var/t = user:zone_sel.selecting
-		if (t == "head")
-			if(ishuman(M))
-				var/mob/living/carbon/human/H = M
-				if (H.stat < 2 && H.health < 50 && prob(90))
-				// ******* Check
-					if (istype(H, /obj/item/clothing/head) && H.flags & 8 && prob(80))
-						H << "<span class='warning'>The helmet protects you from being hit hard in the head!</span>"
-						return
-					var/time = rand(2, 6)
-					if (prob(75))
-						H.Paralyse(time)
-					else
-						H.Stun(time)
-					if(H.stat != 2)	H.stat = 1
-					for(var/mob/O in viewers(H, null))
-						O.show_message(text("<span class='warning'><B>[] has been knocked unconscious!</B></span>", H), 1, "<span class='warning'>You hear someone fall.</span>", 2)
-				else
-					H << text("<span class='warning'>[] tried to knock you unconcious!</span>",user)
-					H.eye_blurry += 3
-
-		return*/
-
 // -----------------------------
 //        Secure Safe
 // -----------------------------