Merge branch 'dev' into mutiny

baystation12.dme

@@ -872,6 +872,7 @@
 #include "code\modules\mob\death.dm"
 #include "code\modules\mob\emote.dm"
 #include "code\modules\mob\hear_say.dm"
+#include "code\modules\mob\holder.dm"
 #include "code\modules\mob\inventory.dm"
 #include "code\modules\mob\language.dm"
 #include "code\modules\mob\login.dm"

code/ATMOSPHERICS/components/trinary_devices/filter.dm

@@ -1,7 +1,7 @@
 obj/machinery/atmospherics/trinary/filter
 	icon = 'icons/obj/atmospherics/filter.dmi'
 	icon_state = "intact_off"
-	density = 1
+	density = 0
 
 	name = "Gas filter"
 

code/ATMOSPHERICS/components/trinary_devices/mixer.dm

@@ -1,7 +1,7 @@
 obj/machinery/atmospherics/trinary/mixer
 	icon = 'icons/obj/atmospherics/mixer.dmi'
 	icon_state = "intact_off"
-	density = 1
+	density = 0
 
 	name = "Gas mixer"
 

code/ATMOSPHERICS/datum_pipeline.dm

@@ -1,3 +1,5 @@
+#define STEFAN_BOLTZMANN_CONSTANT 0.0000000567
+
 datum/pipeline
 	var/datum/gas_mixture/air
 
@@ -209,5 +211,12 @@ datum/pipeline
 					(partial_heat_capacity*target.heat_capacity/(partial_heat_capacity+target.heat_capacity))
 
 				air.temperature -= heat/total_heat_capacity
+		if(network)
+			network.update = 1
+			
+	proc/radiate_heat(surface, thermal_conductivity)
+		var/total_heat_capacity = air.heat_capacity()
+		var/heat = STEFAN_BOLTZMANN_CONSTANT * surface * air.temperature ** 4 * thermal_conductivity
+		air.temperature = max(0, air.temperature - heat / total_heat_capacity)
 		if(network)
 			network.update = 1

code/ATMOSPHERICS/he_pipes.dm

@@ -4,6 +4,7 @@ obj/machinery/atmospherics/pipe/simple/heat_exchanging
 	icon_state = "intact"
 	level = 2
 	var/initialize_directions_he
+	var/surface = 2
 
 	minimum_temperature_difference = 20
 	thermal_conductivity = OPEN_HEAT_TRANSFER_COEFFICIENT
@@ -49,12 +50,11 @@ obj/machinery/atmospherics/pipe/simple/heat_exchanging
 				else
 					var/datum/gas_mixture/environment = loc.return_air()
 					environment_temperature = environment.temperature
+				var/datum/gas_mixture/pipe_air = return_air()
+				if(abs(environment_temperature-pipe_air.temperature) > minimum_temperature_difference)
+					parent.temperature_interact(loc, volume, thermal_conductivity)
 			else
-				environment_temperature = loc:temperature
-			var/datum/gas_mixture/pipe_air = return_air()
-			if(abs(environment_temperature-pipe_air.temperature) > minimum_temperature_difference)
-				parent.temperature_interact(loc, volume, thermal_conductivity)
-
+				parent.radiate_heat(surface, 1)
 
 
 obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction

code/__HELPERS/unsorted.dm

