Merge branch 'master' into powerhud

author slarticodefast <161409025+slarticodefast@users.noreply.github.com>

Fri, 22 Nov 2024 18:38:55 +0000 (19:38 +0100)

committer slarticodefast <161409025+slarticodefast@users.noreply.github.com>

Fri, 22 Nov 2024 18:38:55 +0000 (19:38 +0100)
author slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Fri, 22 Nov 2024 18:38:55 +0000 (19:38 +0100)
committer slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Fri, 22 Nov 2024 18:38:55 +0000 (19:38 +0100)
diff --cc Resources/Prototypes/Entities/Mobs/Player/silicon.yml
Simple merge
diff --cc Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
Simple merge
author	slarticodefast <161409025+slarticodefast@users.noreply.github.com>
	Fri, 22 Nov 2024 18:38:55 +0000 (19:38 +0100)
committer	slarticodefast <161409025+slarticodefast@users.noreply.github.com>
	Fri, 22 Nov 2024 18:38:55 +0000 (19:38 +0100)
		1	2
Resources/Prototypes/Entities/Mobs/Player/silicon.yml	patch \|	diff1 \|	diff2 \|	blob \| history
Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml	patch \|	diff1 \|	diff2 \|	blob \| history