Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015

Conflicts:
	.travis.yml
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/turfs/simulated.dm
	code/global.dm
	icons/misc/fullscreen.dmi
	polaris.dme

code/modules/research/circuitprinter.dm

@@ -79,10 +79,6 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid).
 	else
 		icon_state = "circuit_imprinter"
 
-/obj/machinery/r_n_d/circuit_imprinter/blob_act()
-	if(prob(50))
-		qdel(src)
-
 /obj/machinery/r_n_d/circuit_imprinter/proc/TotalMaterials()
 	var/t = 0
 	for(var/f in materials)
@@ -199,7 +195,7 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid).
 		reagents.remove_reagent(C, D.chemicals[C] * mat_efficiency)
 
 	if(D.build_path)
-		var/obj/new_item = new D.build_path(src)
+		var/obj/new_item = D.Fabricate(src, src)
 		new_item.loc = loc
 		if(mat_efficiency != 1) // No matter out of nowhere
 			if(new_item.matter && new_item.matter.len > 0)

code/modules/research/designs.dm

@@ -55,6 +55,11 @@ other types of metals and chemistry for reagents).
 		desc = "Allows for the construction of \a [item_name]."
 	return
 
+//Returns a new instance of the item for this design
+//This is to allow additional initialization to be performed, including possibly additional contructor arguments.
+/datum/design/proc/Fabricate(var/newloc, var/fabricator)
+	return new build_path(newloc)
+
 /datum/design/item
 	build_type = PROTOLATHE
 
@@ -195,9 +200,9 @@ other types of metals and chemistry for reagents).
 /datum/design/item/stock_part/RPED
 	name = "Rapid Part Exchange Device"
 	desc = "Special mechanical module made to store, sort, and apply standard machine parts."
-	id = "rped"
+	id = "rped"
 	req_tech = list(TECH_ENGINEERING = 3, TECH_MATERIAL = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 15000, "glass" = 5000)
+	materials = list(DEFAULT_WALL_MATERIAL = 15000, "glass" = 5000)
 	build_path = /obj/item/weapon/storage/part_replacer
 	sort_string = "CBAAA"
 
@@ -212,6 +217,11 @@ other types of metals and chemistry for reagents).
 		var/obj/item/weapon/cell/C = build_path
 		desc = "Allows the construction of power cells that can hold [initial(C.maxcharge)] units of energy."
 
+/datum/design/item/powercell/Fabricate()
+	var/obj/item/weapon/cell/C = ..()
+	C.charge = 0 //shouldn't produce power out of thin air.
+	return C
+
 /datum/design/item/powercell/basic
 	name = "basic"
 	build_type = PROTOLATHE | MECHFAB
@@ -277,9 +287,9 @@ other types of metals and chemistry for reagents).
 /datum/design/item/mesons
 	name = "Optical meson scanners design"
 	desc = "Using the meson-scanning technology those glasses allow you to see through walls, floor or anything else."
-	id = "mesons"
+	id = "mesons"
 	req_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
+	materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
 	build_path = /obj/item/clothing/glasses/meson
 	sort_string = "GAAAC"
 
@@ -288,23 +298,23 @@ other types of metals and chemistry for reagents).
 	name = "Mining equipment design ([item_name])"
 
 /datum/design/item/weapon/mining/jackhammer
-	id = "jackhammer"
+	id = "jackhammer"
 	req_tech = list(TECH_MATERIAL = 3, TECH_POWER = 2, TECH_ENGINEERING = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 500, "silver" = 500)
+	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 500, "silver" = 500)
 	build_path = /obj/item/weapon/pickaxe/jackhammer
 	sort_string = "KAAAA"
 
 /datum/design/item/weapon/mining/drill
-	id = "drill"
+	id = "drill"
 	req_tech = list(TECH_MATERIAL = 2, TECH_POWER = 3, TECH_ENGINEERING = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 6000, "glass" = 1000) //expensive, but no need for miners.
+	materials = list(DEFAULT_WALL_MATERIAL = 6000, "glass" = 1000) //expensive, but no need for miners.
 	build_path = /obj/item/weapon/pickaxe/drill
 	sort_string = "KAAAB"
 
 /datum/design/item/weapon/mining/plasmacutter
-	id = "plasmacutter"
+	id = "plasmacutter"
 	req_tech = list(TECH_MATERIAL = 4, TECH_PHORON = 3, TECH_ENGINEERING = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 1500, "glass" = 500, "gold" = 500, "phoron" = 500)
