Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into reenable-tests

code/controllers/subsystem/air.dm

@@ -58,9 +58,9 @@ SUBSYSTEM_DEF(air)
 	// Whether turf-to-turf heat exchanging should be enabled.
 	var/heat_enabled = FALSE
 	// Max number of times process_turfs will share in a tick.
-	var/share_max_steps = 1
+	var/share_max_steps = 3
 	// Excited group processing will try to equalize groups with total pressure difference less than this amount.
-	var/excited_group_pressure_goal = 0.25
+	var/excited_group_pressure_goal = 1
 
 /datum/controller/subsystem/air/stat_entry(msg)
 	msg += "C:{"

code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm

@@ -1,6 +1,6 @@
 /obj/machinery/atmospherics/pipe/heat_exchanging
 	level = 2
-	var/minimum_temperature_difference = 20
+	var/minimum_temperature_difference = 0.01
 	var/thermal_conductivity = WINDOW_HEAT_TRANSFER_COEFFICIENT
 	color = "#404040"
 	buckle_lying = 1

html/changelog.html

@@ -50,6 +50,19 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">27 July 2021</h2>
+			<h3 class="author">Putnam3145 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Generic fires work now</li>
+				<li class="balance">A knock-on effect of the HE pipe change is that space cooling is ~8.4x as powerful</li>
+			</ul>
+
+			<h2 class="date">26 July 2021</h2>
+			<h3 class="author">SandPoot updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscdel">Removes a sneaky transform button on the vore panel.</li>
+			</ul>
+
 			<h2 class="date">24 July 2021</h2>
 			<h3 class="author">MrJWhit updated:</h3>
 			<ul class="changes bgimages16">
@@ -568,19 +581,6 @@
 			<ul class="changes bgimages16">
 				<li class="balance">puglism damage can no longer stack with scarp</li>
 			</ul>
-
-			<h2 class="date">26 May 2021</h2>
-			<h3 class="author">bunny232 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Removed two random 'captain's office' tiles from space on meta station</li>
-			</ul>
-
-			<h2 class="date">24 May 2021</h2>
-			<h3 class="author">zeroisthebiggay updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">New traitor item: the Mauler Gauntlets! Punch hard, punch good! Eight telecrystals, buy today!</li>
-				<li class="rscadd">hairs from Airborne Snitch</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>

html/changelogs/.all_changelog.yml

@@ -29717,3 +29717,11 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - balance: supermatter now causes only half the hallucinations
   cadyn:
   - server: auxmos bump for dependencies.sh
+2021-07-26:
+  SandPoot:
+  - rscdel: Removes a sneaky transform button on the vore panel.
+2021-07-27:
+  Putnam3145:
+  - bugfix: Generic fires work now
+  - balance: A knock-on effect of the HE pipe change is that space cooling is ~8.4x
+      as powerful

html/changelogs/AutoChangeLog-pr-14966.yml

@@ -1,4 +0,0 @@
-author: "SandPoot"
-delete-after: True
-changes: 
-  - rscdel: "Removes a sneaky transform button on the vore panel."