]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Merge branch 'ion-storm-refactor' of https://github.com/ScarKy0/space-station-14...
authorScarKy0 <scarky0@onet.eu>
Thu, 14 Nov 2024 13:55:24 +0000 (14:55 +0100)
committerScarKy0 <scarky0@onet.eu>
Thu, 14 Nov 2024 13:55:24 +0000 (14:55 +0100)
1  2 
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