+	materials = list(DEFAULT_WALL_MATERIAL = 1500, "glass" = 500, "gold" = 500, "phoron" = 500)
 	build_path = /obj/item/weapon/pickaxe/plasmacutter
 	sort_string = "KAAAC"
 
@@ -316,9 +326,9 @@ other types of metals and chemistry for reagents).
 	sort_string = "KAAAD"
 
 /datum/design/item/weapon/mining/drill_diamond
-	id = "drill_diamond"
+	id = "drill_diamond"
 	req_tech = list(TECH_MATERIAL = 6, TECH_POWER = 4, TECH_ENGINEERING = 4)
-	materials = list(DEFAULT_WALL_MATERIAL = 3000, "glass" = 1000, "diamond" = 2000)
+	materials = list(DEFAULT_WALL_MATERIAL = 3000, "glass" = 1000, "diamond" = 2000)
 	build_path = /obj/item/weapon/pickaxe/diamonddrill
 	sort_string = "KAAAE"
 ///////////////////////////////////
@@ -337,9 +347,9 @@ other types of metals and chemistry for reagents).
 
 /datum/design/item/medical/robot_scanner
 	desc = "A hand-held scanner able to diagnose robotic injuries."
-	id = "robot_scanner"
+	id = "robot_scanner"
 	req_tech = list(TECH_MAGNET = 3, TECH_BIO = 2, TECH_ENGINEERING = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 200)
+	materials = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 200)
 	build_path = /obj/item/device/robotanalyzer
 	sort_string = "MACFA"
 
@@ -394,9 +404,9 @@ other types of metals and chemistry for reagents).
 
 /datum/design/item/medical/nanopaste
 	desc = "A tube of paste containing swarms of repair nanites. Very effective in repairing robotic machinery."
-	id = "nanopaste"
+	id = "nanopaste"
 	req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 7000, "glass" = 7000)
+	materials = list(DEFAULT_WALL_MATERIAL = 7000, "glass" = 7000)
 	build_path = /obj/item/stack/nanopaste
 	sort_string = "MBAAA"
 
@@ -528,16 +538,16 @@ other types of metals and chemistry for reagents).
 
 /datum/design/item/weapon/chemsprayer
 	desc = "An advanced chem spraying device."
-	id = "chemsprayer"
+	id = "chemsprayer"
 	req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_BIO = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 1000)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 1000)
 	build_path = /obj/item/weapon/reagent_containers/spray/chemsprayer
 	sort_string = "TABAA"
 
 /datum/design/item/weapon/rapidsyringe
-	id = "rapidsyringe"
+	id = "rapidsyringe"
 	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_BIO = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 1000)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 1000)
 	build_path = /obj/item/weapon/gun/launcher/syringe/rapid
 	sort_string = "TABAB"
 
@@ -639,10 +649,10 @@ other types of metals and chemistry for reagents).
 
 /datum/design/item/posibrain
 	name = "Positronic brain"
-	id = "posibrain"
+	id = "posibrain"
 	req_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 6, TECH_BLUESPACE = 2, TECH_DATA = 4)
 	build_type = PROTOLATHE | MECHFAB
-	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 1000, "silver" = 1000, "gold" = 500, "phoron" = 500, "diamond" = 100)
+	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 1000, "silver" = 1000, "gold" = 500, "phoron" = 500, "diamond" = 100)
 	build_path = /obj/item/device/mmi/digital/posibrain
 	category = "Misc"
 	sort_string = "VACAB"
@@ -1353,16 +1363,16 @@ CIRCUITS BELOW
 /datum/design/item/pda
 	name = "PDA design"
 	desc = "Cheaper than whiny non-digital assistants."