@@ -721,13 +721,14 @@ proc/anim(turf/location as turf,target as mob|obj,a_icon,a_icon_state as text,fl
 
 	var/delayfraction = round(delay/numticks)
 	var/original_loc = user.loc
+	var/original_turf = get_turf(user)
 	var/holding = user.get_active_hand()
 
 	for(var/i = 0, i<numticks, i++)
 		sleep(delayfraction)
 
 
-		if(!user || user.stat || user.weakened || user.stunned || (user.loc != original_loc))
+		if(!user || user.stat || user.weakened || user.stunned || user.loc != original_loc || get_turf(user) != original_turf)
 			return 0
 		if(needhand && !(user.get_active_hand() == holding))	//Sometimes you don't want the user to have to keep their active hand
 			return 0

code/datums/visibility_networks/update_triggers.dm

@@ -71,8 +71,8 @@
 
 /mob/Move(n,direct)
 	var/oldLoc = src.loc
-	. = ..()
-	if(.)
+	//. = ..()
+	if(..(n,direct))
 		if(src.visibilityNetworks.len)
 			if(!src.updatingVisibilityNetworks)
 				src.updatingVisibilityNetworks = 1
@@ -81,7 +81,7 @@
 						for (var/datum/visibility_network/currentNetwork in src.visibilityNetworks)
 							currentNetwork.updateMob(src)
 					src.updatingVisibilityNetworks = 0
-	return ..(n,direct)
+	return .
 
 /mob/proc/addToVisibilityNetwork(var/datum/visibility_network/network)
 	if(network)

code/game/area/Space Station 13 areas.dm

@@ -962,6 +962,10 @@ var/list/ghostteleportlocs = list()
 		name = "\improper Engineering Monitoring Room"
 		icon_state = "engine_monitoring"
 
+	atmos_monitoring
+		name = "\improper Atmospherics Monitoring Room"
+		icon_state = "engine_monitoring"
+
 	engineering
 		name = "Engineering"
 		icon_state = "engine_smes"
@@ -982,10 +986,18 @@ var/list/ghostteleportlocs = list()
 		name = "\improper Engineering Hallway"
 		icon_state = "engine_hallway"
 
+	engine_hallway
+		name = "\improper Engine Room Hallway"
+		icon_state = "engine_hallway"
+
 	engine_eva
 		name = "\improper Engine EVA"
 		icon_state = "engine_eva"
 
+	engine_eva_maintenance
+		name = "\improper Engine EVA Maintenance"
+		icon_state = "engine_eva"
+
 	workshop
 		name = "\improper Engineering Workshop"
 		icon_state = "engine_storage"

code/game/gamemodes/wizard/soulstone.dm

@@ -179,7 +179,6 @@
 						del(T)
 						Z << "<B>You are playing a Juggernaut. Though slow, you can withstand extreme punishment, and rip apart enemies and walls alike.</B>"
 						Z << "<B>You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.</B>"
-						Z.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/lesserforcewall(Z)
 						Z.cancel_camera()
 						del(C)
 
@@ -195,7 +194,6 @@
 						del(T)
 						Z << "<B>You are playing a Wraith. Though relatively fragile, you are fast, deadly, and even able to phase through walls.</B>"
 						Z << "<B>You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.</B>"
-						Z.spell_list += new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift(Z)
 						Z.cancel_camera()
 						del(C)
 
@@ -211,10 +209,6 @@
 						del(T)
 						Z << "<B>You are playing an Artificer. You are incredibly weak and fragile, but you are able to construct fortifications, repair allied constructs (by clicking on them), and even create new constructs</B>"
 						Z << "<B>You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.</B>"
-						Z.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/construct/lesser(Z)
-						Z.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/wall(Z)
-						Z.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/floor(Z)
-						Z.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone(Z)
 						Z.cancel_camera()
 						del(C)
 			else

code/game/machinery/atmoalter/canister.dm

@@ -294,6 +294,9 @@ update_flag
 
 	if (href_list["remove_tank"])
 		if(holding)
+			if (valve_open)
+				valve_open = 0
+				release_log += "Valve was <b>closed</b> by [usr] ([usr.ckey]), stopping the transfer into the [holding]<br>"
 			if(istype(holding, /obj/item/weapon/tank))
 				holding.manipulated_by = usr.real_name
 			holding.loc = loc

code/game/machinery/doors/poddoor.dm

@@ -1,6 +1,6 @@
 /obj/machinery/door/poddoor
 	name = "Podlock"
-	desc = "Why it no open!!!"
+	desc = "That looks like it doesn't open easily."
 	icon = 'icons/obj/doors/rapid_pdoor.dmi'
 	icon_state = "pdoor1"
 	var/id = 1.0

code/game/machinery/hologram.dm

@@ -78,13 +78,13 @@ var/const/HOLOPAD_MODE = 0
 
 /*This is the proc for special two-way communication between AI and holopad/people talking near holopad.
 For the other part of the code, check silicon say.dm. Particularly robot talk.*/
-/obj/machinery/hologram/holopad/hear_talk(mob/living/M, text)
+/obj/machinery/hologram/holopad/hear_talk(mob/living/M, text, verb)
 	if(M&&hologram&&master)//Master is mostly a safety in case lag hits or something.
 		if(!master.say_understands(M))//The AI will be able to understand most mobs talking through the holopad.
 			text = stars(text)
 		var/name_used = M.GetVoice()
 		//This communication is imperfect because the holopad "filters" voices and is only designed to connect to the master only.
-		var/rendered = "<i><span class='game say'>Holopad received, <span class='name'>[name_used]</span> <span class='message'>[M.say_quote(text)]</span></span></i>"
+		var/rendered = "<i><span class='game say'>Holopad received, <span class='name'>[name_used]</span> [verb], <span class='message'>\"[text]\"</span></span></i>"
 		master.show_message(rendered, 2)
 	return
 
@@ -210,4 +210,4 @@ Holographic project of everything else.
 	name = "hologram projector"
 	desc = "It makes a hologram appear...with magnets or something..."
 	icon = 'icons/obj/stationobjs.dmi'
-	icon_state = "hologram0"
+	icon_state = "hologram0"

code/game/objects/items/bodybag.dm

@@ -5,6 +5,7 @@
 	desc = "A folded bag designed for the storage and transportation of cadavers."
 	icon = 'icons/obj/bodybag.dmi'
 	icon_state = "bodybag_folded"
+	w_class = 2.0
 
 	attack_self(mob/user)
 		var/obj/structure/closet/body_bag/R = new /obj/structure/closet/body_bag(user.loc)

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

@@ -464,7 +464,7 @@
 	foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
 	storage_slots=21
 	can_hold = list("/obj/item/weapon/light/tube", "/obj/item/weapon/light/bulb")
-	max_combined_w_class = 21
+	max_combined_w_class = 42	//holds 21 items of w_class 2
 	use_to_pickup = 1 // for picking up broken bulbs, not that most people will try
 
 /obj/item/weapon/storage/box/lights/bulbs/New()

code/modules/client/preferences.dm

@@ -562,7 +562,7 @@ datum/preferences
 		return
 
 	proc/SetAntagoptions(mob/user)
-		if(uplinklocation == "")
+		if(uplinklocation == "" || !uplinklocation)
 			uplinklocation = "PDA"
 		var/HTML = "<body>"
 		HTML += "<tt><center>"
@@ -953,11 +953,12 @@ datum/preferences
 					if("language")
 						var/languages_available
 						var/list/new_languages = list("None")
+						var/datum/species/S = all_species[species]
 
 						if(config.usealienwhitelist)
 							for(var/L in all_languages)
 								var/datum/language/lang = all_languages[L]
-								if((!(lang.flags & RESTRICTED)) && (is_alien_whitelisted(user, L)||(!( lang.flags & WHITELISTED ))))
+								if((!(lang.flags & RESTRICTED)) && (is_alien_whitelisted(user, L)||(!( lang.flags & WHITELISTED ))||(S && (L in S.secondary_langs))))
 									new_languages += lang
 									languages_available = 1
 

code/modules/mining/satchel_ore_boxdm.dm

@@ -7,6 +7,16 @@
 	name = "Ore Box"
 	desc = "A heavy box used for storing ore."
 	density = 1
+	var/amt_gold = 0
+	var/amt_silver = 0
+	var/amt_diamond = 0
+	var/amt_glass = 0
+	var/amt_iron = 0
+	var/amt_phoron = 0
+	var/amt_uranium = 0
+	var/amt_clown = 0
+	var/amt_strange = 0
+	var/last_update = 0
 
 /obj/structure/ore_box/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if (istype(W, /obj/item/weapon/ore))
@@ -20,72 +30,129 @@
 		user << "\blue You empty the satchel into the box."
 	return
 
-/obj/structure/ore_box/attack_hand(obj, mob/user as mob)
-	var/amt_gold = 0
-	var/amt_silver = 0
-	var/amt_diamond = 0
-	var/amt_glass = 0
-	var/amt_iron = 0
-	var/amt_phoron = 0
-	var/amt_uranium = 0
-	var/amt_clown = 0
-	var/amt_strange = 0
+/obj/structure/ore_box/examine()
+	set name = "Examine"
+	set category = "IC"
+	set src in view(usr.client) //If it can be seen, it can be examined.
 
-
-	for (var/obj/item/weapon/ore/C in contents)
-		if (istype(C,/obj/item/weapon/ore/diamond))
-			amt_diamond++;
-		if (istype(C,/obj/item/weapon/ore/glass))
-			amt_glass++;
-		if (istype(C,/obj/item/weapon/ore/phoron))
-			amt_phoron++;
-		if (istype(C,/obj/item/weapon/ore/iron))
-			amt_iron++;
-		if (istype(C,/obj/item/weapon/ore/silver))
-			amt_silver++;
-		if (istype(C,/obj/item/weapon/ore/gold))
-			amt_gold++;
-		if (istype(C,/obj/item/weapon/ore/uranium))
-			amt_uranium++;
-		if (istype(C,/obj/item/weapon/ore/clown))
-			amt_clown++;
-		if (istype(C,/obj/item/weapon/ore/strangerock))
-			amt_strange++;
-
-	var/dat = text("<b>The contents of the ore box reveal...</b><br>")
-	if (amt_gold)
-		dat += text("Gold ore: [amt_gold]<br>")
-	if (amt_silver)
-		dat += text("Silver ore: [amt_silver]<br>")
-	if (amt_iron)
-		dat += text("Metal ore: [amt_iron]<br>")
-	if (amt_glass)
-		dat += text("Sand: [amt_glass]<br>")
-	if (amt_diamond)
-		dat += text("Diamond ore: [amt_diamond]<br>")
-	if (amt_phoron)
-		dat += text("Phoron ore: [amt_phoron]<br>")
-	if (amt_uranium)
-		dat += text("Uranium ore: [amt_uranium]<br>")
-	if (amt_clown)
-		dat += text("Bananium ore: [amt_clown]<br>")
-	if (amt_strange)
-		dat += text("Strange rocks: [amt_strange]<br>")
-
-	dat += text("<br><br><A href='?src=\ref[src];removeall=1'>Empty box</A>")
-	user << browse("[dat]", "window=orebox")
-	return
-
-/obj/structure/ore_box/Topic(href, href_list)
-	if(..())
+	if (!( usr ))
 		return
-	usr.set_machine(src)
-	src.add_fingerprint(usr)
-	if(href_list["removeall"])
-		for (var/obj/item/weapon/ore/O in contents)
-			contents -= O
-			O.loc = src.loc
-		usr << "\blue You empty the box"
-	src.updateUsrDialog()
+	usr << "That's an [src]."
+	usr << desc
+
+	if(!istype(usr, /mob/living/carbon/human)) //Only living, intelligent creatures with hands can check the contents of ore boxes.
+		return
+
+	if(!Adjacent(usr)) //Can only check the contents of ore boxes if you can physically reach them.
+		return
+
+	add_fingerprint(usr)
+
+	if(contents.len < 1)
+		usr << "It is empty."
+		return
+
+	if(world.time > last_update + 10)
+		update_orecount()
+		last_update = world.time
+
+	var/dat = text("<b>The contents of the ore box reveal...</b>")
+	if (amt_iron)
+		dat += text("<br>Metal ore: [amt_iron]")
+	if (amt_glass)
+		dat += text("<br>Sand: [amt_glass]")
+	if (amt_phoron)
+		dat += text("<br>Phoron ore: [amt_phoron]")
+	if (amt_uranium)
+		dat += text("<br>Uranium ore: [amt_uranium]")
+	if (amt_silver)
+		dat += text("<br>Silver ore: [amt_silver]")
+	if (amt_gold)
+		dat += text("<br>Gold ore: [amt_gold]")
+	if (amt_diamond)
+		dat += text("<br>Diamond ore: [amt_diamond]")
+	if (amt_strange)
+		dat += text("<br>Strange rocks: [amt_strange]")
+	if (amt_clown)
+		dat += text("<br>Bananium ore: [amt_clown]")
+
+	usr << dat
+
 	return
 
+
+/obj/structure/ore_box/verb/empty_box()
+	set name = "Empty Ore Box"
+	set category = "Object"
+	set src in view(1)
+
+	if(!istype(usr, /mob/living/carbon/human)) //Only living, intelligent creatures with hands can empty ore boxes.
+		usr << "\red You are physically incapable of emptying the ore box."
+		return
+
+	if( usr.stat || usr.restrained() )
+		return
+
+	if(!Adjacent(usr)) //You can only empty the box if you can physically reach it
+		usr << "You cannot reach the ore box."
+		return
+
+	add_fingerprint(usr)
+
+	if(contents.len < 1)
+		usr << "\red The ore box is empty"
+		return
+
+	for (var/obj/item/weapon/ore/O in contents)
+		contents -= O
+		O.loc = src.loc
+	usr << "\blue You empty the ore box"
+
+	return
+
+
+// Updates ore tally
+/obj/structure/ore_box/proc/update_orecount()
+	amt_iron = 0
+	amt_glass = 0
+	amt_phoron = 0
+	amt_uranium = 0
+	amt_silver = 0
+	amt_gold = 0
+	amt_diamond = 0
+	amt_strange = 0
+	amt_clown = 0
+
+	for(var/obj/item/weapon/ore/O in contents)
+		if(!istype(O))
+			continue
+
+		if (istype(O, /obj/item/weapon/ore/iron))
+			amt_iron++
+			continue
+		if (istype(O, /obj/item/weapon/ore/glass))
+			amt_glass++
+			continue
+		if (istype(O, /obj/item/weapon/ore/phoron))
+			amt_phoron++
+			continue
+		if (istype(O, /obj/item/weapon/ore/uranium))
+			amt_uranium++
+			continue
+		if (istype(O, /obj/item/weapon/ore/silver))
+			amt_silver++
+			continue
+		if (istype(O, /obj/item/weapon/ore/gold))
+			amt_gold++
+			continue
+		if (istype(O, /obj/item/weapon/ore/diamond))
+			amt_diamond++
+			continue
+		if (istype(O, /obj/item/weapon/ore/strangerock))
+			amt_strange++
+			continue
+		if (istype(O, /obj/item/weapon/ore/clown))
+			amt_clown++
+			continue
+
+	return

code/modules/mob/emote.dm

@@ -39,12 +39,30 @@
 		// Type 1 (Visual) emotes are sent to anyone in view of the item
 		if (m_type & 1)
 			for (var/mob/O in viewers(src, null))
+
+				if(O.status_flags & PASSEMOTES)
+
+					for(var/obj/item/weapon/holder/H in O.contents)
+						H.show_message(message, m_type)
+
+					for(var/mob/living/M in O.contents)
+						M.show_message(message, m_type)
+
 				O.show_message(message, m_type)
 
 		// Type 2 (Audible) emotes are sent to anyone in hear range
 		// of the *LOCATION* -- this is important for pAIs to be heard
 		else if (m_type & 2)
 			for (var/mob/O in hearers(get_turf(src), null))
+
+				if(O.status_flags & PASSEMOTES)
+
+					for(var/obj/item/weapon/holder/H in O.contents)
+						H.show_message(message, m_type)
+
+					for(var/mob/living/M in O.contents)
+						M.show_message(message, m_type)
+
 				O.show_message(message, m_type)
 
 /mob/proc/emote_dead(var/message)

code/modules/mob/holder.dm

@@ -0,0 +1,51 @@
+//Helper object for picking dionaea (and other creatures) up.
+/obj/item/weapon/holder
+	name = "holder"
+	desc = "You shouldn't ever see this."
+	icon = 'icons/obj/objects.dmi'
+	slot_flags = SLOT_HEAD
+
+/obj/item/weapon/holder/New()
+	..()
+	processing_objects.Add(src)
+
+/obj/item/weapon/holder/Del()
+	processing_objects.Remove(src)
+	..()
+
+/obj/item/weapon/holder/process()
+
+	if(istype(loc,/turf) || !(contents.len))
+
+		for(var/mob/M in contents)
+
+			var/atom/movable/mob_container
+			mob_container = M
+			mob_container.forceMove(get_turf(src))
+			M.reset_view()
+
+		del(src)
+
+/obj/item/weapon/holder/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	for(var/mob/M in src.contents)
+		M.attackby(W,user)
+
+/obj/item/weapon/holder/proc/show_message(var/message, var/m_type)
+	for(var/mob/living/M in contents)
+		M.show_message(message,m_type)
+
+//Mob specific holders.
+
+/obj/item/weapon/holder/diona
+
+	name = "diona nymph"
+	desc = "It's a tiny plant critter."
+	icon_state = "nymph"
+	origin_tech = "magnets=3;biotech=5"
+
+/obj/item/weapon/holder/drone
+
+	name = "maintenance drone"
+	desc = "It's a small maintenance robot."
+	icon_state = "drone"
+	origin_tech = "magnets=3;engineering=5"

code/modules/mob/language.dm

@@ -31,8 +31,8 @@
 	name = "Siik'tajr"
 	desc = "An expressive language that combines yowls and chirps with posture, tail and ears. Spoken by many Tajaran."
 	speech_verb = "mrowls"
-	colour = "tajaran"
-	key = "y"		//only "dfpqyz" left.
+	colour = "tajaran_signlang"
+	key = "y"		//only "dfpqxyz" left.
 	flags = WHITELISTED | NONVERBAL
 
 /datum/language/skrell

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

@@ -29,7 +29,7 @@
 	var/b_type = "A+"	//Player's bloodtype
 
 	var/underwear = 1	//Which underwear the player wants
-	var/undershirt = 1	//Which undershirt the player wants.
+	var/undershirt = 0	//Which undershirt the player wants.
 	var/backbag = 2		//Which backpack type the player has chosen. Nothing, Satchel or Backpack.
 
 	//Equipment slots

code/modules/mob/living/carbon/monkey/diona.dm

@@ -2,45 +2,6 @@
   Tiny babby plant critter plus procs.
 */
 
-//Helper object for picking dionaea (and other creatures) up.
-/obj/item/weapon/holder
-	name = "holder"
-	desc = "You shouldn't ever see this."
-
-/obj/item/weapon/holder/diona
-
-	name = "diona nymph"
-	desc = "It's a tiny plant critter."
-	icon = 'icons/obj/objects.dmi'
-	icon_state = "nymph"
-	slot_flags = SLOT_HEAD
-	origin_tech = "magnets=3;biotech=5"
-
-/obj/item/weapon/holder/New()
-	..()
-	processing_objects.Add(src)
-
-/obj/item/weapon/holder/Del()
-	processing_objects.Remove(src)
-	..()
-
-/obj/item/weapon/holder/process()
-
-	if(istype(loc,/turf) || !(contents.len))
-
-		for(var/mob/M in contents)
-
-			var/atom/movable/mob_container
-			mob_container = M
-			mob_container.forceMove(get_turf(src))
-			M.reset_view()
-
-		del(src)
-
-/obj/item/weapon/holder/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	for(var/mob/M in src.contents)
-		M.attackby(W,user)
-
 //Mob defines.
 /mob/living/carbon/monkey/diona
 	name = "diona nymph"
@@ -67,6 +28,7 @@
 			D.attack_hand(M)
 			M << "You scoop up [src]."
 			src << "[M] scoops you up."
+		M.status_flags |= PASSEMOTES
 		return
 
 	..()
@@ -108,6 +70,8 @@
 
 	if(istype(M,/mob/living/carbon/human))
 		M << "You feel your being twine with that of [src] as it merges with your biomass."
+		M.status_flags |= PASSEMOTES
+
 		src << "You feel your being twine with that of [M] as you merge with its biomass."
 		src.loc = M
 		src.verbs += /mob/living/carbon/monkey/diona/proc/split
@@ -127,10 +91,19 @@
 
 	src.loc << "You feel a pang of loss as [src] splits away from your biomass."
 	src << "You wiggle out of the depths of [src.loc]'s biomass and plop to the ground."
+
+	var/mob/living/M = src.loc
+
 	src.loc = get_turf(src)
 	src.verbs -= /mob/living/carbon/monkey/diona/proc/split
 	src.verbs += /mob/living/carbon/monkey/diona/proc/merge
 
+	if(istype(M))
+		for(var/atom/A in M.contents)
+			if(istype(A,/mob/living/simple_animal/borer) || istype(A,/obj/item/weapon/holder))
+				return
+	M.status_flags &= ~PASSEMOTES
+
 /mob/living/carbon/monkey/diona/verb/fertilize_plant()
 
 	set category = "Diona"
@@ -269,16 +242,16 @@
 		if(client.prefs.muted & MUTE_IC)
 			src << "\red You cannot speak in IC (Muted)."
 			return
-	
+
 	message =  trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
-	
+
 
 	if(stat == 2)
 		return say_dead(message)
 
 	var/datum/language/speaking = null
 
-	
+
 
 	if(length(message) >= 2)
 		var/channel_prefix = copytext(message, 1 ,3)
@@ -292,7 +265,7 @@
 	if(speaking)
 		message = trim(copytext(message,3))
 
-	message = capitalize(trim_left(message))	
+	message = capitalize(trim_left(message))
 
 	if(!message || stat)
 		return

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

@@ -12,6 +12,7 @@
 	var/primitive                // Lesser form, if any (ie. monkey for humans)
 	var/tail                     // Name of tail image in species effects icon file.
 	var/language                 // Default racial language, if any.
+	var/secondary_langs = list() // The names of secondary languages that are available to this species.
 	var/attack_verb = "punch"    // Empty hand hurt intent verb.
 	var/punch_damage = 0		 // Extra empty hand attack damage.
 	var/mutantrace               // Safeguard due to old code.
@@ -155,6 +156,7 @@
 	icobase = 'icons/mob/human_races/r_tajaran.dmi'
 	deform = 'icons/mob/human_races/r_def_tajaran.dmi'
 	language = "Siik'maas"
+	secondary_langs = list("Siik'tajr")
 	tail = "tajtail"
 	attack_verb = "scratch"
 	punch_damage = 5
@@ -216,14 +218,14 @@
 		"gloves" = 'icons/mob/species/vox/gloves.dmi'
 		)
 
