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 0000000000..4ae018ab3a Binary files /dev/null and b/Resources/Textures/Clothing/cloak.rsi/heraldcloak-equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/cloak.rsi/heraldcloak.png b/Resources/Textures/Clothing/cloak.rsi/heraldcloak.png new file mode 100644 index 0000000000..7c4fef28aa Binary files /dev/null and b/Resources/Textures/Clothing/cloak.rsi/heraldcloak.png differ 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 0000000000..91bbe81d37 Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/bling-equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/neck.rsi/bling.png b/Resources/Textures/Clothing/neck.rsi/bling.png new file mode 100644 index 0000000000..7e999c17b6 Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/bling.png differ diff --git a/Resources/Textures/Clothing/neck.rsi/dettie-equipped-NECK.png b/Resources/Textures/Clothing/neck.rsi/dettie-equipped-NECK.png new file mode 100644 index 0000000000..34c7ddb0bc Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/dettie-equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/neck.rsi/dettie.png b/Resources/Textures/Clothing/neck.rsi/dettie.png new file mode 100644 index 0000000000..ee8d3a346f Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/dettie.png differ 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 0000000000..671cf6b361 Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/headphones_off-equipped-NECK.png differ 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 0000000000..f1ea592a60 Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/headphones_off.png differ 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 0000000000..59841d347e Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/headphones_on-equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/neck.rsi/headphones_on-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/headphones_on-inhand-left.png new file mode 100644 index 0000000000..ab7a61a123 Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/headphones_on-inhand-left.png differ 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 0000000000..8a09470e94 Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/headphones_on-inhand-right.png differ 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 0000000000..f1ea592a60 Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/headphones_on.png differ 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 0000000000..45a4c147fc Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/redtie-equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/neck.rsi/redtie.png b/Resources/Textures/Clothing/neck.rsi/redtie.png new file mode 100644 index 0000000000..5d94099779 Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/redtie.png differ 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 0000000000..22693b4ae3 Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/stethoscope-equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/neck.rsi/stethoscope.png b/Resources/Textures/Clothing/neck.rsi/stethoscope.png new file mode 100644 index 0000000000..d4d03ad198 Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/stethoscope.png differ 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 0000000000..e0c1bee72d Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/stripedbluescarf-equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/neck.rsi/stripedbluescarf.png b/Resources/Textures/Clothing/neck.rsi/stripedbluescarf.png new file mode 100644 index 0000000000..962d0cb48c Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/stripedbluescarf.png differ 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 0000000000..b626538c2a Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/stripedgreenscarf-equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/neck.rsi/stripedgreenscarf.png b/Resources/Textures/Clothing/neck.rsi/stripedgreenscarf.png new file mode 100644 index 0000000000..89d303ab02 Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/stripedgreenscarf.png differ 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 0000000000..c9b543450a Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/stripedredscarf-equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/neck.rsi/stripedredscarf.png b/Resources/Textures/Clothing/neck.rsi/stripedredscarf.png new file mode 100644 index 0000000000..1e8ed9ee80 Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/stripedredscarf.png differ 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 0000000000..5a0e5d6c7b Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/zebrascarf-equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/neck.rsi/zebrascarf.png b/Resources/Textures/Clothing/neck.rsi/zebrascarf.png new file mode 100644 index 0000000000..08b12b353b Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/zebrascarf.png differ 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 0000000000..664a3dfa3e Binary files /dev/null and b/Resources/Textures/Objects/Food/milkape.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Food/milkape.rsi/meta.json b/Resources/Textures/Objects/Food/milkape.rsi/meta.json new file mode 100644 index 0000000000..8aa4c1e799 --- /dev/null +++ b/Resources/Textures/Objects/Food/milkape.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/UserInterface/Inventory/neck.png b/Resources/Textures/UserInterface/Inventory/neck.png new file mode 100644 index 0000000000..d744499516 Binary files /dev/null and b/Resources/Textures/UserInterface/Inventory/neck.png differ