From 1ecdb057b244e954c28adb0e7f12601f9f4fec82 Mon Sep 17 00:00:00 2001 From: "cmss13-ci[bot]" <180991813+cmss13-ci[bot]@users.noreply.github.com> Date: Thu, 9 Jan 2025 02:08:34 +0000 Subject: [PATCH 1/8] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-8023.yml | 4 ---- html/changelogs/archive/2025-01.yml | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-8023.yml diff --git a/html/changelogs/AutoChangeLog-pr-8023.yml b/html/changelogs/AutoChangeLog-pr-8023.yml deleted file mode 100644 index 892d186c6645..000000000000 --- a/html/changelogs/AutoChangeLog-pr-8023.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "AndroBetel" -delete-after: True -changes: - - spellcheck: "Formatting of M10 auto pistol." \ No newline at end of file diff --git a/html/changelogs/archive/2025-01.yml b/html/changelogs/archive/2025-01.yml index f4291bcbab49..f1346e83b7cb 100644 --- a/html/changelogs/archive/2025-01.yml +++ b/html/changelogs/archive/2025-01.yml @@ -142,3 +142,6 @@ - balance: Custom rockets will now shoot their shrapnell on a 90 degree angle cuberound: - rscadd: UPP req console, dropship part fabricato and tank part fabricator +2025-01-09: + AndroBetel: + - spellcheck: Formatting of M10 auto pistol. From 0c985d9f953e3ba5180db02b004bdd2e2ddd7441 Mon Sep 17 00:00:00 2001 From: private-tristan <54422837+private-tristan@users.noreply.github.com> Date: Wed, 8 Jan 2025 23:33:36 -0500 Subject: [PATCH 2/8] Neuraline no longer generates/is required for chem (#8012) # About the pull request taken directly from #7023 #7249 didn't make it impossible to get ![image](https://github.com/user-attachments/assets/dc9bfc49-2fb3-4ffe-8f10-411a4637ca1b) # Explain why it's good for the game neuraline very hard to get, removes the ability to get it or for it to generate as a requirement for chems so that researchers can be happy. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: fix: Neuraline no longer generates in recipes, and is unobtainable from botany. /:cl: --- code/modules/reagents/chemistry_reagents/medical.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/chemistry_reagents/medical.dm b/code/modules/reagents/chemistry_reagents/medical.dm index a30fcfe28f98..dfd382cd0042 100644 --- a/code/modules/reagents/chemistry_reagents/medical.dm +++ b/code/modules/reagents/chemistry_reagents/medical.dm @@ -188,9 +188,9 @@ custom_metabolism = AMOUNT_PER_TIME(1, 5 SECONDS) overdose = 2 overdose_critical = 3 - chemclass = CHEM_CLASS_SPECIAL + chemclass = CHEM_CLASS_RARE properties = list(PROPERTY_NERVESTIMULATING = 5) - flags = REAGENT_TYPE_MEDICAL + flags = REAGENT_TYPE_MEDICAL | REAGENT_NO_GENERATION /datum/reagent/medical/arithrazine name = "Arithrazine" From 13d48ae1e92146cb511e82c26f1394621f590071 Mon Sep 17 00:00:00 2001 From: "cmss13-ci[bot]" <180991813+cmss13-ci[bot]@users.noreply.github.com> Date: Thu, 9 Jan 2025 04:43:11 +0000 Subject: [PATCH 3/8] Automatic changelog for PR #8012 [ci skip] --- html/changelogs/AutoChangeLog-pr-8012.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-8012.yml diff --git a/html/changelogs/AutoChangeLog-pr-8012.yml b/html/changelogs/AutoChangeLog-pr-8012.yml new file mode 100644 index 000000000000..da7a69197f49 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-8012.yml @@ -0,0 +1,4 @@ +author: "private-tristan" +delete-after: True +changes: + - bugfix: "Neuraline no longer generates in recipes, and is unobtainable from botany." \ No newline at end of file From 1ba8af7d8013c150809bdd6bd371ca3d44af6422 Mon Sep 17 00:00:00 2001 From: harryob Date: Thu, 9 Jan 2025 10:14:18 +0000 Subject: [PATCH 4/8] fix od linter (#8057) now requires .net 9 --- .github/workflows/ci_suite.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml index 716686b51433..d4bac42906b7 100644 --- a/.github/workflows/ci_suite.yml +++ b/.github/workflows/ci_suite.yml @@ -67,6 +67,9 @@ jobs: name: Lint with OpenDream runs-on: ubuntu-22.04 steps: + - uses: actions/setup-dotnet@v4 + with: + dotnet-version: 9 - uses: actions/checkout@v4 - uses: robinraju/release-downloader@v1.9 with: From eac93e519c3ff7bdd100a217a14308135f126dbd Mon Sep 17 00:00:00 2001 From: FebrezeNinja <190972231+FebrezeNinja@users.noreply.github.com> Date: Thu, 9 Jan 2025 05:44:44 -0500 Subject: [PATCH 5/8] Fix CIC Dropship Console (#8054) # About the pull request Fixes #7846 and fixes #7872 Remote navigation computers that don't start with a default shuttleId defined by the map (CIC, left hangar control) were throwing null pointer errors and not allowing changes. # Explain why it's good for the game Allows CIC remote computer to control the dropships and autopilot again. # Testing Photographs and Procedure
Screenshots & Videos ![CIC_console_fix](https://github.com/user-attachments/assets/22071281-824e-4c2a-9558-ec50a78319ed)
Confirmed I could enable and disable autopilot from CIC and hangar consoles # Changelog :cl: fix: Added a missing reference check to flight/ui_act /:cl: Co-authored-by: harryob --- code/modules/shuttle/computers/dropship_computer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index 8c2ed8191fef..48b867477f65 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -465,7 +465,7 @@ to_chat(user, SPAN_WARNING("The dropship isn't responding to controls.")) return - if(use_factions && shuttle.faction != faction) //someone trying href + if(use_factions && shuttle && shuttle.faction != faction) //someone trying href return FALSE switch(action) From 4ca163978580734a2ede890c36338cec8f7dac16 Mon Sep 17 00:00:00 2001 From: "cmss13-ci[bot]" <180991813+cmss13-ci[bot]@users.noreply.github.com> Date: Thu, 9 Jan 2025 10:56:16 +0000 Subject: [PATCH 6/8] Automatic changelog for PR #8054 [ci skip] --- html/changelogs/AutoChangeLog-pr-8054.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-8054.yml diff --git a/html/changelogs/AutoChangeLog-pr-8054.yml b/html/changelogs/AutoChangeLog-pr-8054.yml new file mode 100644 index 000000000000..212989b81eb4 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-8054.yml @@ -0,0 +1,4 @@ +author: "FebrezeNinja" +delete-after: True +changes: + - bugfix: "Added a missing reference check to flight/ui_act" \ No newline at end of file From 1ee1fc014f5ddc5026b0ec3a3d839998a2ed9cd3 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Thu, 9 Jan 2025 02:45:01 -0800 Subject: [PATCH 7/8] Adds messaging for situation where larva and host both survive surgery (#8059) # About the pull request Adds messaging for situation where larva and host both survive surgery # Explain why it's good for the game The situation is quite rare for larva removal surgery to succeed after the larva has spawned but before it chestbursts causing both human and larva to survive (it's rare enough that players are typically confused about how it happened), so there should be a message. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: qol: Adds messaging when larva and host both survive surgery /:cl: Co-authored-by: harryob --- code/modules/surgery/chestburster.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/surgery/chestburster.dm b/code/modules/surgery/chestburster.dm index 08b19b24e515..173836a7f3e5 100644 --- a/code/modules/surgery/chestburster.dm +++ b/code/modules/surgery/chestburster.dm @@ -171,6 +171,7 @@ if(L) L.forceMove(target.loc) qdel(A) + user.visible_message(SPAN_HIGHDANGER("The larva was removed just in time, but is fully grown and alive!")) else A.forceMove(target.loc) target.status_flags &= ~XENO_HOST From b089b048ec108190ffb00019221c5e3d8609d6ae Mon Sep 17 00:00:00 2001 From: "cmss13-ci[bot]" <180991813+cmss13-ci[bot]@users.noreply.github.com> Date: Thu, 9 Jan 2025 11:07:01 +0000 Subject: [PATCH 8/8] Automatic changelog for PR #8059 [ci skip] --- html/changelogs/AutoChangeLog-pr-8059.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-8059.yml diff --git a/html/changelogs/AutoChangeLog-pr-8059.yml b/html/changelogs/AutoChangeLog-pr-8059.yml new file mode 100644 index 000000000000..84bd2a3c073b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-8059.yml @@ -0,0 +1,4 @@ +author: "zzzmike" +delete-after: True +changes: + - qol: "Adds messaging when larva and host both survive surgery" \ No newline at end of file