NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 10:21:18 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Stable -> Master (#44165)

Browse source 
* [HOTFIX] Fix singularity and tesla friction (#44078)

* Vehicle system: Movement & Buckling (#43525)

* Part one of Vehicles

* Also we need this

* And we need this

* We REALLY need this

* Little fix

* fixes (i'm tired)

* Apply suggestions from code review

Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>

* update

* fixed

* just for cleaner diff

* just in case

* I think this might be cleaner

* small fix

---------

Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>

* Fix ID inspect message when ending perma sentence early (#44018)

* Automatic changelog update

* Smarter Entity Targeting (#39571)

* Smart targeting

* use swidge statement

* Undo

* merge conflicts

* works well

* Better logic

* GO TO SLEEP

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

* fix: don't delete items on some polymorph reverts (#39423)

* Automatic changelog update

* Fix error texture for harmpack hand solution visuals (#39442)

* fix: check for inhand sprite's existence

* refactor: simplify solution container visuals code

this made my brain hurt but I think I didn't break anything

* Automatic changelog update

* fix role assignment when late joining (#41419)

* fix role assignment when late joining

* push

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

* Automatic changelog update

* SSD Players now properly stay asleep when being revived. (#39409)

* Fixes and API changes

* aaaaaaaaaa

* super shitcode

* cleanup

* fix admin logs

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

* Automatic changelog update

* Fix Barber Scissors not playing audio (#43922)

* Fix Barber Scissors not playing audio

* Add code comment

* Requested changes

* More requested changes thanks Warock

* Requested changes

* Automatic changelog update

* [MALD PR] Remove mimic vendor gamerule (#44057)

remove mimic vender rule

* Automatic changelog update

* Destructible Automatic Overkill (#43113)

* Change to file scoped namespace

* Improve variable naming

* Remove unnecessary audiosystem

* Add automatic overkill

* Small cleanups

* Alphabetize dependencies

* Change to file scoped namespace

* Change to OnMapInit

* Fix overkill if no destruction node present

* Add overkill test

* Example cleanup

* Performance improvements

* Tuple event subscriptions

* Correct comment

* Realphabetize

I might be dyslexic. Or just stupid.

* Invert toggle behavior and rename

* Change from MapInit to ComponentInit

* Revert "Change from MapInit to ComponentInit"

This reverts commit 1ed9fa0ad49be00becd9adca5cfee45cf4fef3a2.

* Change to use index instead of raw int

* Explicit check not required

* Clean up overkill test

* Improve commenting

* Overhaul the test

* Little more

* Improve commenting

* Update DestructibleOverkillTest.cs

* Typo

* Change to tuple assignment

* Alphabetize dependencies

* Update Content.IntegrationTests/Tests/Destructible/DestructibleOverkillTest.cs

* Update Content.IntegrationTests/Tests/Destructible/DestructibleOverkillTest.cs

* Update Content.IntegrationTests/Tests/Destructible/DestructibleOverkillTest.cs

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Update Credits (#44060)

Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>

* fix off by 1 in tips (#44062)

fix the thing the uhhhh the thing the thing ynow....   fix uhh the thing. the thing that needs fixing

* Remove background box from main menu (#43977)

* Menu Change

* Change v2

* final change

* Format code

---------

Co-authored-by: Thomas (Aeshus) <git@aeshus.com>

* Mini Gravity Generator requires charging (#44061)

* Starting charge to zero

* Reach starts with gravity

* Revert "Reach starts with gravity"

This reverts commit 49a7e22fc054687b879a5a13562433bc081f19cd.

* Create charged/uncharged prototypes

* Fix formatting

* Change construction

* Review feedback

* Automatic changelog update

* [BUGFIX] Shaken sodas now spill again (#44033)

Tiders will rule the halls once again.

* Automatic changelog update

* add empty tile friction modifiers

* add empty tile friction modifiers

* Revert "[Hotfix] Fix MenuButton Missing Negative Style (#44073)"

This reverts commit 0f1abd73669c6c7ff291bb289f760090dc9454b6.

* Revert "Automatic changelog update"

This reverts commit 4a34a711845f0da49686c750cad7807639b56deb.

* Revert "[BUGFIX] Shaken sodas now spill again (#44033)"

This reverts commit 37447f4d89feeb98baba91d896b0439d30088b80.

* Revert "Automatic changelog update"

This reverts commit 1ced1977fb73186a8aaefab504e3a860aee219f9.

* Revert "Mini Gravity Generator requires charging (#44061)"

This reverts commit 51e0f74f49673146973f8ad4966d1df0d97a506d.

* Revert "Remove background box from main menu (#43977)"

This reverts commit 48f3fd0c5029b384b008fdda9016e78858fcae38.

* Revert "fix off by 1 in tips (#44062)"

This reverts commit 1616ed806eef33bbdcaca64aaa642c44ab95f869.

* Revert "Update Credits (#44060)"

This reverts commit 6a9ffb9b4d5d62d191c173c4670e1c3ea6ffadb0.

* Revert "Destructible Automatic Overkill (#43113)"

This reverts commit 76277b737df94b02cb3fd439d8cda0f63964b85d.

* Revert "Automatic changelog update"

This reverts commit 5e3a647839dd5f2e3fb942b9fc4693b0bfe6baa8.

* Revert "[MALD PR] Remove mimic vendor gamerule (#44057)"

This reverts commit 77ee428ce4ab312b4d91124c884c233328ce871c.

* Revert "Automatic changelog update"

This reverts commit 71c503bf9c8c9fe785110e6b3cd5a5b46138c1d0.

* Revert "Fix Barber Scissors not playing audio (#43922)"

This reverts commit 989ab25751eb494b463d476c502a28d82b1cca6d.

* Revert "Automatic changelog update"

This reverts commit 013962c7160912570e361195c9dfcea694d0c514.

* Revert "SSD Players now properly stay asleep when being revived. (#39409)"

This reverts commit 546c62b38810bd6f4666235046407fb008593289.

* Revert "Automatic changelog update"

This reverts commit f5d65b43621721dda77d6c5ce6b18202c6b02ad7.

* Revert "fix role assignment when late joining (#41419)"

This reverts commit bec4c4c827ad69a2206415fc26a35f2f2e00ff1e.

* Revert "Automatic changelog update"

This reverts commit 0c6d7aa29bb6dbd3b4b57b5f787152a946cc5b39.

* Revert "fix: don't delete items on some polymorph reverts (#39423)"

This reverts commit 01a2dfb9762fc53f3918199360717208c9162695.

* Revert "Fix error texture for harmpack hand solution visuals (#39442)"

This reverts commit 42dbb60e0fe670e5bc35c5dd9f4c1f81c69e15cd.

* Revert "Automatic changelog update"

This reverts commit 1cb150f5bbd8c430eba0d2471fa4d2b4e72ba8ad.

* Revert "Smarter Entity Targeting (#39571)"

This reverts commit 87b389d1492af8404eb3c43a5a0dcd7623d724b9.

* Revert "Automatic changelog update"

This reverts commit 927f9e2652f146686be50750ffc04569893cb5d8.

* Revert "Fix ID inspect message when ending perma sentence early (#44018)"

This reverts commit c7dfbf89484dd332847924643bd6bfed08d37253.

* Revert "Vehicle system: Movement & Buckling (#43525)"

This reverts commit 8c85a5927564701e1e44eca27cb55d295c2eda11.

* revert

---------

Co-authored-by: AndrewFenriz <78079974+AndrewFenriz@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
Co-authored-by: themias <89101928+themias@users.noreply.github.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: Perry Fraser <perryprog@users.noreply.github.com>
Co-authored-by: Ignaz "Ian" Kraft <ignaz.k@live.de>
Co-authored-by: Rami <ramialanbagy@gmail.com>
Co-authored-by: Jessica M <jessica@jessicamaybe.com>
Co-authored-by: Connor Huffine <chuffine@gmail.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: PicklOH <62030853+PicklOH@users.noreply.github.com>
Co-authored-by: Lye <128915833+Lyroth001@users.noreply.github.com>
Co-authored-by: piskaczek <192605039+piskaczek@users.noreply.github.com>
Co-authored-by: riccardi48 <39341154+riccardi48@users.noreply.github.com>
Co-authored-by: Thomas (Aeshus) <git@aeshus.com>
Co-authored-by: ThatGuyUSA <thatguyusa123@gmail.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* [HOTFIX] Fix Barber DoAfter Bug (#44162)

* Update the Salamander server description for the server browser: Redux (#44104)

Update the MRP config

---------

Co-authored-by: Crude Oil <124208219+CroilBird@users.noreply.github.com>
Co-authored-by: AndrewFenriz <78079974+AndrewFenriz@users.noreply.github.com>
Co-authored-by: themias <89101928+themias@users.noreply.github.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: Perry Fraser <perryprog@users.noreply.github.com>
Co-authored-by: Ignaz "Ian" Kraft <ignaz.k@live.de>
Co-authored-by: Rami <ramialanbagy@gmail.com>
Co-authored-by: Jessica M <jessica@jessicamaybe.com>
Co-authored-by: Connor Huffine <chuffine@gmail.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: PicklOH <62030853+PicklOH@users.noreply.github.com>
Co-authored-by: Lye <128915833+Lyroth001@users.noreply.github.com>
Co-authored-by: piskaczek <192605039+piskaczek@users.noreply.github.com>
Co-authored-by: riccardi48 <39341154+riccardi48@users.noreply.github.com>
Co-authored-by: Thomas (Aeshus) <git@aeshus.com>
Co-authored-by: ThatGuyUSA <thatguyusa123@gmail.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
Co-authored-by: Kowlin <10947836+Kowlin@users.noreply.github.com>
This commit is contained in:
ArtisticRoomba 2026-05-29 23:11:42 -07:00 • committed by GitHub
commit 0d2c96e23e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Content.Shared/MagicMirror/MagicMirrorSystem.cs
View file

@ -68,7 +68,7 @@ public sealed partial class MagicMirrorSystem : EntitySystem
if (ent.Comp.DoAfter.HasValue)
{
_doAfter.Cancel(target, ent.Comp.DoAfter.Value);
_doAfter.Cancel(args.Actor, ent.Comp.DoAfter.Value);
ent.Comp.DoAfter = null;
}

2
Resources/ConfigPresets/WizardsDen/salamander.toml
View file

@ -1,7 +1,7 @@
# Configuration preset used on Wizard's Den Salamander
[game]
desc = "Official English Space Station 14 servers. Medium roleplay ruleset. You must apply for a whitelist on the official forums to be able to join. If the current player count is less than 15 players then anyone with enough playtime on Wizard's Den servers may join."
desc = "Official English Space Station 14 servers. Medium roleplay ruleset. Open to anyone with at least 20 hours of playtime on any Wizard's Den server. Freely joinable when the player count is less than 15 players."
hostname = "[EN][MRP] Wizard's Den Salamander [US West]"
round_restart_time = 300

1
Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml
View file

@ -13,6 +13,7 @@
bodyType: Dynamic
bodyStatus: InAir
- type: CanMoveInAir
- type: TileFrictionModifier
- type: EventHorizon # To make the singularity consume things.
radius: 0.5
canBreachContainment: false

1
Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml
View file

@ -8,6 +8,7 @@
bodyStatus: InAir
sleepingAllowed: false
- type: CanMoveInAir
- type: TileFrictionModifier
- type: ChasingWalk
minSpeed: 1
maxSpeed: 3