Vigers Ray 252e81c728 Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs # Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs # Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs # Content.Server/Mindshield/MindShieldSystem.cs # Content.Shared/Gravity/SharedGravitySystem.cs # Content.Shared/Implants/SharedSubdermalImplantSystem.cs # Resources/Locale/en-US/_strings/traits/traits.ftl # Resources/Prototypes/Entities/Clothing/Shoes/misc.yml # Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml # Resources/Prototypes/Entities/Objects/Misc/implanters.yml # Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml # Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml # Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml # Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json		2025-08-23 23:10:05 +03:00
..
barricades.rsi	Ports /vg/station barricade sprites & slightly buffs them (#19840)	2023-09-16 05:50:48 -07:00
cargo_pallets.rsi	Базовые Прототипы Экономики (#1303)	2025-02-09 20:13:15 +03:00
cargo_telepad.rsi
catwalk.rsi
conveyor.rsi	Fixed Two-Way Lever Sprites (#37390)	2025-05-15 11:42:17 -04:00
cryostorage.rsi	Cryogenic Sleep Units (#24096)	2024-01-14 23:35:28 -07:00
Decoration	Роли СССП для Ивентов, и их вещи. (#882)	2024-12-21 18:06:05 +03:00
dispensers.rsi
Doors	Merge remote-tracking branch 'space-wizards/master'	2025-08-23 23:10:05 +03:00
floor_web.rsi	Spider web visuals update (#38175)	2025-06-16 17:30:43 -07:00
Furniture	Merge remote-tracking branch 'space-wizards/master'	2025-08-10 01:49:23 +03:00
Holo	Merge remote-tracking branch 'space-wizards/master'	2025-08-10 01:49:23 +03:00
Hydroponics	Adding fungal soil (#36245)	2025-05-20 21:59:51 -07:00
Lighting/LightPosts/small_light_post.rsi	Post light update (#25814)	2024-03-06 04:39:47 +03:00
Machines	Merge remote-tracking branch 'space-wizards/master'	2025-08-23 23:10:05 +03:00
Magic
mailbox.rsi	Reworked Mail Spawning (#36774)	2025-04-21 11:32:18 +02:00
meat_spike.rsi	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
monitors.rsi
Piping	Merge remote-tracking branch 'space-wizards/master'	2025-08-10 01:49:23 +03:00
plastic_flaps.rsi
Power	Merge remote-tracking branch 'space-wizards/master'	2025-08-10 01:49:23 +03:00
Shuttles	Exo Station - Upstream Playtest Version (#33144)	2025-06-15 12:10:22 -07:00
smalldispensers.rsi
Specific	Assorted device and core inhands (#38162)	2025-06-09 00:40:14 -07:00
stairs.rsi	Stairs palette resprite (#2223)	2024-06-09 01:27:10 +03:00
Storage	Merge remote-tracking branch 'space-wizards/master'	2025-08-18 01:18:36 +03:00
Wallmounts	Merge remote-tracking branch 'space-wizards/master'	2025-08-10 01:49:23 +03:00
Walls	Merge remote-tracking branch 'space-wizards/master'	2025-08-23 23:10:05 +03:00
Web	Arachnid RE-REWORK (#19138)	2023-09-04 13:02:54 -07:00
Windows	Merge remote-tracking branch 'space-wizards/master'	2025-08-23 23:10:05 +03:00