rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Resources/Textures/Structures
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
..
barricades.rsi Ports /vg/station barricade sprites & slightly buffs them (#19840) 2023-09-16 05:50:48 -07:00
cargo_pallets.rsi Make cargo pallets smoothing with eachother (#27049) 2024-04-17 23:22:09 +10:00
cargo_telepad.rsi Telepad revival (#16664) 2023-05-21 20:09:31 +10:00
catwalk.rsi
conveyor.rsi
conveyor_old.rsi
cryostorage.rsi Cryogenic Sleep Units (#24096) 2024-01-14 23:35:28 -07:00
Decoration Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-06-15 21:05:02 +03:00
dispensers.rsi Improves bartending with some tweaks. (#14169) 2023-02-18 19:00:31 -06:00
Doors Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-10-02 15:50:00 +03:00
Furniture Fixes some common iconsmoothing oddities (#32051) 2024-09-10 17:20:49 -06:00
Holo Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
Hydroponics Made hydroponics alert light more orange (#31088) 2024-08-18 20:48:47 -06:00
Lighting/LightPosts/small_light_post.rsi Post light update (#25814) 2024-03-06 04:39:47 +03:00
Machines Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-10-30 13:26:32 +03:00
Magic Simple Magic Spellbook System (#7823) 2022-05-29 16:29:10 +10:00
meat_spike.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
monitors.rsi [QOL] Removed unnecessary delays in some old texture meta.json files (#15378) 2023-04-16 23:50:37 -06:00
Piping upstream 2024-09-16 12:40:23 +03:00
plastic_flaps.rsi
Power Генератор Супер материи (#399) 2024-09-26 20:09:27 +03:00
Shuttles Fix the remaining invalid RSIs (#13113) 2022-12-20 11:49:18 -06:00
smalldispensers.rsi Improves bartending with some tweaks. (#14169) 2023-02-18 19:00:31 -06:00
Specific Anomalous infections (#31876) 2024-09-17 12:49:19 +03:00
stairs.rsi Stairs palette resprite (#2223) 2024-06-09 01:27:10 +03:00
Storage Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-09-26 20:17:14 +03:00
Wallmounts Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-10-30 13:26:32 +03:00
Walls Reinforced walls sprite see throu top (#32578) 2024-10-01 23:44:47 +02:00
Web Arachnid RE-REWORK (#19138) 2023-09-04 13:02:54 -07:00
Windows upstream 2024-09-16 12:40:23 +03:00