Commit Graph
22276 Commits
Author SHA1 Message Date
DrSmugleaf c7f5846bca Fix another error on round restart when terminating spreaders (#23201)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit bc304a3127)
2024-01-26 21:27:47 +01:00
lzk 6f07aee901 Lil profile editor rearrange (#23305)
(cherry picked from commit abf6b9243f)
2024-01-26 21:27:46 +01:00
metalgearsloth 3269b970ef Update submodule to 200.0.0 (#23426)
(cherry picked from commit a96a2e5479)
2024-01-26 21:27:33 +01:00
themias 3ddb612545 Fix a few cyborg interactions (#23391)
Fix cyborg interactions

(cherry picked from commit e7d1302357)
2024-01-26 21:27:31 +01:00
metalgearsloth b1738dcf9c AutoCompState + ItemToggle fixes (#23422)
* AutoCompState + ItemToggle fixes

Fix a lot of the comp states that are never actually networked and also cleaned up ItemToggle events a bunch. ItemToggle will still need some future work for lights and sounds.

* Also catch these

(cherry picked from commit 2166958bd0)
2024-01-26 21:27:29 +01:00
Mr. 27 a29714eb4f Syndicate agents are now red (#23420)
inital

(cherry picked from commit 2548156eae)
2024-01-26 21:27:28 +01:00
Nemanja 0060f2fc74 Fix small logic issue in item slot swapping (#23378)
fix swapping item slots sometimes failing

(cherry picked from commit 58d518a2a0)
2024-01-26 21:27:26 +01:00
Nemanja 96d1e4090f Flatpacks and the Flatpacker 1001 (#23338)
* Flatpacker and flatpacks

* ok that's good enough

* convert solars/AME to flatpacks

* mats, mats, we are the mats

* basic mechanics are DONE

* thing

* final UI

* sloth

* rped jumpscare

* rename

(cherry picked from commit 1c11332fa4)
2024-01-26 21:27:25 +01:00
PJBot e154e4b8e1 Automatic changelog update
(cherry picked from commit 04fc06e9d4)
2024-01-26 21:27:14 +01:00
zzylex 671fad267b Allow plungers to be fired by bows and embedded into entities (#23406)
* allow plungers to be fired by bows and embedded into entities

* fixed bow being able to shoot every object

(cherry picked from commit 0f85e10747)
2024-01-26 21:27:13 +01:00
Nemanja 9139b969eb Disposals resprite [take 2] (#23418)
Disposals resprite

(cherry picked from commit d008488664)
2024-01-26 21:27:12 +01:00
PJBot 6aeb886ab1 Automatic changelog update
(cherry picked from commit d8eef7a16c)
2024-01-26 21:27:10 +01:00
CaasGit b0e0d78a14 Wire up the slime people TypingIndicator to use the existing slime speech. (#23415)
(cherry picked from commit 7f3d2b86ca)
2024-01-26 21:27:09 +01:00
DrSmugleaf ec6a4c8f06 Fix ConfigPresetTests.TestLoadAll not handling automatic panic bunker (#23414)
(cherry picked from commit ac022090b6)
2024-01-26 21:27:08 +01:00
PJBot 048393af31 Automatic changelog update
(cherry picked from commit 089768a118)
2024-01-26 21:27:07 +01:00
Admiral-Obvious-001 4aeeaa6828 Added info to body bag description. (#23407)
Tells people that the body bag stops rot.

(cherry picked from commit 548058b6c4)
2024-01-26 21:27:06 +01:00
PJBot 5a84f7ae2e Automatic changelog update
(cherry picked from commit 66ee414bf8)
2024-01-26 21:26:11 +01:00
Adrian16199 3eb6751dd6 Limits marking for certain species. (#23385)
Was told that due to the bandages bein added, the fact that reptilians not having a limit is technicly a bug and should be fix. So might aswell prevent anythin happening in the future for other species.

Could make the limiter up to 4 but thats up to discussion ¯\_(ツ)_/¯

(cherry picked from commit aa92dd0c58)
2024-01-26 21:26:10 +01:00
themias aa741d6348 refill welders from wall dispensers (#23376)
(cherry picked from commit 1bdc91e1ca)
2024-01-26 21:26:09 +01:00
PJBot 9a13837493 Automatic changelog update
(cherry picked from commit 897e1d3419)
2024-01-26 21:26:07 +01:00
Ilya246 59f69e4d6c biofabricator (#23319)
* initial implementation

* implement

* more mobs

* add tech

* buff abomination

* uncopypaste desc

* add sprite

* fix sprite

* remove biomass tag

* inden't

* less plasma for fish

(cherry picked from commit fc4ad82934)
2024-01-26 21:26:06 +01:00
PJBot b721c2e97d Automatic changelog update
(cherry picked from commit 8c47ea7c8c)
2024-01-26 21:26:04 +01:00
778b f025c681e5 Fixed mice behavior of eating everything (#23322)
* Added precondition for EatTask

* Added Thirsty precondition for htn drink task

* Added start state for hungry and thirsty components

* Update nutrition.yml

* Fixed pascalcase's

(cherry picked from commit 439d6ff44e)
2024-01-26 21:26:03 +01:00
PJBot daf70e5942 Automatic changelog update
(cherry picked from commit 5e6633ea50)
2024-01-26 21:26:01 +01:00
Trevor Day 7d6f0b42a1 Add admin logs for drawing with syringe. (#23333)
Add logs for drawing with syringe.

(cherry picked from commit 207ca6f423)
2024-01-26 21:26:00 +01:00
PJBot e441f715e1 Automatic changelog update
(cherry picked from commit a371e92f42)
2024-01-26 21:25:59 +01:00
J. Brown 3d5516a232 Tesla Ball no longer gets kicked around by explosions. Fixes 23331. (#23377)
* Tesla Ball no longer gets kicked around by explosions. Fixes 23331.

* Remove commented block.

(cherry picked from commit 799c22bd09)
2024-01-26 21:25:58 +01:00
VelcroboyandJeff 725f7db06e Add Research Director's Dresser (#23375)
Co-authored-by: Jeff <velcroboy333@hotmail.com>

(cherry picked from commit 09c7a64da7)
2024-01-26 21:25:31 +01:00
PJBot 998b074799 Automatic changelog update
(cherry picked from commit c467f1b7b0)
2024-01-26 21:24:29 +01:00
Skye 3b5adde686 ChemMaster buffer preserves list ordering (#23352)
ChemMaster now maintains list order on reagent removal

(cherry picked from commit fbe72c848a)
2024-01-26 21:24:21 +01:00
Debug 56cd917c73 Fix Nyano systems for solution refactor 2024-01-26 21:22:43 +01:00
Nemanja 6fb12db0ed Fix chem guide data build fail (#23289)
(cherry picked from commit a425bc78c5)
2024-01-23 23:04:39 +01:00
TemporalOroboros ce27944275 Revert 'Revert 'Solution Entities'' (#23168)
(cherry picked from commit d23c8d5c19)
2024-01-23 23:00:42 +01:00
PJBot d8f31cc4da Automatic changelog update
(cherry picked from commit 773146acf7)
2024-01-23 22:57:55 +01:00
metalgearsloth b761ffba4e Update submodule to 199.0.0 (#23358) 2024-01-23 22:56:24 +01:00
Ilya246 9e3a023f32 fix emagged lathes (#23318)
* implement

* pass uid

* fix

* fix dementia

* event implementation

* fix

(cherry picked from commit 49dbbc5721)
2024-01-23 22:55:31 +01:00
Leon Friedrich f4149a1404 Fix GravityGridTest (#23348)
(cherry picked from commit 383271c8fa)
2024-01-23 22:53:53 +01:00
Nemanja 6f38a16ff0 Fix all objectives on end screen being bolded (#23345)
fix all objectives on end screen being bolded.

(cherry picked from commit 719b44f1ce)
2024-01-23 22:53:51 +01:00
Nemanja 0cea348425 Fix anti-anomaly zones (#23357)
(cherry picked from commit 2988d60bd4)
2024-01-23 22:53:50 +01:00
Vasilis 78fd5a7931 Happy new year! (#23343)
Update LICENSE.TXT

(cherry picked from commit 835d13fc01)
2024-01-23 22:53:44 +01:00
PJBot 301db86937 Automatic changelog update
(cherry picked from commit 484197661d)
2024-01-23 22:53:29 +01:00
Nemanja 6e8c4009b4 Fix defibs resetting rot timer + slimes not having perishable (#23340)
* Fix defibs resetting rot timer + slimes not having perishable

* fix the sound too

(cherry picked from commit 8d9a76c95d)
2024-01-23 22:53:17 +01:00
Errant eadbf3daa1 Two more station beacons (#23334)
* evac beacon

* checkpoint beacon

* a!

* waa

(cherry picked from commit d8e4cd1d22)
2024-01-23 22:52:45 +01:00
Ed 2c75e0498d Anti Anomaly zones (#23187)
* add

* its work now

* pipi

* Update Content.Server/Anomaly/AnomalySystem.Generator.cs

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* fix ()

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
(cherry picked from commit 77cc81d376)
2024-01-23 22:52:44 +01:00
deathride58 176ae67137 Adds current panic bunker status to the server's /status API (#23330)
allows the server to advertise its current panic bunker status

(cherry picked from commit 0ffd4e953e)
2024-01-23 22:52:43 +01:00
PJBot a2297fcdf2 Automatic changelog update
(cherry picked from commit 1a9274758c)
2024-01-23 22:52:42 +01:00
Alekshhh d52ca46972 Hair Redo (#23304)
hair

(cherry picked from commit 3799ccbf1b)
2024-01-23 22:52:41 +01:00
PJBot 94e260eddc Automatic changelog update
(cherry picked from commit aebd29a34d)
2024-01-23 22:52:40 +01:00
SonicHDC ea0655ecaa L gun reshape (#23104)
* Update pistols.yml

* Update revolvers.yml

* Update battery_guns.yml

* Update battery_guns.yml

(cherry picked from commit fae28594f4)
2024-01-23 22:52:39 +01:00
Łukasz Mędrek 9fd71ca321 Fix reptilians pulling after being zombiefied (#23066)
* Fix reptilians pulling after being zombiefied

Now being zombefied removes ability to pull objects, regardless of if
the entity could pull without using their hands.

Fix #23043

* Apply changes from review

(cherry picked from commit 3a7fda10df)
2024-01-23 22:52:37 +01:00