-/datum/species/vox/handle_post_spawn()
+/datum/species/vox/handle_post_spawn(var/mob/living/carbon/human/H)
 
-	verbs += /mob/living/carbon/human/proc/leap
+	H.verbs += /mob/living/carbon/human/proc/leap
 	..()
 
-/datum/species/vox/armalis/handle_post_spawn()
+/datum/species/vox/armalis/handle_post_spawn(var/mob/living/carbon/human/H)
 
-	verbs += /mob/living/carbon/human/proc/gut
+	H.verbs += /mob/living/carbon/human/proc/gut
 	..()
 
 /datum/species/vox/armalis

code/modules/mob/living/living.dm

@@ -460,6 +460,13 @@
 		else if(istype(H.loc,/obj/item))
 			src << "You struggle free of [H.loc]."
 			H.loc = get_turf(H)
+
+		if(istype(M))
+			for(var/atom/A in M.contents)
+				if(istype(A,/mob/living/simple_animal/borer) || istype(A,/obj/item/weapon/holder))
+					return
+
+		M.status_flags &= ~PASSEMOTES
 		return
 
 	//Resisting control by an alien mind.

code/modules/mob/living/silicon/robot/drone/drone_abilities.dm

@@ -33,18 +33,6 @@
 		layer = MOB_LAYER
 		src << text("\blue You have stopped hiding.")
 
