Merge branch 'ion-storm-refactor' of https://github.com/ScarKy0/space-station-14...

author ScarKy0 <scarky0@onet.eu>

Thu, 14 Nov 2024 13:55:24 +0000 (14:55 +0100)

committer ScarKy0 <scarky0@onet.eu>

Thu, 14 Nov 2024 13:55:24 +0000 (14:55 +0100)
author ScarKy0 <scarky0@onet.eu>
Thu, 14 Nov 2024 13:55:24 +0000 (14:55 +0100)
committer ScarKy0 <scarky0@onet.eu>
Thu, 14 Nov 2024 13:55:24 +0000 (14:55 +0100)
diff --cc Resources/Locale/en-US/interaction/interaction-popup-component.ftl
Simple merge
diff --cc Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
Simple merge
diff --cc Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
Simple merge
diff --cc Resources/Prototypes/Entities/Mobs/Player/silicon.yml
Simple merge
diff --cc Resources/Prototypes/GameRules/events.yml
Simple merge
author	ScarKy0 <scarky0@onet.eu>
	Thu, 14 Nov 2024 13:55:24 +0000 (14:55 +0100)
committer	ScarKy0 <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	patch \|	diff1 \|	diff2 \|	blob \| history
Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml	patch \|	diff1 \|	diff2 \|	blob \| history
Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml	patch \|	diff1 \|	diff2 \|	blob \| history
Resources/Prototypes/Entities/Mobs/Player/silicon.yml	patch \|	diff1 \|	diff2 \|	blob \| history
Resources/Prototypes/GameRules/events.yml	patch \|	diff1 \|	diff2 \|	blob \| history