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
..
Arachnid	Arachnid 2: Episode 2 (#19984)	2023-11-08 12:18:52 -08:00
cat_parts.rsi	Animated cat tail (#603)	2022-12-06 21:17:22 -08:00
diona.rsi	diona customization (#19304)	2023-08-20 19:02:12 -06:00
eyes.rsi	diona customization (#19304)	2023-08-20 19:02:12 -06:00
gauze.rsi	Gauze Markings 3 - Revenge of the Wrap (#25481)	2024-04-09 10:04:51 +02:00
human_facial_hair.rsi	Fix the remaining invalid RSIs (#13113)	2022-12-20 11:49:18 -06:00
human_hair.rsi	The return of the 'long bedhead' haircut as an alternative (#26336)	2024-03-22 13:35:40 -04:00
human_noses.rsi	Add nose customization to humans & dwarves (#25557)	2024-02-26 16:15:04 -07:00
masking_helpers.rsi	More gendered sprite masks (#14735)	2023-06-05 21:11:45 +10:00
Moth	New moth antennae and wing pair, Underwing (#23559)	2024-01-05 08:55:49 -05:00
reptilian_parts.rsi	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-04-26 11:19:50 +03:00
scars.rsi	Clean up scars.yml and add a new chest scar (#25215)	2024-02-17 15:50:39 -05:00
slime_parts.rsi	Split slime marking leg gradient (#24928)	2024-02-13 17:03:41 -05:00
tattoos.rsi	Heterochromia (#12126)	2022-11-08 15:16:12 -06:00
vox_facial_hair.rsi	[QOL] Removed unnecessary delays in some old texture meta.json files (#15378)	2023-04-16 23:50:37 -06:00
vox_hair.rsi	[QOL] Removed unnecessary delays in some old texture meta.json files (#15378)	2023-04-16 23:50:37 -06:00