rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Resources/Textures/Structures
History
VigersRay 67c8ba2471 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
#	Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml
#	Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/Clothing/Components/GloveHeatResistanceComponent.cs
#	Content.Server/Light/EntitySystems/PoweredLightSystem.cs
#	Content.Server/Medical/HealthAnalyzerSystem.cs
#	Content.Server/Medical/SuitSensors/SuitSensorComponent.cs
#	Content.Server/StationEvents/Events/MeteorSwarmSystem.cs
#	Content.Server/StationEvents/Events/StationEventSystem.cs
#	Content.Shared/Actions/SharedActionsSystem.cs
#	Content.Shared/Interaction/SharedInteractionSystem.cs
#	Resources/Prototypes/AlertLevels/alert_levels.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml
#	Resources/Prototypes/Datasets/Names/fortunes.yml
#	Resources/Prototypes/Datasets/ion_storm.yml
#	Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
#	Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
#	Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
#	Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
#	Resources/Prototypes/Entities/Objects/Fun/pai.yml
#	Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
#	Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
#	Resources/Prototypes/Recipes/Lathes/clothing.yml
#	Resources/Prototypes/game_presets.yml
#	Resources/Prototypes/secret_weights.yml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
#	Resources/Textures/Clothing/Mask/ert.rsi/meta.json
#	Resources/Textures/Clothing/Mask/joy.rsi/meta.json
#	Resources/Textures/Clothing/Mask/squadron.rsi/meta.json
#	Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png
#	Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png
#	Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
#	Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png
#	Resources/Textures/Objects/Tools/crowbar.rsi/red-storage.png
#	Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png
#	Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png
#	Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png
#	Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png
#	Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png
#	Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json
#	Resources/migration.yml
2024-08-14 19:55:44 +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 Respriting the codebase (#4820) 2021-10-15 11:58:40 +02:00
conveyor.rsi Respriting the codebase (#4820) 2021-10-15 11:58:40 +02:00
conveyor_old.rsi Respriting the codebase (#4820) 2021-10-15 11:58:40 +02:00
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-08-14 19:55:44 +03:00
Furniture Fix wooden counter sprites (#2305) 2024-06-21 04:48:13 +03:00
Holo Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
Hydroponics
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-08-05 17:22:05 +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 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-22 04:16:05 +03:00
plastic_flaps.rsi Add buildable plastic flaps (#6583) 2022-02-21 22:01:58 -07:00
Power apc touchup sprite (#30460) 2024-08-02 17:19:25 +10: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 Church Bells (#26030) 2024-03-26 00:24:00 +11: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-07-22 04:16:05 +03:00
Wallmounts Partially revert light tube sprites (#29091) 2024-08-10 11:00:21 -04:00
Walls Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-22 04:16:05 +03:00
Web Arachnid RE-REWORK (#19138) 2023-09-04 13:02:54 -07:00
Windows Респрайты стен, шлюзов, окон и плиток. (#33) 2024-06-07 11:06:08 +03:00