-//DRONE PICKUP.
-//Item holder.
-/obj/item/weapon/holder/drone
-
-	name = "maintenance drone"
-	desc = "It's a small maintenance robot."
-	icon = 'icons/obj/objects.dmi'
-	icon_state = "drone"
-	slot_flags = SLOT_HEAD
-	origin_tech = "magnets=3;engineering=5"
-
-
 //Actual picking-up event.
 /mob/living/silicon/robot/drone/attack_hand(mob/living/carbon/human/M as mob)
 
@@ -54,6 +42,7 @@
 		D.attack_hand(M)
 		M << "You scoop up [src]."
 		src << "[M] scoops you up."
+		M.status_flags |= PASSEMOTES
 		return
 
 	..()

code/modules/mob/living/simple_animal/borer.dm

@@ -58,7 +58,6 @@
 
 	..()
 
-
 	if(host)
 
 		if(!stat && !host.stat)
@@ -338,8 +337,14 @@ mob/living/simple_animal/borer/proc/detatch()
 		host_brain.name = "host brain"
 		host_brain.real_name = "host brain"
 
+	var/mob/living/H = host
 	host = null
 
+	for(var/atom/A in H.contents)
+		if(istype(A,/mob/living/simple_animal/borer) || istype(A,/obj/item/weapon/holder))
+			return
+	H.status_flags &= ~PASSEMOTES
+
 /mob/living/simple_animal/borer/verb/infest()
 	set category = "Alien"
 	set name = "Infest"
