Skip to content

Commit

Permalink
Merge branch 'watches-and-other-accessory-shit' of https://github.com…
Browse files Browse the repository at this point in the history
…/TheKillfish/cmss13 into watches-and-other-accessory-shit
  • Loading branch information
TheKillfish committed Jan 9, 2025
2 parents 6d10ad6 + 9dc6037 commit 1ec8821
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 7 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/ci_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
with:
Expand Down
4 changes: 2 additions & 2 deletions code/modules/reagents/chemistry_reagents/medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/shuttle/computers/dropship_computer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions code/modules/surgery/chestburster.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions html/changelogs/AutoChangeLog-pr-8012.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
author: "private-tristan"
delete-after: True
changes:
- bugfix: "Neuraline no longer generates in recipes, and is unobtainable from botany."
4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-8023.yml

This file was deleted.

4 changes: 4 additions & 0 deletions html/changelogs/AutoChangeLog-pr-8054.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
author: "FebrezeNinja"
delete-after: True
changes:
- bugfix: "Added a missing reference check to flight/ui_act"
4 changes: 4 additions & 0 deletions html/changelogs/AutoChangeLog-pr-8059.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
author: "zzzmike"
delete-after: True
changes:
- qol: "Adds messaging when larva and host both survive surgery"
3 changes: 3 additions & 0 deletions html/changelogs/archive/2025-01.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.

0 comments on commit 1ec8821

Please sign in to comment.