Commit Graph

19503 Commits

Author SHA1 Message Date
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
PJBot
d9be666e8a Automatic changelog update 2024-07-07 03:53:24 +00: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
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
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
PJBot
12edad89e8 Automatic changelog update 2024-07-06 03:53:02 +00: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
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
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
Ed
38cd8ad6a1 Fix Vox clothing in character creation menu (#29709)
Update vox.yml
2024-07-04 22:55:00 +10:00
Brandon Hu
96ff998d18 fix(packed): Fix a couple of issues (#29422)
* fix(packed): Fix a couple of issues

* Name the signal button for bar
2024-07-04 03:02:02 -06:00
Brandon Hu
fb9c03186c fix(marathon): Fixing more issues (#29411) 2024-07-04 03:01:31 -06:00
PJBot
2cf42bf7a4 Automatic changelog update 2024-07-04 08:03:49 +00:00
PJBot
bc7907728c Automatic changelog update 2024-07-04 07:18:53 +00:00
JIPDawg
1471bd5b53 Added Health Analyzer to basic treatment module. (#29696)
Removed dropped, added Health Analyzer to Basic Treatment Module

Co-authored-by: JIP <jipdawg93@gmail.com>
2024-07-04 17:17:47 +10:00
PJBot
acf186490c Automatic changelog update 2024-07-04 07:12:08 +00:00
metalgearsloth
2988ac3839 Make vox roundstart (#29704)
* Make vox roundstart

I believe all the issues are fixed.

* Click detection bandaid
2024-07-04 17:11:01 +10:00
PJBot
97d39e0c28 Automatic changelog update 2024-07-04 02:30:32 +00:00
Nemanja
3e3e050aaf Make all nukies humans (#29693) 2024-07-04 12:29:26 +10:00
Errant
223ade9b3f Starting gear for vox crewmembers (#29685)
* tank harness

* weh

* Suit Storage Whitelist

* Revert "Suit Storage Whitelist"

This reverts commit b1f503573c2936642a2d7627c4852153ec71ce79.

* suit storage filter

* vox spawn gear

* weh
2024-07-04 12:01:03 +10:00
PJBot
0d80021433 Automatic changelog update 2024-07-04 01:52:52 +00:00
Plykiya
62fcb6bd96 Makes portable flashers destructable (#29564)
Makes portable flashers destructible

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-07-04 11:51:46 +10:00
PJBot
406cf7adcd Automatic changelog update 2024-07-04 01:30:13 +00:00
PJBot
143151f284 Automatic changelog update 2024-07-04 01:26:31 +00:00
Nemanja
e612ccda92 add apc power draw to stat value command (#29701)
add apc stat value
2024-07-04 11:13:49 +10:00
Interrobang01
5198c87597 improved wrench description (#29700)
Lefty latchy, righty removey
2024-07-03 20:43:42 -04:00
PJBot
5c1aa578ef Automatic changelog update 2024-07-03 17:00:36 +00:00