@@ -406,6 +411,7 @@ mob/living/simple_animal/borer/proc/detatch()
 
 		host_brain.name = M.name
 		host_brain.real_name = M.real_name
+		host.status_flags |= PASSEMOTES
 
 		return
 	else

code/modules/mob/new_player/new_player.dm

@@ -368,7 +368,7 @@
 		if(client.prefs.language)
 			chosen_language = all_languages["[client.prefs.language]"]
 		if(chosen_language)
-			if(is_alien_whitelisted(src, client.prefs.language) || !config.usealienwhitelist || !(chosen_language.flags & WHITELISTED))
+			if(is_alien_whitelisted(src, client.prefs.language) || !config.usealienwhitelist || !(chosen_language.flags & WHITELISTED) || (new_character.species && (chosen_language.name in new_character.species.secondary_langs)))
 				new_character.add_language("[client.prefs.language]")
 
 		if(ticker.random_players)

code/modules/power/generator.dm

@@ -84,15 +84,17 @@
 				air2.temperature = air2.temperature + heat/air2_heat_capacity
 				air1.temperature = air1.temperature - energy_transfer/air1_heat_capacity
 
-			//Transfer the air
-			circ1.air2.merge(air1)
-			circ2.air2.merge(air2)
+	//Transfer the air
+	if (air1)
+		circ1.air2.merge(air1)
+	if (air2)
+		circ2.air2.merge(air2)
 
