From 7b98f37f9a32b33a0a3d9ff05158cf98d975cda6 Mon Sep 17 00:00:00 2001 From: Swept Date: Sun, 21 Jun 2020 20:02:18 +0000 Subject: [PATCH] Adds neck UI slot and rearranges inventory UI. (#1130) * UI Icon * It worked? * Reorganized UI * converted the bedsheet/cloak sprites * backpacks go over cloaks now * Added a couple more neck clothing * Milk Ape --- .../HumanInventoryInterfaceController.cs | 33 +- .../Inventory/EquipmentSlotDefinitions.cs | 27 +- .../Inventory/InventoryTemplates.cs | 16 +- .../Entities/Items/Clothing/cloaks.yml | 17 +- .../Entities/Items/Clothing/neck.yml | 134 ++++++ .../Entities/Items/Consumables/food.yml | 19 + .../Prototypes/Entities/Items/bedsheets.yml | 118 +++--- Resources/Prototypes/Entities/Mobs/human.yml | 2 + ...ACKPACK.png => capcloak-equipped-NECK.png} | Bin ...BACKPACK.png => cecloak-equipped-NECK.png} | Bin ...ACKPACK.png => cmocloak-equipped-NECK.png} | Bin .../cloak.rsi/heraldcloak-equipped-NECK.png | Bin 0 -> 1199 bytes .../Clothing/cloak.rsi/heraldcloak.png | Bin 0 -> 273 bytes ...ACKPACK.png => hopcloak-equipped-NECK.png} | Bin ...ACKPACK.png => hoscloak-equipped-NECK.png} | Bin .../Textures/Clothing/cloak.rsi/meta.json | 41 +- ...BACKPACK.png => qmcloak-equipped-NECK.png} | Bin ...BACKPACK.png => rdcloak-equipped-NECK.png} | Bin .../Clothing/neck.rsi/bling-equipped-NECK.png | Bin 0 -> 519 bytes .../Textures/Clothing/neck.rsi/bling.png | Bin 0 -> 194 bytes .../neck.rsi/dettie-equipped-NECK.png | Bin 0 -> 169 bytes .../Textures/Clothing/neck.rsi/dettie.png | Bin 0 -> 215 bytes .../neck.rsi/headphones_off-equipped-NECK.png | Bin 0 -> 273 bytes .../Clothing/neck.rsi/headphones_off.png | Bin 0 -> 176 bytes .../neck.rsi/headphones_on-equipped-NECK.png | Bin 0 -> 1425 bytes .../neck.rsi/headphones_on-inhand-left.png | Bin 0 -> 329 bytes .../neck.rsi/headphones_on-inhand-right.png | Bin 0 -> 329 bytes .../Clothing/neck.rsi/headphones_on.png | Bin 0 -> 176 bytes .../Clothing/{back.rsi => neck.rsi}/meta.json | 388 ++++++++++++++++-- .../neck.rsi/redtie-equipped-NECK.png | Bin 0 -> 155 bytes .../Textures/Clothing/neck.rsi/redtie.png | Bin 0 -> 232 bytes .../sheetNT-equipped-NECK.png} | Bin .../sheetNT-inhand-left.png | Bin .../sheetNT-inhand-right.png | Bin .../sheetUSA-equipped-NECK.png} | Bin .../sheetUSA-inhand-left.png | Bin .../sheetUSA-inhand-right.png | Bin .../sheetblack-equipped-NECK.png} | Bin .../sheetblack-inhand-left.png | Bin .../sheetblack-inhand-right.png | Bin .../sheetblue-equipped-NECK.png} | Bin .../sheetblue-inhand-left.png | Bin .../sheetblue-inhand-right.png | Bin .../sheetbrown-equipped-NECK.png} | Bin .../sheetbrown-inhand-left.png | Bin .../sheetbrown-inhand-right.png | Bin .../sheetcaptain-equipped-NECK.png} | Bin .../sheetcaptain-inhand-left.png | Bin .../sheetcaptain-inhand-right.png | Bin .../sheetce-equipped-NECK.png} | Bin .../sheetce-inhand-left.png | Bin .../sheetce-inhand-right.png | Bin .../sheetcentcom-equipped-NECK.png} | Bin .../sheetcentcom-inhand-left.png | Bin .../sheetcentcom-inhand-right.png | Bin .../sheetclown-equipped-NECK.png} | Bin .../sheetcmo-equipped-NECK.png} | Bin .../sheetcmo-inhand-left.png | Bin .../sheetcmo-inhand-right.png | Bin .../sheetcosmos-equipped-NECK.png} | Bin .../sheetcosmos-inhand-left.png | Bin .../sheetcosmos-inhand-right.png | Bin .../sheetcult-equipped-NECK.png} | Bin .../sheetcult-inhand-left.png | Bin .../sheetcult-inhand-right.png | Bin .../sheetgreen-equipped-NECK.png} | Bin .../sheetgreen-inhand-left.png | Bin .../sheetgreen-inhand-right.png | Bin .../sheetgrey-equipped-NECK.png} | Bin .../sheetgrey-inhand-left.png | Bin .../sheetgrey-inhand-right.png | Bin .../sheethop-equipped-NECK.png} | Bin .../sheethop-inhand-left.png | Bin .../sheethop-inhand-right.png | Bin .../sheethos-equipped-NECK.png} | Bin .../sheethos-inhand-left.png | Bin .../sheethos-inhand-right.png | Bin .../sheetian-equipped-NECK.png} | Bin .../sheetian-inhand-left.png | Bin .../sheetian-inhand-right.png | Bin .../sheetmedical-equipped-NECK.png} | Bin .../sheetmedical-inhand-left.png | Bin .../sheetmedical-inhand-right.png | Bin .../sheetmime-equipped-NECK.png} | Bin .../sheetmime-inhand-left.png | Bin .../sheetmime-inhand-right.png | Bin .../sheetorange-equipped-NECK.png} | Bin .../sheetorange-inhand-left.png | Bin .../sheetorange-inhand-right.png | Bin .../sheetpurple-equipped-NECK.png} | Bin .../sheetpurple-inhand-left.png | Bin .../sheetpurple-inhand-right.png | Bin .../sheetqm-equipped-NECK.png} | Bin .../sheetqm-inhand-left.png | Bin .../sheetqm-inhand-right.png | Bin .../sheetrainbow-equipped-NECK.png} | Bin .../sheetrainbow-inhand-left.png | Bin .../sheetrainbow-inhand-right.png | Bin .../sheetrd-equipped-NECK.png} | Bin .../sheetrd-inhand-left.png | Bin .../sheetrd-inhand-right.png | Bin .../sheetred-equipped-NECK.png} | Bin .../sheetred-inhand-left.png | Bin .../sheetred-inhand-right.png | Bin .../sheetsyndie-equipped-NECK.png} | Bin .../sheetsyndie-inhand-left.png | Bin .../sheetsyndie-inhand-right.png | Bin .../sheetwhite-equipped-NECK.png} | Bin .../sheetwhite-inhand-left.png | Bin .../sheetwhite-inhand-right.png | Bin .../sheetwiz-equipped-NECK.png} | Bin .../sheetwiz-inhand-left.png | Bin .../sheetwiz-inhand-right.png | Bin .../sheetyellow-equipped-NECK.png} | Bin .../sheetyellow-inhand-left.png | Bin .../sheetyellow-inhand-right.png | Bin .../neck.rsi/stethoscope-equipped-NECK.png | Bin 0 -> 272 bytes .../Clothing/neck.rsi/stethoscope.png | Bin 0 -> 271 bytes .../stripedbluescarf-equipped-NECK.png | Bin 0 -> 662 bytes .../Clothing/neck.rsi/stripedbluescarf.png | Bin 0 -> 320 bytes .../stripedgreenscarf-equipped-NECK.png | Bin 0 -> 660 bytes .../Clothing/neck.rsi/stripedgreenscarf.png | Bin 0 -> 320 bytes .../stripedredscarf-equipped-NECK.png | Bin 0 -> 677 bytes .../Clothing/neck.rsi/stripedredscarf.png | Bin 0 -> 320 bytes .../neck.rsi/zebrascarf-equipped-NECK.png | Bin 0 -> 349 bytes .../Textures/Clothing/neck.rsi/zebrascarf.png | Bin 0 -> 249 bytes .../Objects/Food/milkape.rsi/icon.png | Bin 0 -> 751 bytes .../Objects/Food/milkape.rsi/meta.json | 1 + .../Textures/UserInterface/Inventory/neck.png | Bin 0 -> 846 bytes 129 files changed, 662 insertions(+), 134 deletions(-) create mode 100644 Resources/Prototypes/Entities/Items/Clothing/neck.yml rename Resources/Textures/Clothing/cloak.rsi/{capcloak-equipped-BACKPACK.png => capcloak-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/cloak.rsi/{cecloak-equipped-BACKPACK.png => cecloak-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/cloak.rsi/{cmocloak-equipped-BACKPACK.png => cmocloak-equipped-NECK.png} (100%) create mode 100644 Resources/Textures/Clothing/cloak.rsi/heraldcloak-equipped-NECK.png create mode 100644 Resources/Textures/Clothing/cloak.rsi/heraldcloak.png rename Resources/Textures/Clothing/cloak.rsi/{hopcloak-equipped-BACKPACK.png => hopcloak-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/cloak.rsi/{hoscloak-equipped-BACKPACK.png => hoscloak-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/cloak.rsi/{qmcloak-equipped-BACKPACK.png => qmcloak-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/cloak.rsi/{rdcloak-equipped-BACKPACK.png => rdcloak-equipped-NECK.png} (100%) create mode 100644 Resources/Textures/Clothing/neck.rsi/bling-equipped-NECK.png create mode 100644 Resources/Textures/Clothing/neck.rsi/bling.png create mode 100644 Resources/Textures/Clothing/neck.rsi/dettie-equipped-NECK.png create mode 100644 Resources/Textures/Clothing/neck.rsi/dettie.png create mode 100644 Resources/Textures/Clothing/neck.rsi/headphones_off-equipped-NECK.png create mode 100644 Resources/Textures/Clothing/neck.rsi/headphones_off.png create mode 100644 Resources/Textures/Clothing/neck.rsi/headphones_on-equipped-NECK.png create mode 100644 Resources/Textures/Clothing/neck.rsi/headphones_on-inhand-left.png create mode 100644 Resources/Textures/Clothing/neck.rsi/headphones_on-inhand-right.png create mode 100644 Resources/Textures/Clothing/neck.rsi/headphones_on.png rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/meta.json (77%) create mode 100644 Resources/Textures/Clothing/neck.rsi/redtie-equipped-NECK.png create mode 100644 Resources/Textures/Clothing/neck.rsi/redtie.png rename Resources/Textures/Clothing/{back.rsi/sheetNT-equipped-BACKPACK.png => neck.rsi/sheetNT-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetNT-inhand-left.png (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetNT-inhand-right.png (100%) rename Resources/Textures/Clothing/{back.rsi/sheetUSA-equipped-BACKPACK.png => neck.rsi/sheetUSA-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetUSA-inhand-left.png (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetUSA-inhand-right.png (100%) rename Resources/Textures/Clothing/{back.rsi/sheetblack-equipped-BACKPACK.png => neck.rsi/sheetblack-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetblack-inhand-left.png (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetblack-inhand-right.png (100%) rename Resources/Textures/Clothing/{back.rsi/sheetblue-equipped-BACKPACK.png => neck.rsi/sheetblue-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetblue-inhand-left.png (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetblue-inhand-right.png (100%) rename Resources/Textures/Clothing/{back.rsi/sheetbrown-equipped-BACKPACK.png => neck.rsi/sheetbrown-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetbrown-inhand-left.png (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetbrown-inhand-right.png (100%) rename Resources/Textures/Clothing/{back.rsi/sheetcaptain-equipped-BACKPACK.png => neck.rsi/sheetcaptain-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetcaptain-inhand-left.png (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetcaptain-inhand-right.png (100%) rename Resources/Textures/Clothing/{back.rsi/sheetce-equipped-BACKPACK.png => neck.rsi/sheetce-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetce-inhand-left.png (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetce-inhand-right.png (100%) rename Resources/Textures/Clothing/{back.rsi/sheetcentcom-equipped-BACKPACK.png => neck.rsi/sheetcentcom-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetcentcom-inhand-left.png (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetcentcom-inhand-right.png (100%) rename Resources/Textures/Clothing/{back.rsi/sheetclown-equipped-BACKPACK.png => neck.rsi/sheetclown-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/{back.rsi/sheetcmo-equipped-BACKPACK.png => neck.rsi/sheetcmo-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetcmo-inhand-left.png (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetcmo-inhand-right.png (100%) rename Resources/Textures/Clothing/{back.rsi/sheetcosmos-equipped-BACKPACK.png => neck.rsi/sheetcosmos-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetcosmos-inhand-left.png (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetcosmos-inhand-right.png (100%) rename Resources/Textures/Clothing/{back.rsi/sheetcult-equipped-BACKPACK.png => neck.rsi/sheetcult-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetcult-inhand-left.png (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetcult-inhand-right.png (100%) rename Resources/Textures/Clothing/{back.rsi/sheetgreen-equipped-BACKPACK.png => neck.rsi/sheetgreen-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetgreen-inhand-left.png (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetgreen-inhand-right.png (100%) rename Resources/Textures/Clothing/{back.rsi/sheetgrey-equipped-BACKPACK.png => neck.rsi/sheetgrey-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetgrey-inhand-left.png (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetgrey-inhand-right.png (100%) rename Resources/Textures/Clothing/{back.rsi/sheethop-equipped-BACKPACK.png => neck.rsi/sheethop-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheethop-inhand-left.png (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheethop-inhand-right.png (100%) rename Resources/Textures/Clothing/{back.rsi/sheethos-equipped-BACKPACK.png => neck.rsi/sheethos-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheethos-inhand-left.png (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheethos-inhand-right.png (100%) rename Resources/Textures/Clothing/{back.rsi/sheetian-equipped-BACKPACK.png => neck.rsi/sheetian-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetian-inhand-left.png (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetian-inhand-right.png (100%) rename Resources/Textures/Clothing/{back.rsi/sheetmedical-equipped-BACKPACK.png => neck.rsi/sheetmedical-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetmedical-inhand-left.png (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetmedical-inhand-right.png (100%) rename Resources/Textures/Clothing/{back.rsi/sheetmime-equipped-BACKPACK.png => neck.rsi/sheetmime-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetmime-inhand-left.png (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetmime-inhand-right.png (100%) rename Resources/Textures/Clothing/{back.rsi/sheetorange-equipped-BACKPACK.png => neck.rsi/sheetorange-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetorange-inhand-left.png (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetorange-inhand-right.png (100%) rename Resources/Textures/Clothing/{back.rsi/sheetpurple-equipped-BACKPACK.png => neck.rsi/sheetpurple-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetpurple-inhand-left.png (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetpurple-inhand-right.png (100%) rename Resources/Textures/Clothing/{back.rsi/sheetqm-equipped-BACKPACK.png => neck.rsi/sheetqm-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetqm-inhand-left.png (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetqm-inhand-right.png (100%) rename Resources/Textures/Clothing/{back.rsi/sheetrainbow-equipped-BACKPACK.png => neck.rsi/sheetrainbow-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetrainbow-inhand-left.png (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetrainbow-inhand-right.png (100%) rename Resources/Textures/Clothing/{back.rsi/sheetrd-equipped-BACKPACK.png => neck.rsi/sheetrd-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetrd-inhand-left.png (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetrd-inhand-right.png (100%) rename Resources/Textures/Clothing/{back.rsi/sheetred-equipped-BACKPACK.png => neck.rsi/sheetred-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetred-inhand-left.png (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetred-inhand-right.png (100%) rename Resources/Textures/Clothing/{back.rsi/sheetsyndie-equipped-BACKPACK.png => neck.rsi/sheetsyndie-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetsyndie-inhand-left.png (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetsyndie-inhand-right.png (100%) rename Resources/Textures/Clothing/{back.rsi/sheetwhite-equipped-BACKPACK.png => neck.rsi/sheetwhite-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetwhite-inhand-left.png (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetwhite-inhand-right.png (100%) rename Resources/Textures/Clothing/{back.rsi/sheetwiz-equipped-BACKPACK.png => neck.rsi/sheetwiz-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetwiz-inhand-left.png (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetwiz-inhand-right.png (100%) rename Resources/Textures/Clothing/{back.rsi/sheetyellow-equipped-BACKPACK.png => neck.rsi/sheetyellow-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetyellow-inhand-left.png (100%) rename Resources/Textures/Clothing/{back.rsi => neck.rsi}/sheetyellow-inhand-right.png (100%) create mode 100644 Resources/Textures/Clothing/neck.rsi/stethoscope-equipped-NECK.png create mode 100644 Resources/Textures/Clothing/neck.rsi/stethoscope.png create mode 100644 Resources/Textures/Clothing/neck.rsi/stripedbluescarf-equipped-NECK.png create mode 100644 Resources/Textures/Clothing/neck.rsi/stripedbluescarf.png create mode 100644 Resources/Textures/Clothing/neck.rsi/stripedgreenscarf-equipped-NECK.png create mode 100644 Resources/Textures/Clothing/neck.rsi/stripedgreenscarf.png create mode 100644 Resources/Textures/Clothing/neck.rsi/stripedredscarf-equipped-NECK.png create mode 100644 Resources/Textures/Clothing/neck.rsi/stripedredscarf.png create mode 100644 Resources/Textures/Clothing/neck.rsi/zebrascarf-equipped-NECK.png create mode 100644 Resources/Textures/Clothing/neck.rsi/zebrascarf.png create mode 100644 Resources/Textures/Objects/Food/milkape.rsi/icon.png create mode 100644 Resources/Textures/Objects/Food/milkape.rsi/meta.json create mode 100644 Resources/Textures/UserInterface/Inventory/neck.png diff --git a/Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs b/Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs index 2410ca7c26..92085c56bf 100644 --- a/Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs +++ b/Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs @@ -203,31 +203,30 @@ namespace Content.Client.GameObjects buttonDict.Add(slot, button); } - const int size = ButtonSize; - const int sep = ButtonSeparation; - const int rSep = RightSeparation; + const int sizep = (ButtonSize + ButtonSeparation); // Left column. - AddButton(Slots.EYES, "glasses", (0, size + sep)); - AddButton(Slots.INNERCLOTHING, "uniform", (0, 2 * (size + sep))); - AddButton(Slots.EXOSUITSLOT1, "suit_storage", (0, 3 * (size + sep))); + AddButton(Slots.EYES, "glasses", (0, 0)); + AddButton(Slots.NECK, "neck", (0, sizep)); + AddButton(Slots.INNERCLOTHING, "uniform", (0, 2 * sizep)); // Middle column. - AddButton(Slots.HEAD, "head", (size + sep, 0)); - AddButton(Slots.MASK, "mask", (size + sep, size + sep)); - AddButton(Slots.OUTERCLOTHING, "suit", (size + sep, 2 * (size + sep))); - AddButton(Slots.SHOES, "shoes", (size + sep, 3 * (size + sep))); + AddButton(Slots.HEAD, "head", (sizep, 0)); + AddButton(Slots.MASK, "mask", (sizep, sizep)); + AddButton(Slots.OUTERCLOTHING, "suit", (sizep, 2 * sizep)); + AddButton(Slots.SHOES, "shoes", (sizep, 3 * sizep)); // Right column - AddButton(Slots.EARS, "ears", (2 * (size + sep), 0)); - AddButton(Slots.IDCARD, "id", (2 * (size + sep), size + sep)); - AddButton(Slots.GLOVES, "gloves", (2 * (size + sep), 2 * (size + sep))); + AddButton(Slots.EARS, "ears", (2 * sizep, 0)); + AddButton(Slots.IDCARD, "id", (2 * sizep, sizep)); + AddButton(Slots.EXOSUITSLOT1, "suit_storage", (2 * sizep, 2 * sizep)); + AddButton(Slots.POCKET1, "pocket", (2 * sizep, 3 * sizep)); // Far right column. - AddButton(Slots.BACKPACK, "back", (rSep + 3 * (size + sep), 0)); - AddButton(Slots.BELT, "belt", (rSep + 3 * (size + sep), size + sep)); - AddButton(Slots.POCKET1, "pocket", (rSep + 3 * (size + sep), 2 * (size + sep))); - AddButton(Slots.POCKET2, "pocket", (rSep + 3 * (size + sep), 3 * (size + sep))); + AddButton(Slots.BACKPACK, "back", (3 * sizep, 0)); + AddButton(Slots.BELT, "belt", (3 * sizep, sizep)); + AddButton(Slots.GLOVES, "gloves", (3 * sizep, 2 * sizep)); + AddButton(Slots.POCKET2, "pocket", (3 * sizep, 3 * sizep)); } } } diff --git a/Content.Shared/GameObjects/Components/Inventory/EquipmentSlotDefinitions.cs b/Content.Shared/GameObjects/Components/Inventory/EquipmentSlotDefinitions.cs index 294e796c87..2c7dd1d282 100644 --- a/Content.Shared/GameObjects/Components/Inventory/EquipmentSlotDefinitions.cs +++ b/Content.Shared/GameObjects/Components/Inventory/EquipmentSlotDefinitions.cs @@ -35,6 +35,7 @@ namespace Content.Shared.GameObjects.Components.Inventory MASK, OUTERCLOTHING, INNERCLOTHING, + NECK, BACKPACK, BELT, GLOVES, @@ -69,17 +70,18 @@ namespace Content.Shared.GameObjects.Components.Inventory MASK = 1 << 4, OUTERCLOTHING = 1 << 5, INNERCLOTHING = 1 << 6, - BACK = 1 << 7, - BACKPACK = 1 << 7, - BELT = 1 << 8, - GLOVES = 1 << 9, - HAND = 1 << 9, - IDCARD = 1 << 10, - POCKET = 1 << 11, - LEGS = 1 << 12, - SHOES = 1 << 13, - FEET = 1 << 13, - EXOSUITSTORAGE = 1 << 14 + NECK = 1 << 7, + BACK = 1 << 8, + BACKPACK = 1 << 8, + BELT = 1 << 9, + GLOVES = 1 << 10, + HAND = 1 << 10, + IDCARD = 1 << 11, + POCKET = 1 << 12, + LEGS = 1 << 13, + SHOES = 1 << 14, + FEET = 1 << 14, + EXOSUITSTORAGE = 1 << 15 } public static readonly IReadOnlyDictionary SlotNames = new Dictionary() @@ -90,6 +92,7 @@ namespace Content.Shared.GameObjects.Components.Inventory {Slots.MASK, "Mask"}, {Slots.OUTERCLOTHING, "Outer Clothing"}, {Slots.INNERCLOTHING, "Inner Clothing"}, + {Slots.NECK, "Neck"}, {Slots.BACKPACK, "Backpack"}, {Slots.BELT, "Belt"}, {Slots.GLOVES, "Gloves"}, @@ -117,6 +120,7 @@ namespace Content.Shared.GameObjects.Components.Inventory {Slots.MASK, SlotFlags.MASK}, {Slots.OUTERCLOTHING, SlotFlags.OUTERCLOTHING}, {Slots.INNERCLOTHING, SlotFlags.INNERCLOTHING}, + {Slots.NECK, SlotFlags.NECK}, {Slots.BACKPACK, SlotFlags.BACK}, {Slots.BELT, SlotFlags.BELT}, {Slots.GLOVES, SlotFlags.GLOVES}, @@ -140,6 +144,7 @@ namespace Content.Shared.GameObjects.Components.Inventory "Inventory_MASK", "Inventory_OUTERCLOTHING", "Inventory_INNERCLOTHING", + "Inventory_NECK", "Inventory_BACKPACK", "Inventory_BELT", "Inventory_GLOVES", diff --git a/Content.Shared/GameObjects/Components/Inventory/InventoryTemplates.cs b/Content.Shared/GameObjects/Components/Inventory/InventoryTemplates.cs index 32ef2ea30e..0415814b41 100644 --- a/Content.Shared/GameObjects/Components/Inventory/InventoryTemplates.cs +++ b/Content.Shared/GameObjects/Components/Inventory/InventoryTemplates.cs @@ -28,11 +28,12 @@ namespace Content.Shared.GameObjects private static readonly Dictionary _slotDrawingOrder = new Dictionary { - {Slots.POCKET1, 12}, - {Slots.POCKET2, 11}, - {Slots.HEAD, 10}, - {Slots.MASK, 9}, - {Slots.EARS, 8}, + {Slots.POCKET1, 13}, + {Slots.POCKET2, 12}, + {Slots.HEAD, 11}, + {Slots.MASK, 10}, + {Slots.EARS, 9}, + {Slots.NECK, 8}, {Slots.BACKPACK, 7}, {Slots.EYES, 6}, {Slots.OUTERCLOTHING, 5}, @@ -46,9 +47,10 @@ namespace Content.Shared.GameObjects public override IReadOnlyList SlotMasks { get; } = new List() { Slots.EYES, Slots.HEAD, Slots.EARS, - Slots.OUTERCLOTHING, Slots.MASK, Slots.INNERCLOTHING, + Slots.OUTERCLOTHING, Slots.MASK, Slots.INNERCLOTHING, Slots.BACKPACK, Slots.BELT, Slots.GLOVES, - Slots.NONE, Slots.SHOES, Slots.IDCARD, Slots.POCKET1, Slots.POCKET2 + Slots.NONE, Slots.SHOES, Slots.IDCARD, Slots.POCKET1, Slots.POCKET2, + Slots.NECK }; public override int SlotDrawingOrder(Slots slot) diff --git a/Resources/Prototypes/Entities/Items/Clothing/cloaks.yml b/Resources/Prototypes/Entities/Items/Clothing/cloaks.yml index 1a6237eefc..e018c59139 100644 --- a/Resources/Prototypes/Entities/Items/Clothing/cloaks.yml +++ b/Resources/Prototypes/Entities/Items/Clothing/cloaks.yml @@ -13,7 +13,7 @@ Size: 10 QuickEquip: true Slots: - - back + - neck sprite: Clothing/cloak.rsi - type: entity @@ -42,7 +42,6 @@ - type: Clothing HeldPrefix: hoscloak - - type: entity parent: CloakClothing id: CeCloak @@ -55,7 +54,6 @@ - type: Clothing HeldPrefix: cecloak - - type: entity parent: CloakClothing id: CmoCloak @@ -80,7 +78,6 @@ - type: Clothing HeldPrefix: rdcloak - - type: entity parent: CloakClothing id: QmCloak @@ -104,3 +101,15 @@ state: hopcloak - type: Clothing HeldPrefix: hopcloak + +- type: entity + parent: CloakClothing + id: HeraldCloak + name: Herald's cloak + components: + - type: Sprite + state: heraldcloak + - type: Icon + state: heraldcloak + - type: Clothing + HeldPrefix: heraldcloak diff --git a/Resources/Prototypes/Entities/Items/Clothing/neck.yml b/Resources/Prototypes/Entities/Items/Clothing/neck.yml new file mode 100644 index 0000000000..658756bfb9 --- /dev/null +++ b/Resources/Prototypes/Entities/Items/Clothing/neck.yml @@ -0,0 +1,134 @@ +- type: entity + parent: Clothing + id: NeckClothing + abstract: true + name: neck + description: + components: + - type: Sprite + sprite: Clothing/neck.rsi + - type: Icon + sprite: Clothing/neck.rsi + - type: Clothing + Size: 10 + QuickEquip: true + Slots: + - neck + sprite: Clothing/neck.rsi + +- type: entity + parent: NeckClothing + id: HeadPhonesOn + name: headphones + description: + components: + - type: Sprite + state: headphones_on + - type: Icon + state: headphones_on + - type: Clothing + HeldPrefix: headphones_on + +- type: entity + parent: NeckClothing + id: RedTie + name: red-tie + description: + components: + - type: Sprite + state: redtie + - type: Icon + state: redtie + - type: Clothing + HeldPrefix: redtie + +- type: entity + parent: NeckClothing + id: DetTie + name: detective's tie + description: + components: + - type: Sprite + state: dettie + - type: Icon + state: dettie + - type: Clothing + HeldPrefix: dettie + +- type: entity + parent: NeckClothing + id: Stethoscope + name: stethoscope + description: + components: + - type: Sprite + state: stethoscope + - type: Icon + state: stethoscope + - type: Clothing + HeldPrefix: stethoscope + +- type: entity + parent: NeckClothing + id: StripedRedScarf + name: striped red scarf + description: + components: + - type: Sprite + state: stripedredscarf + - type: Icon + state: stripedredscarf + - type: Clothing + HeldPrefix: stripedredscarf + +- type: entity + parent: NeckClothing + id: StripedBlueScarf + name: striped blue scarf + description: + components: + - type: Sprite + state: stripedbluescarf + - type: Icon + state: stripedbluescarf + - type: Clothing + HeldPrefix: stripedbluescarf + +- type: entity + parent: NeckClothing + id: StripedGreenScarf + name: striped green scarf + description: + components: + - type: Sprite + state: stripedgreenscarf + - type: Icon + state: stripedgreenscarf + - type: Clothing + HeldPrefix: stripedgreenscarf + +- type: entity + parent: NeckClothing + id: ZebraScarf + name: zebra scarf + description: + components: + - type: Sprite + state: zebrascarf + - type: Icon + state: zebrascarf + - type: Clothing + HeldPrefix: zebrascarf + +- type: entity + parent: NeckClothing + id: Bling + name: bling + description: + components: + - type: Sprite + state: bling + - type: Icon + state: bling + - type: Clothing + HeldPrefix: bling diff --git a/Resources/Prototypes/Entities/Items/Consumables/food.yml b/Resources/Prototypes/Entities/Items/Consumables/food.yml index 612056a604..c4c909698e 100644 --- a/Resources/Prototypes/Entities/Items/Consumables/food.yml +++ b/Resources/Prototypes/Entities/Items/Consumables/food.yml @@ -2988,3 +2988,22 @@ sprite: Objects/Food/stew.rsi - type: Icon sprite: Objects/Food/stew.rsi + +- type: entity + parent: FoodBase + id: MilkApe + name: Milk Ape +# Milk Ape's a proper noun you fuck + description: He sighed for your grins. + components: + - type: Food + trash: TrashSnackBowl + - type: Solution + contents: + reagents: + - ReagentId: chem.Nutriment + Quantity: 20 + - type: Sprite + sprite: Objects/Food/milkape.rsi + - type: Icon + sprite: Objects/Food/milkape.rsi diff --git a/Resources/Prototypes/Entities/Items/bedsheets.yml b/Resources/Prototypes/Entities/Items/bedsheets.yml index 229a8cd72a..a437f8bc6e 100644 --- a/Resources/Prototypes/Entities/Items/bedsheets.yml +++ b/Resources/Prototypes/Entities/Items/bedsheets.yml @@ -28,8 +28,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetblack - type: entity @@ -45,8 +45,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetblue - type: entity @@ -62,8 +62,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetbrown - type: entity @@ -79,8 +79,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetcaptain - type: entity @@ -96,8 +96,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetce - type: entity @@ -113,8 +113,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetcentcom - type: entity @@ -130,9 +130,9 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi - HeldPrefix: sheetclown + - neck + sprite: Clothing/neck.rsi + HeldPrefix: sheetrainbow - type: entity id: BedsheetCMO @@ -147,8 +147,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetcmo - type: entity @@ -164,8 +164,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetcosmos - type: entity @@ -181,8 +181,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetcult - type: entity @@ -198,8 +198,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetgreen - type: entity @@ -215,8 +215,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetgrey - type: entity @@ -232,8 +232,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheethop - type: entity @@ -249,8 +249,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheethos - type: entity @@ -266,8 +266,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetian - type: entity @@ -283,8 +283,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetmedical - type: entity @@ -300,8 +300,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetmime - type: entity @@ -317,8 +317,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetNT - type: entity @@ -334,8 +334,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetorange - type: entity @@ -351,8 +351,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetpurple - type: entity @@ -368,8 +368,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetqm - type: entity @@ -385,8 +385,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetrainbow - type: entity @@ -402,8 +402,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetrd - type: entity @@ -419,8 +419,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetred - type: entity @@ -436,8 +436,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetsyndie - type: entity @@ -453,8 +453,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetUSA - type: entity @@ -470,8 +470,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetwhite - type: entity @@ -487,8 +487,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetwiz - type: entity @@ -504,6 +504,6 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetyellow diff --git a/Resources/Prototypes/Entities/Mobs/human.yml b/Resources/Prototypes/Entities/Mobs/human.yml index 9707e228c5..5bb8d68aaf 100644 --- a/Resources/Prototypes/Entities/Mobs/human.yml +++ b/Resources/Prototypes/Entities/Mobs/human.yml @@ -87,6 +87,7 @@ - map: ["enum.Slots.OUTERCLOTHING"] - map: ["enum.Slots.EYES"] - map: ["enum.Slots.BELT"] + - map: ["enum.Slots.NECK"] - map: ["enum.Slots.BACKPACK"] - map: ["enum.HumanoidVisualLayers.FacialHair"] state: shaved @@ -227,6 +228,7 @@ - map: ["enum.Slots.OUTERCLOTHING"] - map: ["enum.Slots.EYES"] - map: ["enum.Slots.BELT"] + - map: ["enum.Slots.NECK"] - map: ["enum.Slots.BACKPACK"] - map: ["enum.HumanoidVisualLayers.FacialHair"] state: shaved diff --git a/Resources/Textures/Clothing/cloak.rsi/capcloak-equipped-BACKPACK.png b/Resources/Textures/Clothing/cloak.rsi/capcloak-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/cloak.rsi/capcloak-equipped-BACKPACK.png rename to Resources/Textures/Clothing/cloak.rsi/capcloak-equipped-NECK.png diff --git a/Resources/Textures/Clothing/cloak.rsi/cecloak-equipped-BACKPACK.png b/Resources/Textures/Clothing/cloak.rsi/cecloak-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/cloak.rsi/cecloak-equipped-BACKPACK.png rename to Resources/Textures/Clothing/cloak.rsi/cecloak-equipped-NECK.png diff --git a/Resources/Textures/Clothing/cloak.rsi/cmocloak-equipped-BACKPACK.png b/Resources/Textures/Clothing/cloak.rsi/cmocloak-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/cloak.rsi/cmocloak-equipped-BACKPACK.png rename to Resources/Textures/Clothing/cloak.rsi/cmocloak-equipped-NECK.png diff --git a/Resources/Textures/Clothing/cloak.rsi/heraldcloak-equipped-NECK.png b/Resources/Textures/Clothing/cloak.rsi/heraldcloak-equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..4ae018ab3aa0decb0a4c1173794dd24f6a762f88 GIT binary patch literal 1199 zcmV;g1W@~lP)uc9GA-Ws+1{G2y*{{|A8D_aYah2YpoIv3$YPg zwA11cAs_*5w%e`tioG|P-K^{USl1jk9|*+ValdcgzL|N>JiuTu7z{7DIz98RPS5;f zJtHgqH%T|Utu}Nz&~3F6VwP(}d`x@~2_4gm}_4~KI`qXhz{hbkT|MYk=Sj^c&`jase*(J`m zTW>cQEapfuIEkn}9}TgL^_UaVf_H+I z&&BFn`CO>;q9hIh!f`zSz+f>40CI%i{PY?9Uk{;seEYPCyoeY2{mB^3^9!kG?hQ}! zcB5KDsZgY`2!4j8&ou7H8LHtQ)wl9F06_EnVy`|$pW}K$`a%w9RBP;WsZay}^hQH= zjV3-m^mN95miodG00dFM8^J^3{7^{C0f*F2Y(U{h21(>)p0@=`a%u> z5Sm>0@FQ5R07#F+W9si+1?uGr?A4OZu>Hw6_Mz5f?9+Yv9v_aXMD=^4VW_hNU6<7t zS_Y|O{mB?VSHELD`uDm|?RB%jUHZUt1X%f8XvwAfGWtS^5V5QCqW5*79Kg!wVC8eD zmn-alO2T9jih$Pwwk7Ew~TZtEJR4g;QY}(oTixdG=}<3T=KaSZ_D1^D_E- zBS6-py5HON9LM!w<#VuCOW3O=9M{A3Wf6nL99I5Wi*F}FVg%ejJ)StO7o?!&3ci%z zCH^M=Qhw*x%N5pM7ha!eo?o!J000~N(Ke#`Qj=hmq)m#nQehyN_2ZJCxS76Dt)Vv> z3hQe*AS44Wn9qn)(KV!C){L3T} zI#a1iQQ8utgU8OzEjyTq8g?j1gLFGLw^~&x!k(go%6hqi=BLlFXH)b>LsqEJx%n$~-N)C`ce>*f(F`|N$1NgC*W)YMwWQ$5P zDn&qA)gNi1YLixdz_G?Z5nT;b&~m`B_X3V$!)x0OB3`Rq27}>s^9L_Ec#W9>UrPW0 N002ovPDHLkV1g7>LZbix literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/cloak.rsi/heraldcloak.png b/Resources/Textures/Clothing/cloak.rsi/heraldcloak.png new file mode 100644 index 0000000000000000000000000000000000000000..7c4fef28aad587b797315b2bdf2b0cc0e6a56499 GIT binary patch literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvp#Yx{S0L>!A$zT*XK_e$r-NIV zg36la113OG#*!evUFVdQ&MBb@00{MOg#Z8m literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/cloak.rsi/hopcloak-equipped-BACKPACK.png b/Resources/Textures/Clothing/cloak.rsi/hopcloak-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/cloak.rsi/hopcloak-equipped-BACKPACK.png rename to Resources/Textures/Clothing/cloak.rsi/hopcloak-equipped-NECK.png diff --git a/Resources/Textures/Clothing/cloak.rsi/hoscloak-equipped-BACKPACK.png b/Resources/Textures/Clothing/cloak.rsi/hoscloak-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/cloak.rsi/hoscloak-equipped-BACKPACK.png rename to Resources/Textures/Clothing/cloak.rsi/hoscloak-equipped-NECK.png diff --git a/Resources/Textures/Clothing/cloak.rsi/meta.json b/Resources/Textures/Clothing/cloak.rsi/meta.json index 7f6607aea1..651d692e7c 100644 --- a/Resources/Textures/Clothing/cloak.rsi/meta.json +++ b/Resources/Textures/Clothing/cloak.rsi/meta.json @@ -6,7 +6,7 @@ }, "states": [ { - "name": "capcloak-equipped-BACKPACK", + "name": "capcloak-equipped-NECK", "directions": 4, "delays": [ [ @@ -24,7 +24,7 @@ ] }, { - "name": "cecloak-equipped-BACKPACK", + "name": "cecloak-equipped-NECK", "directions": 4, "delays": [ [ @@ -42,7 +42,7 @@ ] }, { - "name": "cmocloak-equipped-BACKPACK", + "name": "cmocloak-equipped-NECK", "directions": 4, "delays": [ [ @@ -60,7 +60,7 @@ ] }, { - "name": "hopcloak-equipped-BACKPACK", + "name": "hopcloak-equipped-NECK", "directions": 4, "delays": [ [ @@ -78,7 +78,7 @@ ] }, { - "name": "hoscloak-equipped-BACKPACK", + "name": "hoscloak-equipped-NECK", "directions": 4, "delays": [ [ @@ -96,7 +96,7 @@ ] }, { - "name": "qmcloak-equipped-BACKPACK", + "name": "qmcloak-equipped-NECK", "directions": 4, "delays": [ [ @@ -114,7 +114,7 @@ ] }, { - "name": "rdcloak-equipped-BACKPACK", + "name": "rdcloak-equipped-NECK", "directions": 4, "delays": [ [ @@ -193,6 +193,33 @@ 1 ] ] + }, + { + "name": "heraldcloak", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "heraldcloak-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] } ] } diff --git a/Resources/Textures/Clothing/cloak.rsi/qmcloak-equipped-BACKPACK.png b/Resources/Textures/Clothing/cloak.rsi/qmcloak-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/cloak.rsi/qmcloak-equipped-BACKPACK.png rename to Resources/Textures/Clothing/cloak.rsi/qmcloak-equipped-NECK.png diff --git a/Resources/Textures/Clothing/cloak.rsi/rdcloak-equipped-BACKPACK.png b/Resources/Textures/Clothing/cloak.rsi/rdcloak-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/cloak.rsi/rdcloak-equipped-BACKPACK.png rename to Resources/Textures/Clothing/cloak.rsi/rdcloak-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/bling-equipped-NECK.png b/Resources/Textures/Clothing/neck.rsi/bling-equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..91bbe81d37cb113c69923639ce8af274a6fdd09b GIT binary patch literal 519 zcmV+i0{H!jP))6{A|Bz3hSc>DU~mGdDjS8~>g7ds{8hYU1hzXaTI@@PnZMEa1=rn5d(v2u1Mi z*3JV!rTOtN-Oq5N@xON7T!faPjvMB@Dgnae-FNNkug=eeBApNF0C1fd);Q)h0B5** z)d6R?e)NlyN^I3O7}D+PqEkNyQ34Dzpuia*7it0ek=|m0rrXsSN-B$50J#&?t1d%H zWwHJX+-5+(2Ba*iBL$7!gCxj3}2qA>L7r%2d^-WJ47MK74002ov JPDHLkV1gy-<%s|Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/neck.rsi/bling.png b/Resources/Textures/Clothing/neck.rsi/bling.png new file mode 100644 index 0000000000000000000000000000000000000000..7e999c17b65afa9a321545af0f47fcc3972a91e4 GIT binary patch literal 194 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@o&cW^S0MfWKg0hk42M>mFSR_I z3*bZ){&GjZ;-4JUc%?VQ?->X%SibQmzqSgaj!T4P}9 mXJE=*x`1ajZ^hqZ3=ADs{7zM2D>{JoF?hQAxvX<+p@2-HLb19FH}-^z1)<6;X$Y6^UC`A%=Yv06Cd5Hz9w_JMQj5zcZW#7;ihLm zV}PJx{feGb@zSTmd8XY}HkDnsL;S=$MY(v}16eD%SL_fkm<&>sC~l?C&GYy6tp*U! M)78&qol`;+0Cvbbh5!Hn literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/neck.rsi/dettie.png b/Resources/Textures/Clothing/neck.rsi/dettie.png new file mode 100644 index 0000000000000000000000000000000000000000..ee8d3a346fe4623a64f64605a83852db8c38e2fa GIT binary patch literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvp#Yx{S0F7RA)%q6p{uK_qN1Xp zpuq4tSsp0LSQ6wH%;50sMjDV)?CIhdqA~I4goA<&3Op>H>LlcDrGB`@CpV}=xt-ULU zQ>!-in`4^bYK3*TbT@`RWo+4W!0jp5;yBmCflZbHMfE=q+lsB=_1n?G*#NYj!PC{x JWt~$(696H9NL&B_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/neck.rsi/headphones_off-equipped-NECK.png b/Resources/Textures/Clothing/neck.rsi/headphones_off-equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..671cf6b36122ca7e6b060f5c865edc75621043d4 GIT binary patch literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=H#}V&Ln`LHy|t0|u!2DAL+>eF ztQryxx_Rv15@g;#Tsh+a^8~G+t|N+N2l)QPrx$;-RtzjulDM7vx?Qp5&78?oCY|}b z=cj%BO!?$9+2>=Qw+qCz?XA8ay6=0P>66R9BtNfT+PZ4i+O4ZiuSEr3)tVik{XZ;f zht6sLtZi0S@h-n?n1GIe0EwgP4mL?7`)PI-`z_1NvRYD*vaMswY<7){d&J+@+Ff>i zGOw=dIkQ}dsdVxYiQrtZ1*!J&`3FAB)_nc_gQ@+?<;#LFqY@O#e;4E_uF!b?1tjF@ L>gTe~DWM4f{o`;5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/neck.rsi/headphones_off.png b/Resources/Textures/Clothing/neck.rsi/headphones_off.png new file mode 100644 index 0000000000000000000000000000000000000000..f1ea592a6036588a97959a049034af15f2ace0f2 GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvp#Yx{*8>L*1OxIE)xP8;&yi>^i{e!|b4vy+L!z`J5bvg$Yb+77Bzopr04(Y-KL7v# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/neck.rsi/headphones_on-equipped-NECK.png b/Resources/Textures/Clothing/neck.rsi/headphones_on-equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..59841d347ec97d05cd953fa1875a46007e60eed5 GIT binary patch literal 1425 zcmZ7$X;6|06b)U^tZ`}`EAeQ@a#N=?QxnK^Gsgnc%F+~%anl$wH538)%$%6o%+e;w zQns1Q($p-8FbT_6EDt70@xmhnJOWZc_~csJU(UXncg&l2zj^O^EGo*;&eaYAfjCAV zjf^w%E;IgZV{N91yE2j?5UVrMk>Mu^4`sslxQQ?q>(q|<-S*Hd>mRIM;Wq6Id>?9c z{(U}_oq1Jne;Hz+dX_ss*cW}GayQ&5)+PIUCv102fu&Y=7?N5WRPPkFeWS3uJAyzW z*>flcA7jXh_&~KurTVHaX5Z9v<)Z2BU@izsv9usgi>;D(Kz=FsoWoxR02eP-XmoN_ zL5E&@J)y=_=!i#^F5EJSi)kuQgBQJ?z~%HZ6w;9C61{%ts&SOvYEVIG>4rAv)-aRO z_1dlh#lc4zezI;Ct|>{Mq;R5)m2LWPk+~#SC`iDl!B9LZD>xNI;+QrcCXDIXzI`U$ zXl2z*W`3C40T{D>i8nyum_X5IjVZ%1;;saM-^w1;q&*jz;Kt_afo1KAq6rBYRo5D( zyazz*IVpg+LiIUoqL{q4S3HVooz38(HSYpBPhRS^wn7CNCP5fI%AQSIGU_mj=BTq2 zM>_otPKIo+DTVW!5vVA0FII*b^ z<)z>FBCwg=$T;n9-q<=wpgFl?C@ovmRQld&aw!o!yQpb^4L#{ZQQ#8iJ!C|MN0)<8iL(Qb6GWfsBbV%5;{$a8w+G3kS{~|c1qiKI z+ImXlJU?^XY-QS!cvWz6YEJC&wCeB*zGtXcRYsa~`aR-smaObz^VE%VSC+6ibW)?B zjP^h<#W(cH{isc?q{bqfe6fa+ zP4_gVTg0oloLUgN?40{nSdd+QhFVK#>)h9Q*`}Fs_N%plDF)b$71eyFt@uDxUJD{PfyK zcc*yP{izZJwugTe|CfMc?8rgpkI<2@*&8g~D_$*7!|zGD?ePsg88m_c5SG6W#Q{8z zt--KV*@dudwdU~&EGtj&vMZrvKTKbr!V-{=1+Xmrcr@-|Fkt1#e|37)+IAUQ(H0(Er(N;*JF{f;jeAGXfMBmj_zAh0@(|)89b;JO(hi zQ9>+QnC*T`yt;9IeE}uf(SSd;ALhGvSI(O!L@P<%>i^dNg>74h`Jjqbh)4RjMILP?2v6sS}N0W|B3Q-8wR5mqSs-SGI zztzId-oLZkSatIXi6t|;jn`@znu{JWdlD2@@U@sxnxDa)LpD=+y?y}D_H<7d#}JRs zz zB)WmEA!4D!8?QFe#R(!kOjQhwYg`$a6uh`)92lofEo5-XY-9%Viq=XbF)-|^XGwec SuxA0#N(N6?KbLh*2~7Y8XlRuH literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/neck.rsi/headphones_on-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/headphones_on-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..8a09470e9454a88d8a04cdc8930c9ed582a8443c GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|ep#Yx{S0Ei280f~q(aXh^C?F6g zBvjo0dNxp$u_VYZn8D%MjWi&qs466)#3i*jxhS)sBr`vcfuUkfa9BZ6>GvSI(O!L@P<%>i^dNg>74h`Jjqbh)4RjMILP?2v6sS}N0W|B3Q-8wR5mqSs-SGI zztzId-oLZkSatIXi6t|;jn`@znu{JWdlD2@@U@sxnxDa)LpD=+y?y}D_H<7d#}JRs zS_#?Fm5 zM4cJ60~oUz3d4Gu0u8t_SXnlRGI%fqialW9VlmPRifoW=IK?=P!E24gCkBSc|5!>N TIBNlY$H3s}>gTe~DWM4fw}@w) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/neck.rsi/headphones_on.png b/Resources/Textures/Clothing/neck.rsi/headphones_on.png new file mode 100644 index 0000000000000000000000000000000000000000..f1ea592a6036588a97959a049034af15f2ace0f2 GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvp#Yx{*8>L*1OxIE)xP8;&yi>^i{e!|b4vy+L!z`J5bvg$Yb+77Bzopr04(Y-KL7v# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/back.rsi/meta.json b/Resources/Textures/Clothing/neck.rsi/meta.json similarity index 77% rename from Resources/Textures/Clothing/back.rsi/meta.json rename to Resources/Textures/Clothing/neck.rsi/meta.json index 71924c6ab8..2f4e6fc712 100644 --- a/Resources/Textures/Clothing/back.rsi/meta.json +++ b/Resources/Textures/Clothing/neck.rsi/meta.json @@ -8,7 +8,7 @@ "copyright": "https://github.com/tgstation/tgstation", "states": [ { - "name": "sheetNT-equipped-BACKPACK", + "name": "sheetNT-equipped-NECK", "directions": 4, "delays": [ [ @@ -26,7 +26,7 @@ ] }, { - "name": "sheetUSA-equipped-BACKPACK", + "name": "sheetUSA-equipped-NECK", "directions": 4, "delays": [ [ @@ -44,7 +44,7 @@ ] }, { - "name": "sheetblack-equipped-BACKPACK", + "name": "sheetblack-equipped-NECK", "directions": 4, "delays": [ [ @@ -62,7 +62,7 @@ ] }, { - "name": "sheetblue-equipped-BACKPACK", + "name": "sheetblue-equipped-NECK", "directions": 4, "delays": [ [ @@ -80,7 +80,7 @@ ] }, { - "name": "sheetbrown-equipped-BACKPACK", + "name": "sheetbrown-equipped-NECK", "directions": 4, "delays": [ [ @@ -98,7 +98,7 @@ ] }, { - "name": "sheetcaptain-equipped-BACKPACK", + "name": "sheetcaptain-equipped-NECK", "directions": 4, "delays": [ [ @@ -116,7 +116,7 @@ ] }, { - "name": "sheetce-equipped-BACKPACK", + "name": "sheetce-equipped-NECK", "directions": 4, "delays": [ [ @@ -134,7 +134,7 @@ ] }, { - "name": "sheetcentcom-equipped-BACKPACK", + "name": "sheetcentcom-equipped-NECK", "directions": 4, "delays": [ [ @@ -152,7 +152,7 @@ ] }, { - "name": "sheetclown-equipped-BACKPACK", + "name": "sheetclown-equipped-NECK", "directions": 4, "delays": [ [ @@ -170,7 +170,7 @@ ] }, { - "name": "sheetcmo-equipped-BACKPACK", + "name": "sheetcmo-equipped-NECK", "directions": 4, "delays": [ [ @@ -188,7 +188,7 @@ ] }, { - "name": "sheetcosmos-equipped-BACKPACK", + "name": "sheetcosmos-equipped-NECK", "directions": 4, "delays": [ [ @@ -226,7 +226,7 @@ ] }, { - "name": "sheetcult-equipped-BACKPACK", + "name": "sheetcult-equipped-NECK", "directions": 4, "delays": [ [ @@ -256,7 +256,7 @@ ] }, { - "name": "sheetgreen-equipped-BACKPACK", + "name": "sheetgreen-equipped-NECK", "directions": 4, "delays": [ [ @@ -274,7 +274,7 @@ ] }, { - "name": "sheetgrey-equipped-BACKPACK", + "name": "sheetgrey-equipped-NECK", "directions": 4, "delays": [ [ @@ -292,7 +292,7 @@ ] }, { - "name": "sheethop-equipped-BACKPACK", + "name": "sheethop-equipped-NECK", "directions": 4, "delays": [ [ @@ -310,7 +310,7 @@ ] }, { - "name": "sheethos-equipped-BACKPACK", + "name": "sheethos-equipped-NECK", "directions": 4, "delays": [ [ @@ -328,7 +328,7 @@ ] }, { - "name": "sheetian-equipped-BACKPACK", + "name": "sheetian-equipped-NECK", "directions": 4, "delays": [ [ @@ -346,7 +346,7 @@ ] }, { - "name": "sheetmedical-equipped-BACKPACK", + "name": "sheetmedical-equipped-NECK", "directions": 4, "delays": [ [ @@ -364,7 +364,7 @@ ] }, { - "name": "sheetmime-equipped-BACKPACK", + "name": "sheetmime-equipped-NECK", "directions": 4, "delays": [ [ @@ -382,7 +382,7 @@ ] }, { - "name": "sheetorange-equipped-BACKPACK", + "name": "sheetorange-equipped-NECK", "directions": 4, "delays": [ [ @@ -400,7 +400,7 @@ ] }, { - "name": "sheetpurple-equipped-BACKPACK", + "name": "sheetpurple-equipped-NECK", "directions": 4, "delays": [ [ @@ -418,7 +418,7 @@ ] }, { - "name": "sheetqm-equipped-BACKPACK", + "name": "sheetqm-equipped-NECK", "directions": 4, "delays": [ [ @@ -436,7 +436,7 @@ ] }, { - "name": "sheetrainbow-equipped-BACKPACK", + "name": "sheetrainbow-equipped-NECK", "directions": 4, "delays": [ [ @@ -454,7 +454,7 @@ ] }, { - "name": "sheetrd-equipped-BACKPACK", + "name": "sheetrd-equipped-NECK", "directions": 4, "delays": [ [ @@ -472,7 +472,7 @@ ] }, { - "name": "sheetred-equipped-BACKPACK", + "name": "sheetred-equipped-NECK", "directions": 4, "delays": [ [ @@ -490,7 +490,7 @@ ] }, { - "name": "sheetsyndie-equipped-BACKPACK", + "name": "sheetsyndie-equipped-NECK", "directions": 4, "delays": [ [ @@ -508,7 +508,7 @@ ] }, { - "name": "sheetwhite-equipped-BACKPACK", + "name": "sheetwhite-equipped-NECK", "directions": 4, "delays": [ [ @@ -526,7 +526,7 @@ ] }, { - "name": "sheetwiz-equipped-BACKPACK", + "name": "sheetwiz-equipped-NECK", "directions": 4, "delays": [ [ @@ -556,7 +556,7 @@ ] }, { - "name": "sheetyellow-equipped-BACKPACK", + "name": "sheetyellow-equipped-NECK", "directions": 4, "delays": [ [ @@ -1604,6 +1604,336 @@ 1 ] ] + }, + { + "name": "bling-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "redtie-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "stethoscope-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "stripedbluescarf-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "stripedredscarf-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "stripedgreenscarf-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "zebrascarf-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "dettie-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "headphones_on-equipped-NECK", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "headphones_off-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "headphones_on-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "headphones_on-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "bling", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "stripedgreenscarf", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "stripedbluescarf", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "stripedredscarf", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "zebrascarf", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "stethoscope", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "dettie", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "redtie", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "headphones_off", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "headphones_on", + "directions": 1, + "delays": [ + [ + 1 + ] + ] } ] } diff --git a/Resources/Textures/Clothing/neck.rsi/redtie-equipped-NECK.png b/Resources/Textures/Clothing/neck.rsi/redtie-equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..45a4c147fcc0d5146e68c46f93a3e57640f28331 GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=NuDl_Ar*7p-ZbPppuod?V2l3w z^S7sNU2(|ij<1f&wCf>^3cqsgeU<@HGGYGtIIjj_qE@BkV;QiKbLh*2~7aEA2@LU literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/neck.rsi/redtie.png b/Resources/Textures/Clothing/neck.rsi/redtie.png new file mode 100644 index 0000000000000000000000000000000000000000..5d94099779b321edc730c4e3bfbcd91c4790cc42 GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvi2$DvS0EiFCe*B`+^3+`q$<~- zBU77}GP|QY;`v84pd4dKkY6x^!?PP{Ku(>fi(`n!#G?~7iXJxLaB-a+RWyZBDdIp* z!@SK7^RDbJ`gUJI&oWAU+3)W=s@XMTXA8}+U|+aiL+7?N$KeZ#$xb>eLqBeuYAjk1 z@#}5ek6VvF{E-TH{bVNdZ=sOie}1&Ky4J81UVbNge%YQz=g0+%i<+&^a~uw8nzN!M c{+>bosy4pH>$-;=fi7Y2boFyt=akR{0HRh{bpQYW literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/back.rsi/sheetNT-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetNT-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetNT-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetNT-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetNT-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetNT-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetNT-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetNT-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetNT-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetNT-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetNT-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetNT-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetUSA-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetUSA-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetUSA-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetUSA-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetUSA-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetUSA-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetUSA-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetUSA-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetUSA-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetUSA-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetUSA-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetUSA-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetblack-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetblack-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetblack-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetblack-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetblack-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetblack-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetblack-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetblack-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetblack-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetblack-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetblack-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetblack-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetblue-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetblue-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetblue-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetblue-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetblue-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetblue-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetblue-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetblue-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetblue-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetblue-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetblue-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetblue-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetbrown-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetbrown-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetbrown-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetbrown-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetbrown-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetbrown-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetbrown-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetbrown-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetbrown-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetbrown-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetbrown-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetbrown-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetcaptain-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetcaptain-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetcaptain-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetcaptain-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetcaptain-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetcaptain-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetcaptain-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetcaptain-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetcaptain-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetcaptain-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetcaptain-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetcaptain-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetce-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetce-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetce-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetce-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetce-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetce-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetce-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetce-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetce-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetce-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetce-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetce-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetcentcom-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetcentcom-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetcentcom-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetcentcom-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetcentcom-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetcentcom-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetcentcom-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetcentcom-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetcentcom-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetcentcom-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetcentcom-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetcentcom-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetclown-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetclown-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetclown-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetclown-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetcmo-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetcmo-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetcmo-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetcmo-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetcmo-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetcmo-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetcmo-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetcmo-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetcmo-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetcmo-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetcmo-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetcmo-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetcosmos-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetcosmos-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetcosmos-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetcosmos-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetcosmos-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetcosmos-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetcosmos-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetcosmos-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetcosmos-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetcosmos-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetcosmos-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetcosmos-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetcult-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetcult-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetcult-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetcult-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetcult-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetcult-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetcult-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetcult-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetcult-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetcult-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetcult-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetcult-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetgreen-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetgreen-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetgreen-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetgreen-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetgreen-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetgreen-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetgreen-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetgreen-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetgreen-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetgreen-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetgreen-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetgreen-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetgrey-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetgrey-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetgrey-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetgrey-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetgrey-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetgrey-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetgrey-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetgrey-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetgrey-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetgrey-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetgrey-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetgrey-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheethop-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheethop-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheethop-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheethop-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheethop-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheethop-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheethop-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheethop-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheethop-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheethop-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheethop-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheethop-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheethos-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheethos-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheethos-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheethos-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheethos-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheethos-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheethos-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheethos-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheethos-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheethos-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheethos-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheethos-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetian-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetian-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetian-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetian-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetian-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetian-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetian-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetian-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetian-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetian-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetian-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetian-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetmedical-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetmedical-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetmedical-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetmedical-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetmedical-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetmedical-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetmedical-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetmedical-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetmedical-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetmedical-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetmedical-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetmedical-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetmime-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetmime-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetmime-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetmime-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetmime-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetmime-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetmime-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetmime-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetmime-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetmime-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetmime-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetmime-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetorange-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetorange-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetorange-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetorange-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetorange-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetorange-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetorange-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetorange-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetorange-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetorange-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetorange-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetorange-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetpurple-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetpurple-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetpurple-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetpurple-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetpurple-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetpurple-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetpurple-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetpurple-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetpurple-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetpurple-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetpurple-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetpurple-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetqm-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetqm-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetqm-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetqm-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetqm-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetqm-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetqm-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetqm-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetqm-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetqm-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetqm-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetqm-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetrainbow-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetrainbow-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetrainbow-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetrainbow-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetrainbow-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetrainbow-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetrainbow-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetrainbow-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetrainbow-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetrainbow-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetrainbow-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetrainbow-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetrd-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetrd-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetrd-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetrd-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetrd-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetrd-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetrd-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetrd-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetrd-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetrd-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetrd-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetrd-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetred-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetred-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetred-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetred-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetred-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetred-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetred-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetred-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetred-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetred-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetred-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetred-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetsyndie-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetsyndie-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetsyndie-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetsyndie-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetsyndie-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetsyndie-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetsyndie-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetsyndie-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetsyndie-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetsyndie-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetsyndie-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetsyndie-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetwhite-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetwhite-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetwhite-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetwhite-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetwhite-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetwhite-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetwhite-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetwhite-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetwhite-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetwhite-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetwhite-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetwhite-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetwiz-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetwiz-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetwiz-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetwiz-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetwiz-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetwiz-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetwiz-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetwiz-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetwiz-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetwiz-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetwiz-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetwiz-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetyellow-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetyellow-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetyellow-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetyellow-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetyellow-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetyellow-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetyellow-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetyellow-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetyellow-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetyellow-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetyellow-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetyellow-inhand-right.png diff --git a/Resources/Textures/Clothing/neck.rsi/stethoscope-equipped-NECK.png b/Resources/Textures/Clothing/neck.rsi/stethoscope-equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..22693b4ae3a6ed073691c6118db7167fc520eab0 GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=*F9YvLn`LHy=BOC$Ux-S$MugC ztC+Ok-M!;-@MyBd&I&8X4=lEh`4^&(IBIWA$<(U#{qujClj4WH)6Kl+u`n=vSZ?&1 zLGhGQ`QP%;yFTIG_6_<0mugs#-)eC^vFPo;FRx|N*vubP+}L@xYU%5ze{O!w369Q}G_{LH>*Tye*`8+V! M)78&qol`;+0HQ5$9{>OV literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/neck.rsi/stethoscope.png b/Resources/Textures/Clothing/neck.rsi/stethoscope.png new file mode 100644 index 0000000000000000000000000000000000000000..d4d03ad198239a899f65846b8633ec6d0f3bd1e0 GIT binary patch literal 271 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv-2k5uS0Eh{67u@>>s`Bc9XWEO zr>AGbh7F~qr8+t~9v&Xy;o+{XuJ-o!fq{XMk&$ZpYi0vAFqQ=Q1v5B2yO9RuOz?DZ z4AGdFoUp)Hz~!;A;i6BX5)v#Eekx>&FbebwE@#-xI7`ksF@#aEYoq|C@5#_eHgKU z`QbZRZ8HYeU4l$^WF78&W;mH`EoQLhh4VM<^6RVe*hCK8-PqVz#=x*fT6)FyDW6z@ PZe#Ft^>bP0l+XkK(%V?% literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/neck.rsi/stripedbluescarf-equipped-NECK.png b/Resources/Textures/Clothing/neck.rsi/stripedbluescarf-equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..e0c1bee72d5a102fa97191f4d7656b75dba343eb GIT binary patch literal 662 zcmV;H0%`q;P)WC*Aq`f#x~$Y%0DMX2weTpaX2@v0N6#hd z;sHVl0Dc+t`t6+xY?9QnVrULZN>`U7%MQy*%`nv48t%C!!QiPFbu;mF$sM7 zz?aXfKj5ugl0bHM4t@HlPnXo6qoQL6KyiBp_zXxpLDA0uhG7_nVVJY!8E3_KVDBA9`v3p{07*qoM6N<$f}Gw#ZvX%Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/neck.rsi/stripedbluescarf.png b/Resources/Textures/Clothing/neck.rsi/stripedbluescarf.png new file mode 100644 index 0000000000000000000000000000000000000000..962d0cb48c8bf458f77c4f1842cf701798487638 GIT binary patch literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvxd5LKS0HWc79ghKt6-TUYnl>~ zTAW`$F|D*!#wbowFGBOcEjOSF#*!evUqRA$%U&TyHeaZvTDTzIkI*y7LWC|ol%qKZ}8y4(TeL0i!08koP1FrSQmJ?ac1Qw zbK&rH+j7Ee|I6KqI+(qzLidQ$oXt)JdM#W3t>$xfcz&qWV9KLKo9gdNho#u4zg}3n Q4CproPgg&ebxsLQ08=D?*#H0l literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/neck.rsi/stripedgreenscarf-equipped-NECK.png b/Resources/Textures/Clothing/neck.rsi/stripedgreenscarf-equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..b626538c2acd64ef01da69a774d87d721eca00ce GIT binary patch literal 660 zcmV;F0&D$=P)`3xCI?u0Ju$O(S-I)>S4ZtuA!!QiP{2L(#%Jq6`-+vGNUN?vIg&2_c z(9)gw;o}>1eJL=W`q)StQ9OrbI@_^rgxE+MZ6n0zPv5lHrRZntKct`SkD~ufcVf6) zL9P=3fahMp?so2t+3(?UMSV7H{i4o3eYsA^`pS-0ud96kKzj0W-QOO>MyBH^$U;tE zxC~J|$L-A>##0~RGS}b887$Mm_aDFD`$N(NkS4ocPublLfHWkJb=!v!VxWroUaU*h zhX;reV3`iCFRvii2{v+uW8e5be1F(-y`BnWo_6=6kVdHpIMwYR1MRl}kVSy_Q)r$B zq!ftaImXivQGA?N-6y}ioK5lRB$}B}DOR=^Q!tQpqdnlWFmGbp}=ohF8 zIR%QOUSS``%NGdb1gGd1s7j>+@cm&cisvc~#b&xirD{Ntru&7JA^>Q umI!Ea&j8nestYu|1~3f6Fbu<-Ex!R~f_um7)N4xs0000qRA$%U&TyHeaZvTDTzIkI*y7LWC|ol%qKZ}8y4(TeL0i!08koP1FrSQmJ?ac1Qw zbK&rH+j7Ee|I6KqI+(qzLidQ$oXt)JdM#W3t>$xfcz&qWV9KLKo9gdNho#u4zg}3n Q4CproPgg&ebxsLQ03Hv3qyPW_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/neck.rsi/stripedredscarf-equipped-NECK.png b/Resources/Textures/Clothing/neck.rsi/stripedredscarf-equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..c9b543450a6a5d6554f0a57e1d02cd07c4272c51 GIT binary patch literal 677 zcmV;W0$TlvP)6o!9FkwB&s5*zYTg=9eiFGz8>3>`C7o+4GeLmwjVkR=n3kRf9#v0%Gi60%V? zBu`-3QiN^?+w_J~>SIHw!}*pg*_Qu%&pG#6@_zt^VHk#C80Oy?dRO!sC9&?_->z?) zP5Or3CC}k~(g&|j%A($GVd~m2bWJGZAv{$>JT{~29oNRUhoC^6ND_UscDmGAr(bWk z&~a@+(SMip!O?tynI8ZEKDS$FR*Nsj`1)wRpsp>kzO1uOf93~d{lpdEsT#gNK0%o; zP>BK&2jtdrpv)IAEeHL{^VYKu0N0b}f@e7**6B$4@xnj)0X$U$CWFN9O&kCqjQs5Q zXc-7E8v74}aM1+eG$`XCK3#mp^zH^DN#A>X0#pq@#y`=&ACMA2dbrmpiDtD3AS}u2 z9c6nHhTat&*GB#P64Sezg^V0eh@}|#~EKo|9((V8YN*$+wMgb z5=m77`^x?_3=f(&0%;2<;~}Q54P{54x_v;dfXdmI!>$1T&?|t?fHzhF z48t%C!!QiPFbu;m43m)9r;mO4*Xj@0G?z4xeu@I2PjBd5(X18`kFiaira>VMa?s_u zT%DB3`s4tt`t-nWoBB0a4SLqz1kzt&;7^}kw#iW=>!)HQX`2~)6H*zRy+%pM?I~x+ zNBB@FW05S&+NH@+ugYE@ z7PufcZE{LnxiWi!BHIZrr;|Vxj3q&S!3+-1ZlnP@7d%}YLo_DNov@d$$w0(yqI$sO zcU6vQT)VEH;!e1^#z8RlOx zle9RUH77_>d+l+%uCpgIYy(7kByB~`dhy(lX0?5vz!m*@+JVqBPqwqI5e__6I(_dc z|8kyKlM7cxcBQy+WYvlba%AmZEFSA^JEJDe-{8T8qZQX17FV26Ir*YMurBa&zopr0M$2tR{#J2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/neck.rsi/zebrascarf-equipped-NECK.png b/Resources/Textures/Clothing/neck.rsi/zebrascarf-equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..5a0e5d6c7bdca04e5a73625ccf79c20a97d26666 GIT binary patch literal 349 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU{vvRaSW-L^Y)f*U#o#c>qBEP z{|Q%p3u2wj4+`z(Jj7L?lA&@i*}AJm(D={Y=oxpu8wyN1)VOWN`^i8v8e-=ZUyPF8 zzHV>#Rx_*TkFIUqyRVOrL(%2^-dDS(sffBRER+ciz51|vuBcPT>Eh{&zsFV1lRsCW zwPmZBRI-WhX?`q2qOHWziDP5tED0x%O>e%Zc>cODrMm9))W7w& zg45!YSUrCIwD)+Vxw(F}`dK@m^w94bPKR zEdN&d$eu0G{P5}P^j|g8QnPM1Mpr>mdKI;Vst06=V+s{jB1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/neck.rsi/zebrascarf.png b/Resources/Textures/Clothing/neck.rsi/zebrascarf.png new file mode 100644 index 0000000000000000000000000000000000000000..08b12b353b60159515486fd5a2230579928e9f71 GIT binary patch literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv-2k5uS0KG&#R^SL&EVi*4-XGp zTU#wHt=F$#@87@w>eZ_X3JS)?#?z)vQ&(62|NnpZ;<8^r4U8p0e!&b5&u*jvIaQu6 zjv*QolM^HY6f`tC4uzL-a(X$43FyC{akJw{I#=ux*|lvd2QF7OIM%c=I3;9WVNJd6 z>(Mr6MqR)<8Bf;hYO2ZNBF22zY~8~S99a75QP-k|hb>Qh9939(Vxp%6JZaR*3iufl sy;pBRS3^t}Q`mc_;DZHii5nOhBr>mdKI;Vst052C=BLDyZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Food/milkape.rsi/icon.png b/Resources/Textures/Objects/Food/milkape.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..664a3dfa3e5f4979016bf9f6f710d1350cc8d647 GIT binary patch literal 751 zcmV>x6|^6m?R-4X`Td^fIp@46qm2I^ zL`?vtR5us)#`D~u`*A{mF~IzP^&Op@+W&sKh;Y9`doz{Tv^@P^`tP zauyo^s?gQpge>2sPN$Q^VliD3R$lw%w!#_{?FYFMv|MPRwZ~6s7WHN`+N~76J6+$st`;j`8fP_0hx4?)l8mjrS) z-)03qE_pS-`?ntOcG7ZDmpq<|@TNi#U^1ED4=REKOZU{$ChxNwz?uqwFpJ>ojBcdJ zl}T+sz6E*ncszU~;SkO(zsEqm0VDoNjF0}D2Sw}N9103)6Zyybl+L=Os8Fco;m$%`RBVqF0Y>V_<`Vkm{Y7z6>o zl2L8b-E7YM_6qG5c)eaS;~RydD7)G!npg+(>+dh^BUK1311^_~AJ%v}R&w+#a*}(? zY&M&)R?63qK`23QZx3-e9P~`n)smcNr(b|lMZ42`fgr$WH1exd_>S)cx7$r5N!lxS h8D*4F#y^R{_kyl=4=ggTiyEY5M5L%}%d^j*zhUJFCTh5xTGr!SjZ+(y!3k_qMgN%U*lgR)q z^~Q8EIJ6L2s0l{|FgWKNYPH6GtFw5(6lDnRbSyF_5(x#KStXeHK7`BVek2Si6bfKj zrNm@{K$UY?ZVRqUiNU5J0Ko3N5!c|lm$;84Tz8@;kd{4T46tj`aMpbfPOA;`M;Gi) z7k>A?BnaeJz?8X0fv0c*C#4$99aj({CAKQy`+jx;22l1$fJk^S0Dm@1SAg%L0Kw4s z4-Wy9%eEjP)~;3~0=Yeq1~q$?h{Y}81;n6#nOG&i2S8tcG#<(hWq|qE6ZcM<4%n@V zAl5#=0Qd99bpq1aCJ(Sx2dEJLz>Z*Y!)d>MCju2&MUZ&%9wYaoG6aJHa`Bx#u;PS0 zuNn`7qwBHm)$_N&k6Ym1k6_mSChi^F12%3riwW43MpS=v{mY9Fa(q96UzeZ6SnUE- zQR@LJEj?^f#eOAsJ2V-rdLQc^TwejNa+vkM#_DRi0B1HlfC{ATbyQOdjO~VQ$DhpJ z{CZ(fK(e%Ldu!nJjMcz6j45~u`iI9ak+6(FA_ zO7Prq#O8t|jyhc^I`ZW~4NT)w@i=n*;%5))HAj0a;PJf-Wdyt$6p&E&fg?j;ykco6z~dqB;UkU3+5>H~SZD$uQy2{{akM*L|8v5;$>)JmVG8PS#wX=R(3TOkF$;qv0+8 Y2ZKh|jr&b!0{{R307*qoM6N<$g1EtYrvLx| literal 0 HcmV?d00001