rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Resources/Textures/Objects/Devices
History
Vigers Ray 389ed704e1 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Entry/EntryPoint.cs
#	Content.Client/IoC/ClientContentIoC.cs
#	Content.Server/Administration/Managers/BanManager.cs
#	Content.Server/Chat/Managers/ChatSanitizationManager.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/Traitor/Uplink/UplinkSystem.cs
#	Content.Shared/Interaction/SharedInteractionSystem.cs
#	Content.Shared/Localizations/ContentLocalizationManager.cs
#	Content.Shared/Roles/JobRequirement/DepartmentTimeRequirement.cs
#	Content.Shared/Roles/JobRequirement/OverallPlaytimeRequirement.cs
#	Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs
#	Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
#	Resources/Audio/Ambience/Antag/attributions.yml
#	Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
#	Resources/Locale/en-US/_strings/advertisements/other/firebot.ftl
#	Resources/Locale/en-US/_strings/shuttles/commands.ftl
#	Resources/Prototypes/Datasets/Names/last.yml
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
#	Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Roles/Jobs/Science/borg.yml
#	Resources/Prototypes/Shuttles/shuttle_incoming_event.yml
#	Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json
#	Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
#	RobustToolbox
2024-10-30 13:26:32 +03:00
..
ai_card.rsi Adding intellicard functionality. (#32347) 2024-10-22 15:49:39 +02: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' 2024-07-26 04:21:22 +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 Various Vaugely Connected Sprite Updates™: Encryption Keys, Station Map, Brig Timer (#32786) 2024-10-30 14:12:49 +11:00
flatpack.rsi cargo can now order fax machines (#28968) 2024-06-14 16:24:18 +10:00
forensic_scanner.rsi Forensics (#8451) 2022-06-27 20:04:53 -05:00
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 Add basic handheld GPS (#6896) 2022-02-26 16:59:20 +11:00
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 Mousetraps (#8440) 2022-05-25 13:16:34 -07:00
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 Flash payload (#7587) 2022-04-20 16:08:57 +10:00
pda.rsi Новые спрайты униформы СБ (#46) 2024-06-09 00:36:19 +03: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 Remote Explosives (#7682) 2022-04-22 16:54:39 +10:00
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 Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
syndicate_teleporter.rsi Syndicate teleporter (#376) 2024-09-16 11:09:57 +03:00
tablets.rsi Various Vaugely Connected Sprite Updates™: Encryption Keys, Station Map, Brig Timer (#32786) 2024-10-30 14:12:49 +11:00
timer.rsi Add Modular grenades (chemnades). (#7138) 2022-03-25 15:17:29 +11:00
voice.rsi Add voice trigger for modular grenades (#11449) 2022-10-17 04:44:50 +11:00
wristwatch.rsi Watches (#29550) 2024-07-13 16:09:19 +10:00