-	id = "pda"
+	id = "pda"
 	req_tech = list(TECH_ENGINEERING = 2, TECH_POWER = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
+	materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
 	build_path = /obj/item/device/pda
 	sort_string = "VAAAA"
 
 // Cartridges
-/datum/design/item/pda_cartridge
+/datum/design/item/pda_cartridge
 	req_tech = list(TECH_ENGINEERING = 2, TECH_POWER = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
+	materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
 
 /datum/design/item/pda_cartridge/AssembleDesignName()
 	..()
@@ -1442,7 +1452,7 @@ CIRCUITS BELOW
 	id = "cart_captain"
 	build_path = /obj/item/weapon/cartridge/captain
 	sort_string = "VBAAO"
-
+
 /* Uncomment if someone makes these buildable
 /datum/design/circuit/general_alert
 	name = "general alert console"

code/modules/research/mechfab_designs.dm

@@ -6,6 +6,13 @@
 /datum/design/item/mechfab/robot
 	category = "Robot"
 
+//if the fabricator is a mech fab pass the manufacturer info over to the robot part constructor
+/datum/design/item/mechfab/robot/Fabricate(var/newloc, var/fabricator)
+	if(istype(fabricator, /obj/machinery/mecha_part_fabricator))
+		var/obj/machinery/mecha_part_fabricator/mechfab = fabricator
+		return new build_path(newloc, mechfab.manufacturer)
+	return ..()
+
 /datum/design/item/mechfab/robot/exoskeleton
 	name = "Robot exoskeleton"
 	id = "robot_exoskeleton"

code/modules/research/protolathe.dm

@@ -196,7 +196,7 @@
 		reagents.remove_reagent(C, D.chemicals[C] * mat_efficiency)
 
 	if(D.build_path)
-		var/obj/new_item = new D.build_path(src)
+		var/obj/new_item = D.Fabricate(src, src)
 		new_item.loc = loc
 		if(mat_efficiency != 1) // No matter out of nowhere
 			if(new_item.matter && new_item.matter.len > 0)

code/modules/research/server.dm

@@ -79,10 +79,6 @@
 	griefProtection()
 	..()
 
-/obj/machinery/r_n_d/server/blob_act()
-	griefProtection()
-	..()
-
 //Backup files to centcomm to help admins recover data after greifer attacks
 /obj/machinery/r_n_d/server/proc/griefProtection()
 	for(var/obj/machinery/r_n_d/server/centcom/C in machines)

code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm

@@ -235,7 +235,7 @@ var/list/valid_secondary_effect_types = list(\
 	src.add_fingerprint(user)
 
 	if(my_effect.trigger == TRIGGER_TOUCH)
-		user << "<b>You touch [src].<b>"
+		user << "<b>You touch [src].</b>"
 		my_effect.ToggleActivate()
 	else
 		user << "<b>You touch [src],</b> [pick("but nothing of note happens","but nothing happens","but nothing interesting happens","but you notice nothing different","but nothing seems to have happened")]."
@@ -321,7 +321,7 @@ var/list/valid_secondary_effect_types = list(\
 			warn = 1
 
 		if(warn)
-			M << "<b>You accidentally touch [src].<b>"
+			M << "<b>You accidentally touch [src].</b>"
 	..()
 
 /obj/machinery/artifact/bullet_act(var/obj/item/projectile/P)

code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm

@@ -1,70 +1,70 @@
-
-/datum/artifact_effect/badfeeling
-	effecttype = "badfeeling"
-	effect_type = 2
-	var/list/messages = list("You feel worried.",\
-		"Something doesn't feel right.",\
-		"You get a strange feeling in your gut.",\
-		"Your instincts are trying to warn you about something.",\
-		"Someone just walked over your grave.",\
-		"There's a strange feeling in the air.",\
-		"There's a strange smell in the air.",\
-		"The tips of your fingers feel tingly.",\
-		"You feel witchy.",\
-		"You have a terrible sense of foreboding.",\
-		"You've got a bad feeling about this.",\
-		"Your scalp prickles.",\
-		"The light seems to flicker.",\
-		"The shadows seem to lengthen.",\
-		"The walls are getting closer.",\
-		"Something is wrong")
-
-	var/list/drastic_messages = list("You've got to get out of here!",\
-		"Someone's trying to kill you!",\
-		"There's something out there!",\
-		"What's happening to you?",\
-		"OH GOD!",\
-		"HELP ME!")
-
-/datum/artifact_effect/badfeeling/DoEffectTouch(var/mob/user)
-	if(user)
-		if (istype(user, /mob/living/carbon/human))
-			var/mob/living/carbon/human/H = user
-			if(prob(50))
-				if(prob(75))
-					H << "<b><font color='red' size='[num2text(rand(1,5))]'><b>[pick(drastic_messages)]</b></font>"
-				else
-					H << "<font color='red'>[pick(messages)]</font>"
-
-			if(prob(50))
-				H.dizziness += rand(3,5)
-
-/datum/artifact_effect/badfeeling/DoEffectAura()
-	if(holder)
-		var/turf/T = get_turf(holder)
-		for (var/mob/living/carbon/human/H in range(src.effectrange,T))
-			if(prob(5))
-				if(prob(75))
-					H << "<font color='red'>[pick(messages)]</font>"
-				else
-					H << "<font color='red' size='[num2text(rand(1,5))]'><b>[pick(drastic_messages)]</b></font>"
-
-			if(prob(10))
-				H.dizziness += rand(3,5)
-		return 1
-
-/datum/artifact_effect/badfeeling/DoEffectPulse()
-	if(holder)
-		var/turf/T = get_turf(holder)
-		for (var/mob/living/carbon/human/H in range(src.effectrange,T))
-			if(prob(50))
-				if(prob(95))
-					H << "<font color='red' size='[num2text(rand(1,5))]'><b>[pick(drastic_messages)]</b></font>"
-				else
-					H << "<font color='red'>[pick(messages)]</font>"
-
-			if(prob(50))
-				H.dizziness += rand(3,5)
-			else if(prob(25))
-				H.dizziness += rand(5,15)
-		return 1
+
+/datum/artifact_effect/badfeeling
+	effecttype = "badfeeling"
+	effect_type = 2
+	var/list/messages = list("You feel worried.",\
+		"Something doesn't feel right.",\
+		"You get a strange feeling in your gut.",\
+		"Your instincts are trying to warn you about something.",\
+		"Someone just walked over your grave.",\
+		"There's a strange feeling in the air.",\
+		"There's a strange smell in the air.",\
+		"The tips of your fingers feel tingly.",\
+		"You feel witchy.",\
+		"You have a terrible sense of foreboding.",\
+		"You've got a bad feeling about this.",\
+		"Your scalp prickles.",\
+		"The light seems to flicker.",\
+		"The shadows seem to lengthen.",\
+		"The walls are getting closer.",\
+		"Something is wrong")
+
+	var/list/drastic_messages = list("You've got to get out of here!",\
+		"Someone's trying to kill you!",\
+		"There's something out there!",\
+		"What's happening to you?",\
+		"OH GOD!",\
+		"HELP ME!")
+
+/datum/artifact_effect/badfeeling/DoEffectTouch(var/mob/user)
+	if(user)
+		if (istype(user, /mob/living/carbon/human))
+			var/mob/living/carbon/human/H = user
+			if(prob(50))
+				if(prob(75))
+					H << "<b><font color='red' size='[num2text(rand(1,5))]'>[pick(drastic_messages)]</b></font>"
+				else
+					H << "<font color='red'>[pick(messages)]</font>"
+
+			if(prob(50))
+				H.dizziness += rand(3,5)
+
+/datum/artifact_effect/badfeeling/DoEffectAura()
+	if(holder)
+		var/turf/T = get_turf(holder)
+		for (var/mob/living/carbon/human/H in range(src.effectrange,T))
+			if(prob(5))
+				if(prob(75))
+					H << "<font color='red'>[pick(messages)]</font>"
+				else
+					H << "<font color='red' size='[num2text(rand(1,5))]'><b>[pick(drastic_messages)]</b></font>"
+
+			if(prob(10))
+				H.dizziness += rand(3,5)
+		return 1
+
+/datum/artifact_effect/badfeeling/DoEffectPulse()
+	if(holder)
+		var/turf/T = get_turf(holder)
+		for (var/mob/living/carbon/human/H in range(src.effectrange,T))
+			if(prob(50))
+				if(prob(95))
+					H << "<font color='red' size='[num2text(rand(1,5))]'><b>[pick(drastic_messages)]</b></font>"
+				else
+					H << "<font color='red'>[pick(messages)]</font>"
+
+			if(prob(50))
+				H.dizziness += rand(3,5)
+			else if(prob(25))
+				H.dizziness += rand(5,15)
+		return 1

code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm

@@ -1,68 +1,68 @@
-
-/datum/artifact_effect/goodfeeling
-	effecttype = "goodfeeling"
-	effect_type = 2
-	var/list/messages = list("You feel good.",\
-		"Everything seems to be going alright",\
-		"You've got a good feeling about this",\
-		"Your instincts tell you everything is going to be getting better.",\
-		"There's a good feeling in the air.",\
-		"Something smells... good.",\
-		"The tips of your fingers feel tingly.",\
-		"You've got a good feeling about this.",\
-		"You feel happy.",\
-		"You fight the urge to smile.",\
-		"Your scalp prickles.",\
-		"All the colours seem a bit more vibrant.",\
-		"Everything seems a little lighter.",\
-		"The troubles of the world seem to fade away.")
-
-	var/list/drastic_messages = list("You want to hug everyone you meet!",\
-		"Everything is going so well!",\
-		"You feel euphoric.",\
-		"You feel giddy.",\
-		"You're so happy suddenly, you almost want to dance and sing.",\
-		"You feel like the world is out to help you.")
-
-/datum/artifact_effect/goodfeeling/DoEffectTouch(var/mob/user)
-	if(user)
-		if (istype(user, /mob/living/carbon/human))
-			var/mob/living/carbon/human/H = user
-			if(prob(50))
-				if(prob(75))
-					H << "<b><font color='blue' size='[num2text(rand(1,5))]'><b>[pick(drastic_messages)]</b></font>"
-				else
-					H << "<font color='blue'>[pick(messages)]</font>"
-
-			if(prob(50))
-				H.dizziness += rand(3,5)
-
-/datum/artifact_effect/goodfeeling/DoEffectAura()
-	if(holder)
-		var/turf/T = get_turf(holder)
-		for (var/mob/living/carbon/human/H in range(src.effectrange,T))
-			if(prob(5))
-				if(prob(75))
-					H << "<font color='blue'>[pick(messages)]</font>"
-				else
-					H << "<font color='blue' size='[num2text(rand(1,5))]'><b>[pick(drastic_messages)]</b></font>"
-
-			if(prob(5))
-				H.dizziness += rand(3,5)
-		return 1
-
-/datum/artifact_effect/goodfeeling/DoEffectPulse()
-	if(holder)
-		var/turf/T = get_turf(holder)
-		for (var/mob/living/carbon/human/H in range(src.effectrange,T))
-			if(prob(50))
-				if(prob(95))
-					H << "<font color='blue' size='[num2text(rand(1,5))]'><b>[pick(drastic_messages)]</b></font>"
-				else
-					H << "<font color='blue'>[pick(messages)]</font>"
-
-			if(prob(50))
-				H.dizziness += rand(3,5)
-			else if(prob(25))
-				H.dizziness += rand(5,15)
-		return 1
+
+/datum/artifact_effect/goodfeeling
+	effecttype = "goodfeeling"
+	effect_type = 2
+	var/list/messages = list("You feel good.",\
+		"Everything seems to be going alright",\
+		"You've got a good feeling about this",\
+		"Your instincts tell you everything is going to be getting better.",\
+		"There's a good feeling in the air.",\
+		"Something smells... good.",\
+		"The tips of your fingers feel tingly.",\
+		"You've got a good feeling about this.",\
+		"You feel happy.",\
+		"You fight the urge to smile.",\
+		"Your scalp prickles.",\
+		"All the colours seem a bit more vibrant.",\
+		"Everything seems a little lighter.",\
+		"The troubles of the world seem to fade away.")
+
+	var/list/drastic_messages = list("You want to hug everyone you meet!",\
+		"Everything is going so well!",\
+		"You feel euphoric.",\
+		"You feel giddy.",\
+		"You're so happy suddenly, you almost want to dance and sing.",\
+		"You feel like the world is out to help you.")
+
+/datum/artifact_effect/goodfeeling/DoEffectTouch(var/mob/user)
+	if(user)
+		if (istype(user, /mob/living/carbon/human))
+			var/mob/living/carbon/human/H = user
+			if(prob(50))
+				if(prob(75))
+					H << "<b><font color='blue' size='[num2text(rand(1,5))]'>[pick(drastic_messages)]</b></font>"
+				else
+					H << "<font color='blue'>[pick(messages)]</font>"
+
+			if(prob(50))
+				H.dizziness += rand(3,5)
+
+/datum/artifact_effect/goodfeeling/DoEffectAura()
+	if(holder)
+		var/turf/T = get_turf(holder)
+		for (var/mob/living/carbon/human/H in range(src.effectrange,T))
+			if(prob(5))
+				if(prob(75))
+					H << "<font color='blue'>[pick(messages)]</font>"
+				else
+					H << "<font color='blue' size='[num2text(rand(1,5))]'><b>[pick(drastic_messages)]</b></font>"
+
+			if(prob(5))
+				H.dizziness += rand(3,5)
+		return 1
+
+/datum/artifact_effect/goodfeeling/DoEffectPulse()
+	if(holder)
+		var/turf/T = get_turf(holder)
+		for (var/mob/living/carbon/human/H in range(src.effectrange,T))
+			if(prob(50))
+				if(prob(95))
+					H << "<font color='blue' size='[num2text(rand(1,5))]'><b>[pick(drastic_messages)]</b></font>"
+				else
+					H << "<font color='blue'>[pick(messages)]</font>"
+
+			if(prob(50))
+				H.dizziness += rand(3,5)
+			else if(prob(25))
+				H.dizziness += rand(5,15)
+		return 1

code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm

@@ -8,13 +8,13 @@
 		var/weakness = GetAnomalySusceptibility(toucher)
 		if(iscarbon(toucher) && prob(weakness * 100))
 			var/mob/living/carbon/C = toucher
-			C << "\red A painful discharge of energy strikes you!"
+			C << "<span class='danger'>A painful discharge of energy strikes you!</span>"
 			C.adjustOxyLoss(rand(5,25) * weakness)
 			C.adjustToxLoss(rand(5,25) * weakness)
 			C.adjustBruteLoss(rand(5,25) * weakness)
 			C.adjustFireLoss(rand(5,25) * weakness)
 			C.adjustBrainLoss(rand(5,25) * weakness)
-			C.radiation += 25 * weakness
+			C.apply_effect(25 * weakness, IRRADIATE)
 			C.nutrition -= min(50 * weakness, C.nutrition)
 			C.make_dizzy(6 * weakness)
 			C.weakened += 6 * weakness
@@ -26,7 +26,7 @@
 			var/weakness = GetAnomalySusceptibility(C)
 			if(prob(weakness * 100))
 				if(prob(10))
-					C << "\red You feel a painful force radiating from something nearby."
+					C << "<span class='danger'>You feel a painful force radiating from something nearby.</span>"
 				C.adjustBruteLoss(1 * weakness)
 				C.adjustFireLoss(1 * weakness)
 				C.adjustToxLoss(1 * weakness)
@@ -40,7 +40,7 @@
 		for (var/mob/living/carbon/C in range(effectrange, T))
 			var/weakness = GetAnomalySusceptibility(C)
 			if(prob(weakness * 100))
-				C << "\red A wave of painful energy strikes you!"
+				C << "<span class='danger'>A wave of painful energy strikes you!</span>"
 				C.adjustBruteLoss(3 * weakness)
 				C.adjustFireLoss(3 * weakness)
 				C.adjustToxLoss(3 * weakness)

code/modules/research/xenoarchaeology/machinery/coolant.dm

@@ -9,13 +9,10 @@
 		reagents.add_reagent("coolant",1000)
 
 /obj/structure/reagent_dispensers/coolanttank/bullet_act(var/obj/item/projectile/Proj)
-	if(Proj.damage_type == BRUTE || Proj.damage_type == BURN)
+	if(Proj.get_structure_damage())
 		if(!istype(Proj ,/obj/item/projectile/beam/lastertag) && !istype(Proj ,/obj/item/projectile/beam/practice) )
 			explode()
 
-/obj/structure/reagent_dispensers/coolanttank/blob_act()
-	explode()
-
 /obj/structure/reagent_dispensers/coolanttank/ex_act()
 	explode()
 

code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm

@@ -1,6 +1,6 @@
 
 /obj/machinery/radiocarbon_spectrometer
-	name = "Radiocarbon spectrometer"
+	name = "radiocarbon spectrometer"
 	desc = "A specialised, complex scanner for gleaning information on all manner of small things."
 	anchored = 1
 	density = 1
@@ -91,9 +91,13 @@
 				user << "<span class='info'>You remove [amount_transferred]u of coolant from [src].</span>"
 				update_coolant()
 				return
+		if(scanned_item)
+			user << "<span class=warning>\The [src] already has \a [scanned_item] inside!</span>"
+			return
 		user.drop_item()
 		I.loc = src
 		scanned_item = I
+		user << "<span class=notice>You put \the [I] into \the [src].</span>"
 
 /obj/machinery/radiocarbon_spectrometer/proc/update_coolant()
 	var/total_purity = 0

code/modules/research/xenoarchaeology/tools/suspension_generator.dm

@@ -132,9 +132,9 @@
 			I.loc = src
 			auth_card = I
 			if(attempt_unlock(I, usr))
-				usr << "<span class='info'>You insert [I], the console flashes \'<i>Access granted.</a>\'</span>"
+				usr << "<span class='info'>You insert [I], the console flashes \'<i>Access granted.</i>\'</span>"
 			else
-				usr << "<span class='warning'>You insert [I], the console flashes \'<i>Access denied.</a>\'</span>"
+				usr << "<span class='warning'>You insert [I], the console flashes \'<i>Access denied.</i>\'</span>"
 	else if(href_list["ejectcard"])
 		if(auth_card)
 			if(ishuman(usr))