-			//Update the gas networks
-			if(circ1.network2)
-				circ1.network2.update = 1
-			if(circ2.network2)
-				circ2.network2.update = 1
+	//Update the gas networks
+	if(circ1.network2)
+		circ1.network2.update = 1
+	if(circ2.network2)
+		circ2.network2.update = 1
 
 	// update icon overlays and power usage only if displayed level has changed
 	if(lastgen > 250000 && prob(10))

code/modules/supermatter/supermatter.dm

@@ -8,6 +8,12 @@
 #define OXYGEN_RELEASE_MODIFIER 1500        //Higher == less oxygen released at high temperature/power
 #define REACTION_POWER_MODIFIER 1.1                //Higher == more overall power
 
+//Controls how much power is produced by each collector in range - this is the main parameter for tweaking SM balance, as it basically controls how the power variable relates to the rest of the game.
+#define POWER_FACTOR 0.35              //Obtained from testing. Aiming to make the ideal running output (600 kW) run the SM to ~85% of the safety level. 
+
+#define CHARGING_FACTOR 0.55
+#define DAMAGE_RATE_LIMIT 5                 //damage rate cap at power = 900, scales linearly with power
+
 
 //These would be what you would get at point blank, decreases with distance
 #define DETONATION_RADS 200
@@ -96,9 +102,6 @@
 	if(!istype(L)) 	//We are in a crate or somewhere that isn't turf, if we return to turf resume processing but for now.
 		return  //Yeah just stop.
 
