Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev

code/game/gamemodes/meteor/meteors.dm

@@ -59,7 +59,7 @@
 		max_i--
 		if(max_i<=0) return
 
-	while (!istype(pickedstart, /turf/space) || pickedstart.loc.name != "Space" ) //FUUUCK, should never happen.
+	while (!istype(pickedstart, /turf/space)) //FUUUCK, should never happen.
 
 
 	var/obj/effect/meteor/M

code/game/machinery/doors/airlock.dm

@@ -885,14 +885,17 @@ About the new airlock wires panel:
 	return
 
 /obj/machinery/door/airlock/proc/check_synth_access(mob/user as mob)
-	if(emagged)
-		user << "<span class='warning'>Unable to interface: Airlock is unresponsive.</span>"
+	if(operating < 0) //emagged
+		user << "<span class='warning'>Unable to interface: Internal error.</span>"
 		return 0
 	if(!src.canAIControl())
 		if(src.canAIHack(user))
 			src.hack(user)
 		else
-			user << "<span class='warning'>Airlock AI control has been blocked with a firewall.</span>"
+			if (src.isAllPowerLoss()) //don't really like how this gets checked a second time, but not sure how else to do it.
+				user << "<span class='warning'>Unable to interface: Connection timed out.</span>"
+			else
+				user << "<span class='warning'>Unable to interface: Connection refused.</span>"
 		return 0
 	return 1
 

code/modules/mob/living/silicon/ai/ai.dm

@@ -130,7 +130,6 @@ var/list/ai_verbs_default = list(
 	//Languages
 	add_language("Sol Common", 0)
 	add_language("Sinta'unathi", 0)
-	add_language("Siik'maas", 0)
 	add_language("Siik'tajr", 0)
 	add_language("Skrellian", 0)
 	add_language("Tradeband", 1)

code/modules/mob/living/silicon/pai/software.dm

@@ -694,7 +694,6 @@
 		translator_on = 0
 
 		remove_language("Sinta'unathi")
-		remove_language("Siik'maas")
 		remove_language("Siik'tajr")
 		remove_language("Skrellian")
 
@@ -704,8 +703,7 @@
 		translator_on = 1
 
 		add_language("Sinta'unathi")
-		add_language("Siik'maas")
-		add_language("Siik'tajr", 0)
+		add_language("Siik'tajr")
 		add_language("Skrellian")
 
 		src << "\blue Translator Module toggled ON."

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -60,7 +60,6 @@
 	R.add_language("Sol Common", 1)
 	R.add_language("Tradeband", 1)
 	R.add_language("Sinta'unathi", 0)
-	R.add_language("Siik'maas", 0)
 	R.add_language("Siik'tajr", 0)
 	R.add_language("Skrellian", 0)
 	R.add_language("Gutter", 0)

code/modules/supermatter/supermatter.dm

@@ -1,5 +1,5 @@
 
-#define NITROGEN_RETARDATION_FACTOR 4        //Higher == N2 slows reaction more
+#define NITROGEN_RETARDATION_FACTOR 0.15        //Higher == N2 slows reaction more
 #define THERMAL_RELEASE_MODIFIER 750               //Higher == more heat released during reaction
 #define PHORON_RELEASE_MODIFIER 1500                //Higher == less phoron released by reaction
 #define OXYGEN_RELEASE_MODIFIER 1500        //Higher == less oxygen released at high temperature/power
@@ -181,7 +181,7 @@
 		removed = env.remove(gasefficency * env.total_moles)	//Remove gas from surrounding area
 
 	if(!env || !removed || !removed.total_moles)
-		damage += max((power-(2*CRITICAL_TEMPERATURE*POWER_FACTOR))/10, 0)	//exciting the supermatter in a vacuum means the internal energy is mostly locked inside.
+		damage += max((power - 15*POWER_FACTOR)/10, 0)
 	else if (grav_pulling) //If supermatter is detonating, remove all air from the zone
 		env.remove(env.total_moles)
 	else
@@ -190,7 +190,7 @@
 		damage = max( damage + min( ( (removed.temperature - CRITICAL_TEMPERATURE) / 150 ), damage_inc_limit ) , 0 )
 		//Ok, 100% oxygen atmosphere = best reaction
 		//Maxes out at 100% oxygen pressure
-		oxygen = max(min((removed.gas["oxygen"] - (removed.gas["nitrogen"] * NITROGEN_RETARDATION_FACTOR)) / MOLES_CELLSTANDARD, 1), 0)
+		oxygen = max(min((removed.gas["oxygen"] - (removed.gas["nitrogen"] * NITROGEN_RETARDATION_FACTOR)) / removed.total_moles, 1), 0)
 
 		//calculate power gain for oxygen reaction
 		var/temp_factor