From 9f75eee3d6f867332064f4de6e53cbf51261b6b3 Mon Sep 17 00:00:00 2001 From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Date: Wed, 27 Sep 2023 18:21:13 -0500 Subject: [PATCH 01/12] Hair! Things are about to get hairy --- .../Customization/human_hair.rsi/meta.json | 740 +++++++++++++++++- 1 file changed, 739 insertions(+), 1 deletion(-) diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json index 0a16a117b80..1d1af38551f 100644 --- a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json @@ -1 +1,739 @@ -{"version":1,"size":{"x":32,"y":32},"copyright":"Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi , resprited by Alekshhh, a modified by potato1234x","license":"CC-BY-SA-3.0","states":[{"name":"80s","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"a","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"afro","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"afro2","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"antenna","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"b","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"baldfade","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"bedhead","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"bedheadv2","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"bedheadv3","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"beehive","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"beehivev2","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"bigafro","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"bigflattop","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"bigpompadour","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"bob","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"bob2","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"bob4","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"bobcurl","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"bobcut","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"boddicker","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"bowlcut","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"bowlcut2","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"braid","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"braid2","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"braided","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"braidfront","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"braidtail","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"bun","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"bun3","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"bunhead2","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"business","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"business2","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"business3","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"business4","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"buzzcut","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"c","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"classicafro","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"classicbigafro","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"classiccia","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"classicfloorlength_bedhead","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"classicmodern","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"classicmulder","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"classicwisp","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"cia","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"coffeehouse","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"combover","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"cornrowbraid","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"cornrowbun","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"cornrows","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"cornrows2","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"cornrowtail","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"country","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"crewcut","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"curls","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"d","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"dandypompadour","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"devilock","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"doublebun","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"dreads","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"drillhair","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"drillhairextended","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"drillruru","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"e","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"emo","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"emo2","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"emofringe","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"f","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"father","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"feather","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"flair","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"floorlength_bedhead","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"fringetail","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"gelled","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"gentle","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"halfbang","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"halfbang2","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"halfshaved","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"hbraid","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"hedgehog","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"highfade","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"highponytail","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"himecut","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"himecut2","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"himeup","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"hitop","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"jade","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"jensen","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"joestar","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"kagami","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"keanu","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"kusanagi","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"largebun","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"lbangs","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"long","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"long2","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"long3","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"long_bedhead","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"longemo","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"longest","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"longest2","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"longfringe","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"longovereye","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"longsidepart","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"longstraightponytail","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"lowfade","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"manbun","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"medfade","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"megaeyebrows","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"messy","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"modern","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"mulder","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"nitori","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"nofade","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"odango","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"ombre","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"oneshoulder","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"oxton","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"part","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"parted","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"pigtails","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"pigtails2","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"pixie","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"pompadour","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"ponytail","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"ponytail2","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"ponytail3","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"ponytail4","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"ponytail5","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"ponytail6","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"ponytail7","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"poofy","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"protagonist","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"quiff","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"reversemohawk","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"ronin","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"rosa","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"sargeant","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"shaved","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"shavedmohawk","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"shavedpart","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"shortbangs","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"shortbraid","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"shorthair2","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"shorthair3","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"shorthairg","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"shorthime","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"shortovereye","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"sidecut","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"sidetail","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"sidetail2","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"sidetail3","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"sidetail4","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"skinhead","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"spikey","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"spiky","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"spiky2","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"spikyponytail","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"stail","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"swept","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"swept2","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"thinning","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"thinningfront","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"thinningrear","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"tightbun","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"topknot","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"tressshoulder","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"trimflat","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"trimmed","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"twintail","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"undercut","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"undercutleft","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"undercutright","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"unkept","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"unshaven_mohawk","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"updo","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"veryshortovereyealternate","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"vlong","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"vlongfringe","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"volaju","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"wisp","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"bald","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]}]} +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi , resprited by Alekshhh, a modified by potato1234x", + "license": "CC-BY-SA-3.0", + "states": [ + { + "name": "80s", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "a", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "afro", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "afro2", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "antenna", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "b", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "baldfade", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "bedhead", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "bedheadv2", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "bedheadv3", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "beehive", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "beehivev2", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "bigafro", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "bigflattop", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "bigpompadour", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "bob", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "bob2", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "bob4", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "bobcurl", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "bobcut", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "boddicker", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "bowlcut", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "bowlcut2", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "braid", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "braid2", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "braided", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "braidfront", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "braidtail", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "bun", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "bun3", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "bunhead2", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "business", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "business2", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "business3", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "business4", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "buzzcut", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "c", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "classicafro", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "classicbigafro", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "classiccia", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "classicfloorlength_bedhead", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "classicmodern", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "classicmulder", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "classicwisp", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "cia", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "coffeehouse", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "combover", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "cornrowbraid", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "cornrowbun", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "cornrows", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "cornrows2", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "cornrowtail", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "country", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "crewcut", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "curls", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "d", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "dandypompadour", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "devilock", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "doublebun", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "dreads", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "drillhair", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "drillhairextended", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "drillruru", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "e", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "emo", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "emo2", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "emofringe", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "f", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "father", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "feather", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "flair", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "floorlength_bedhead", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "fringetail", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "gelled", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "gentle", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "halfbang", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "halfbang2", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "halfshaved", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "hbraid", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "hedgehog", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "highfade", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "highponytail", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "himecut", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "himecut2", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "himeup", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "hitop", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "jade", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "jensen", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "joestar", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "kagami", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "keanu", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "kusanagi", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "largebun", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "lbangs", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "long", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "long2", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "long3", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "long_bedhead", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "longemo", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "longest", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "longest2", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "longfringe", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "longovereye", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "longsidepart", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "longstraightponytail", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "lowfade", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "manbun", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "medfade", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "megaeyebrows", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "messy", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "modern", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "mulder", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "nitori", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "nofade", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "odango", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "ombre", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "oneshoulder", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "oxton", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "part", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "parted", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "pigtails", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "pigtails2", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "pixie", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "pompadour", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "ponytail", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "ponytail2", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "ponytail3", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "ponytail4", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "ponytail5", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "ponytail6", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "ponytail7", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "poofy", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "protagonist", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "quiff", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "reversemohawk", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "ronin", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "rosa", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "sargeant", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "shaved", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "shavedmohawk", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "shavedpart", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "shortbangs", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "shortbraid", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "shorthair2", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "shorthair3", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "shorthairg", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "shorthime", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "shortovereye", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "sidecut", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "sidetail", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "sidetail2", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "sidetail3", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "sidetail4", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "skinhead", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "spikey", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "spiky", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "spiky2", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "spikyponytail", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "stail", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "swept", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "swept2", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "thinning", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "thinningfront", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "thinningrear", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "tightbun", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "topknot", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "tressshoulder", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "trimflat", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "trimmed", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "twintail", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "undercut", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "undercutleft", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "undercutright", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "unkept", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "unshaven_mohawk", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "updo", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "veryshortovereyealternate", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "vlong", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "vlongfringe", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "volaju", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "wisp", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "bald", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]} + ] + } \ No newline at end of file From 0c5f2153b15ba52a8b1701f99d2dfab812fa1204 Mon Sep 17 00:00:00 2001 From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Date: Wed, 27 Sep 2023 18:40:10 -0500 Subject: [PATCH 02/12] Added "Classic Gentle" --- .../Locale/en-US/deltav/accessories/hair.ftl | 1 + .../Mobs/Customization/Markings/human_hair.yml | 7 +++++++ .../human_hair.rsi/classicgentle.png | Bin 0 -> 370 bytes .../Mobs/Customization/human_hair.rsi/meta.json | 4 ++++ 4 files changed, 12 insertions(+) create mode 100644 Resources/Textures/Mobs/Customization/human_hair.rsi/classicgentle.png diff --git a/Resources/Locale/en-US/deltav/accessories/hair.ftl b/Resources/Locale/en-US/deltav/accessories/hair.ftl index 89bf06c8ed4..1316639c770 100644 --- a/Resources/Locale/en-US/deltav/accessories/hair.ftl +++ b/Resources/Locale/en-US/deltav/accessories/hair.ftl @@ -1 +1,2 @@ marking-HumanHairShortBedhead = Short Bedhead +mariking-HumanHairClassicGentle = Classic Gentle diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml index 106af0d6f52..f23f04d888f 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml @@ -299,6 +299,13 @@ sprites: - sprite: Mobs/Customization/human_hair.rsi state: classicfloorlength_bedhead +- type: marking + id: HumanHairClassicGentle #Delta V, classic hairstyle that was replaced + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: Mobs/Customization/human_hair.rsi + state: classicgentle - type: marking id: HumanHairClassicModern bodyPart: Hair diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/classicgentle.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/classicgentle.png new file mode 100644 index 0000000000000000000000000000000000000000..636636bffd157e1d7b7bc78e56d36c25d3b230a2 GIT binary patch literal 370 zcmV-&0ge8NP)UY%*@Qu(b3Y<(%s$N-rnAkMBnxR0004WQchC@no@pf^97rb37|Of9|GR;EJA zp`aH#vu_ci94vw}_Jk1Su%;JRd)Fe&R!r9P;_BE`NGm2ef@|6W>5j<)!8ubPEntB# zcRQ{#Tdtck8vU=AR3oVLoq($C86mS?BQ3qJH5ba)b&0g}XVr0$=&UZ0vLr`yp_p}N zB%LtODWtDk20osVl5b5wy>&=S|4QJdE|JotAP{vap-%$$3@HMd(dbY70H!8H@~0GB QNB{r;07*qoM6N<$g38gPssI20 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json index 1d1af38551f..b2d4a877195 100644 --- a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json @@ -171,6 +171,10 @@ "name": "classicfloorlength_bedhead", "directions": 4, "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "classicgentle", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, { "name": "classicmodern", "directions": 4, From fc25489d45a5670a79663460ee95966af39a0fe1 Mon Sep 17 00:00:00 2001 From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Date: Thu, 28 Sep 2023 10:15:00 -0500 Subject: [PATCH 03/12] Added Classic Fades Classic High fade is indistinguishable from High fade, at least to me it is. --- .../Locale/en-US/deltav/accessories/hair.ftl | 5 ++++- .../Customization/Markings/human_hair.yml | 21 ++++++++++++++++++ .../human_hair.rsi/classiclowfade.png | Bin 0 -> 274 bytes .../human_hair.rsi/classicmedfade.png | Bin 0 -> 195 bytes .../human_hair.rsi/classicnofade.png | Bin 0 -> 215 bytes 5 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Mobs/Customization/human_hair.rsi/classiclowfade.png create mode 100644 Resources/Textures/Mobs/Customization/human_hair.rsi/classicmedfade.png create mode 100644 Resources/Textures/Mobs/Customization/human_hair.rsi/classicnofade.png diff --git a/Resources/Locale/en-US/deltav/accessories/hair.ftl b/Resources/Locale/en-US/deltav/accessories/hair.ftl index 1316639c770..41de6535806 100644 --- a/Resources/Locale/en-US/deltav/accessories/hair.ftl +++ b/Resources/Locale/en-US/deltav/accessories/hair.ftl @@ -1,2 +1,5 @@ marking-HumanHairShortBedhead = Short Bedhead -mariking-HumanHairClassicGentle = Classic Gentle +marking-HumanHairClassicGentle = Classic Gentle +marking-HumanHairClassicNoFade = Classic Fade (None) +marking-HumanHairClassicLowFade = Classic Fade (Low) +marking-HumanHairClassicMedFade = Classic Fade (Medium) \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml index f23f04d888f..88c64f45df0 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml @@ -306,6 +306,20 @@ sprites: - sprite: Mobs/Customization/human_hair.rsi state: classicgentle +- type: marking + id: HumanHairClassicLowFade #Delta V, classic hairstyle that was replaced + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: Mobs/Customization/human_hair.rsi + state: classiclowfade +- type: marking + id: HumanHairClassicMedFade #Delta V, classic hairstyle that was replaced + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: Mobs/Customization/human_hair.rsi + state: classicmedfade - type: marking id: HumanHairClassicModern bodyPart: Hair @@ -320,6 +334,13 @@ sprites: - sprite: Mobs/Customization/human_hair.rsi state: classicmulder +- type: marking + id: HumanHairClassicNoFade #Delta V, classic hairstyle that was replaced + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: Mobs/Customization/human_hair.rsi + state: classicnofade - type: marking id: HumanHairClassicWisp bodyPart: Hair diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/classiclowfade.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/classiclowfade.png new file mode 100644 index 0000000000000000000000000000000000000000..0df2581594a436c4d285491a29fd125ececd9122 GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!yaRkfT!HkbPoGYnJbB~BjVDi@ zJbU)+`Sa(mUcEYX>eQJtXU?8Id;a|S%a<=-xpL+D_3O88-MW4I_Wk?!A3S*Q@ZrP9 zj~{>g_U-4-pTBUaV{@A2pnu`-dXY*-Js~0c2aXbuD9TzAQJI@BRKKUWY3l_{n9BmUN>`{g$I9Ht@J5a*}{BgQbeZF`q24$>^jt z#2mPB?~~H;OUuoqPcYXOhh5$3sleabUA83MQEtihG7-*J0Vj?=eu2s~jkNBVqaYW1 My85}Sb4q9e0N~Y8O8@`> literal 0 HcmV?d00001 From b2f59882014767fc0c32d1ef98de6a2f3cd2bd53 Mon Sep 17 00:00:00 2001 From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Date: Thu, 28 Sep 2023 10:18:36 -0500 Subject: [PATCH 04/12] Update meta.json :trollface: --- .../Mobs/Customization/human_hair.rsi/meta.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json index b2d4a877195..16ec5f3cbe3 100644 --- a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json @@ -175,6 +175,14 @@ "name": "classicgentle", "directions": 4, "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "classiclowfade", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "classicmedfade", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, { "name": "classicmodern", "directions": 4, @@ -183,6 +191,10 @@ "name": "classicmulder", "directions": 4, "delays":[[1.0],[1.0],[1.0],[1.0]]}, + { + "name": "classicnofade", + "directions": 4, + "delays":[[1.0],[1.0],[1.0],[1.0]]}, { "name": "classicwisp", "directions": 4, From 9c692f3dc168bff3142027115a0b21ad8b1418eb Mon Sep 17 00:00:00 2001 From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Date: Tue, 24 Oct 2023 08:12:48 -0500 Subject: [PATCH 05/12] Moved the hair over there Moved the added hairstyles to Delta directory --- .../Mobs/Customization/Markings/hair.yml | 32 +++++++++++++++++++ .../Customization/Markings/human_hair.yml | 28 ---------------- 2 files changed, 32 insertions(+), 28 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml index 11a2cf8f6cc..7953390c2c5 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml @@ -21,3 +21,35 @@ sprites: - sprite: DeltaV/Mobs/Customization/hair.rsi state: messyclassic + +- type: marking + id: HumanHairClassicNoFade + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: Mobs/Customization/human_hair.rsi + state: classicnofade + +- type: marking + id: HumanHairClassicGentle + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: Mobs/Customization/human_hair.rsi + state: classicgentle + +- type: marking + id: HumanHairClassicLowFade + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: Mobs/Customization/human_hair.rsi + state: classiclowfade + +- type: marking + id: HumanHairClassicMedFade + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: Mobs/Customization/human_hair.rsi + state: classicmedfade \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml index 9a595690a7b..14e51a84062 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml @@ -299,27 +299,6 @@ sprites: - sprite: Mobs/Customization/human_hair.rsi state: classicfloorlength_bedhead -- type: marking - id: HumanHairClassicGentle #Delta V, classic hairstyle that was replaced - bodyPart: Hair - markingCategory: Hair - sprites: - - sprite: Mobs/Customization/human_hair.rsi - state: classicgentle -- type: marking - id: HumanHairClassicLowFade #Delta V, classic hairstyle that was replaced - bodyPart: Hair - markingCategory: Hair - sprites: - - sprite: Mobs/Customization/human_hair.rsi - state: classiclowfade -- type: marking - id: HumanHairClassicMedFade #Delta V, classic hairstyle that was replaced - bodyPart: Hair - markingCategory: Hair - sprites: - - sprite: Mobs/Customization/human_hair.rsi - state: classicmedfade - type: marking id: HumanHairClassicModern bodyPart: Hair @@ -334,13 +313,6 @@ sprites: - sprite: Mobs/Customization/human_hair.rsi state: classicmulder -- type: marking - id: HumanHairClassicNoFade #Delta V, classic hairstyle that was replaced - bodyPart: Hair - markingCategory: Hair - sprites: - - sprite: Mobs/Customization/human_hair.rsi - state: classicnofade - type: marking id: HumanHairClassicWisp bodyPart: Hair From 2f844d3c44a9f97dcc6ef9ccca10e536e4e82b5e Mon Sep 17 00:00:00 2001 From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Date: Tue, 24 Oct 2023 08:13:38 -0500 Subject: [PATCH 06/12] Update hair.yml whitespace :trollface: --- .../DeltaV/Entities/Mobs/Customization/Markings/hair.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml index 7953390c2c5..296924fb511 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml @@ -52,4 +52,4 @@ markingCategory: Hair sprites: - sprite: Mobs/Customization/human_hair.rsi - state: classicmedfade \ No newline at end of file + state: classicmedfade From 1c340bed04795402901f7f4bd34a89b87347853d Mon Sep 17 00:00:00 2001 From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Date: Tue, 24 Oct 2023 08:14:36 -0500 Subject: [PATCH 07/12] Update meta.json untouched the file Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> From e45bb79546595063a930165c7828d678dd701c30 Mon Sep 17 00:00:00 2001 From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Date: Tue, 24 Oct 2023 08:16:00 -0500 Subject: [PATCH 08/12] Update meta.json why didn't it do this last commit grrr aaah --- Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json index 14f2daa43e3..9b7d68a1671 100644 --- a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json @@ -744,4 +744,4 @@ "directions": 4 } ] - } + } \ No newline at end of file From 6d568298cba63b6f6c850e7d840a4e667ad84fd4 Mon Sep 17 00:00:00 2001 From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Date: Tue, 24 Oct 2023 08:21:27 -0500 Subject: [PATCH 09/12] Take the hair you wanna wear Fully removed the added hairstyles from any upstream files. --- .../Customization/hair.rsi}/classicgentle.png | Bin .../Customization/hair.rsi}/classiclowfade.png | Bin .../Customization/hair.rsi}/classicmedfade.png | Bin .../Customization/hair.rsi}/classicnofade.png | Bin .../Mobs/Customization/hair.rsi/meta.json | 16 ++++++++++++++++ 5 files changed, 16 insertions(+) rename Resources/Textures/{Mobs/Customization/human_hair.rsi => DeltaV/Mobs/Customization/hair.rsi}/classicgentle.png (100%) rename Resources/Textures/{Mobs/Customization/human_hair.rsi => DeltaV/Mobs/Customization/hair.rsi}/classiclowfade.png (100%) rename Resources/Textures/{Mobs/Customization/human_hair.rsi => DeltaV/Mobs/Customization/hair.rsi}/classicmedfade.png (100%) rename Resources/Textures/{Mobs/Customization/human_hair.rsi => DeltaV/Mobs/Customization/hair.rsi}/classicnofade.png (100%) diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/classicgentle.png b/Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/classicgentle.png similarity index 100% rename from Resources/Textures/Mobs/Customization/human_hair.rsi/classicgentle.png rename to Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/classicgentle.png diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/classiclowfade.png b/Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/classiclowfade.png similarity index 100% rename from Resources/Textures/Mobs/Customization/human_hair.rsi/classiclowfade.png rename to Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/classiclowfade.png diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/classicmedfade.png b/Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/classicmedfade.png similarity index 100% rename from Resources/Textures/Mobs/Customization/human_hair.rsi/classicmedfade.png rename to Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/classicmedfade.png diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/classicnofade.png b/Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/classicnofade.png similarity index 100% rename from Resources/Textures/Mobs/Customization/human_hair.rsi/classicnofade.png rename to Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/classicnofade.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/meta.json index ed05be64b07..2dd7ba0d108 100644 --- a/Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/meta.json +++ b/Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/meta.json @@ -15,6 +15,22 @@ { "name":"messyclassic", "directions":4 + }, + { + "name":"classicgentle", + "directions": 4 + }, + { + "name":"classiclowfade", + "directions": 4 + }, + { + "name":"classicmedfade", + "directions": 4 + }, + { + "name":"classicnofade", + "directions": 4 } ] } From bfe291e234d2313fb20fa1bbe54fb69b1e7dc946 Mon Sep 17 00:00:00 2001 From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Date: Tue, 24 Oct 2023 08:28:05 -0500 Subject: [PATCH 10/12] Update hair.yml lol --- .../DeltaV/Entities/Mobs/Customization/Markings/hair.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml index 296924fb511..31ae01b6211 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml @@ -27,7 +27,7 @@ bodyPart: Hair markingCategory: Hair sprites: - - sprite: Mobs/Customization/human_hair.rsi + - sprite: DeltaV/Mobs/Customization/hair.rsi state: classicnofade - type: marking @@ -35,7 +35,7 @@ bodyPart: Hair markingCategory: Hair sprites: - - sprite: Mobs/Customization/human_hair.rsi + - sprite: DeltaV/Mobs/Customization/hair.rsi state: classicgentle - type: marking @@ -43,7 +43,7 @@ bodyPart: Hair markingCategory: Hair sprites: - - sprite: Mobs/Customization/human_hair.rsi + - sprite: DeltaV/Mobs/Customization/hair.rsi state: classiclowfade - type: marking @@ -51,5 +51,5 @@ bodyPart: Hair markingCategory: Hair sprites: - - sprite: Mobs/Customization/human_hair.rsi + - sprite: DeltaV/Mobs/Customization/hair.rsi state: classicmedfade From a5bdea0589a56d8210c5b58ee217b4d82f47fb6f Mon Sep 17 00:00:00 2001 From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Date: Tue, 24 Oct 2023 09:18:25 -0500 Subject: [PATCH 11/12] Update hair.ftl per floofy review Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> --- Resources/Locale/en-US/deltav/accessories/hair.ftl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/en-US/deltav/accessories/hair.ftl b/Resources/Locale/en-US/deltav/accessories/hair.ftl index e0885eae154..0cef9c15680 100644 --- a/Resources/Locale/en-US/deltav/accessories/hair.ftl +++ b/Resources/Locale/en-US/deltav/accessories/hair.ftl @@ -1,7 +1,7 @@ marking-HumanHairShortBedhead = Short Bedhead marking-HumanHairBobClassic = Bob Hair Classic marking-HumanHairMessyClassic = Messy Classic -marking-HumanHairClassicGentle = Classic Gentle -marking-HumanHairClassicNoFade = Classic Fade (None) -marking-HumanHairClassicLowFade = Classic Fade (Low) -marking-HumanHairClassicMedFade = Classic Fade (Medium) +marking-HumanHairClassicGentle = Gentle Classic +marking-HumanHairClassicNoFade = Fade (Classic, None) +marking-HumanHairClassicLowFade = Fade (Classic, Low) +marking-HumanHairClassicMedFade = Fade (Classic, Medium) From ac379dd4661665c988ce5422c839317030f45270 Mon Sep 17 00:00:00 2001 From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Date: Tue, 24 Oct 2023 09:27:05 -0500 Subject: [PATCH 12/12] Update hair.ftl --- Resources/Locale/en-US/deltav/accessories/hair.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/en-US/deltav/accessories/hair.ftl b/Resources/Locale/en-US/deltav/accessories/hair.ftl index 0cef9c15680..f41a5399699 100644 --- a/Resources/Locale/en-US/deltav/accessories/hair.ftl +++ b/Resources/Locale/en-US/deltav/accessories/hair.ftl @@ -2,6 +2,6 @@ marking-HumanHairShortBedhead = Short Bedhead marking-HumanHairBobClassic = Bob Hair Classic marking-HumanHairMessyClassic = Messy Classic marking-HumanHairClassicGentle = Gentle Classic -marking-HumanHairClassicNoFade = Fade (Classic, None) -marking-HumanHairClassicLowFade = Fade (Classic, Low) -marking-HumanHairClassicMedFade = Fade (Classic, Medium) +marking-HumanHairClassicNoFade = Fade (None, Classic) +marking-HumanHairClassicLowFade = Fade (Low, Classic) +marking-HumanHairClassicMedFade = Fade (Medium. Classic)