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: 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" 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) 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 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 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/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 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 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.