Commit Graph

36638 Commits

Author SHA1 Message Date
Mr. 27 6af478ae29
Zombie wideswing and misc fix (#26064)
* inital

* b

* Update MeleeWeaponComponent.cs

* Update Content.Shared/Zombies/ZombieComponent.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit 3981173a15)
2024-03-17 14:58:53 +01:00
PJBot 9547604243
Automatic changelog update
(cherry picked from commit 67d4fee285)
2024-03-17 14:58:51 +01:00
veprolet ac09dc586c
Cycle injector transfer amount on alt. use (#25566)
* Add toggle verb for injector transfer amount

* Fix injector verb priority scalability

---------

Co-authored-by: veprolet <>
(cherry picked from commit ad6ac73f6f)
2024-03-17 14:58:50 +01:00
PJBot 0f6d334b31
Automatic changelog update
(cherry picked from commit a773182e3e)
2024-03-17 14:58:45 +01:00
SlamBamActionman 64738a3d86
Changed names of uplink categories and swapped around items (#25079)
* Changed names of uplink categories and swapped around items

* sloth feedback

(cherry picked from commit aabf030515)
2024-03-17 14:58:42 +01:00
PJBot 9e5b0f5d37
Automatic changelog update
(cherry picked from commit e624a795d7)
2024-03-17 14:56:22 +01:00
Plykiya 3c45ff6c32
Syringe doafter based on Syringe contents (#25890)
Syringe delay based on amount in syringe

Co-authored-by: Plykiya <plykiya@protonmail.com>
(cherry picked from commit 37cd12524e)
2024-03-17 14:56:17 +01:00
FungiFellow 32a979433d
Grey Matter Addition and Slime Organ Tweak (#25464)
* Added Grey Matter

* Update diona.yml

* Update human.yml

* Update slime.yml

* Update flavors.yml

* Update biological.yml

* Update physical-desc.ftl

* Update biological.ftl

* Make Slime Brain Grindable

* Slime Organs Grind into Slime

* Update flavor-profiles.ftl

* Added Brain to Blacklist

(cherry picked from commit 471dfed445)
2024-03-17 14:56:10 +01:00
Deatherd f1bd110a13
More fax logging (#25911)
* More fax logging

* Update Content.Server/Fax/FaxSystem.cs

Also logging if no author for some reason

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>

* Update Content.Server/Fax/FaxSystem.cs

* Update Content.Server/Fax/FaxSystem.cs

* Update Content.Server/Fax/FaxSystem.cs

* Update Content.Server/Fax/FaxSystem.cs

---------

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit c27c7086c0)
2024-03-17 14:56:07 +01:00
PJBot 0a4f47a479
Automatic changelog update
(cherry picked from commit dc53c2394f)
2024-03-17 14:56:05 +01:00
Cojoke 839fa2e5fb
Adds Senior role drip to the Uniform Printer. (#25668)
Adds Senior role drip to the Uniform Printer.

(cherry picked from commit af57006427)
2024-03-17 14:56:01 +01:00
PJBot a819e860f2
Automatic changelog update
(cherry picked from commit 15a424370e)
2024-03-17 14:55:57 +01:00
Vyacheslav Kovalevsky 4b446c2e62
Fix cream pie bomb when eaten or sliced (#25928)
* fix bomb activation when eaten

* no swap / no eject

* activate when sliced

(cherry picked from commit 0d0edbba4a)
2024-03-17 14:55:56 +01:00
PJBot 47b4fa5dfe
Automatic changelog update
(cherry picked from commit 855def1fba)
2024-03-17 14:55:54 +01:00
maylokana 1356203d30
Attempt at a more noticably whispered bubble (#25602)
* Attempt at a more noticably whispered bubble

* Better implementation

(cherry picked from commit 4f698a6e0d)
2024-03-17 14:55:51 +01:00
Velcroboy 2c56535977
Add fancy table spawner (#26044)
* Add fancy table spawner

* fix icon

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
(cherry picked from commit f5f5eebeee)
2024-03-17 14:55:50 +01:00
PJBot 5885663cb0
Automatic changelog update
(cherry picked from commit 44819d6608)
2024-03-17 14:55:49 +01:00
Gyrandola 12c14747d6
Remove butchering popup when clicking own sprite with a knife (#26051)
added target!=user check

(cherry picked from commit 4e57f1977e)
2024-03-17 14:55:45 +01:00
PJBot 88097212a9
Automatic changelog update
(cherry picked from commit 9e155266be)
2024-03-17 14:55:44 +01:00
Gyrandola 40d3100521
Fix Sky Blue carpet making red tables (#26049)
* created and added CarpetSBlue tag

* reverting unnecessary de-indentation

* Update carpets.yml

(cherry picked from commit 559d7ac593)
2024-03-17 14:55:43 +01:00
SlamBamActionman 533fe8663e
Remove recycling for Syndicate implanters (#26047)
Removes the Trash tag

(cherry picked from commit a8e1489ddb)
2024-03-17 14:55:39 +01:00
PJBot 154c4192ee
Automatic changelog update
(cherry picked from commit ed461f5013)
2024-03-17 14:55:38 +01:00
NakataRin a1f26dac15
skeleton minplayers restriction (#26050)
(cherry picked from commit b49f77f9cd)
2024-03-17 14:55:34 +01:00
PJBot 30f09fe8dc
Automatic changelog update
(cherry picked from commit 10b7da2e71)
2024-03-17 14:55:06 +01:00
FungiFellow 3059e29326
Improvised shell crafting recipe (#25545)
* Changed Projectile Sprite to Shard

* Removed Notes on Recipe

* Made Recipe

* Added a space

* Update improvised.yml

* Update shotgun.yml

* Removed Note

* Reduced needed matches from 8->6

* Update improvised_shotgun_shell.yml

* Matchbox fix didn't work

* Reduced glass needed from 5-4

* Added backspace

* Update Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun_shell.yml

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit 6260e4b35b)
2024-03-17 14:55:02 +01:00
metalgearsloth 28d2f2375c
Fix rounds restarting in the next round (#25856)
* Fix rounds restarting in the next round

Doesn't fix them restarting in lobby I think but should fix most of it.

* delta india sierra charlie oscar romeo delta

(cherry picked from commit 02cc9c05dd)
2024-03-17 14:54:59 +01:00
Errant 73b9c6ae95
Nuke Music start adjusted for duration (#25946)
The exact time when the Nuke Music starts is now derived from the music's duration

(cherry picked from commit 680cf5fec1)
2024-03-17 14:54:56 +01:00
PJBot 1740be67c7
Automatic changelog update
(cherry picked from commit b0c65a03d5)
2024-03-17 14:54:55 +01:00
UnicornOnLSD 2b08a4ceec
new haircut alternative (brought back old one) (#25935)
added crew cut 2 wew

(cherry picked from commit 76db710a1c)
2024-03-17 14:54:51 +01:00
PJBot 5a15e37f52
Automatic changelog update
(cherry picked from commit 44224a3df0)
2024-03-17 14:54:50 +01:00
liltenhead ef7438efc9
Buff Zombie Infection (#25954)
* Infection chance

* Infection Damage

(cherry picked from commit 56ac86a5c1)
2024-03-17 14:54:43 +01:00
Mr. 27 ffb3cfd682
kobolds no longer die at 40 hp (#25984)
* me

* change

(cherry picked from commit ad99564b3e)
2024-03-17 14:54:43 +01:00
Alice "Arimah" Heurlin bb4cb6d28a
Remove random Cyrillic characters from locale files (#26043)
(cherry picked from commit ffd52b24ff)
2024-03-17 14:54:39 +01:00
PJBot 6720c6e2da
Automatic changelog update
(cherry picked from commit afc04a463e)
2024-03-17 14:54:38 +01:00
ShadowCommander b1c86ae0b3
Fix arrivals not docking on spinning stations (#26033)
Fix arrivals not working on spinning stations

Increases the tolerance to .15 instead of .1

(cherry picked from commit 9e2e514319)
2024-03-17 14:54:33 +01:00
SlamBamActionman 3dda5a6cec
Enable multiple Solution Editor windows (#26005)
* More solution edit windows

* Fix error when closing euis after round restart

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
(cherry picked from commit 0da09db99a)
2024-03-17 14:54:32 +01:00
PJBot acab48ebd3
Automatic changelog update
(cherry picked from commit c8fce85a3f)
2024-03-17 14:54:27 +01:00
nikthechampiongr 92f3c54915
Add logs to recycler gibbing and broadcasting. (#26008)
* Add logs to things

* Make the message log be saved as msg because I forgor before.

* Log fails when getting an entity that doesn't exist

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
(cherry picked from commit 2b8415b378)
2024-03-17 14:54:26 +01:00
PJBot 7a72bffb06
Automatic changelog update
(cherry picked from commit f5364f9ffa)
2024-03-17 14:54:09 +01:00
Ubaser a85c4c2c75
Space damage now causes heat along with blunt (#25770)
* add

* heat not burn?

(cherry picked from commit c2d52e4540)
2024-03-17 14:54:08 +01:00
Nikolai Korolev 25093aa725
Fix RUN_THIS.py so it would be cross-platform and it would be possible to use it from cmd on Windows (#26017)
Fix RUN_THIS.py so it would be possible to use it from cmd on Windows

(cherry picked from commit 7ed94f8824)
2024-03-17 14:54:04 +01:00
PJBot a2170400f0
Automatic changelog update
(cherry picked from commit cd43f32a3d)
2024-03-17 14:54:01 +01:00
SlamBamActionman f932eddfc2
Add "Juice that makes you Weh" to moths eating Lizard plushies (#26003)
Weh

(cherry picked from commit 6d1f07a375)
2024-03-17 14:53:58 +01:00
PJBot d9c245799b
Automatic changelog update
(cherry picked from commit c6a8da76e9)
2024-03-17 14:53:23 +01:00
Ilya246 5809d981b5
allow biomass reclaimer to reclaim plants (#23731)
(cherry picked from commit ec4e0990e1)
2024-03-17 14:53:20 +01:00
Baptr0b0t 27c6e7f124
FIX Criminal SecHud icon Rsi path BUG (#26001)
FIX BUG

(cherry picked from commit 7bdfd4cfc0)
2024-03-17 14:53:18 +01:00
PJBot 4d2c788c94
Automatic changelog update
(cherry picked from commit 79604608ad)
2024-03-17 14:53:17 +01:00
pigeonpeas 19828e3fc2
New salvage expedition ambience. (#25983)
adds the stuff!!

adds the OGG file, makes it play in game, and adds the attributions.

(cherry picked from commit 5364bd4af0)
2024-03-17 14:53:14 +01:00
deltanedas 2abd85559b
buff cargo hydroponics crate (#25878)
buff hydroponics crate

Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit 88f8da465b)
2024-03-17 14:53:13 +01:00
metalgearsloth cb92be3719
Update submodule to 213.0.0 (#25987)
(cherry picked from commit e4d33e937f)
2024-03-17 14:53:00 +01:00