-	if(istype(L, /turf/space))	// Stop processing this stuff if we've been ejected.
-		return
-
 	if(damage > warning_point) // while the core is still damaged and it's still worth noting its status
 		if((world.timeofday - lastwarning) / 10 >= WARNING_DELAY)
 			var/stability = num2text(round((damage / explosion_point) * 100))
@@ -127,75 +130,81 @@
 			explode()
 
 	//Ok, get the air from the turf
-	var/datum/gas_mixture/env = L.return_air()
-
-	//Remove gas from surrounding area
-	var/datum/gas_mixture/removed = env.remove(gasefficency * env.total_moles)
-
-	if(!removed || !removed.total_moles)
-		damage += max((power-1600)/10, 0)
-		power = min(power, 1600)
-		return 1
-
-	if (!removed)
-		return 1
-
-	damage_archived = damage
-	damage = max( damage + ( (removed.temperature - 800) / 150 ) , 0 )
-	//Ok, 100% oxygen atmosphere = best reaction
-	//Maxes out at 100% oxygen pressure
-	oxygen = max(min((removed.oxygen - (removed.nitrogen * NITROGEN_RETARDATION_FACTOR)) / MOLES_CELLSTANDARD, 1), 0)
-
-	var/temp_factor = 100
-
-	if(oxygen > 0.8)
-		// with a perfect gas mix, make the power less based on heat
-		icon_state = "[base_icon_state]_glow"
-	else
-		// in normal mode, base the produced energy around the heat
-		temp_factor = 60
-		icon_state = base_icon_state
-
-	power = max( (removed.temperature * temp_factor / T0C) * oxygen + power, 0) //Total laser power plus an overload
-
-	//We've generated power, now let's transfer it to the collectors for storing/usage
-	transfer_energy()
-
-	var/device_energy = power * REACTION_POWER_MODIFIER
-
-	//To figure out how much temperature to add each tick, consider that at one atmosphere's worth
-	//of pure oxygen, with all four lasers firing at standard energy and no N2 present, at room temperature
-	//that the device energy is around 2140. At that stage, we don't want too much heat to be put out
-	//Since the core is effectively "cold"
-
-	//Also keep in mind we are only adding this temperature to (efficiency)% of the one tile the rock
-	//is on. An increase of 4*C @ 25% efficiency here results in an increase of 1*C / (#tilesincore) overall.
+	var/datum/gas_mixture/removed = null
+	var/datum/gas_mixture/env = null
+	
+	//ensure that damage doesn't increase too quickly due to super high temperatures resulting from no coolant, for example. We dont want the SM exploding before anyone can react.
+	//We want the cap to scale linearly with power (and explosion_point). Let's aim for a cap of 5 at power = 900 (based on testing, equals roughly 5% per SM alert announcement).
+	var/damage_inc_limit = (power/900)*(explosion_point/1000)*DAMAGE_RATE_LIMIT
+	
+	if(!istype(L, /turf/space))
+		env = L.return_air()
+		removed = env.remove(gasefficency * env.total_moles)	//Remove gas from surrounding area
+	
+	if(!env || !removed || !removed.total_moles)
+		damage += max(((power-(1600*POWER_FACTOR)))/10, 0)	//exciting the supermatter in a vacuum means the internal energy is mostly locked inside.
+	else
+		damage_archived = damage
+		
+		damage = max( damage + min( ( (removed.temperature - 800) / 150 ), damage_inc_limit ) , 0 )
+		//Ok, 100% oxygen atmosphere = best reaction
+		//Maxes out at 100% oxygen pressure
+		oxygen = max(min((removed.oxygen - (removed.nitrogen * NITROGEN_RETARDATION_FACTOR)) / MOLES_CELLSTANDARD, 1), 0)
+		
+		var/temp_factor = 100
+		
+		if(oxygen > 0.8)
+			// with a perfect gas mix, make the power less based on heat
+			icon_state = "[base_icon_state]_glow"
+		else
+			// in normal mode, base the produced energy around the heat
+			temp_factor = 60
+			icon_state = base_icon_state
+		
+		power = max( (removed.temperature * temp_factor / T0C) * oxygen + power, 0) //Total laser power plus an overload
+		
+		//We've generated power, now let's transfer it to the collectors for storing/usage
+		transfer_energy()
+		
+		var/device_energy = power * REACTION_POWER_MODIFIER
+		
+		//To figure out how much temperature to add each tick, consider that at one atmosphere's worth
+		//of pure oxygen, with all four lasers firing at standard energy and no N2 present, at room temperature
+		//that the device energy is around 2140. At that stage, we don't want too much heat to be put out
+		//Since the core is effectively "cold"
+		
+		//Also keep in mind we are only adding this temperature to (efficiency)% of the one tile the rock
+		//is on. An increase of 4*C @ 25% efficiency here results in an increase of 1*C / (#tilesincore) overall.
+		
+		var/thermal_power = THERMAL_RELEASE_MODIFIER
+		
+		//This shouldn't be necessary. If the number of moles is low, then heat_capacity should be tiny.
+		//if(removed.total_moles < 35) thermal_power += 750   //If you don't add coolant, you are going to have a bad time.
+		
+		removed.temperature += ((device_energy * thermal_power) / removed.heat_capacity())
+		
+		removed.temperature = max(0, min(removed.temperature, 10000))
+		
+		//Calculate how much gas to release
+		removed.phoron += max(device_energy / PHORON_RELEASE_MODIFIER, 0)
+		
+		removed.oxygen += max((device_energy + removed.temperature - T0C) / OXYGEN_RELEASE_MODIFIER, 0)
+		
+		removed.update_values()
+		
+		env.merge(removed)
 	
