]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Merge branch 'master' into ion-storm-refactor
authorScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Thu, 14 Nov 2024 13:45:55 +0000 (14:45 +0100)
committerGitHub <noreply@github.com>
Thu, 14 Nov 2024 13:45:55 +0000 (14:45 +0100)
commit755f322e29d40a08cd4952d7042a4c0f2d8c40bd
treeef7a60190820f3526a62d4c000eb1a5af94c28ea
parentb0c5023fda93ef68f73ea0c4d50c01e7d60c587d
parent5e5453614181f1e29bd8be5790ce4c5fd59e225d
Merge branch 'master' into ion-storm-refactor
Content.Server/Silicons/Laws/SiliconLawSystem.cs
Resources/Locale/en-US/interaction/interaction-popup-component.ftl
Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
Resources/Prototypes/Entities/Mobs/Player/silicon.yml
Resources/Prototypes/GameRules/events.yml