Commit Graph

29142 Commits

Author SHA1 Message Date
Plykiya
04249e8682 Removes max damage threshold on healing for hyperzine (#29712)
* Removes max damage threshold for hyperzine

* the description...

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-07-08 00:28:13 +10:00
Nemanja
ed7f00692e The real AME nerf (#29587)
* The real AME nerf

* oh the real change

* Update AmeNodeGroup.cs
2024-07-08 00:27:52 +10:00
Nemanja
21d0f85cc2 metal foam grenades (#29428)
* metal foam grenades

* wow okay

* meh

* bruh

* test

* push
2024-07-08 00:26:58 +10:00
PJBot
ff93070d25 Automatic changelog update 2024-07-07 14:23:44 +00:00
Brandon Hu
70b56136aa fix(hardsuits): Give the carp suit and hardsuit a suit storage slot (#29322)
* fix(hardsuits): Give the carp hardsuit suit storage

* Both carpsuits have suit slots
2024-07-08 00:23:03 +10:00
NotSoDamn
437f6f451a Slicing food with Swords (#29005)
* added utensil component

* BaseSword added
2024-07-08 00:22:38 +10:00
Verm
13b84870ec Bartending+: Shaking and Stirring (#29243)
* Shaking and Stirring

* Remove shake message

* Switch if order a bit

* Add doafter supprot for reactionmixer

* Fix nullability

* Timespan zero

* Forgot to remove loc string

* Reorganize usings

* Remove unneeded usings, fix b52 needing to be shaken
2024-07-08 00:21:53 +10:00
PJBot
71b7dddb59 Automatic changelog update 2024-07-07 14:20:16 +00:00
Nemanja
0e9ed36b85 Intercom buffs and fixes (#29580)
* Intercom buffs and fixes

* remove unused bui state

* mild sec intercom buff

* reinforce sec intercoms
2024-07-08 00:19:10 +10:00
PJBot
063c5de985 Automatic changelog update 2024-07-07 13:07:30 +00:00
Simon
f50488d7e3 Raise ratking migration minimum players to 30 from 15 (#29737) 2024-07-07 23:06:24 +10:00
lzk
c9c721be16 Add supplybot moving states (#29795)
* Add supplybot moving states

* forgor
2024-07-07 23:05:09 +10:00
Ed
8e1547e616 Update attributions.yml 2024-07-07 14:06:48 +03:00
Ed
20d6ccffdb Scythe (#311)
* Scythe

* Update entities.ftl
2024-07-07 12:55:03 +03:00
PJBot
336f264c77 Automatic changelog update 2024-07-07 06:21:59 +00:00
Tayrtahn
23887d5bd9 Improve buckling's interactions with standing state (#29741) 2024-07-07 16:20:53 +10:00
PJBot
d9be666e8a Automatic changelog update 2024-07-07 03:53:24 +00:00
beck-thompson
18df27d8e7 Spilling reagents on mutliple entities at once fix (#29763)
* Fixed!

* That could have been bad this is why I'm glad I check the diff xD
2024-07-07 13:52:18 +10:00
github-actions[bot]
0098d71717 Update Credits (#29784)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
2024-07-07 13:50:12 +10:00
themias
60ef7848fb Fix wielding while pulling (#29781) 2024-07-07 13:49:55 +10:00
PJBot
fa6d6806d1 Automatic changelog update 2024-07-06 17:34:30 +00:00
JIPDawg
5cd7cf182a Added cryosleep UnitSpawner and UnitSpawnerLate to the map Origin (#29761)
Added cryosleep UnitSpawner and UnitSpawnerLate

Co-authored-by: JIP <jipdawg93@gmail.com>
2024-07-06 11:33:20 -06:00
Ed
b6d6e2de8c haha! 2024-07-06 12:19:32 +03:00
Ed
b4b63ed898 revert sublicense, its not working 2024-07-06 12:08:50 +03:00
Ed
d9ed4a63df sublicense 2024-07-06 11:56:18 +03:00
Ed
f8b6bc7243 Update battle_royale.yml 2024-07-06 11:27:38 +03:00
Ed
205aae364c Battle royale playtest map (#309)
* setup balance

* more preparation

* Update arenas.yml

* Update battle_royale.yml

* pop

* Update arenas.yml
2024-07-06 11:22:36 +03:00
Errant
b418338af7 Phoronman 1984 (#29747)
No more.
2024-07-06 14:17:32 +10:00
MFMessage
34f36665a6 Fixes a minor typo for the base gingerbread body part (#29717)
"Fixes a minor typo in the gingerbread bodypart prototype"
2024-07-06 14:04:59 +10:00
Killerqu00
7ae3e353ea You no longer get deleted when cuffed and buckled (#29718)
fix
2024-07-06 14:01:51 +10:00
themias
7b99d1f851 Don't allow toggling internals while asleep (#29753) 2024-07-06 13:55:58 +10:00
PJBot
12edad89e8 Automatic changelog update 2024-07-06 03:53:02 +00:00
metalgearsloth
4c5c6a84dc Shuttle map button tweaks (#29757)
- Avoids adding pending objects we can never show so the list should fill much faster.
2024-07-06 13:51:55 +10:00
end
84ff5e334b nuke biochem (#29751)
Nuke biomchem again
2024-07-06 00:52:27 +03:00
AndreyCamper
24c47c805d Fire Axe resprite 45 degrees v3 (#28866)
Rotating Fire Axe 45 deg
2024-07-06 00:37:29 +03:00
DrSmugleaf
11034a0986 Fix showing the inventory button on entities without any inventory slots (#29728) 2024-07-06 00:25:23 +10:00
lzk
b0ae7d5725 Add summary comments for ElectrifiedComponent fields (#29733)
add summaries for ElectrifiedComponent
2024-07-05 09:01:39 -04:00
Ed
cc9e5f68da Update entities.ftl (#307) 2024-07-05 14:00:56 +03:00
PJBot
ead0c375f6 Automatic changelog update 2024-07-05 08:00:24 +00:00
Jezithyr
8adcb37964 Re-enabling nukie species(except vox), added antag species blacklisting
* Revert "Make all Nukies humans (#29693)"

This reverts commit 3e3e050aaf.

* Implemented species blacklist

* Re-enabled all species as Nukies except for Vox because loadouts don't support breathing alternative gases yet.
2024-07-05 00:59:16 -07:00
Ed
01f97a8aaa +3 berets (#306) 2024-07-05 08:56:38 +03:00
Ed
d9fc93e0c5 +2 lobby track (#304) 2024-07-04 23:35:53 +03:00
Ed
3182447fbf Grass update v2 (#303)
* high bush

* update worldgen
2024-07-04 23:25:22 +03:00
nikthechampiongr
8e05e1cfed Move checking code for BlacklistedRange to the right place in sqlite (#29389) 2024-07-04 21:02:53 +02:00
jmcb
bc7c121713 Fix typo in pineapple pizza description (#29714) 2024-07-04 14:30:33 -04:00
Ed
9280ca8830 Merge pull request #301 from crystallpunk-14/ed-05-07-2024-upstream
Upstream sync
2024-07-04 19:46:27 +03:00
Jaraten
b7e2d66557 wood&paper walls (#299) 2024-07-04 19:46:10 +03:00
Jaraten
a9cb687899 resprite decals (#302) 2024-07-04 19:45:24 +03:00
Ed
b1a2aaf1f5 remove vox 2024-07-04 18:25:23 +03:00
Ed
bd011bf418 Merge remote-tracking branch 'upstream/master' into ed-05-07-2024-upstream
# Conflicts:
#	Content.IntegrationTests/Tests/Round/JobTest.cs
#	Resources/Prototypes/Traits/speech.yml
2024-07-04 18:14:21 +03:00