Merge remote-tracking branch 'origin/master' into luciee

code/game/objects/items/tools/weldingtool.dm

@@ -104,9 +104,9 @@
 				to_chat(user, span_warning("[affecting] is already in good condition!"))
 				return FALSE
 			user.changeNext_move(CLICK_CD_MELEE)
-			user.visible_message(span_notice("[user] starts to fix some of the dents on [src]'s [affecting.name]."), span_notice("You start fixing some of the dents on [src == user ? "your" : "[src]'s"] [affecting.name]."))
+			user.visible_message(span_notice("[user] starts to fix some of the dents on [M]'s [affecting.name]."), span_notice("You start fixing some of the dents on [M == user ? "your" : "[M]'s"] [affecting.name]."))
 			heal_robo_limb(src, H, user, 15, 0)
-			user.visible_message(span_notice("[user] fixes some of the dents on [src]'s [affecting.name]."), span_notice("You fix some of the dents on [src == user ? "your" : "[src]'s"] [affecting.name]."))
+			user.visible_message(span_notice("[user] fixes some of the dents on [M]'s [affecting.name]."), span_notice("You fix some of the dents on [M == user ? "your" : "[M]'s"] [affecting.name]."))
 			return TRUE
 
 	if(!isOn() || user.a_intent == INTENT_HARM || !attempt_initiate_surgery(src, M, user))

code/modules/atmospherics/environmental/LINDA_system.dm

@@ -33,16 +33,17 @@
 /turf/proc/update_conductivity(turf/T)
 	var/dir = get_dir_multiz(src, T)
 	var/opp = REVERSE_DIR(dir)
+
 	//all these must be above zero for auxmos to even consider them
 	if(!thermal_conductivity || !heat_capacity || !T.thermal_conductivity || !T.heat_capacity)
 		return
+	
+	conductivity_blocked_directions &= ~dir
+	T.conductivity_blocked_directions &= ~opp
 	for(var/obj/O in contents+T.contents)
-		conductivity_blocked_directions &= ~dir
-		T.conductivity_blocked_directions &= ~opp
 		if(O.BlockThermalConductivity(opp)) 	//the direction and open/closed are already checked on CanAtmosPass() so there are no arguments
 			conductivity_blocked_directions |= dir
 			T.conductivity_blocked_directions |= opp
-			return
 
 //dir of this obj to the other turf
 /atom/movable/proc/BlockThermalConductivity(dir) // Objects that don't let heat through.

html/changelog.html

@@ -59,9 +59,20 @@
 		<div class="commit sansserif">
 
 			<h2 class="date">17 July 2022</h2>
+			<h3 class="author">JamieD1 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes Cryo</li>
+			</ul>
+			<h3 class="author">VaelophisNyx updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">adds fishing to the box station Garden</li>
+				<li class="rscadd">adds weaker MegaSeed Vendor that only has garden-approved seeds</li>
+				<li class="tweak">massive overhaul for the box station Garden</li>
+			</ul>
 			<h3 class="author">redmoogle updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Unobserve button doesnt duplicate now</li>
+				<li class="bugfix">Fixing a robotic limb no longer displays tool name</li>
 			</ul>
 
 			<h2 class="date">16 July 2022</h2>

html/changelogs/.all_changelog.yml

@@ -32801,5 +32801,12 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       temperature
   - rscadd: Added refilling recipes for atropine and epinephrine medipens
 2022-07-17:
+  JamieD1:
+  - bugfix: Fixes Cryo
+  VaelophisNyx:
+  - rscadd: adds fishing to the box station Garden
+  - rscadd: adds weaker MegaSeed Vendor that only has garden-approved seeds
+  - tweak: massive overhaul for the box station Garden
   redmoogle:
   - bugfix: Unobserve button doesnt duplicate now
+  - bugfix: Fixing a robotic limb no longer displays tool name

html/changelogs/AutoChangelog-pr-14827.yml

@@ -1,6 +0,0 @@
-author: "VaelophisNyx"
-delete-after: true 
-changes: 
-  - rscadd: "adds fishing to the box station Garden"
-  - rscadd: "adds weaker MegaSeed Vendor that only has garden-approved seeds"
-  - tweak: "massive overhaul for the box station Garden"

html/changelogs/AutoChangelog-pr-14889.yml

@@ -0,0 +1,7 @@
+author: "nmajask"
+delete-after: true 
+changes: 
+  - tweak: "adds an organ fridge to the meta medbay"
+  - tweak: "wires the meta medbay treatment center,"
+  - tweak: "adds some firelocks to meta medbay"
+  - tweak: "fixed the cooler in meta medbay"