From 1303e3aa455ca8c6ce4f9bc81e4b98cfc49e4fc7 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Thu, 5 Dec 2024 01:09:06 +0000 Subject: [PATCH 1/4] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-3860.yml | 4 ---- html/changelogs/AutoChangeLog-pr-3871.yml | 6 ------ html/changelogs/AutoChangeLog-pr-3872.yml | 5 ----- html/changelogs/archive/2024-12.yml | 10 ++++++++++ 4 files changed, 10 insertions(+), 15 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-3860.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-3871.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-3872.yml diff --git a/html/changelogs/AutoChangeLog-pr-3860.yml b/html/changelogs/AutoChangeLog-pr-3860.yml deleted file mode 100644 index 11af31860c34..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3860.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Gristlebee -changes: - - {rscadd: Shoulder slings to outpost cargo for 500 credits.} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-3871.yml b/html/changelogs/AutoChangeLog-pr-3871.yml deleted file mode 100644 index f9c0431ab0ef..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3871.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: firebudgy -changes: - - {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.} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-3872.yml b/html/changelogs/AutoChangeLog-pr-3872.yml deleted file mode 100644 index 5c5719fcd250..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3872.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: MarkSuckerberg & Anticept -changes: - - {bugfix: 'auxmos updated with correct feature flags, windows atmos hosts will - function correctly again.'} -delete-after: true diff --git a/html/changelogs/archive/2024-12.yml b/html/changelogs/archive/2024-12.yml index fbdd1d5f96fe..c175fbd4a3b1 100644 --- a/html/changelogs/archive/2024-12.yml +++ b/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. From 876c60d42b1856b71ad4bf9f00c6a48a7df93f07 Mon Sep 17 00:00:00 2001 From: Erika Fox <94164348+Erikafox@users.noreply.github.com> Date: Fri, 6 Dec 2024 15:45:39 -0500 Subject: [PATCH 2/4] bolide fix (#3886) fixes that stupid fucking door on the bolide and also some pipes that were unconnected??? --- _maps/shuttles/pgf/pgf_elated_bolide.dmm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/_maps/shuttles/pgf/pgf_elated_bolide.dmm b/_maps/shuttles/pgf/pgf_elated_bolide.dmm index f64bc3d920b4..1239ee22bbbd 100644 --- a/_maps/shuttles/pgf/pgf_elated_bolide.dmm +++ b/_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" = ( From 4f23da2de6da100017aced076e75854fa615705d Mon Sep 17 00:00:00 2001 From: rye-rice <58402542+rye-rice@users.noreply.github.com> Date: Fri, 6 Dec 2024 19:05:10 -0800 Subject: [PATCH 3/4] Fixes phorids finding plasma awful smelling (#3882) ## About The Pull Request I forgot about phorids ## Changelog :cl: fix: phoroids should no longer smell plasma, or anything for that matter. /:cl: Co-authored-by: retlaw34 <58402542+retlaw34@users.noreply.github.com> --- code/modules/surgery/organs/lungs.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm index fabc1bb3ab26..c450d2a86040 100644 --- a/code/modules/surgery/organs/lungs.dm +++ b/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 From 401d3e843ea706dfb1964c7c6ff13120c79d9133 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Fri, 6 Dec 2024 21:17:16 -0600 Subject: [PATCH 4/4] Automatic changelog generation for PR #3882 [ci skip] --- html/changelogs/AutoChangeLog-pr-3882.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-3882.yml diff --git a/html/changelogs/AutoChangeLog-pr-3882.yml b/html/changelogs/AutoChangeLog-pr-3882.yml new file mode 100644 index 000000000000..4fa80150fbae --- /dev/null +++ b/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