Fixes conflicts in icons/obj/gun.dmi.

code/datums/ai_laws.dm

@@ -1,6 +1,7 @@
 /datum/ai_laws
 	var/name = "Unknown Laws"
 	var/zeroth = null
+	var/zeroth_type = null // In order to override zeroth laws
 	var/zeroth_borg = null
 	var/list/inherent = list()
 	var/list/supplied = list()
@@ -152,8 +153,9 @@ datum/ai_laws/tyrant //This probably shouldn't be a default lawset.
 
 /* General ai_law functions */
 
-/datum/ai_laws/proc/set_zeroth_law(var/law, var/law_borg = null)
+/datum/ai_laws/proc/set_zeroth_law(var/law, var/law_borg = null, law_type)
 	src.zeroth = law
+	src.zeroth_type = law_type
 	if(law_borg) //Making it possible for slaved borgs to see a different law 0 than their AI. --NEO
 		src.zeroth_borg = law_borg
 
@@ -182,6 +184,7 @@ datum/ai_laws/tyrant //This probably shouldn't be a default lawset.
 
 /datum/ai_laws/proc/clear_zeroth_law(var/law_borg = null)
 	src.zeroth = null
+	src.zeroth_type = null
 	if(law_borg)
 		src.zeroth_borg = null
 

code/datums/cargoprofile.dm

@@ -673,7 +673,7 @@
 	id = "people"
 
 	whitelist = null
-	blacklist = list(/mob/camera,/mob/new_player,/mob/living/simple_animal/hostile/blobspore,/mob/living/simple_animal/hostile/creature,
+	blacklist = list(/mob/camera,/mob/new_player,/mob/living/simple_animal/hostile/blob/blobspore,/mob/living/simple_animal/hostile/creature,
 					/mob/living/simple_animal/hostile/spaceWorm,/mob/living/simple_animal/shade,/mob/living/simple_animal/hostile/faithless,/mob/dead)
 	universal = 1
 	mobcheck = 1

code/datums/periodic_news.dm

@@ -6,7 +6,7 @@
 		round_time // time of the round at which this should be announced, in seconds
 		message // body of the message
 		author = "Nanotrasen Editor"
-		channel_name = "Tau Ceti Daily"
+		channel_name = "Nyx Daily"
 		can_be_redacted = 0
 		message_type = "Story"
 
@@ -66,7 +66,7 @@
 			round_time = 60 * 50
 
 		found_ssd
-			channel_name = "Tau Ceti Daily"
+			channel_name = "Nyx Daily"
 			author = "Doctor Eric Hanfield"
 
 			message = {"Several people have been found unconscious at their terminals. It is thought that it was due
@@ -78,7 +78,7 @@
 	lotus_tree
 
 		explosions
-			channel_name = "Tau Ceti Daily"
+			channel_name = "Nyx Daily"
 			author = "Reporter Leland H. Howards"
 
 			message = {"The newly-christened civillian transport Lotus Tree suffered two very large explosions near the
@@ -92,7 +92,7 @@
 	food_riots
 
 		breaking_news
-			channel_name = "Tau Ceti Daily"
+			channel_name = "Nyx Daily"
 			author = "Reporter Ro'kii Ar-Raqis"
 
 			message = {"Breaking news: Food riots have broken out throughout the Refuge asteroid colony in the Tenebrae
@@ -103,7 +103,7 @@
 			round_time = 60 * 10
 
 		more
-			channel_name = "Tau Ceti Daily"
+			channel_name = "Nyx Daily"
 			author = "Reporter Ro'kii Ar-Raqis"
 
 			message = {"More on the Refuge food riots: The Refuge Council has condemned Nanotrasen's withdrawal from
@@ -143,7 +143,7 @@ proc/announce_newscaster_news(datum/news_announcement/news)
 		sendto.locked = 1
 		sendto.is_admin_channel = 1
 		news_network.network_channels += sendto
-		
+
 	var/datum/feed_message/newMsg = new /datum/feed_message
 	newMsg.author = news.author ? news.author : sendto.author
 	newMsg.is_admin_message = !news.can_be_redacted

code/datums/uplink_item.dm

@@ -586,7 +586,7 @@ var/list/uplink_items = list()
 	name = "Syndicate Encryption Key"
 	desc = "A key, that when inserted into a radio headset, allows you to listen to all station department channels as well as talk on an encrypted Syndicate channel."
 	item = /obj/item/device/encryptionkey/syndicate
-	cost = 5
+	cost = 2 //Nowhere near as useful as the Binary Key!
 	surplus = 75
 
 /datum/uplink_item/device_tools/hacked_module
@@ -679,7 +679,7 @@ var/list/uplink_items = list()
 	name = "Uplink Implant"
 	desc = "An implant injected into the body, and later activated using a bodily gesture to open an uplink with 5 telecrystals. The ability for an agent to open an uplink after their posessions have been stripped from them makes this implant excellent for escaping confinement."
 	item = /obj/item/weapon/implanter/uplink
-	cost = 20
+	cost = 14
 	surplus = 0
 
 /datum/uplink_item/implants/explosive