Merge branch 'shiptest-ss13:master' into master

_maps/shuttles/pgf/pgf_elated_bolide.dmm

@@ -1615,6 +1615,9 @@
 	dir = 5
 	},
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/security/armory)
 "jB" = (
@@ -1777,6 +1780,9 @@
 	dir = 4;
 	name = "Armory"
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
 "km" = (
@@ -5437,6 +5443,9 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/security/armory)
 "Im" = (
@@ -7561,10 +7570,6 @@
 /obj/structure/closet/wall/white/directional/south,
 /obj/item/storage/ration/crayons,
 /obj/structure/table/reinforced,
-/obj/machinery/door/airlock/security{
-	name = "Engineering Storage";
-	req_one_access_txt = "1"
-	},
 /turf/open/floor/plasteel/mono/white,
 /area/ship/crew/ccommons)
 "Ve" = (

code/modules/surgery/organs/lungs.dm

@@ -76,6 +76,9 @@
 
 	var/crit_stabilizing_reagent = /datum/reagent/medicine/epinephrine
 
+	///Can we smell odors? If false then we don't smell certain gases
+	var/can_smell = TRUE
+
 /obj/item/organ/lungs/New()
 	. = ..()
 	populate_gas_info()
@@ -216,7 +219,8 @@
 			H.reagents.add_reagent(R, breath.get_moles(gas) * 2) // 2 represents molarity of O2, we don't have citadel molarity
 			mole_adjustments[gas] = (gas in mole_adjustments) ? mole_adjustments[gas] - breath.get_moles(gas) : -breath.get_moles(gas)
 
-	handle_smell(breath, H)
+	if(can_smell)
+		handle_smell(breath, H)
 
 	for(var/gas in mole_adjustments)
 		breath.adjust_moles(gas, mole_adjustments[gas])
@@ -582,6 +586,8 @@
 
 	breathing_class = BREATH_PLASMA
 
+	can_smell = FALSE
+
 /obj/item/organ/lungs/plasmaman/populate_gas_info()
 	..()
 	gas_max -= GAS_PLASMA

html/changelogs/AutoChangeLog-pr-3882.yml

@@ -0,0 +1,4 @@
+author: rye-rice
+changes:
+  - {bugfix: 'phoroids should no longer smell plasma, or anything for that matter.'}
+delete-after: true

html/changelogs/archive/2024-12.yml

@@ -56,3 +56,13 @@
   - balance: 'Adjusted the item size of various guns and misc objects, see pr #3509
       for more info'
   - imageadd: Overhauled the look of autoinjectors
+2024-12-05:
+  Gristlebee:
+  - rscadd: Shoulder slings to outpost cargo for 500 credits.
+  MarkSuckerberg & Anticept:
+  - bugfix: auxmos updated with correct feature flags, windows atmos hosts will function
+      correctly again.
+  firebudgy:
+  - rscadd: An intercepted shipment of CM-40 barrels has led to an influx of SKM-24u
+      LMGs to the black market. Report sightings to your nearest CLIP representative.
+  - bugfix: Bipods actually work now.