]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Revert "Remove handheld crew monitor (#24761)" (#25439)
authormetalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Thu, 22 Feb 2024 11:00:35 +0000 (22:00 +1100)
committerGitHub <noreply@github.com>
Thu, 22 Feb 2024 11:00:35 +0000 (22:00 +1100)
commitd0df5ed5fa502baa87c53fae8b8ce43257c92ffe
tree0800399202096c8cc09faa414ce7675f389b327e
parent7c7bca1d323293b39de0c22253a62bff15f878ca
Revert "Remove handheld crew monitor (#24761)" (#25439)

* Revert "Remove handheld crew monitor (#24761)"

This reverts commit bbc6d29d21df618f7aaf51550da5d71d2e31da04.

# Conflicts:
# Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Research/biochemical.yml
# Resources/migration.yml

* changes

* zeweh

* dergs
Resources/Maps/Test/dev_map.yml
Resources/Maps/centcomm.yml
Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml [new file with mode: 0644]
Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/scanner.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/syndiscanner.png [new file with mode: 0644]
Resources/migration.yml