Merge remote-tracking branch 'upstream/dev-freeze' into dev

baystation12.dme

@@ -839,6 +839,7 @@
 #include "code\modules\mining\mine_areas.dm"
 #include "code\modules\mining\mine_items.dm"
 #include "code\modules\mining\mine_turfs.dm"
+#include "code\modules\mining\minerals.dm"
 #include "code\modules\mining\mint.dm"
 #include "code\modules\mining\money_bag.dm"
 #include "code\modules\mining\ores_coins.dm"
@@ -1172,7 +1173,6 @@
 #include "code\modules\research\xenoarchaeology\geosample.dm"
 #include "code\modules\research\xenoarchaeology\manuals.dm"
 #include "code\modules\research\xenoarchaeology\misc.dm"
-#include "code\modules\research\xenoarchaeology\readme.dm"
 #include "code\modules\research\xenoarchaeology\artifact\artifact.dm"
 #include "code\modules\research\xenoarchaeology\artifact\artifact_autocloner.dm"
 #include "code\modules\research\xenoarchaeology\artifact\artifact_crystal.dm"

code/ATMOSPHERICS/datum_pipeline.dm

@@ -149,10 +149,6 @@ datum/pipeline
 			air.merge(air_sample)
 			//turf_air already modified by equalize_gases()
 
-		if(istype(target) && !target.processing)
-			if(target.air)
-				if(target.air.check_tile_graphic())
-					target.update_visuals(target.air)
 		if(network)
 			network.update = 1
 

code/WorkInProgress/Yinadele/Supermatter.dm

@@ -200,15 +200,18 @@
 
 
 /obj/machinery/power/supermatter/attack_robot(mob/user as mob)
-	return attack_hand(user)
+	if(Adjacent(user))
+		return attack_hand(user)
+	else
+		user << "<span class = \"warning\">You attempt to interface with the control circuits but find they are not connected to your network.  Maybe in a future firmware update.</span>"
+	return
 
 /obj/machinery/power/supermatter/attack_ai(mob/user as mob)
 	user << "<span class = \"warning\">You attempt to interface with the control circuits but find they are not connected to your network.  Maybe in a future firmware update.</span>"
 
-
 /obj/machinery/power/supermatter/attack_hand(mob/user as mob)
