Morb0 3e015c6f67 Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync ... # Conflicts: # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml # Resources/Prototypes/Entities/Clothing/Masks/specific.yml # Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml # Resources/Prototypes/GameRules/midround.yml # Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml # Resources/Prototypes/Roles/Jobs/Security/warden.yml # Resources/Prototypes/StatusEffects/health.yml # Resources/Prototypes/StatusIcon/antag.yml # Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml # Resources/ServerInfo/Guidebook/Engineering/AME.xml # Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml # Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml # Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml # Resources/ServerInfo/Guidebook/Engineering/Construction.xml # Resources/ServerInfo/Guidebook/Engineering/Engineering.xml # Resources/ServerInfo/Guidebook/Engineering/Fires.xml # Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml # Resources/ServerInfo/Guidebook/Engineering/Networking.xml # Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml # Resources/ServerInfo/Guidebook/Engineering/Power.xml # Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/ServerInfo/Guidebook/Engineering/TEG.xml # Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml # Resources/ServerInfo/Guidebook/Science/TraversalDistorter.xml # Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml # Resources/ServerInfo/Guidebook/Security/Forensics.xml # Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png		2024-04-26 11:19:50 +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	Colourful curtains (#25684)	2024-02-29 15:25:41 -07:00
dispensers.rsi	Improves bartending with some tweaks. (#14169)	2023-02-18 19:00:31 -06:00
Doors	Corvax Retexture pack 2! (#2012)	2024-04-04 10:33:11 +03:00
Furniture	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-04-02 11:32:48 +03:00
Holo	Fix CLRF to LF	2024-03-28 11:42:27 +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' into upstream-sync	2024-04-26 11:19:50 +03:00
Magic
meat_spike.rsi
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 'upstream/master' into upstream-sync	2024-02-29 12:28:26 +03:00
plastic_flaps.rsi
Power	APC sprite tweaks (#1896)	2024-02-27 14:31:38 +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	Church Bells (#26030)	2024-03-26 00:24:00 +11:00
stairs.rsi	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-03-21 01:15:13 +03:00
Storage	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-04-17 11:57:44 +03:00
Wallmounts	Revert "Maints Exit Sign" (#27271)	2024-04-23 20:40:26 +02:00
Walls	Merge remote-tracking branch 'upstream/master' into master-syndicate	2024-03-27 01:12:55 +03:00
Web	Arachnid RE-REWORK (#19138)	2023-09-04 13:02:54 -07:00
Windows	Corvax Retexture pack 2! (#2012)	2024-04-04 10:33:11 +03:00