fish-station/Content.Client/Silicons
Vigers Ray fba2af74b3 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	.github/labeler.yml
#	.github/workflows/labeler-needsreview.yml
#	.github/workflows/labeler-untriaged.yml
#	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/Entities/Objects/Specific/Robotics/borg_parts.yml
#	Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml
#	Resources/Prototypes/tags.yml
#	Resources/ServerInfo/Guidebook/Science/Cyborgs.xml
#	Resources/migration.yml
2024-11-15 14:52:30 +03:00
..
Borgs Borg type switching. (#32586) 2024-11-14 11:08:35 -06:00
Laws Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-08-28 19:12:01 +03:00
StationAi Station AI ability to electricute doors (#32012) 2024-09-27 17:22:17 +10:00