-	user.visible_message("<span class=\"warning\">\The [user] reaches out and touches \the [src] inducing a resonance... \his body starts to glow and catch flame before flashing into ash.</span>",\
-		"<span class=\"danger\">You reach out and touch \the [src], everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\"</span>",\
+	user.visible_message("<span class=\"warning\">\The [user] reaches out and touches \the [src], inducing a resonance... \his body starts to glow and bursts into flames before flashing into ash.</span>",\
+		"<span class=\"danger\">You reach out and touch \the [src]. Everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\"</span>",\
 		"<span class=\"warning\">You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.</span>")
 
 	Consume(user)

code/ZAS/ZAS_Turfs.dm

@@ -39,8 +39,6 @@
 
 /turf/simulated/var/tmp/datum/gas_mixture/air
 
-/turf/simulated/var/tmp/processing = 1
-
 /turf/simulated/var/tmp/air_check_directions = 0 //Do not modify this, just add turf to air_master.tiles_to_update
 
 /turf/simulated/var/tmp/unsim_check_directions = 0 //See above.
@@ -61,8 +59,6 @@
 			overlays.Add(slmaster)
 
 /turf/simulated/New()
-	..()
-
 	if(!blocks_air)
 		air = new
 
@@ -84,6 +80,8 @@
 				if(istype(target))
 					air_master.tiles_to_update |= target
 
+	. = ..()
+
 /turf/simulated/Del()
 	if(active_hotspot)
 		del(active_hotspot)
@@ -168,23 +166,73 @@
 	if(src in air_master.turfs_with_connections)
 		air_master.AddConnectionToCheck(air_master.turfs_with_connections[src])
 
-	if(zone && CanPass(null, src, 0, 0))
-
+	if(zone && !air_master.zones_needing_rebuilt.Find(zone))
 		for(var/direction in cardinal)
 			var/turf/T = get_step(src,direction)
 			if(!istype(T))
 				continue
 
-			//I can connect to air or space in this direction
-			if((air_check_directions & direction && !(air_directions_archived & direction)) || \
-				(unsim_check_directions & direction && !(unsim_directions_archived & direction)))
-				ZConnect(src,T)
-				zone.ActivateIfNeeded()
-				if(T.zone) T.zone.ActivateIfNeeded()
+			//I can connect to air in this direction
+			if(air_check_directions & direction || unsim_check_directions & direction)
+
+				//If either block air, we must look to see if the adjacent turfs need rebuilt.
+				if(!CanPass(null, T, 0, 0))
+
+					//Target blocks air
+					if(!T.CanPass(null, T, 0, 0))
+						var/turf/NT = get_step(T, direction)
+
+						//If that turf is in my zone still, rebuild.
+						if(istype(NT,/turf/simulated) && NT in zone.contents)
+							air_master.zones_needing_rebuilt.Add(zone)
+
+						//If that is an unsimulated tile in my zone, see if we need to rebuild or just remove.
+						else if(istype(NT) && NT in zone.unsimulated_tiles)
+							var/consider_rebuild = 0
+							for(var/d in cardinal)
+								var/turf/UT = get_step(NT,d)
+								if(istype(UT, /turf/simulated) && UT.zone == zone && UT.CanPass(null, NT, 0, 0)) //If we find a neighboring tile that is in the same zone, check if we need to rebuild
+									consider_rebuild = 1
+									break
+							if(consider_rebuild)
+								air_master.zones_needing_rebuilt.Add(zone) //Gotta check if we need to rebuild, dammit
+							else
+								zone.RemoveTurf(NT) //Not adjacent to anything, and unsimulated.  Goodbye~
+
+						//To make a closed connection through closed door.
+						ZConnect(T, src)
+
+					//If I block air.
+					else if(T.zone && !air_master.zones_needing_rebuilt.Find(T.zone))
+						var/turf/NT = get_step(src, reverse_direction(direction))
+
+						//If I am splitting a zone, rebuild.
+						if(istype(NT,/turf/simulated) && (NT in T.zone.contents || (NT.zone && T in NT.zone.contents)))
+							air_master.zones_needing_rebuilt.Add(T.zone)
+
+						//If NT is unsimulated, parse if I should remove it or rebuild.
+						else if(istype(NT) && NT in T.zone.unsimulated_tiles)
+							var/consider_rebuild = 0
+							for(var/d in cardinal)
+								var/turf/UT = get_step(NT,d)
+								if(istype(UT, /turf/simulated) && UT.zone == T.zone && UT.CanPass(null, NT, 0, 0)) //If we find a neighboring tile that is in the same zone, check if we need to rebuild
+									consider_rebuild = 1
+									break
+
+							//Needs rebuilt.
+							if(consider_rebuild)
+								air_master.zones_needing_rebuilt.Add(T.zone)
+
+							//Not adjacent to anything, and unsimulated.  Goodbye~
+							else
+								T.zone.RemoveTurf(NT)
+
+				else
+					//Produce connection through open door.
+					ZConnect(src,T)
 
 			//Something like a wall was built, changing the geometry.
-			else if((!(air_check_directions & direction) && air_directions_archived & direction) || \
-					(!(unsim_check_directions & direction) && unsim_directions_archived & direction))
+			else if(air_directions_archived & direction || unsim_directions_archived & direction)
 				var/turf/NT = get_step(T, direction)
 
 				//If the tile is in our own zone, and we cannot connect to it, better rebuild.
@@ -207,16 +255,12 @@
 					//The unsimulated turf is adjacent to another one of our zone's turfs,
 					//  better rebuild to be sure we didn't get cut in twain
 					if(consider_rebuild)
-						air_master.zones_needing_rebuilt.Add(zone)
+						air_master.zones_needing_rebuilt.Add(NT.zone)
 
 					//Not adjacent to anything, and unsimulated.  Goodbye~
 					else
 						zone.RemoveTurf(NT)
 
-	if(air_check_directions)
-		processing = 1
-	else
-		processing = 0
 	return 1
 
 /turf/proc/HasDoor(turf/O)

code/ZAS/ZAS_Zones.dm

@@ -50,11 +50,19 @@ var/list/CounterDoorDirections = list(SOUTH,EAST) //Which directions doors turfs
 	air = new
 	air.group_multiplier = contents.len
 	for(var/turf/simulated/T in contents)
-		air.oxygen += T.oxygen / air.group_multiplier
-		air.nitrogen += T.nitrogen / air.group_multiplier
-		air.carbon_dioxide += T.carbon_dioxide / air.group_multiplier
-		air.toxins += T.toxins / air.group_multiplier
-		air.temperature += T.temperature / air.group_multiplier
+		if(!T.air)
+			continue
+		air.oxygen += T.air.oxygen / air.group_multiplier
+		air.nitrogen += T.air.nitrogen / air.group_multiplier
+		air.carbon_dioxide += T.air.carbon_dioxide / air.group_multiplier
+		air.toxins += T.air.toxins / air.group_multiplier
+		air.temperature += T.air.temperature / air.group_multiplier
+		for(var/datum/gas/trace in T.air.trace_gases)
+			var/datum/gas/corresponding_gas = locate(trace.type) in air.trace_gases
+			if(!corresponding_gas)
+				corresponding_gas = new trace.type()
+				air.trace_gases.Add(corresponding_gas)
+			corresponding_gas.moles += trace.moles
 	air.update_values()
 
 	//Add this zone to the global list.
@@ -69,40 +77,48 @@ var/list/CounterDoorDirections = list(SOUTH,EAST) //Which directions doors turfs
 	for(var/turf/simulated/T in contents)
 		RemoveTurf(T)
 		air_master.ReconsiderTileZone(T)
-	for(var/zone/Z in connected_zones)
-		if(src in Z.connected_zones)
-			Z.connected_zones.Remove(src)
-	air_master.AddConnectionToCheck(connections)
 
 	if(air_master)
-		air_master.zones.Remove(src)
-		air_master.active_zones.Remove(src)
-		air_master.zones_needing_rebuilt.Remove(src)
+		air_master.AddConnectionToCheck(connections)
+
 	air = null
+
 	. = ..()
 
 
 //Handles deletion via garbage collection.
 /zone/proc/SoftDelete()
+	air = null
+
 	if(air_master)
 		air_master.zones.Remove(src)
 		air_master.active_zones.Remove(src)
 		air_master.zones_needing_rebuilt.Remove(src)
-	air = null
+		air_master.AddConnectionToCheck(connections)
+
+	connections = null
+	for(var/connection/C in direct_connections)
+		if(C.A.zone == src)
+			C.A.zone = null
+		if(C.B.zone == src)
+			C.B.zone = null
+	direct_connections = null
 
 	//Ensuring the zone list doesn't get clogged with null values.
 	for(var/turf/simulated/T in contents)
 		RemoveTurf(T)
 		air_master.ReconsiderTileZone(T)
 
+	contents.Cut()
+
 	//Removing zone connections and scheduling connection cleanup
 	for(var/zone/Z in connected_zones)
-		if(src in Z.connected_zones)
-			Z.connected_zones.Remove(src)
-	connected_zones = null
+		Z.connected_zones.Remove(src)
+		Z.closed_connection_zones.Remove(src)
+
+	connected_zones = null
+	closed_connection_zones = null
 
-	air_master.AddConnectionToCheck(connections)
-	connections = null
 
 	return 1
 
@@ -715,9 +731,9 @@ zone/proc/Rebuild()
 		current_adjacents = list()
 
 		for(var/direction in cardinal)
-			if( !(current.air_check_directions & direction))
-				continue
 			var/turf/simulated/adjacent = get_step(current, direction)
+			if(!current.ZCanPass(adjacent))
+				continue
 			if(adjacent in turfs)
 				current_adjacents += adjacent
 				adjacent_id = turfs[adjacent]

code/controllers/master_controller.dm

@@ -66,6 +66,7 @@ datum/controller/game_controller/proc/setup()
 	setupgenetics()
 	setupfactions()
 	setup_economy()
+	SetupXenoarch()
 
 	transfer_controller = new
 

code/game/gamemodes/ninja/ninja.dm

@@ -128,6 +128,7 @@
 	var/datum/objective/survive/ninja_objective = new
 	ninja_objective.owner = ninja
 	ninja.objectives += ninja_objective
+	ninja.current.mind = ninja
 
 	var/directive = generate_ninja_directive("heel")//Only hired by antags, not NT
 	ninja.current << "You are an elite mercenary assassin of the Spider Clan, [ninja.current.real_name]. You have a variety of abilities at your disposal, thanks to your nano-enhanced cyber armor.\nYour current directive is: \red <B>[directive]</B>\n \blue Try your best to adhere to this."

code/game/machinery/bots/cleanbot.dm

@@ -309,19 +309,22 @@ text("<A href='?src=\ref[src];operation=oddbutton'>[src.oddbutton ? "Yes" : "No"
 		target_types += /obj/effect/decal/cleanable/blood/
 
 /obj/machinery/bot/cleanbot/proc/clean(var/obj/effect/decal/cleanable/target)
-	src.anchored = 1
-	src.icon_state = "cleanbot-c"
+	anchored = 1
+	icon_state = "cleanbot-c"
 	visible_message("\red [src] begins to clean up the [target]")
-	src.cleaning = 1
+	cleaning = 1
 	var/cleantime = 50
 	if(istype(target,/obj/effect/decal/cleanable/dirt))		// Clean Dirt much faster
 		cleantime = 10
 	spawn(cleantime)
-		src.cleaning = 0
+		if(istype(loc,/turf/simulated))
+			var/turf/simulated/f = loc
+			f.dirt = 0
+		cleaning = 0
 		del(target)
-		src.icon_state = "cleanbot[src.on]"
-		src.anchored = 0
-		src.target = null
+		icon_state = "cleanbot[on]"
+		anchored = 0
+		target = null
 
 /obj/machinery/bot/cleanbot/explode()
 	src.on = 0

code/game/mecha/equipment/tools/tools.dm

@@ -94,7 +94,7 @@
 				else if(istype(target, /turf/simulated/mineral))
 					for(var/turf/simulated/mineral/M in range(chassis,1))
 						if(get_dir(chassis,M)&chassis.dir)
-							M.gets_drilled()
+							M.GetDrilled()
 					log_message("Drilled through [target]")
 					if(locate(/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp) in chassis.equipment)
 						var/obj/structure/ore_box/ore_box = locate(/obj/structure/ore_box) in chassis:cargo
@@ -153,7 +153,7 @@
 				else if(istype(target, /turf/simulated/mineral))
 					for(var/turf/simulated/mineral/M in range(chassis,1))
 						if(get_dir(chassis,M)&chassis.dir)
-							M.gets_drilled()
+							M.GetDrilled()
 					log_message("Drilled through [target]")
 					if(locate(/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp) in chassis.equipment)
 						var/obj/structure/ore_box/ore_box = locate(/obj/structure/ore_box) in chassis:cargo

code/game/objects/effects/decals/Cleanable/misc.dm

@@ -39,14 +39,7 @@
 	layer = 2
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "dirt"
-
-/obj/effect/decal/cleanable/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if(!istype(W,/obj/item/weapon/mop) && !istype(W,/obj/item/weapon/soap))
-		var/turf/T = get_turf(src)
-		if(T)
-			T.attackby(W,user)
-			return
-	..()
+	mouse_opacity = 0
 
 /obj/effect/decal/cleanable/flour
 	name = "flour"

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

@@ -93,7 +93,7 @@ RCD
 					if(useResource(1, user))
 						user << "Building Floor..."
 						activate()
-						A:ChangeTurf(/turf/simulated/floor/plating)
+						A:ChangeTurf(/turf/simulated/floor/plating/airless)
 						return 1
 					return 0
 
@@ -132,7 +132,7 @@ RCD
 						if(do_after(user, 40))
 							if(!useResource(5, user)) return 0
 							activate()
-							A:ChangeTurf(/turf/simulated/floor/plating)
+							A:ChangeTurf(/turf/simulated/floor/plating/airless)
 							return 1
 					return 0
 

code/game/turfs/simulated/floor_types.dm

@@ -73,7 +73,7 @@
 
 /turf/simulated/floor/engine/n20
 	New()
-		..()
+		. = ..()
 		var/datum/gas_mixture/adding = new
 		var/datum/gas/sleeping_agent/trace_gas = new
 

code/modules/mining/minerals.dm

@@ -0,0 +1,72 @@
+var/list/name_to_mineral
+
+proc/SetupMinerals()
+	name_to_mineral = list()
+	for(var/type in typesof(/mineral) - /mineral)
+		var/mineral/new_mineral = new type
+		if(!new_mineral.name)
+			continue
+		name_to_mineral[new_mineral.name] = new_mineral
+	return 1
+
+mineral
+	///What am I called?
+	var/name
+	var/display_name
+	///How much ore?
+	var/result_amount
+	///Does this type of deposit spread?
+	var/spread = 1
+	///Chance of spreading in any direction
+	var/spread_chance
+
+	///Path to the resultant ore.
+	var/ore
+
+	New()
+		. = ..()
+		if(!display_name)
+			display_name = name
+
+mineral/uranium
+	name = "Uranium"
+	result_amount = 5
+	spread_chance = 10
+	ore = /obj/item/weapon/ore/uranium
+
+mineral/iron
+	name = "Iron"
+	result_amount = 5
+	spread_chance = 25
+	ore = /obj/item/weapon/ore/iron
+
+mineral/diamond
+	name = "Diamond"
+	result_amount = 5
+	spread_chance = 10
+	ore = /obj/item/weapon/ore/diamond
+
+mineral/gold
+	name = "Gold"
+	result_amount = 5
+	spread_chance = 10
+	ore = /obj/item/weapon/ore/gold
+
+mineral/silver
+	name = "Silver"
+	result_amount = 5
+	spread_chance = 10
+	ore = /obj/item/weapon/ore/silver
+
+mineral/plasma
+	name = "Plasma"
+	result_amount = 5
+	spread_chance = 25
+	ore = /obj/item/weapon/ore/plasma
+
+mineral/clown
+	display_name = "Bananium"
+	name = "Clown"
+	result_amount = 3
+	spread = 0
+	ore = /obj/item/weapon/ore/clown

code/modules/mining/ores_coins.dm

@@ -4,7 +4,7 @@
 	name = "Rock"
 	icon = 'icons/obj/mining.dmi'
 	icon_state = "ore2"
-	var/datum/geosample/geological_data
+	var/datum/geosample/geologic_data
 
 /obj/item/weapon/ore/uranium
 	name = "Uranium ore"

code/modules/mob/language.dm

@@ -6,7 +6,7 @@
 	var/name = "an unknown language" // Fluff name of language if any.
 	var/desc = "A language."         // Short description for 'Check Languages'.
 	var/speech_verb = "says"         // 'says', 'hisses', 'farts'.
-	var/colour = "say_quote"         // CSS style to use for strings in this language.
+	var/colour = "body"         // CSS style to use for strings in this language.
 	var/key = "x"                    // Character used to speak in language eg. :o for Unathi.
 	var/flags = 0                    // Various language flags.
 	var/native                       // If set, non-native speakers will have trouble speaking.
@@ -54,6 +54,7 @@
 /datum/language/human
 	name = "Sol Common"
 	desc = "A bastardized hybrid of informal English and elements of Mandarin Chinese; the common language of the Sol system."
+	colour = "rough"
 	key = "1"
 	flags = RESTRICTED
 
@@ -62,35 +63,30 @@
 	name = "Tradeband"
 	desc = "Maintained by the various trading cartels in major systems, this elegant, structured language is used for bartering and bargaining."
 	speech_verb = "enunciates"
+	colour = "say_quote"
 	key = "2"
 
 /datum/language/gutter
 	name = "Gutter"
 	desc = "Much like Standard, this crude pidgin tongue descended from numerous languages and serves as Tradeband for criminal elements."
 	speech_verb = "growls"
+	colour = "rough"
 	key = "3"
 
 // Language handling.
 /mob/proc/add_language(var/language)
 
-	for(var/datum/language/L in languages)
-		if(L && L.name == language)
-			return 0
-
 	var/datum/language/new_language = all_languages[language]
 
-	if(!istype(new_language,/datum/language))
+	if(!istype(new_language) || new_language in languages)
 		return 0
 
-	languages += new_language
+	languages.Add(new_language)
 	return 1
 
 /mob/proc/remove_language(var/rem_language)
 
-	for(var/datum/language/L in languages)
-		if(L && L.name == rem_language)
-			languages -= L
-			return 1
+	languages.Remove(all_languages[rem_language])
 
 	return 0
 

code/modules/mob/living/carbon/human/human.dm

@@ -40,11 +40,6 @@
 	if(!species)
 		set_species()
 
-	if(species.language)
-		var/datum/language/L = all_languages[species.language]
-		if(L)
-			languages += L
-
 	var/datum/reagents/R = new/datum/reagents(1000)
 	reagents = R
 	R.my_atom = src
@@ -1268,8 +1263,14 @@ mob/living/carbon/human/yank_out_object()
 	if(species && (species.name && species.name == new_species))
 		return
 
+	if(species && species.language)
+		remove_language(species.language)
+
 	species = all_species[new_species]
 
+	if(species.language)
+		add_language(species.language)
+
 	spawn(0)
 		update_icons()
 

code/modules/mob/living/say.dm

@@ -108,7 +108,7 @@ var/list/department_radio_keys = list(
 		if(client.prefs.muted & MUTE_IC)
 			src << "\red You cannot speak in IC (muted)."
 			return
-		if (src.client.handle_spam_prevention(message,MUTE_IC))
+		if (src.client.handle_spam_prevention(message, MUTE_IC))
 			return
 
 	// Mute disability
@@ -173,7 +173,7 @@ var/list/department_radio_keys = list(
 	if(src.stunned > 2 || (traumatic_shock > 61 && prob(50)))
 		message_mode = null //Stunned people shouldn't be able to physically turn on their radio/hold down the button to speak into it
 
-	message = capitalize(message)
+	message = capitalize(trim_left(message))
 
 	if (!message)
 		return
@@ -371,9 +371,9 @@ var/list/department_radio_keys = list(
 	for(var/mob/M in hearers(5, src))
 		if(M != src && is_speaking_radio)
 			M:show_message("<span class='notice'>[src] talks into [used_radios.len ? used_radios[1] : "radio"]</span>")
-		
+
 	var/rendered = null
-	
+
 	if (length(heard_a))
 		var/message_a = say_quote(message,speaking)
 

code/modules/mob/new_player/new_player.dm

@@ -287,6 +287,9 @@
 			src << alert("[rank] is not available. Please try another.")
 			return 0
 
+		spawning = 1
+		close_spawn_windows()
+
 		job_master.AssignRole(src, rank, 1)
 
 		var/mob/living/carbon/human/character = create_character()	//creates the human and transfers vars and mind
@@ -359,8 +362,6 @@
 		if(chosen_species)
 			if(is_alien_whitelisted(src, client.prefs.species) || !config.usealienwhitelist || !(chosen_species.flags & IS_WHITELISTED) || (client.holder.rights & R_ADMIN) )// Have to recheck admin due to no usr at roundstart. Latejoins are fine though.
 				new_character.set_species(client.prefs.species)
-				if(chosen_species.language)
-					new_character.add_language(chosen_species.language)
 
 		var/datum/language/chosen_language
 		if(client.prefs.language)

code/modules/mob/say.dm

@@ -98,30 +98,28 @@
 		//tcomms code is still runtiming somewhere here
 	var/ending = copytext(text, length(text))
 
-	var/speechverb = "<span class='say_quote'>"
+	var/speech_verb = "says"
+	var/speech_style = "body"
 
 	if (speaking)
-		speechverb = "[speaking.speech_verb]</span>, \"<span class='[speaking.colour]'>"
+		speech_verb = speaking.speech_verb
+		speech_style = speaking.colour
 	else if(speak_emote && speak_emote.len)
-		speechverb = "[pick(speak_emote)], \""
+		speech_verb = pick(speak_emote)
 	else if (src.stuttering)
-		speechverb = "stammers, \""
+		speech_verb = "stammers"
 	else if (src.slurring)
-		speechverb = "slurrs, \""
+		speech_verb = "slurrs"
 	else if (ending == "?")
-		speechverb = "asks, \""
+		speech_verb = "asks"
 	else if (ending == "!")
-		speechverb = "exclaims, \""
+		speech_verb = "exclaims"
 	else if(isliving(src))
 		var/mob/living/L = src
 		if (L.getBrainLoss() >= 60)
-			speechverb = "gibbers, \""
-		else
-			speechverb = "says, \""
-	else
-		speechverb = "says, \""
+			speech_verb = "gibbers"
 
-	return "[speechverb][text]</span>\""
+	return "<span class='say_quote'>[speech_verb],</span> \"<span class='[speech_style]'>[text]</span>\""
 
 /mob/proc/emote(var/act, var/type, var/message)
 	if(act == "me")

code/modules/reagents/Chemistry-Reagents-Antidepressants.dm

@@ -1,5 +1,3 @@
-Methylphenidate
-
 #define ANTIDEPRESSANT_MESSAGE_DELAY 5*60*10
 
 /datum/reagent/antidepressant/methylphenidate

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

@@ -29,7 +29,7 @@
 			anchored = 1
 			spawn(drill_time)
 				if(get_turf(src) == drilling_turf && active)
-					M.gets_drilled()
+					M.GetDrilled()
 					src.loc = M
 				drilling_turf = null
 				anchored = 0

code/modules/research/xenoarchaeology/geosample.dm

@@ -57,44 +57,45 @@
 
 	age = rand(1,999)
 
-	switch(container.mineralName)
-		if("Uranium")
-			age_million = rand(1, 704)
-			age_thousand = rand(1,999)
-			find_presence["potassium"] = rand(1,1000) / 100
-			source_mineral = "potassium"
-		if("Iron")
-			age_thousand = rand(1, 999)
-			age_million = rand(1, 999)
-			find_presence["iron"] = rand(1,1000) / 100
-			source_mineral = "iron"
-		if("Diamond")
-			age_thousand = rand(1,999)
-			age_million = rand(1,999)
-			find_presence["nitrogen"] = rand(1,1000) / 100
-			source_mineral = "nitrogen"
-		if("Gold")
-			age_thousand = rand(1,999)
-			age_million = rand(1,999)
-			age_billion = rand(3,4)
-			find_presence["iron"] = rand(1,1000) / 100
-			source_mineral = "iron"
-		if("Silver")
-			age_thousand = rand(1,999)
-			age_million = rand(1,999)
-			find_presence["iron"] = rand(1,1000) / 100
-			source_mineral = "iron"
-		if("Plasma")
-			age_thousand = rand(1,999)
-			age_million = rand(1,999)
-			age_billion = rand(10, 13)
-			find_presence["plasma"] = rand(1,1000) / 100
-			source_mineral = "plasma"
-		if("Clown")
-			age = rand(-1,-999)				//thats the joke
-			age_thousand = rand(-1,-999)
-			find_presence["plasma"] = rand(1,1000) / 100
-			source_mineral = "plasma"
+	if(container.mineral)
+		switch(container.mineral.name)
+			if("Uranium")
+				age_million = rand(1, 704)
+				age_thousand = rand(1,999)
+				find_presence["potassium"] = rand(1,1000) / 100
+				source_mineral = "potassium"
+			if("Iron")
+				age_thousand = rand(1, 999)
+				age_million = rand(1, 999)
+				find_presence["iron"] = rand(1,1000) / 100
+				source_mineral = "iron"
+			if("Diamond")
+				age_thousand = rand(1,999)
+				age_million = rand(1,999)
+				find_presence["nitrogen"] = rand(1,1000) / 100
+				source_mineral = "nitrogen"
+			if("Gold")
+				age_thousand = rand(1,999)
+				age_million = rand(1,999)
+				age_billion = rand(3,4)
+				find_presence["iron"] = rand(1,1000) / 100
+				source_mineral = "iron"
+			if("Silver")
+				age_thousand = rand(1,999)
+				age_million = rand(1,999)
+				find_presence["iron"] = rand(1,1000) / 100
+				source_mineral = "iron"
+			if("Plasma")
+				age_thousand = rand(1,999)
+				age_million = rand(1,999)
+				age_billion = rand(10, 13)
+				find_presence["plasma"] = rand(1,1000) / 100
+				source_mineral = "plasma"
+			if("Clown")
+				age = rand(-1,-999)				//thats the joke
+				age_thousand = rand(-1,-999)
+				find_presence["plasma"] = rand(1,1000) / 100
+				source_mineral = "plasma"
 
 	if(prob(75))
 		find_presence["phosphorus"] = rand(1,500) / 100

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

@@ -273,8 +273,8 @@
 		switch(scanned_item.type)
 			if(/obj/item/weapon/ore)
 				var/obj/item/weapon/ore/O = scanned_item
-				if(O.geological_data)
-					G = O.geological_data
+				if(O.geologic_data)
+					G = O.geologic_data
 
 			if(/obj/item/weapon/rocksliver)
 				var/obj/item/weapon/rocksliver/O = scanned_item

code/modules/research/xenoarchaeology/misc.dm

@@ -1,3 +1,52 @@
+#define XENOARCH_SPAWN_CHANCE 0.5
+#define XENOARCH_SPREAD_CHANCE 15
+#define ARTIFACT_SPAWN_CHANCE 20
+
+proc/SetupXenoarch()
+	for(var/turf/simulated/mineral/M in block(locate(1,1,1), locate(world.maxx, world.maxy, world.maxz)))
+		if(!M.geologic_data)
+			M.geologic_data = new/datum/geosample(M)
+
+		if(!prob(XENOARCH_SPAWN_CHANCE))
+			continue
+
+		var/digsite = get_random_digsite_type()
+		var/list/processed_turfs = list()
+		var/list/turfs_to_process = list(M)
+		for(var/turf/simulated/mineral/archeo_turf in turfs_to_process)
+
+			for(var/turf/simulated/mineral/T in orange(1, archeo_turf))
+				if(T.finds)
+					continue
+				if(T in processed_turfs)
+					continue
+				if(prob(XENOARCH_SPREAD_CHANCE))
+					turfs_to_process.Add(T)
+
+			processed_turfs.Add(archeo_turf)
+			if(!archeo_turf.finds)
+				archeo_turf.finds = list()
+				if(prob(50))
+					archeo_turf.finds.Add(new /datum/find(digsite, rand(5,95)))
+				else if(prob(75))
+					archeo_turf.finds.Add(new /datum/find(digsite, rand(5,45)))
+					archeo_turf.finds.Add(new /datum/find(digsite, rand(55,95)))
+				else
+					archeo_turf.finds.Add(new /datum/find(digsite, rand(5,30)))
+					archeo_turf.finds.Add(new /datum/find(digsite, rand(35,75)))
+					archeo_turf.finds.Add(new /datum/find(digsite, rand(75,95)))
+
+				//sometimes a find will be close enough to the surface to show
+				var/datum/find/F = archeo_turf.finds[1]
+				if(F.excavation_required <= F.view_range)
+					archeo_turf.archaeo_overlay = "overlay_archaeo[rand(1,3)]"
+					archeo_turf.overlays += archeo_turf.archaeo_overlay
+
+		//dont create artifact machinery in animal or plant digsites, or if we already have one
+		if(!M.artifact_find && digsite != 1 && digsite != 2 && prob(ARTIFACT_SPAWN_CHANCE))
+			M.artifact_find = new()
+			artifact_spawn.Add(src)
+
 
 //---- Noticeboard
 

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

@@ -51,11 +51,11 @@
 	var/datum/geosample/geo_data
 	if(istype(item_to_sample, /turf/simulated/mineral))
 		var/turf/simulated/mineral/T = item_to_sample
-		T.geological_data.UpdateNearbyArtifactInfo(T)
-		geo_data = T.geological_data
+		T.geologic_data.UpdateNearbyArtifactInfo(T)
+		geo_data = T.geologic_data
 	else if(istype(item_to_sample, /obj/item/weapon/ore))
 		var/obj/item/weapon/ore/O = item_to_sample
-		geo_data = O.geological_data
+		geo_data = O.geologic_data
 
 	if(geo_data)
 		if(filled_bag)

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

@@ -28,14 +28,14 @@
 	user.visible_message("\blue [user] scans [A], the air around them humming gently.")
 	if(istype(A,/turf/simulated/mineral))
 		var/turf/simulated/mineral/M = A
-		if(M.excavation_minerals.len || M.finds.len || M.artifact_find)
+		if(M.finds.len || M.artifact_find)
 
 			//create a new scanlog entry
 			var/datum/depth_scan/D = new()
 			D.coords = "[M.x].[rand(0,9)]:[M.y].[rand(0,9)]:[10 * M.z].[rand(0,9)]"
 			D.time = worldtime2text()
 			D.record_index = positive_locations.len + 1
-			D.material = M.mineralName
+			D.material = M.mineral ? M.mineral.display_name : "Rock"
 
 			//find the first artifact and store it
 			if(M.finds.len)
@@ -44,13 +44,6 @@
 				D.clearance = F.clearance_range * 2
 				D.material = get_responsive_reagent(F.find_type)
 
-			//check if there are minerals interfering with the scan
-			if(M.excavation_minerals.len)
-				if(!D.depth || M.excavation_minerals[1] < D.depth)
-					D.depth = M.excavation_minerals[1]
-					D.clearance = rand() * 4 + 1
-					D.material = M.mineralName
-
 			positive_locations.Add(D)
 
 			for(var/mob/L in range(src, 1))

code/stylesheet.dm

@@ -63,6 +63,7 @@ h1.alert, h2.alert		{color: #000000;}
 .skrell					{color: #00CED1;}
 .soghun					{color: #228B22;}
 .vox					{color: #AA00AA;}
+.rough					{font-family: "Trebuchet MS", cursive, sans-serif;}
 .say_quote				{font-family: Georgia, Verdana, sans-serif;}
 
 .interface				{color: #330033;}