]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
merge staging into master (#37009)
authorslarticodefast <161409025+slarticodefast@users.noreply.github.com>
Mon, 28 Apr 2025 18:14:39 +0000 (20:14 +0200)
committerGitHub <noreply@github.com>
Mon, 28 Apr 2025 18:14:39 +0000 (20:14 +0200)
1  2 
Resources/Prototypes/Entities/Mobs/Player/silicon.yml
Resources/Prototypes/tags.yml

Simple merge