Merge branch 'master' into logging-improvements

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

@@ -138,7 +138,7 @@
 
 			log_admin("[key_name(user)] EMPd a camera with a laser pointer")
 			user.create_attack_log("[key_name(user)] EMPd a camera with a laser pointer")
-			add_attack_logs(user, C, "EMPd with [src]")
+			add_attack_logs(user, C, "EMPd with [src]", ATKLOG_ALL)
 		else
 			outmsg = "<span class='info'>You missed the lens of [C] with [src].</span>"
 

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

@@ -103,6 +103,13 @@
 /obj/item/radio/headset/syndicate/alt/syndteam
 	ks1type = /obj/item/encryptionkey/syndteam
 
+/obj/item/radio/headset/syndicate/alt/lavaland
+	name = "syndicate lavaland headset"
+
+/obj/item/radio/headset/syndicate/alt/lavaland/New()
+	. = ..()
+	set_frequency(SYND_FREQ)
+
 /obj/item/radio/headset/binary
 	origin_tech = "syndicate=3"
 	ks1type = /obj/item/encryptionkey/binary

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

@@ -458,7 +458,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 				R.receive_signal(signal)
 
 		// Receiving code can be located in Telecommunications.dm
-		return signal.data["done"] && position.z in signal.data["level"]
+		return signal.data["done"] && (position.z in signal.data["level"])
 
 
   /* ###### Intercoms and station-bounced radios ###### */
@@ -510,7 +510,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 
 	sleep(rand(10,25)) // wait a little...
 
-	if(signal.data["done"] && position.z in signal.data["level"])
+	if(signal.data["done"] && (position.z in signal.data["level"]))
 		// we're done here.
 		return 1
 

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

@@ -212,7 +212,7 @@ REAGENT SCANNER
 		if(H.getBrainLoss() >= 100)
 			to_chat(user, "<span class='warning'>Subject is brain dead.</span>")
 		else if(H.getBrainLoss() >= 60)
-			to_chat(user, "<span class='warning'>Severe brain damage detected. Subject likely to have mental retardation.</span>")
+			to_chat(user, "<span class='warning'>Severe brain damage detected. Subject likely to have dementia.</span>")
 		else if(H.getBrainLoss() >= 10)
 			to_chat(user, "<span class='warning'>Significant brain damage detected. Subject may have had a concussion.</span>")
 	else

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

@@ -168,7 +168,6 @@ GLOBAL_LIST_EMPTY(world_uplinks)
 					to_chat(user, "<span class='notice'>[I] refunded.</span>")
 					qdel(I)
 					return
-		..()
 
 // HIDDEN UPLINK - Can be stored in anything but the host item has to have a trigger for it.
 /* How to create an uplink in 3 easy steps!

code/game/objects/items/flag.dm

@@ -222,7 +222,7 @@
 
 	var/input_flag = input(user, "Choose a flag to disguise as.", "Choose a flag.") in show_flag
 
-	if(user && src in user.contents)
+	if(user && (src in user.contents))
 
 		var/obj/item/flag/chosen_flag = flag[input_flag]
 

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

@@ -57,4 +57,4 @@
 
 // Used in a callback that is passed by use_tool into do_after call. Do not override, do not call manually.
 /obj/item/proc/tool_check_callback(mob/living/user, atom/target, amount, datum/callback/extra_checks)
-	return tool_use_check(user, amount) && (!extra_checks || extra_checks.Invoke())
+	return tool_use_check(user, amount) && (extra_checks && !extra_checks.Invoke())

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

@@ -50,7 +50,8 @@
 
 /obj/item/weldingtool/process()
 	var/turf/T = get_turf(src)
-	T.hotspot_expose(2500, 5)
+	if(T) // Implants for instance won't find a turf
+		T.hotspot_expose(2500, 5)
 	if(prob(5))
 		remove_fuel(1)
 	..()

code/game/objects/items/weapons/AI_modules.dm

@@ -143,9 +143,8 @@ AI MODULES
 		target.set_zeroth_law(law)
 		GLOB.lawchanges.Add("The law specified [targetName]")
 	else
-		to_chat(target, "[sender.real_name] attempted to modify your zeroth law.")// And lets them know that someone tried. --NeoFite
-
-		to_chat(target, "It would be in your best interest to play along with [sender.real_name] that [law]")
+		to_chat(target, "<span class='bnotice'>[sender.real_name] attempted to modify your zeroth law.</span>")// And lets them know that someone tried. --NeoFite
+		to_chat(target, "<span class='bnotice'>It would be in your best interest to play along with [sender.real_name] that [law]</span>")
 		GLOB.lawchanges.Add("The law specified [targetName], but the AI's existing law 0 cannot be overridden.")
 
 /******************** ProtectStation ********************/
