Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream Merge 11/11/23 #35

Closed
wants to merge 244 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
244 commits
Select commit Hold shift + click to select a range
6ce75cc
Health analyzer UI improve (#17280)
Arteben Oct 28, 2023
5776a15
Automatic changelog update
PJBot Oct 28, 2023
e0f3bf0
User accessible playtime (#21242)
Titian3 Oct 28, 2023
3319774
Automatic changelog update
PJBot Oct 28, 2023
17f3fc1
Moves cloning comp & cloning event to shared (#21253)
keronshb Oct 28, 2023
b223e7d
Generalizes solution overflow & slightly increases space lube yield (…
TemporalOroboros Oct 28, 2023
1b86ecf
Automatic changelog update
PJBot Oct 28, 2023
f308adf
Move ActorComponent to shared (#21293)
ElectroJr Oct 28, 2023
f3c84b9
Update engine to v174.0.0 (#21311)
ElectroJr Oct 28, 2023
e792475
Fix planet command help message (#21312)
ElectroJr Oct 29, 2023
d08a9e2
Wearable bee plush (#20623)
UbaserB Oct 29, 2023
44558f0
Automatic changelog update
PJBot Oct 29, 2023
cd280ee
remove pulse rifle from ert medic (#21310)
QuietlyWhisper Oct 29, 2023
9b1b3e0
Content audio (#20862)
metalgearsloth Oct 29, 2023
073c8c1
Automatic changelog update
PJBot Oct 29, 2023
4f6ea2a
Update submodule to 175.0.0 (#21318)
metalgearsloth Oct 29, 2023
5b8f3c4
Revert "Update submodule to 175.0.0 (#21318)" (#21319)
metalgearsloth Oct 29, 2023
f2bc0ff
Atomic bomb add uranium (#21143)
kerisargit Oct 29, 2023
6e49331
Action bugfixes (#21321)
ElectroJr Oct 29, 2023
5466a9b
Disable OOC during round (#21323)
Titian3 Oct 29, 2023
d696793
Fix PDA notifications when creating a news entry using the Mass-Media…
Simyon264 Oct 29, 2023
24dc5b6
Automatic changelog update
PJBot Oct 29, 2023
b5c21bc
Update belt.yml (#21317)
Sifb26 Oct 29, 2023
00523b5
New foam sprites (edge sprites) (#21308)
brainfood1183 Oct 29, 2023
a6448cb
Fix bola stam damage, bring back old construction requirements (#21340)
misandrie Oct 29, 2023
9734ead
Automatic changelog update
PJBot Oct 29, 2023
014d3a3
Added thermal insulation to flannel jackets (#21273)
nmajask Oct 30, 2023
5349f32
Automatic changelog update
PJBot Oct 30, 2023
e22d3a4
Space Asshole Gear (#21243)
Psychpsyo Oct 30, 2023
6eebda7
Fix broken slot highlight in midnight theme. (#21331)
EmoGarbage404 Oct 30, 2023
d0e2672
Update Patrons.yml (#21344)
DrSmugleaf Oct 30, 2023
b3b0d0c
Thicken thindow bounds (#21280)
metalgearsloth Oct 30, 2023
d6d0312
Automatic changelog update
PJBot Oct 30, 2023
1a45c32
1984 mouse AI (#21353)
VasilisThePikachu Oct 31, 2023
98420b5
Automatic changelog update
PJBot Oct 31, 2023
e1440cb
Pumpkins, jack o' lanterns and pumpkin hat resprite (#21176)
Doru991 Oct 31, 2023
1659a14
Update ground_lighting.yml (#21350)
TheShuEd Oct 31, 2023
01d57a0
fix fireaxe swing (#21346)
notquitehadouken Oct 31, 2023
b6bd029
Automatic changelog update
PJBot Oct 31, 2023
4f81a56
Enable skeletons temporarily for Halloween (#21356)
EmoGarbage404 Oct 31, 2023
2c5ea97
Automatic changelog update
PJBot Oct 31, 2023
0c329ed
Storage Standardization [Take 2] (#21270)
EmoGarbage404 Oct 31, 2023
4ebc688
Automatic changelog update
PJBot Oct 31, 2023
a302775
Pea Plants (#20504)
ZeroDayDaemon Oct 31, 2023
89df430
Automatic changelog update
PJBot Oct 31, 2023
a05ef80
fix smoke not transferring (#21332)
EmoGarbage404 Oct 31, 2023
bb4bb50
Automatic changelog update
PJBot Oct 31, 2023
1a9f3bc
Fix the organtype (#21347)
LankLTE Oct 31, 2023
4ca06ee
Automatic changelog update
PJBot Oct 31, 2023
77db8b1
mindshield implants (#21269)
brainfood1183 Oct 31, 2023
74f1098
Candy Bucket for Halloween (#21257)
Bixkitts Oct 31, 2023
49f0b20
make bloodred large size (#21362)
deltanedas Oct 31, 2023
1c604a4
Cockroach + Glockroach Admeme + Mothroach (#19752)
potato1234x Oct 31, 2023
672969b
Automatic changelog update
PJBot Oct 31, 2023
6a18bdc
Soapy Water & Edible Soap (#20364)
Psychpsyo Oct 31, 2023
31d9956
Automatic changelog update
PJBot Oct 31, 2023
15fc7b1
blue blood now requires copper instead of iron to cure bloodloss (#20…
brainfood1183 Oct 31, 2023
3b10c88
Command Styled QM Card (#21368)
Nairodian Oct 31, 2023
b806722
Automatic changelog update
PJBot Oct 31, 2023
3a4c40c
Validate PresetIdCardComponent.JobName prototype ids (#21361)
DrSmugleaf Oct 31, 2023
96ff529
Anomaly Cores (#21306)
TheShuEd Oct 31, 2023
f85ca70
Automatic changelog update
PJBot Oct 31, 2023
e1e3eba
Getting turned to a rev makes the rev antag sound (#21316)
VasilisThePikachu Nov 1, 2023
e134a53
Automatic changelog update
PJBot Nov 1, 2023
222c025
Revert "Enable skeletons temporarily for Halloween (#21356)" (#21385)
Titian3 Nov 1, 2023
2b903ed
Automatic changelog update
PJBot Nov 1, 2023
9e7cac2
Fix tests fail (#21384)
MilenVolf Nov 1, 2023
85f09ca
More Storage Rebalancing (#21373)
EmoGarbage404 Nov 1, 2023
9374e2b
Automatic changelog update
PJBot Nov 1, 2023
aa0c3b6
Mark all tests that restart rounds as dirty (#21376)
DrSmugleaf Nov 2, 2023
2d58d19
Make all prototype types partial (#21374)
DrSmugleaf Nov 2, 2023
751ffdc
Return the nukie hypo (#21391)
liltenhead Nov 2, 2023
0392217
Automatic changelog update
PJBot Nov 2, 2023
1961445
Makes thieving gloves sneakier (#21398)
TemporalOroboros Nov 3, 2023
8ee0a96
Automatic changelog update
PJBot Nov 3, 2023
675bcd5
Fix negative tank pressure (#21401)
themias Nov 3, 2023
973380b
Automatic changelog update
PJBot Nov 3, 2023
268bd10
buff bag of holding (#21411)
deltanedas Nov 3, 2023
7e8d042
Automatic changelog update
PJBot Nov 3, 2023
a68b1d2
fixed rat kebab parents (#21409)
Tunguso4ka Nov 3, 2023
598b3c9
Automatic changelog update
PJBot Nov 3, 2023
f1c9935
Makes a syndicate chemvend so they dont have to hack it on nukie plan…
IProduceWidgets Nov 3, 2023
c7f74f7
fish petting (#21412)
deltanedas Nov 3, 2023
188cbba
Fix roaches weight to match new system (#21414)
Fromoriss Nov 3, 2023
6e90eef
Security Chunk Salvage (#21403)
Blackern5000 Nov 3, 2023
a90d624
Fix rotation on Moth Head (Moonfly) marking (#21417)
photonicDog Nov 3, 2023
d218fa3
Automatic changelog update
PJBot Nov 3, 2023
3a788dd
Mind Action Container (#21336)
keronshb Nov 3, 2023
a96563c
fix anomaly core size (#21418)
EmoGarbage404 Nov 4, 2023
5a5e39f
Added a penguin plushie! (#21097)
Piras314 Nov 4, 2023
6be2ef0
Fixes A Anomaly Core Description Typo (#21424)
PursuitInAshes Nov 4, 2023
aa713ea
Candles (#21087)
TheShuEd Nov 4, 2023
5a3476f
Automatic changelog update
PJBot Nov 4, 2023
bda8a9c
microwave can be turned on with signal (#21138)
deltanedas Nov 4, 2023
7a2a3ce
fix hand examine (#21309)
EmoGarbage404 Nov 4, 2023
4a730c5
Fix double counting bounties (#21399)
EmoGarbage404 Nov 4, 2023
1263206
Automatic changelog update
PJBot Nov 4, 2023
84b55c4
fix borg actions (#21235)
EmoGarbage404 Nov 4, 2023
83a2513
Automatic changelog update
PJBot Nov 4, 2023
7d0070d
Soap dont have 100% vomit chance (#21428)
TheEmber Nov 4, 2023
34c69b2
Senior Physician Beret (#21426)
UbaserB Nov 4, 2023
d152e64
Automatic changelog update
PJBot Nov 4, 2023
9182c20
Enter mech with drag-drop (#21405)
themias Nov 4, 2023
8abc084
Automatic changelog update
PJBot Nov 4, 2023
10be264
adjust radiation blockers (#21286)
daerSeebaer Nov 4, 2023
40afc27
Automatic changelog update
PJBot Nov 4, 2023
6a8023c
Fix admin verb PVS issue (#21406)
ElectroJr Nov 4, 2023
84bc7ee
SO gets sec beret (#21433)
TsjipTsjip Nov 4, 2023
843a7d1
Fix ambuzol zombie damage (#21432)
themias Nov 4, 2023
26519ab
Automatic changelog update
PJBot Nov 4, 2023
a385990
Fix accidental crayon graffiti when writing on paper (#21445)
themias Nov 4, 2023
349f583
Automatic changelog update
PJBot Nov 4, 2023
ef8ecf8
Move "id" clothing layer above gloves, shoes, ears, outerclothing, ey…
DrSmugleaf Nov 5, 2023
8b11c4f
Cleanup chemistry-bottles.yml (#21459)
lzk228 Nov 5, 2023
670f745
fix susbox slots (#21435)
deltanedas Nov 5, 2023
cfaac4b
wintercoats fit small items (#21463)
joshepvodka Nov 5, 2023
c54febc
Stop mice eating soap (#21446)
crazybrain23 Nov 5, 2023
34e03d1
Automatic changelog update
PJBot Nov 5, 2023
488433c
give chemistry bag better storage (#21447)
deltanedas Nov 5, 2023
77d49ea
:trollface: (#21470)
deltanedas Nov 5, 2023
e5fd5cc
Automatic changelog update
PJBot Nov 5, 2023
b1eb5d4
Convert license.txt to attributions.yml in misc folder (#21465)
RieBi Nov 6, 2023
10c7363
Convert license.txt to attributions.yml in Items folder (#21466)
RieBi Nov 6, 2023
13d412e
Convert license.txt to attributions.yml in Animals folder (#21471)
RieBi Nov 6, 2023
f6f73aa
Converted weapons license.txts to attributions.ymls (#21444)
RieBi Nov 6, 2023
2c87c53
hide medibot messages from chat and logs (#21468)
deltanedas Nov 6, 2023
196be3c
Adds more sources for sheet paper material (#21364)
SpaceRox1244 Nov 6, 2023
3a430f3
Automatic changelog update
PJBot Nov 6, 2023
79cd2a7
Significantly nerf chemvomit and give it a reasonable default. (#21453)
IProduceWidgets Nov 6, 2023
b79607b
Automatic changelog update
PJBot Nov 6, 2023
95a651e
Bicaridine metabolism bandaid (#21443)
themias Nov 6, 2023
36c82ca
Notice board (#21410)
Tunguso4ka Nov 6, 2023
9c9a3f7
Automatic changelog update
PJBot Nov 6, 2023
c540b61
Fix erase verb not removing chat messages in some cases (#21355)
DrSmugleaf Nov 6, 2023
1c497db
Artifact fragments can now stack. (#21232)
c0rigin Nov 6, 2023
fd7db80
sprite change (#21423)
UbaserB Nov 6, 2023
2b08889
Automatic changelog update
PJBot Nov 6, 2023
3d13332
The Mobs of the Living Light (#21338)
Nimfar11 Nov 6, 2023
f103a38
Automatic changelog update
PJBot Nov 6, 2023
e35cd61
allow network payload data to inherit nullability (#21327)
graevy Nov 6, 2023
f9369db
Made livestock crates not airtight. (#21315)
IProduceWidgets Nov 6, 2023
284547e
Automatic changelog update
PJBot Nov 6, 2023
615f15e
Nukeops hud (#21260)
IntegerTempest Nov 6, 2023
3079b38
:trollface: (#21182)
JoeHammad1844 Nov 6, 2023
f87152a
Automatic changelog update
PJBot Nov 6, 2023
5af97da
diagonal window glass and pirate shuttle improvements (#21174)
brainfood1183 Nov 6, 2023
d07ea20
Use object-spaced bounding boxes for putting stuff in crates (#21427)
ChrisThirtle Nov 6, 2023
b1f39ad
Automatic changelog update
PJBot Nov 6, 2023
4cacb7b
Ice anomaly spawns ice underneath it (#21227)
YuriyKiss Nov 6, 2023
40b36d1
Roller Skates (#20257)
brainfood1183 Nov 6, 2023
3be6c5b
Microreactor power cell research (#21473)
deltanedas Nov 6, 2023
71ec51b
Replicate the PDA belt slot sprite in the IDSLOT (#21457)
QuietlyWhisper Nov 6, 2023
8302bef
Automatic changelog update
PJBot Nov 6, 2023
96e2781
add ied (#20966)
deltanedas Nov 6, 2023
db1eba1
Automatic changelog update
PJBot Nov 6, 2023
f0f54b5
mech nitrogen filtering 2 (#19868)
deltanedas Nov 6, 2023
dd0ab19
Freelance Radio Channel and Encryption Key (#20904)
LordEclipse Nov 6, 2023
e0a11f9
(Reagent) Minor blood and uncooked protein rework (#20891)
QuietlyWhisper Nov 6, 2023
ad1a280
Automatic changelog update
PJBot Nov 6, 2023
8b3adf6
Anomaly Synchronizer (#20945)
TheShuEd Nov 6, 2023
18eae13
Automatic changelog update
PJBot Nov 6, 2023
525d8e3
Add map info to status HTTP API (#21089)
Morb0 Nov 6, 2023
3890490
ninja stun change (#20503)
deltanedas Nov 6, 2023
4729024
Convert ItemSize to prototypes (#21481)
EmoGarbage404 Nov 6, 2023
df46c52
Automatic changelog update
PJBot Nov 6, 2023
b9c3887
Port python packaging to Content.Packaging (#21458)
metalgearsloth Nov 6, 2023
2a9e08b
Update submodule to 176.0.0 (#21500)
metalgearsloth Nov 6, 2023
fb60a56
Guardian bugfixes (#21467)
ElectroJr Nov 7, 2023
778d3e9
eek (penis) (#21498)
Emisse Nov 7, 2023
651dffb
Fix map renderer (#21515)
DrSmugleaf Nov 7, 2023
dc3b6e3
Fix Client RoleSystem not inheriting SharedRoleSystem, network job co…
DrSmugleaf Nov 7, 2023
c90316d
Lockers for clown, mime and NT Representative (#21504)
Tunguso4ka Nov 7, 2023
201fe5f
Automatic changelog update
PJBot Nov 7, 2023
b1fd313
Minor rule change to include disability slurs in rules (#21518)
Titian3 Nov 7, 2023
104300b
uwu (#21521)
VasilisThePikachu Nov 8, 2023
45ddc30
Make the cloning pod and medical scanner fit through verical doors (#…
VasilisThePikachu Nov 8, 2023
3953257
Add method to clear an action's cooldown (#21517)
DrSmugleaf Nov 8, 2023
a6985e5
Automatic changelog update
PJBot Nov 8, 2023
94368f1
Speed Boots [Tier 3 Civ-Service] (#21438)
EmoGarbage404 Nov 8, 2023
d8a88d0
Origin Station Update 06.11.2023 (notice boards and gasgiant parallax…
brainfood1183 Nov 8, 2023
fb7afe4
Automatic changelog update
PJBot Nov 8, 2023
490ebdc
No more passive zombies (#21506)
VasilisThePikachu Nov 8, 2023
932c5db
content (#21505)
KingFroozy Nov 8, 2023
2f296dc
Allows reptilians to eat crayons, as is their right (#21420)
FluidRock Nov 8, 2023
33f211b
Automatic changelog update
PJBot Nov 8, 2023
ac25dd8
Fix mob state error (#21431)
ElectroJr Nov 8, 2023
b5e8890
Adding damage visuals for directional windows (#21194)
Darkenson Nov 8, 2023
e249aba
Automatic changelog update
PJBot Nov 8, 2023
8f72e0a
Add Spawners (#20495)
Deeeeja Nov 8, 2023
b360391
Update Robust to v177.0.0 (#21528)
DrSmugleaf Nov 8, 2023
52af546
Arachnid 2: Episode 2 (#19984)
PixelTheKermit Nov 8, 2023
e8a47cd
Automatic changelog update
PJBot Nov 8, 2023
6550f42
Common spelling mistake (#21535)
VasilisThePikachu Nov 8, 2023
55c6c35
Fix O id prototype (#21534)
Morb0 Nov 8, 2023
52508a6
Fixed typo "tranexmic -> tranexamic" (#21537)
Brandon-Huu Nov 8, 2023
a466a9e
Grill Resprite (#21524)
ps3moira Nov 8, 2023
4831f2a
Automatic changelog update
PJBot Nov 8, 2023
3f4d998
nitrile gloves (#21509)
KingFroozy Nov 8, 2023
174aa3b
Automatic changelog update
PJBot Nov 8, 2023
4220b09
Sling Resprites (#21538)
Boaz1111 Nov 8, 2023
cf6eb20
Remove need to toggle vending machine button (#21543)
themias Nov 9, 2023
be8e5b7
Automatic changelog update
PJBot Nov 9, 2023
8be97a2
Roller Skates fixes (#21542)
brainfood1183 Nov 9, 2023
c1791eb
Fix space vault (#21541)
themias Nov 9, 2023
cb1e799
Automatic changelog update
PJBot Nov 9, 2023
2ef29fb
New crop: Cotton (#21536)
DoubleRiceEddiedd Nov 9, 2023
50e358a
Automatic changelog update
PJBot Nov 9, 2023
88a9dce
Tweak dwarf accent (#21522)
pewter-wiz Nov 9, 2023
e355541
Minor: Revert removal of "Oye" from dwarven accent in favour of "Oi" …
pewter-wiz Nov 9, 2023
2f2d237
LOOC will appear on top of your head (#21514)
VasilisThePikachu Nov 9, 2023
7b06e1e
Automatic changelog update
PJBot Nov 9, 2023
c2de7ec
Adding a kitten (#20726)
ravage123321 Nov 9, 2023
1ae210f
Automatic changelog update
PJBot Nov 9, 2023
5cc157e
Mark space glue and lube TrashOnSolutionEmpty (#21550)
themias Nov 9, 2023
5d46bbb
Minor Borg Qol (#21548)
Emisse Nov 9, 2023
4de0cf6
Automatic changelog update
PJBot Nov 9, 2023
ac5e9cd
Fix borg mobstates (#21307)
EmoGarbage404 Nov 9, 2023
977cced
Automatic changelog update
PJBot Nov 9, 2023
02584a5
strip fix (#21552)
PixelTheKermit Nov 9, 2023
fdf4ea1
Generators were discharged in the admin arena (#21549)
Genkail Nov 9, 2023
6d2c086
Automatic changelog update
PJBot Nov 9, 2023
df11de0
cheaper borg parts and modules (#21557)
EmoGarbage404 Nov 10, 2023
a367097
Automatic changelog update
PJBot Nov 10, 2023
654cc7f
Merge `ActorSystem` and `IPlayerManager` (#21314)
ElectroJr Nov 11, 2023
68c45eb
Update engine to v178.0.0 (#21571)
ElectroJr Nov 11, 2023
909621e
stasis bed and microwave qol(#21572)
VasilisThePikachu Nov 11, 2023
d7810e6
Borg QOL, part 3 (#21567)
Doru991 Nov 11, 2023
a0198f4
Automatic changelog update
PJBot Nov 11, 2023
9af9574
Fix replay spectating bugs (#21573)
ElectroJr Nov 11, 2023
1a3d3a3
Fix missing if statement when logging missing action error (#21560)
DrSmugleaf Nov 11, 2023
86ebdf8
Automatic changelog update
PJBot Nov 11, 2023
d9119f8
aspid update (#21575)
Emisse Nov 11, 2023
fb180fb
Remove welding mask from tech assistant starting inventory (#21578)
lzk228 Nov 11, 2023
c032fad
Stops plants from growing when they do not have enough resources (#21…
Brandon-Huu Nov 11, 2023
d097b67
Automatic changelog update
PJBot Nov 11, 2023
e4ec03f
Disallow bee zombification (#21507)
VasilisThePikachu Nov 11, 2023
61f2532
Automatic changelog update
PJBot Nov 11, 2023
a183f16
aspid update (#21587)
Emisse Nov 11, 2023
f7638ae
convert license.txt to attributions.yml (#21585)
Chronophylos Nov 11, 2023
2de0619
mining shuttle update (#21588)
Emisse Nov 11, 2023
7012ac9
Merge 11/11/23
LankLTE Nov 11, 2023
4a7c849
More conflicts
LankLTE Nov 11, 2023
8995b1b
Fix Skatesystem
LankLTE Nov 11, 2023
5770f9a
More merge conflicts
LankLTE Nov 11, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Automatic changelog update
PJBot committed Oct 29, 2023

Verified

This commit was signed with the committer’s verified signature.
jason-p-pickering Jason Pickering
commit 9734ead7f7e5ccddb94e201d27ae72d2859e6945
14 changes: 8 additions & 6 deletions Resources/Changelog/Changelog.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
Entries:
- author: Interrobang01
changes:
- {message: Centcom will now sell Cargo gas canisters at a vastly reduced (and consistent!)
price after realizing the station has infinite gasses anyway., type: Tweak}
id: 4578
time: '2023-08-14T13:56:07.0000000+00:00'
- author: mirrorcult
changes:
- {message: Asteroid rocks and secret doors should look less weird in certain scenarios,
@@ -2915,3 +2909,11 @@ Entries:
Reporters rejoice!', type: Fix}
id: 5077
time: '2023-10-29T10:37:40.0000000+00:00'
- author: Subversionary
changes:
- {message: Bolas no longer deal stamina damage if you're already ensnared., type: Tweak}
- {message: Returned old bola recipe, type: Tweak}
- {message: Nerfed bola stamina damage from 80 to 55, type: Tweak}
- {message: You can break out of bolas while moving., type: Tweak}
id: 5078
time: '2023-10-29T22:27:44.0000000+00:00'