Ed 209f02a0dd Merge remote-tracking branch 'upstream/master' into ed-30-05-2024-upstream ...

# Conflicts:
#	Resources/Prototypes/Maps/Pools/default.yml

2024-05-30 13:29:19 +03:00

..

_CP14

Bloodgrass gatherable entity + gatherable system cleanup + bugfix (#154)

2024-05-18 15:16:20 +03:00

Guidebook

Update Antagonists Guidebook Sections (#27931)

2024-05-27 17:51:30 -07:00

Gameplay.txt

Fix tiny grammar/spelling issues (#23534)

2024-01-04 23:35:31 +01:00

Intro.txt

Rename "Server Info" to ServerInfo (#15436)

2023-04-16 10:55:59 +10:00

RP_Rules.txt

Update WizDen's borg definition of crew (#22873)

2023-12-22 18:27:22 -06:00

Rules.txt

Update WizDen's borg definition of crew (#22873)

2023-12-22 18:27:22 -06:00

Sandbox.txt

Rename "Server Info" to ServerInfo (#15436)

2023-04-16 10:55:59 +10:00