-	var/thermal_power = THERMAL_RELEASE_MODIFIER
-	if(removed.total_moles < 35) thermal_power += 750   //If you don't add coolant, you are going to have a bad time.
-
-	removed.temperature += ((device_energy * thermal_power) / max(1, removed.heat_capacity()))
-
-	removed.temperature = max(0, min(removed.temperature, 10000))
-
-	//Calculate how much gas to release
-	removed.phoron += max(device_energy / PHORON_RELEASE_MODIFIER, 0)
-
-	removed.oxygen += max((device_energy + removed.temperature - T0C) / OXYGEN_RELEASE_MODIFIER, 0)
-
-	removed.update_values()
-
-	env.merge(removed)
-
 	for(var/mob/living/carbon/human/l in view(src, min(7, round(power ** 0.25)))) // If they can see it without mesons on.  Bad on them.
 		if(!istype(l.glasses, /obj/item/clothing/glasses/meson))
 			l.hallucination = max(0, min(200, l.hallucination + power * config_hallucination_power * sqrt( 1 / max(1,get_dist(l, src)) ) ) )
 
-	for(var/mob/living/l in range(src, round((power / 100) ** 0.25)))
+	//adjusted range so that a power of 600 (pretty high) results in 8 tiles, roughly the distance from the core to the engine monitoring room.
+	//at power of 1210 this becomes 9 tiles --> increases very very slowly.
+	for(var/mob/living/l in range(src, round((power / 0.146484375) ** 0.25)))
 		var/rads = (power / 10) * sqrt( 1 / get_dist(l, src) )
 		l.apply_effect(rads, IRRADIATE)
 
-	power -= (power/500)**3
+	power -= (power/500)**3		//energy losses due to radiation
 
 	return 1
 
@@ -208,7 +217,7 @@
 
 
 	if(Proj.flag != "bullet")
-		power += Proj.damage * config_bullet_energy
+		power += Proj.damage * config_bullet_energy	* CHARGING_FACTOR
 	else
 		damage += Proj.damage * config_bullet_energy
 	return 0
@@ -238,7 +247,7 @@
 /obj/machinery/power/supermatter/proc/transfer_energy()
 	for(var/obj/machinery/power/rad_collector/R in rad_collectors)
 		if(get_dist(R, src) <= 15) // Better than using orange() every process
-			R.receive_pulse(power)
+			R.receive_pulse(power * POWER_FACTOR)
 	return
 
 /obj/machinery/power/supermatter/attackby(obj/item/weapon/W as obj, mob/living/user as mob)

code/setup.dm

@@ -453,6 +453,7 @@ var/list/global_mutations = list() // list of hidden mutation things
 #define CANPARALYSE	4
 #define CANPUSH		8
 #define LEAPING		16
+#define PASSEMOTES	32      //Mob has a cortical borer or holders inside of it that need to see emotes.
 #define GODMODE		4096
 #define FAKEDEATH	8192	//Replaces stuff like changeling.changeling_fakedeath
 #define DISFIGURED	16384	//I'll probably move this elsewhere if I ever get wround to writing a bitflag mob-damage system

code/stylesheet.dm

@@ -62,6 +62,7 @@ h1.alert, h2.alert		{color: #000000;}
 .modooc					{color: #184880;	font-weight: bold;}
 .adminmod				{color: #402A14;	font-weight: bold;}
 .tajaran				{color: #803B56;}
+.tajaran_signlang		{color: #941C1C;}
 .skrell					{color: #00CED1;}
 .soghun					{color: #228B22;}
 .vox					{color: #AA00AA;}