NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 18:31:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Resources/Textures/Mobs/Customization
History
Exact
Morb0 3ab6d3ef71 Merge remote-tracking branch 'wizards/master' into upstream-sync 
# Conflicts:
#	.github/workflows/publish.yml
#	Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
#	Content.Server/GameTicking/GameTicker.Player.cs
#	Content.Server/VoiceMask/VoiceMaskComponent.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.cs
#	Content.Server/VoiceMask/VoiceMaskerComponent.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Entities/Clothing/Masks/specific.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
#	Resources/Prototypes/Roles/Jobs/Command/captain.yml
#	Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
#	Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_director.yml
#	Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
#	Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
#	Resources/Textures/Tiles/attributions.yml
#	Resources/Textures/Tiles/blue_circuit.png
#	Resources/Textures/Tiles/green_circuit.png
#	Resources/Textures/Tiles/steel.png
2024-10-04 19:47:54 +03:00
..
Arachnid Arachnid 2: Episode 2 (#19984) 2023-11-08 12:18:52 -08:00
cat_parts.rsi
diona.rsi diona customization (#19304) 2023-08-20 19:02:12 -06:00
ears.rsi Long human ears (#30490) 2024-08-21 17:44:43 -06:00
eyes.rsi Vox sprite rework (#26985) 2024-04-27 16:04:51 +10:00
gauze.rsi New gauze customization (#30852) 2024-09-15 00:55:13 +10:00
human_facial_hair.rsi Fix the remaining invalid RSIs (#13113) 2022-12-20 11:49:18 -06:00
human_hair.rsi Some new hairstyles! (#31010) 2024-09-28 16:07:51 +10: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 fix moffra antennae (#31981) 2024-09-09 13:42:23 +10:00
reptilian_parts.rsi Fix snout splotch colors (#2353) 2024-06-28 23:34:58 +02: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
vox_facial_hair.rsi Minor vox customization update: new hairstyles & facial hair (#30815) 2024-08-18 21:32:15 -06:00
vox_hair.rsi Minor vox customization update: new hairstyles & facial hair (#30815) 2024-08-18 21:32:15 -06:00
vox_parts.rsi Vox displacement updates (#29824) 2024-07-17 10:43:11 +03:00
vox_tattoos.rsi Vox customization fixes & updating (#27663) 2024-05-04 04:12:11 -07:00