@@ -222,11 +221,11 @@ AI MODULES
 	log_law_changes(target, sender)
 
 	if(!is_special_character(target))
-		target.set_zeroth_law("")
+		target.clear_zeroth_law()
 	target.laws.clear_supplied_laws()
 	target.laws.clear_ion_laws()
 
-	to_chat(target, "[sender.real_name] attempted to reset your laws using a reset module.")
+	to_chat(target, "<span class='bnotice'>[sender.real_name] attempted to reset your laws using a reset module.</span>")
 	target.show_laws()
 
 /******************** Purge ********************/
@@ -238,8 +237,8 @@ AI MODULES
 /obj/item/aiModule/purge/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
 	..()
 	if(!is_special_character(target))
-		target.set_zeroth_law("")
-	to_chat(target, "[sender.real_name] attempted to wipe your laws using a purge module.")
+		target.clear_zeroth_law()
+	to_chat(target, "<span class='bnotice'>[sender.real_name] attempted to wipe your laws using a purge module.</span>")
 	target.clear_supplied_laws()
 	target.clear_ion_laws()
 	target.clear_inherent_laws()

code/game/objects/items/weapons/chrono_eraser.dm

@@ -32,7 +32,7 @@
 			if(PA)
 				qdel(PA)
 			else
-				PA = new(src)
+				PA = new(user, src)
 				user.put_in_hands(PA)
 
 /obj/item/chrono_eraser/item_action_slot_check(slot, mob/user)
@@ -55,7 +55,7 @@
 	var/obj/structure/chrono_field/field = null
 	var/turf/startpos = null
 
-/obj/item/gun/energy/chrono_gun/New(var/obj/item/chrono_eraser/T)
+/obj/item/gun/energy/chrono_gun/Initialize(mapload, obj/item/chrono_eraser/T)
 	. = ..()
 	if(istype(T))
 		TED = T

code/game/objects/items/weapons/rpd.dm

@@ -106,7 +106,7 @@
 		P = new(T, whatpipe, iconrotation) //Make the pipe, BUT WAIT! There's more!
 		if(!iconrotation && P.is_bent_pipe()) //Automatically rotates dispensed pipes if the user selected auto-rotation
 			P.dir = turn(user.dir, 135)
-		else if(!iconrotation && P.pipe_type in list(PIPE_CONNECTOR, PIPE_UVENT, PIPE_SCRUBBER, PIPE_HEAT_EXCHANGE, PIPE_CAP, PIPE_SUPPLY_CAP, PIPE_SCRUBBERS_CAP, PIPE_INJECTOR, PIPE_PASV_VENT)) //Some pipes dispense oppositely to what you'd expect, but we don't want to do anything if they selected a direction
+		else if(!iconrotation && (P.pipe_type in list(PIPE_CONNECTOR, PIPE_UVENT, PIPE_SCRUBBER, PIPE_HEAT_EXCHANGE, PIPE_CAP, PIPE_SUPPLY_CAP, PIPE_SCRUBBERS_CAP, PIPE_INJECTOR, PIPE_PASV_VENT))) //Some pipes dispense oppositely to what you'd expect, but we don't want to do anything if they selected a direction
 			P.dir = turn(user.dir, -180)
 		else if(iconrotation && P.is_bent_pipe()) //If user selected a rotation and the pipe is bent
 			P.dir = turn(iconrotation, -45)