Skip to content

Commit

Permalink
Merge branch 'bug-demo-sim' of https://github.com/Cthulhu80/cmss13 in…
Browse files Browse the repository at this point in the history
…to bug-demo-sim
  • Loading branch information
doom committed Dec 27, 2023
2 parents 9053c26 + 24c7292 commit 5cd92b3
Show file tree
Hide file tree
Showing 14 changed files with 29 additions and 50 deletions.
2 changes: 0 additions & 2 deletions code/modules/mob/living/carbon/xenomorph/Xenomorph.dm
Original file line number Diff line number Diff line change
Expand Up @@ -731,8 +731,6 @@
if(!isliving(AM))
return FALSE
var/mob/living/L = AM
if(issynth(L) && L.health < 0) // no pulling critted or dead synths
return FALSE
if(L.buckled)
return FALSE //to stop xeno from pulling marines on roller beds.
if(!L.is_xeno_grabbable())
Expand Down
6 changes: 0 additions & 6 deletions html/changelogs/AutoChangeLog-pr-5185.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-5205.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-5224.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-5225.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-5276.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-5286.yml

This file was deleted.

6 changes: 0 additions & 6 deletions html/changelogs/AutoChangeLog-pr-5287.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-5289.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-5296.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-5299.yml

This file was deleted.

4 changes: 4 additions & 0 deletions html/changelogs/AutoChangeLog-pr-5303.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
author: "InsaneRed"
delete-after: True
changes:
- bugfix: "Synths are no longer immune to lunges / dragging while in 'critical state' since they dont go into crit."
4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-5305.yml

This file was deleted.

25 changes: 25 additions & 0 deletions html/changelogs/archive/2023-12.yml
Original file line number Diff line number Diff line change
Expand Up @@ -496,3 +496,28 @@
- refactor: CAS can offset in different direction to attack vector
realforest2001:
- bugfix: Yautja bracer lock can now properly unlock thrall bracers.
2023-12-27:
Birdtalon:
- rscdel: Removed old crystal code from xenos
- code_imp: Renames still used vars from crystal to plasma
- code_imp: Removes crystal define in place of plasma string
Drathek:
- bugfix: Fix xeno wounds layering over weeds when merged with the weeds
InsaneRed:
- spellcheck: More WE/YOU fixes for xenomorph side.
- bugfix: Spitter's charge spit abiltiy now properly adds and removes the 5 armor
like its supposed to initially.
SabreML:
- bugfix: Fixed the Queen Eye still showing as "Immature" after the Queen ages.
- bugfix: Fixed carriers being unable to reduce their 'reserved facehuggers' number.
- bugfix: Fixed being able to vend infinite alcohol.
- bugfix: Fixed the death message from GAU-21 and Laser Cannon strikes saying that
the player was killed by the ammo crate.
cuberound:
- balance: launchbay price 400 -> 200
- balance: DS installed sentrygun price lowered to 200
realforest2001:
- code_imp: Added a new span class that combines bold and big.
- code_imp: Tweaked the way prayer sends notifications to be more efficient.
- admin: Moved the prayer notification sound to a toggle preference, combined with
ARES Interface notifications.

0 comments on commit 5cd92b3

Please sign in to comment.