rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Resources/Textures/Objects/Tools
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
..
access_configurator.rsi sprite change (#21423) 2023-11-05 19:21:41 -07:00
appraisal-tool.rsi In-hand apprasial tool sprite (#32849) 2024-10-23 10:51:49 +11:00
blueprint.rsi Blueprints (#31138) 2024-08-25 22:06:50 +10:00
bucket.rsi Resprite buckets (#23866) 2024-01-16 08:47:52 -05:00
cable-coils.rsi
Cowtools Toolboxes (#24305) 2024-01-20 13:29:13 +11:00
crowbar.rsi Fix crowbars sprites (#2505) 2024-08-22 07:47:31 +03:00
debug.rsi
Decoys Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
drill.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
emag.rsi emag inhand sprites (#20729) 2023-10-04 21:46:30 -04:00
EnergyDome Энергетические щиты (#404) 2024-09-26 20:09:00 +03:00
flashlight.rsi
fulton.rsi Add fultons (#18958) 2023-08-29 16:34:05 +10:00
fulton_balloon.rsi Add fultons (#18958) 2023-08-29 16:34:05 +10:00
geiger.rsi
greenlight.rsi Syndicate Decoy Bundle + Snap Pops (#25333) 2024-02-28 16:53:46 -05:00
hand_labeler.rsi
handdrill.rsi Add mining drill inhand sprites (#22494) 2023-12-14 11:47:48 -05:00
handdrilldiamond.rsi Add diamond mining drills, buff regular mining drills (#30814) 2024-08-12 11:49:09 +10:00
handheld_mass_scanner.rsi Handheld Mass Scanner (#25526) 2024-02-26 16:19:51 -07:00
Hydroponics Delete hydroponics bags (#13106) 2022-12-20 09:38:07 +01:00
jaws_of_life.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
lantern.rsi Allow flashlights on belts (#23256) 2023-12-30 19:06:27 -07:00
lighters.rsi Added a regular and an engraved zippo (flippo) lighter (#23020) 2023-12-27 15:47:35 -07:00
matches.rsi
multitool.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
network_configurator.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
omnitool.rsi
rcd.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
rcl.rsi
rolling_pin.rsi Rolling pin can be worn in belt slot (#21019) 2023-10-16 00:09:06 -04:00
scissors.rsi It's time to build a barbershop! (#22565) 2023-12-22 02:54:00 -07:00
screwdriver.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
seclite.rsi
shovel.rsi
spray_painter.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
spy_device.rsi Thief stuff: Gloves, Spy Crew Monitor, Invisible Crate, Toy (#21551) 2023-11-12 16:41:45 -07:00
t-ray.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
thief_beacon.rsi Thief beacons (try 2) (#29997) 2024-08-08 16:17:50 +03:00
Toolboxes Toolboxes (#24305) 2024-01-20 13:29:13 +11:00
universal_access_configurator.rsi Admin access configurator (#28107) 2024-05-19 17:04:16 -06:00
welder.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
welder_experimental.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
welder_industrial.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
welder_industrialadv.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
welder_mini.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
wirecutters.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
wrench.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00