]> git.smokeofanarchy.ru Git - space-station-14.git/commit
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)
commite9c66cfe982a7c63de3f8bbfba2a1ce37195f813
tree031289f2c4a7a15335cdfa3e2f52e19b139a8a3f
parent4f754b814bdc7c72d900e6d13aef4eb0a533cdce
parent755f322e29d40a08cd4952d7042a4c0f2d8c40bd
Merge branch 'ion-storm-refactor' of https://github.com/ScarKy0/space-station-14 into ion-storm-refactor
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