CatStation/Resources/Textures/Objects/Devices
Morb0 3ab6d3ef71 Merge remote-tracking branch 'wizards/master' into upstream-sync
# Conflicts:
#	.github/workflows/publish.yml
#	Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
#	Content.Server/GameTicking/GameTicker.Player.cs
#	Content.Server/VoiceMask/VoiceMaskComponent.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.cs
#	Content.Server/VoiceMask/VoiceMaskerComponent.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Entities/Clothing/Masks/specific.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
#	Resources/Prototypes/Roles/Jobs/Command/captain.yml
#	Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
#	Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_director.yml
#	Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
#	Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
#	Resources/Textures/Tiles/attributions.yml
#	Resources/Textures/Tiles/blue_circuit.png
#	Resources/Textures/Tiles/green_circuit.png
#	Resources/Textures/Tiles/steel.png
2024-10-04 19:47:54 +03:00
..
ai_card.rsi Station AI (#30944) 2024-08-28 10:57:12 +10:00
camera_bug.rsi Add camera bug (#30250) 2024-10-01 00:24:36 +02:00
cartridge.rsi MedTek Cartridge (#32450) 2024-10-01 23:17:57 -07:00
chameleon_projector.rsi prop hunt ss14 (real) (#26691) 2024-04-17 14:48:35 -07:00
communication.rsi Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-08-02 11:29:44 +03:00
declaration_of_war.rsi Give nukies the ability to declare war for a TC boost (#19291) 2023-08-29 23:56:20 -08:00
door_remote.rsi
encryption_keys.rsi Update binary key to use AI icon (#32327) 2024-10-01 14:03:37 +10:00
flatpack.rsi cargo can now order fax machines (#28968) 2024-06-14 16:24:18 +10:00
forensic_scanner.rsi
gates.rsi add memory cell and rework logic construction (#24983) 2024-08-18 16:34:43 -06:00
goldwatch.rsi Watches (#29550) 2024-07-13 16:09:19 +10:00
gps.rsi
hand_teleporter.rsi Portals & hand teleporter (#13266) 2023-01-02 19:58:25 -06:00
health_analyzer.rsi Health analyzers now show if somebody is starving (#24789) 2024-02-01 17:28:17 +11:00
Holoprojectors Remove CRLF, enforce with workflow (#26401) 2024-03-24 22:06:17 +01:00
igniter.rsi add igniter (#20962) 2023-10-14 00:11:50 -07:00
jammer.rsi Radio jammer update! (#25912) 2024-04-25 12:19:16 +10:00
mousetrap.rsi
nuke.rsi Fix gay nuke layering (#29410) 2024-06-24 20:01:24 +02:00
output.rsi Station AI (#30944) 2024-08-28 10:57:12 +10:00
payload.rsi
pda.rsi Darken equipped PDA sprites (#23197) 2023-12-29 21:22:29 -05:00
pinpointer.rsi New Thief minor antagonist (#21520) 2023-12-24 02:58:28 -07:00
securityhandy.rsi Add a handy security radio (#25913) 2024-04-27 23:27:18 +10:00
signaller.rsi Partially reverts the remote signaller resprite (#27073) 2024-04-17 21:16:48 -04:00
signaltrigger.rsi
singularity_beacon.rsi add syndicate singularity beacon (#18486) 2024-01-06 00:21:24 -08:00
station_beacon.rsi Station beacons (#23136) 2023-12-28 17:02:21 -07:00
swapper.rsi [Resprite] Swapper (#1746) 2024-01-17 19:57:16 +03:00
tablets.rsi Station maps (#13027) 2023-04-13 16:21:24 +10:00
timer.rsi
voice.rsi
wristwatch.rsi Watches (#29550) 2024-07-13 16:09:19 +10:00