]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Merge branch 'master' into powerhud
authorslarticodefast <161409025+slarticodefast@users.noreply.github.com>
Fri, 22 Nov 2024 18:38:55 +0000 (19:38 +0100)
committerslarticodefast <161409025+slarticodefast@users.noreply.github.com>
Fri, 22 Nov 2024 18:38:55 +0000 (19:38 +0100)
commit5a9a2d463b8ab16d137ddb22f0ab1d6b4d5fc7fd
tree0f97e134c0de97771a8d263e2e8500788ec93079
parent3758715bdc8cd0209d3de3714b69897182546a20
parent09ca45a621b633cd4d4d3bebb2dda47fb7043bc7
Merge branch 'master' into powerhud
Resources/Prototypes/Entities/Mobs/Player/silicon.yml
Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml