Merge branch 'master' into master

code/__DEFINES/devices.dm

@@ -13,3 +13,12 @@
 #define INSPECTOR_TIME_MODE_SLOW 1
 #define INSPECTOR_TIME_MODE_FAST 2
 #define INSPECTOR_TIME_MODE_HONK 3
+
+// Health scan modes
+/// Healthscan prints health of the target
+#define SCANNER_CONDENSED 0
+/// Healthscan prints health of each bodypart of the target in addition to broad health
+#define SCANNER_VERBOSE 1
+/// Used to prevent health analyzers from switching modes when they shouldn't.
+/// Functions the same as [SCANNER_CONDENSED]
+#define SCANNER_NO_MODE -1

code/game/objects/items/devices/scanners/health_analyzer.dm

@@ -2,10 +2,6 @@
 #define SCANMODE_HEALTH 0
 #define SCANMODE_WOUND 1
 #define SCANMODE_COUNT 2 // Update this to be the number of scan modes if you add more
-#define SCANNER_CONDENSED 0
-#define SCANNER_VERBOSE 1
-// Not updating above count because you're not meant to switch to this mode.
-#define SCANNER_NO_MODE -1
 
 /obj/item/healthanalyzer
 	name = "health analyzer"
@@ -681,9 +677,6 @@
 #undef SCANMODE_HEALTH
 #undef SCANMODE_WOUND
 #undef SCANMODE_COUNT
-#undef SCANNER_CONDENSED
-#undef SCANNER_VERBOSE
-#undef SCANNER_NO_MODE
 
 #undef AID_EMOTION_NEUTRAL
 #undef AID_EMOTION_HAPPY

code/modules/atmospherics/machinery/components/binary_devices/circulator.dm

@@ -4,7 +4,7 @@
 /obj/machinery/atmospherics/components/binary/circulator
 	name = "circulator/heat exchanger"
 	desc = "A gas circulator pump and heat exchanger."
-	icon_state = "circ-off-0"
+	icon_state = "circ_base"
 	pipe_flags = PIPING_ONE_PER_TURF | PIPING_DEFAULT_LAYER_ONLY
 	vent_movement = VENTCRAWL_CAN_SEE
 	density = TRUE
@@ -59,19 +59,25 @@
 /obj/machinery/atmospherics/components/binary/circulator/process_atmos()
 	update_appearance()
 
-/obj/machinery/atmospherics/components/binary/circulator/update_icon_state()
+/obj/machinery/atmospherics/components/binary/circulator/update_overlays()
+	. = ..()
+	cut_overlays()
+	if(anchored)
+		add_overlay("circ_anchor")
+	add_overlay("panel_[panel_open]")
+
 	if(!is_operational)
-		icon_state = "circ-p-[flipped]"
-		return ..()
-	if(last_pressure_delta > 0)
-		if(last_pressure_delta > ONE_ATMOSPHERE)
-			icon_state = "circ-run-[flipped]"
-		else
-			icon_state = "circ-slow-[flipped]"
-		return ..()
+		add_overlay("fan_[mode]")
+		add_overlay("flow")
+		add_overlay("display")
+		return
 
-	icon_state = "circ-off-[flipped]"
-	return ..()
+	add_overlay("flow_on")
+	add_overlay("display_[mode]")
+	if(last_pressure_delta > 0)
+		add_overlay("fan_[mode]_[last_pressure_delta > ONE_ATMOSPHERE]")
+	else
+		add_overlay("fan_[mode]")
 
 /obj/machinery/atmospherics/components/binary/circulator/wrench_act(mob/living/user, obj/item/I)
 	if(!panel_open)

html/changelogs/archive/2024-01.yml

@@ -741,3 +741,29 @@
   - bugfix: auto lathes don't hog local apc supply when printing items
   rageguy505:
   - bugfix: ' The buttons for flashers on birdshot/tramstation now work'
+2024-01-30:
+  00-Steven:
+  - bugfix: Rootbread soup now uses poached egg (egg reagents in soup pot) instead
+      of raw unpeeled egg (which would break into reagents upon coming into contact
+      with the soup pot) and is thus craftable again.
+  ArcaneMusic:
+  - rscdel: The lathe tax on printing items has been removed from the game for both
+      humans and silicons.
+  Ghommie:
+  - image: Resprited the goldfish and lanternfish as well.
+  Inari-Whitebear:
+  - bugfix: Bone daggers and shivs are now longer electrically conductive
+  Melbert:
+  - bugfix: You can build on some niche tables again, such as the Wabbajack Altar.
+  Profakos:
+  - bugfix: The construction console drone becomes visible again while its in use
+  Rhials:
+  - bugfix: The encrypted bitrunner cache is now impervious to most conventional means
+      of destruction.
+  distributivgesetz:
+  - bugfix: Ambient loops will now refresh when entering a mob.
+  jjpark-kb:
+  - code_imp: added the code that allows the image overlays to work for the circulator
+      (teg)
+  - image: changed circulator's (teg) fast/slow turbine sprite
+  - image: added an anchor, panel, and flow overlay for the circulator (teg)