diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-18.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-18.ftl index 18df623929..4432bcf832 100644 --- a/Resources/Locale/ru-RU/locales-new/autotranslate-18.ftl +++ b/Resources/Locale/ru-RU/locales-new/autotranslate-18.ftl @@ -22,7 +22,7 @@ ent-HoloprojectorSecurity = голобарьерный проектор .desc = Создает прочный, но хрупкий голографический барьер. ent-ParamedicPDA = ПДА парамедика .desc = Блестящие и стерильные. Имеет встроенный экспресс-анализатор здоровья. -ent-BrigmedicPDA = ПДА парамедика +ent-BrigmedicPDA = ПДА бригмедика .desc = Интересно, чей пульс на экране? Надеюсь, он не остановится... В ПДА встроен анализатор здоровья. ent-SeniorEngineerPDA = ПДА бригадира .desc = Кажется, его несколько раз разбирали и собирали обратно. diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-2.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-2.ftl index 12f7b81b61..bf58b91d1c 100644 --- a/Resources/Locale/ru-RU/locales-new/autotranslate-2.ftl +++ b/Resources/Locale/ru-RU/locales-new/autotranslate-2.ftl @@ -30,7 +30,7 @@ ent-ClothingHeadHatCasa = Шляпа .desc = Шляпа конусообразной формы ent-ClothingHeadHatBeretRND = берет учёного .desc = Берет для настоящих ученых. -ent-ClothingHeadHatBeretBrigmedic = медицинский берет +ent-ClothingHeadHatBeretBrigmedic = берет бригмедика .desc = Белый берет выглядит как кремовый пирог на голове. ent-ClothingHeadHatBeretMerc = берет наемника .desc = Оливковый берет, на значке изображен шакал на скале. diff --git a/Resources/Locale/ru-RU/prototypes/access/accesses.ftl b/Resources/Locale/ru-RU/prototypes/access/accesses.ftl index db65e0ddd5..b05d59badc 100644 --- a/Resources/Locale/ru-RU/prototypes/access/accesses.ftl +++ b/Resources/Locale/ru-RU/prototypes/access/accesses.ftl @@ -43,3 +43,20 @@ id-card-access-level-nuclear-operative = Ядерные оперативники id-card-access-level-syndicate-agent = Агенты Синдиката id-card-access-level-central-command = Центральное Коммандование + +id-card-access-level-orders = Заказы +id-card-access-level-mantis = Мантис +id-card-access-level-chief-justice = Верховный судья +id-card-access-level-prosecutor = Прокурор +id-card-access-level-justice = Юридический +id-card-access-level-corpsman = Бригмедик +id-card-access-level-psychologist = Психолог +id-card-access-level-mail = Почта +id-card-access-level-boxer = Боксёр +id-card-access-level-clown = Клоун +id-card-access-level-library = Библиотека +id-card-access-level-mime = Мим +id-card-access-level-musician = Музыкант +id-card-access-level-reporter = Репортёр +id-card-access-level-zookeeper = Зоолог +id-card-access-level-unused = Ты не должен был видеть это diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/belt/belts.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/belt/belts.ftl index 3b6e25939e..ef842de234 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/belt/belts.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/belt/belts.ftl @@ -37,6 +37,12 @@ ent-ClothingBeltSyndieHolster = плечевая кобура синдиката ent-ClothingBeltSecurityWebbing = РПС охраны .desc = Уникальный, универсальный разгрузочный жилет с ремнями и поясом, может вмещать снаряжение службы безопасности. .suffix = { "" } +ent-ClothingBeltMedicalRig = медицинская РПС + .desc = Специальный разгрузочный жилет в медицинских цветах, что имеет множество карманов и отделений для хранения медикаментов. + .suffix = { "" } +ent-ClothingBeltBrigmedicRig = РПС бригмедика + .desc = Одна из вариаций медицинской РПС, что обладает аналогичными характеристиками и параметрами, что и оригинал. + .suffix = { "" } ent-ClothingBeltMilitaryWebbing = армейская РПС .desc = Ременно-поясная система тактических ремней, которую носят абордажные группы Синдиката. .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/vending_machines.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/vending_machines.ftl index 432ac4fd0e..4e3f887c9f 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/vending_machines.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/vending_machines.ftl @@ -193,3 +193,42 @@ ent-VendingMachineSpaceUp = раздатчик Спейс-Ап ent-VendingMachineStarkist = раздатчик Старкист .desc = Вкус звезды в жидком виде. .suffix = { "" } +ent-VendingMachineBoxingDrobe = Боксомат + .desc = Торговый автомат для боксёрской одежды. + .suffix = { "" } +ent-VendingMachineCourierDrobe = КурьерШкаф + .desc = Идеальная, прочная и удобная одежда для курьеров! О да, самое то! + .suffix = { "" } +ent-VendingMachineCuraDrobe = КураДроб + .desc = Одежда для длительных посиделок за книжками только тут! + .suffix = { "" } +ent-VendingMachineDrGibb = Напитки Доктора Гибба + .desc = Напитки от всеми известного Доктора Гибба! (Примечание: Врачи не рекомендуют пить данные напитки, пейте на свой страх и риск.) + .suffix = { "" } +ent-VendingMachineMNKDrobe = АмиДроб + .desc = Спортивная одежда от компании «Амидас». + .suffix = { "" } +ent-VendingMachineAutomatrobe = ТургоШкаф + .desc = Торговый автомат одежды для автоматурга. + .suffix = { "" } +ent-VendingMachineAutomatrobe = ТургоШкаф + .desc = Торговый автомат одежды для автоматурга. + .suffix = { "" } +ent-VendingMachineSolsnack = СолМат + .desc = Закуски прямо из Солнечной системы! + .suffix = { "" } +ent-VendingMachinePride = ГееМат + .desc = Боже правый, как оно сюда попало?.. + .suffix = { "" } +ent-VendingMachineRepDrobe = РепоШкаф + .desc = Торговый автомат одежды для репортёра. + .suffix = { "" } +ent-VendingMachineFitness = СпортДроб + .desc = Одежда для спорта! Содержит на 99% больше белка! + .suffix = { "" } +ent-VendingMachineChemicalsSyndicate = СиндиХимия + .desc = Совершенно точно не продаёт химикаты и реагенты для Синдиката. + .suffix = { "" } +ent-VendingMachineHotfood = Горячие закуски + .desc = Старый торговый автомат, предлагающий «горячие блюда». Вы сомневаетесь, что его содержимое ещё съедобно. + .suffix = { "" } diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 752591da37..196f87ea46 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -300,7 +300,7 @@ - id: WeaponDisabler - id: ClothingOuterCoatHoSTrench - id: ClothingMaskNeckGaiter - - id: ClothingOuterHardsuitCombatHoS # DeltaV - ClothingOuterHardsuitSecurityRed replaced in favour of head of security's advanced combat hardsuit. + - id: ClothingOuterHardsuitSecurityRed # WWDP - Edit - id: ClothingBeltSecurityFilled - id: ClothingHeadsetAltSecurity - id: ClothingEyesGlassesSunglasses diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml index f217791683..88bef7707f 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml @@ -109,7 +109,7 @@ prob: 0.3 - id: ClothingMaskSterile - id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes! - prob: 0.3 + prob: 0.3 - type: entity parent: LockerWallMedical @@ -145,7 +145,7 @@ orGroup: Surgshrubs - id: ClothingMaskSterile - id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes! - prob: 0.3 + prob: 0.3 - type: entity id: LockerChemistryFilled @@ -184,10 +184,11 @@ - id: ClothingHeadsetMedical - id: ClothingMaskSterile - id: ClothingShoesBootsWinterParamedic #Delta V: Add departmental winter boots + - id: ClothingBeltMedicalRig # WWDP - Edit - id: MedkitFilled prob: 0.3 - id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes! - prob: 0.3 + prob: 0.3 - type: entity id: LockerParamedicFilledHardsuit #Delta V - Paramedic locker with suit @@ -207,8 +208,9 @@ - id: ClothingHeadsetMedical - id: ClothingMaskSterile - id: ClothingShoesBootsWinterParamedic #Delta V: Add departmental winter boots + - id: ClothingBeltMedicalRig # WWDP - Edit - id: HandheldGPSBasic - id: MedkitFilled prob: 0.3 - id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes! - prob: 0.3 + prob: 0.3 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index e2d7ad1483..f4f3ea9d4d 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -18,7 +18,7 @@ - id: ClothingOuterWinterWarden - id: RubberStampWarden - id: DoorRemoteArmory - - id: ClothingOuterHardsuitCombatWarden # DeltaV - ClothingOuterHardsuitWarden replaced in favour of warden's riot combat hardsuit. + - id: ClothingOuterHardsuitWarden # WWDP - Edit - id: HoloprojectorSecurity - id: ClothingEyesHudSecurity - id: BoxPDAPrisoner # Delta-V @@ -63,28 +63,26 @@ - type: StorageFill contents: - id: FlashlightSeclite - prob: 0.8 - - id: ClothingUniformJumpsuitSecGrey - prob: 0.3 - - id: ClothingUniformJumpsuitSecBlue # DeltaV - consistency with other sec uniforms - prob: 0.3 + # - id: ClothingUniformJumpsuitSecGrey # WWDP - Nah + # prob: 0.3 + # - id: ClothingUniformJumpsuitSecBlue # DeltaV - consistency with other sec uniforms # WWDP - Nah + # prob: 0.3 - id: ClothingUniformJumpsuitSec # DeltaV - consistency with other sec uniforms - prob: 0.3 - - id: ClothingUniformJumpskirtSecGrey # DeltaV - consistency with other sec uniforms - prob: 0.3 - - id: ClothingUniformJumpskirtSecBlue # DeltaV - consistency with other sec uniforms - prob: 0.3 + # - id: ClothingUniformJumpskirtSecGrey # DeltaV - consistency with other sec uniforms # WWDP - Nah + # prob: 0.3 + # - id: ClothingUniformJumpskirtSecBlue # DeltaV - consistency with other sec uniforms # WWDP - Nah + # prob: 0.3 - id: ClothingUniformJumpskirtSec # DeltaV - consistency with other sec uniforms - prob: 0.3 - id: ClothingHeadHelmetBasic - - id: ClothingHeadHelmetInsulated # Nyanotrasen - Insulative headgear - prob: 0.4 - - id: ClothingOuterArmorPlateCarrier # DeltaV - ClothingOuterArmorBasic replaced in favour of plate carrier and stabproof vest - - id: ClothingOuterArmorDuraVest - - id: ClothingOuterStasecSweater # DeltaV - in case the officers get cold :3 - prob: 0.75 - - id: ClothingUniformJumpsuitSecFormal # DeltaV - emergency parade time, Central's coming to visit - prob: 0.25 + - id: ClothingOuterArmorBasic # WWDP - Edit + # - id: ClothingHeadHelmetInsulated # Nyanotrasen - Insulative headgear # WWDP - Nah + # prob: 0.4 + # - id: ClothingOuterArmorPlateCarrier # DeltaV - ClothingOuterArmorBasic replaced in favour of plate carrier and stabproof vest # WWDP - Nah + # - id: ClothingOuterArmorDuraVest + # - id: ClothingOuterStasecSweater # DeltaV - in case the officers get cold :3 # WWDP - Nah + # prob: 0.75 + # - id: ClothingUniformJumpsuitSecFormal # DeltaV - emergency parade time, Central's coming to visit # WWDP - Nah + # prob: 0.25 - id: ClothingBeltSecurityFilled - id: Flash prob: 0.5 @@ -95,46 +93,34 @@ - id: WeaponMeleeNeedle prob: 0.1 - id: ClothingEyesHudSecurity + - id: ClothingMaskGasSecurity # WWDP - Edit - id: HoloprojectorSecurity - prob: 0.6 + - id: WeaponPistolMk58 # WWDP - Edit + - id: MagazinePistolRubber # WWDP - Edit - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes! prob: 0.3 - type: entity id: LockerBrigmedicFilled - suffix: Corpsman, Filled # DeltaV - rename brigmedic to corpsman + suffix: Brigmedic, Filled parent: LockerBrigmedic components: - type: StorageFill contents: - - id: ClothingEyesHudSecurity - id: WeaponDisabler - id: TrackingImplanter amount: 2 -## - id: ClothingOuterHardsuitCombatCorpsman # DeltaV - ClothingOuterHardsuitBrigmedic replaced in favour of corpsman's combat hardsuit; removing from standard filled locker to place in hardsuit filled locker. - id: BoxSterileMask - - id: ClothingHeadHatBeretCorpsman # DeltaV - ClothingHeadHatBeretBrigmedic replaced in favour of corpsman beret. -## - id: ClothingOuterCoatAMG # DeltaV - removed until I can resprite it or replace it. + - id: ClothingEyesHudMedSec # WWDP - Edit + - id: ClothingHeadHatBeretBrigmedic # WWDP - Edit + - id: ClothingOuterCoatAMG # WWDP - Edit + - id: ClothingBeltBrigmedicRig # WWDP - Edit - id: ClothingUniformJumpsuitBrigmedic - id: ClothingUniformJumpskirtBrigmedic -## - id: ClothingUniformJumpskirtOfLife # DeltaV - nah -## prob: 0.1 - id: HandheldGPSBasic # Delta V - added it for tracking the implant tracker pop up. - - id: MedkitFilled - - id: MedkitCombatFilled - prob: 0.6 - - id: MedkitAdvancedFilled - prob: 0.4 - - id: MedkitOxygenFilled - prob: 0.3 - - id: MedkitBruteFilled - prob: 0.3 - - id: MedkitToxinFilled - prob: 0.3 - - id: MedkitBurnFilled - prob: 0.7 -## - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse # DeltaV - why -## prob: 0.15 + - id: MedkitFilled # WWDP - Edit + - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse # DeltaV - why # WWDP - because + prob: 0.15 - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes! prob: 0.3 @@ -142,32 +128,26 @@ - type: entity id: LockerBrigmedicFilledHardsuit - suffix: Corpsman, Filled, Hardsuit + suffix: Brigmedic, Filled, Hardsuit parent: LockerBrigmedic components: - type: StorageFill contents: - - id: ClothingEyesHudSecurity - id: WeaponDisabler - id: TrackingImplanter amount: 2 - - id: ClothingOuterHardsuitCombatCorpsman + - id: BoxSterileMask # WWDP - Edit + - id: ClothingEyesHudMedSec # WWDP - Edit + - id: ClothingHeadHatBeretBrigmedic # WWDP - Edit + - id: ClothingOuterHardsuitBrigmedic # WWDP - Edit + - id: ClothingOuterCoatAMG # WWDP - Edit + - id: ClothingBeltBrigmedicRig # WWDP - Edit - id: ClothingUniformJumpsuitBrigmedic - id: ClothingUniformJumpskirtBrigmedic - id: HandheldGPSBasic # Added GPS because I just think it should be there tbh. - id: MedkitFilled - - id: MedkitCombatFilled - prob: 0.6 - - id: MedkitAdvancedFilled - prob: 0.4 - - id: MedkitOxygenFilled - prob: 0.3 - - id: MedkitBruteFilled - prob: 0.3 - - id: MedkitToxinFilled - prob: 0.3 - - id: MedkitBurnFilled - prob: 0.7 + - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse # DeltaV - why # WWDP - because + prob: 0.15 - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes! prob: 0.3 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml index 734bd485a2..05074bb2f9 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml @@ -139,7 +139,7 @@ - type: StorageFill contents: - id: OxygenTankFilled - - id: ClothingOuterHardsuitCombatOfficer # DeltaV - ClothingOuterHardsuitSecurity replaced in favour of security combat hardsuit. + - id: ClothingOuterHardsuitSecurity - id: ClothingMaskBreath - type: AccessReader access: [["Security"]] @@ -198,7 +198,7 @@ contents: - id: OxygenTankFilled - id: JetpackSecurityFilled - - id: ClothingOuterHardsuitCombatHoS # DeltaV - ClothingOuterHardsuitSecurityRed replaced in favour of head of security's advanced combat hardsuit. + - id: ClothingOuterHardsuitSecurityRed - id: ClothingMaskGasSwat - type: AccessReader access: [["HeadOfSecurity"]] @@ -212,7 +212,7 @@ - type: StorageFill contents: - id: OxygenTankFilled - - id: ClothingOuterHardsuitCombatWarden # DeltaV - ClothingOuterHardsuitWarden replaced in favour of warden's riot combat hardsuit. + - id: ClothingOuterHardsuitWarden - id: ClothingMaskBreath - type: AccessReader access: [["Armory"]] @@ -262,18 +262,17 @@ - type: AccessReader access: [ [ "Paramedic" ] ] -# DeltaV - Adding Corpsman Suit Storage Unit - type: entity id: SuitStorageCorpsman parent: SuitStorageBase - suffix: Corpsman + suffix: Brigmedic components: - type: StorageFill contents: - id: NitrogenTankFilled - id: OxygenTankFilled - - id: ClothingOuterHardsuitCombatCorpsman - - id: ClothingMaskBreath + - id: ClothingOuterHardsuitBrigmedic + - id: ClothingMaskBreathMedicalSecurity - type: AccessReader access: [ [ "Corpsman" ] ] diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml index bd3975767b..ca3146cb3d 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml @@ -130,7 +130,7 @@ - type: entity parent: DefaultStationBeaconSecurity id: DefaultStationBeaconCorpsman - suffix: Corpsman + suffix: Brigmedic components: - type: NavMapBeacon text: station-beacon-corpsman diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml index f6e7bcf257..4c5822ddb5 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml @@ -100,7 +100,7 @@ - type: entity parent: AirlockSecurity id: AirlockCorpsmanLocked - suffix: Corpsman, Locked + suffix: Brigmedic, Locked components: - type: AccessReader access: [["Corpsman"]] @@ -108,7 +108,7 @@ - type: entity parent: AirlockSecurityGlass id: AirlockCorpsmanGlassLocked - suffix: Corpsman, Locked + suffix: Brigmedic, Locked components: - type: AccessReader access: [["Corpsman"]] diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml index 681cb95be7..fbbebfa8c0 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml @@ -34,15 +34,16 @@ id: CorpsmanGear # see Prototypes/Roles/Jobs/Fun/misc_startinggear.yml for "BrigmedicGear" equipment: jumpsuit: ClothingUniformJumpsuitBrigmedic - outerClothing: ClothingOuterArmorPlateCarrier - back: ClothingBackpackBrigmedicFilled - shoes: ClothingShoesBootsCombatFilled + outerClothing: ClothingOuterArmorBasic + back: ClothingBackpackBrigmedicFilled + shoes: ClothingShoesBootsJack gloves: ClothingHandsGlovesNitrile - eyes: ClothingEyesHudMedical - head: ClothingHeadHatBeretCorpsman - id: CorpsmanPDA + eyes: ClothingEyesHudMedSec + head: ClothingHeadHatBeretBrigmedic + mask: ClothingMaskSterile + id: BrigmedicPDA ears: ClothingHeadsetBrigmedic - belt: ClothingBeltCorpsmanWebbingFilled + belt: ClothingBeltBrigmedicRig pocket1: WeaponPistolMk58Nonlethal innerClothingSkirt: ClothingUniformJumpskirtBrigmedic satchel: ClothingBackpackSatchelBrigmedicFilled diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index 605cb61c43..00313a63ae 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -68,11 +68,11 @@ - type: entity parent: ClothingBackpack id: ClothingBackpackBrigmedic - name: corpsman backpack # DeltaV - rename brig medic to corpsman + name: brigmedic backpack # WWDP - Edit description: It's a very sterile backpack. components: - type: Sprite - sprite: DeltaV/Clothing/Back/Backpacks/brigmedic.rsi # DeltaV - resprite + sprite: Clothing/Back/Backpacks/brigmedic.rsi # WWDP - Edit - type: entity parent: ClothingBackpack diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml index 46d7ae4538..8efd7f838f 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -75,11 +75,11 @@ - type: entity parent: ClothingBackpackDuffel id: ClothingBackpackDuffelBrigmedic - name: corpsman duffel bag # DeltaV - rename brigmedic to corpsman + name: brigmedic duffel bag # WWDP - Edit description: A large duffel bag for holding extra medical related goods. components: - type: Sprite - sprite: DeltaV/Clothing/Back/Duffels/brigmedic.rsi # DeltaV - resprite + sprite: Clothing/Back/Duffels/brigmedic.rsi # WWDP - Edit - type: entity parent: ClothingBackpackDuffel diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml index bf52477340..b251ea6de2 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml @@ -117,11 +117,11 @@ - type: entity parent: ClothingBackpackSatchel id: ClothingBackpackSatchelBrigmedic - name: corpsman satchel # DeltaV - rename brigmedic to corpsman + name: brigmedic satchel # WWDP - Edit description: A sterile satchel for medical related needs. components: - type: Sprite - sprite: DeltaV/Clothing/Back/Satchels/brigmedic.rsi # DeltaV - resprite + sprite: Clothing/Back/Satchels/brigmedic.rsi # WWDP - Edit - type: entity parent: ClothingBackpackSatchel diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 30907f70b5..68ad4f0af6 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -49,9 +49,9 @@ description: A stylish clothing option for security officers. components: - type: Sprite - sprite: DeltaV/Clothing/Head/Hats/beret_security.rsi # DeltaV - resprite + sprite: Clothing/Head/Hats/beret_security.rsi # WWDP - Edit - type: Clothing - sprite: DeltaV/Clothing/Head/Hats/beret_security.rsi # DeltaV - resprite + sprite: Clothing/Head/Hats/beret_security.rsi # WWDP - Edit - type: Tag tags: - ClothMade diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index b79b72ffb6..e4f9621f7a 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -9,9 +9,9 @@ description: Standard security gear. Protects the head from impacts. components: - type: Sprite - sprite: DeltaV/Clothing/Head/Helmets/security.rsi # DeltaV - resprite + sprite: Clothing/Head/Helmets/security.rsi # WWDP - Edit - type: Clothing - sprite: DeltaV/Clothing/Head/Helmets/security.rsi # DeltaV - resprite + sprite: Clothing/Head/Helmets/security.rsi # WWDP - Edit - type: Armor #Values seem to let the user survive one extra hit if attacked consistently. modifiers: coefficients: diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 8d48c11ca8..a6bfae5c6c 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -170,9 +170,9 @@ description: A standard Station Security uniform, adorned with gold emblems and commander's epaulettes. # DeltaV - improved description components: - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpskirt/hos.rsi # WWDP-Edit - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpskirt/hos.rsi # WWDP-Edit - type: entity parent: ClothingUniformSkirtBase @@ -254,13 +254,13 @@ - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtBrigmedic - name: corpsman jumpskirt # DeltaV - renamed brigmedic to corpsman + name: brigmedic jumpskirt description: This uniform is issued to qualified personnel who have been trained. No one cares that the training took half a day. components: - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpskirt/brigmedic.rsi # WWDP-Edit - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpskirt/brigmedic.rsi # WWDP-Edit - type: entity parent: ClothingUniformBase @@ -364,9 +364,9 @@ description: A charcoal skirt and a dull red shirt, the standard-issue uniform of the infamous Station Security Department. # DeltaV - improved description components: - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpskirt/security.rsi # WWDP-Edit - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpskirt/security.rsi # WWDP-Edit - type: entity parent: ClothingUniformSkirtBase @@ -375,9 +375,9 @@ description: Red shirt on a charcoal skirt, with white markings and epaulettes that denote a warden's rank. # DeltaV - improved description components: - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpskirt/warden.rsi # WWDP-Edit - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpskirt/warden.rsi # WWDP-Edit - type: entity parent: ClothingUniformSkirtBase diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 6c853374f2..84bb44396c 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -86,9 +86,9 @@ description: It's a snappy jumpsuit with a sturdy set of overalls. It's very dirty. components: - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/explorer.rsi # DeltaV - Salvage better looking uniform + sprite: Clothing/Uniforms/Jumpsuit/salvage.rsi # WWDP-Edit - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/explorer.rsi # DeltaV - Salvage better looking uniform + sprite: Clothing/Uniforms/Jumpsuit/salvage.rsi # WWDP-Edit - type: entity parent: ClothingUniformBase @@ -326,9 +326,9 @@ description: A standard Station Security uniform, adorned with gold emblems and commander's epaulettes. # DeltaV - improved description components: - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/hos.rsi # WWDP-Edit - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/hos.rsi # WWDP-Edit - type: entity parent: ClothingUniformBase @@ -348,9 +348,9 @@ description: A blue Station Security shirt with charcoal trousers. Features gold emblems and commander's epaulettes. # DeltaV - improved description components: - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/hos_blue.rsi # WWDP-Edit - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/hos_blue.rsi # WWDP-Edit - type: entity parent: ClothingUniformBase @@ -359,9 +359,9 @@ description: A grey Station Security shirt with charcoal trousers. Stands out with red highlights, gold emblems, and commander's epaulettes. # DeltaV - improved description components: - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/hos_grey.rsi # WWDP-Edit - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/hos_grey.rsi # WWDP-Edit - type: entity parent: ClothingUniformBase @@ -443,13 +443,13 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitBrigmedic - name: corpsman jumpsuit # DeltaV - rename brigmedic to corpsman + name: brigmedic jumpsuit description: This uniform is issued to qualified personnel who have been trained. No one cares that the training took half a day. components: - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/brigmedic.rsi # WWDP-Edit - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/brigmedic.rsi # WWDP-Edit - type: entity parent: ClothingUniformBase @@ -576,9 +576,9 @@ description: Charcoal trousers and a dull red shirt, the standard-issue uniform of the infamous Station Security Department. # DeltaV - improved description components: - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/security.rsi # WWDP-Edit - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/security.rsi # WWDP-Edit - type: entity parent: ClothingUniformBase @@ -587,9 +587,9 @@ description: A cool blue shirt over charcoal trousers, for the calm and collected security officer. # DeltaV - improved description components: - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/security_blue.rsi # WWDP-Edit - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/security_blue.rsi # WWDP-Edit - type: entity parent: ClothingUniformBase @@ -598,9 +598,9 @@ description: A light grey shirt with bright red highlights, for dedicated and responsive security officers. # DeltaV - improved description components: - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/security_grey.rsi # WWDP-Edit - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/security_grey.rsi # WWDP-Edit - type: entity parent: ClothingUniformBase @@ -609,9 +609,9 @@ description: Red shirt on charcoal trousers, with white markings and epaulettes that denote a warden's rank. # DeltaV - improved description components: - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/warden.rsi # WWDP-Edit - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/warden.rsi # WWDP-Edit - type: entity parent: ClothingUniformBase diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml index 52b008c7f2..1d7b6d899c 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml @@ -9,7 +9,7 @@ - type: Transform noRot: true - type: Sprite - sprite: Structures/Storage/canister.rsi + sprite: _White\Structures\Storage\canister.rsi noRot: true layers: - state: grey @@ -674,7 +674,7 @@ damageModifierSet: Metallic - type: InteractionOutline - type: Sprite - sprite: Structures/Storage/canister.rsi + sprite: _White\Structures\Storage\canister.rsi state: grey-1 - type: Physics bodyType: Dynamic diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml index b38a77b82b..5fd3050705 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -325,7 +325,7 @@ - type: entity id: LockerBrigmedic parent: LockerBaseSecure - name: corpsman locker # DeltaV - rename brigmedic to corpsman + name: brigmedic locker # WWDP - Edit components: - type: Appearance - type: EntityStorageVisuals diff --git a/Resources/Prototypes/_White/Entities/Clothing/Belt/brigmedicrig.yml b/Resources/Prototypes/_White/Entities/Clothing/Belt/brigmedicrig.yml new file mode 100644 index 0000000000..6a3dc22e7e --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Clothing/Belt/brigmedicrig.yml @@ -0,0 +1,10 @@ +- type: entity + parent: ClothingBeltStorageBase + id: ClothingBeltBrigmedicRig + name: brigmedic webbing + description: Recolor of medical webbing vest. Special for brigmedic! + components: + - type: Sprite + sprite: _White/Clothing/Belt/brigmedicwebbing.rsi + - type: Clothing + sprite: _White/Clothing/Belt/brigmedicwebbing.rsi diff --git a/Resources/Prototypes/_White/Entities/Clothing/Belt/paramedicrig.yml b/Resources/Prototypes/_White/Entities/Clothing/Belt/paramedicrig.yml new file mode 100644 index 0000000000..f7e9f9c921 --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Clothing/Belt/paramedicrig.yml @@ -0,0 +1,10 @@ +- type: entity + parent: ClothingBeltStorageBase + id: ClothingBeltMedicalRig + name: medical webbing + description: A medical webbing vest that has many pockets and places to store medications. + components: + - type: Sprite + sprite: _White/Clothing/Belt/paramedwebbing.rsi + - type: Clothing + sprite: _White/Clothing/Belt/paramedwebbing.rsi diff --git a/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/equipped-BACKPACK.png index b4f0155515..f5f32aa348 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/icon.png index d61d4eeb83..22f7831b46 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/equipped-BACKPACK.png index aa9b9fa096..cc1afccae5 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/icon.png index 93c823ce08..6050ab8de7 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/equipped-BACKPACK.png index 9f10db67a9..5f22d5a11d 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/icon.png index 9112452d20..528364ad49 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/clown.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/clown.rsi/equipped-BACKPACK.png index 3923e872a1..a0dff37764 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/clown.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/clown.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/clown.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/clown.rsi/icon.png index f5dd61b22c..848b405dad 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/clown.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/clown.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/clown.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/clown.rsi/inhand-left.png index 9a1dc27dda..a3f3b84ce3 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/clown.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Backpacks/clown.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/clown.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/clown.rsi/inhand-right.png index c7cec5afbc..cc5279f936 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/clown.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Backpacks/clown.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/cluwne.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/cluwne.rsi/equipped-BACKPACK.png index 589cf50997..3673fd3067 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/cluwne.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/cluwne.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/cluwne.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/cluwne.rsi/icon.png index 3d31713622..bcf2a51e43 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/cluwne.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/cluwne.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/equipped-BACKPACK.png index ee34a4a9c2..cd4dce8756 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/icon.png index 20df264c06..6918decb91 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/equipped-BACKPACK.png index 0f412e2338..6174410417 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/icon.png index 669c5bc3e7..b79c807ae6 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/equipped-BACKPACK.png index af6478d1fa..8d3834833b 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/icon.png index ec7d022940..99af2a17c7 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/equipped-BACKPACK.png index bfe4179307..2538c8d433 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/icon.png index 7ad80206d8..5037ee3687 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/inhand-left.png index f4318242ca..9d9dbbd30f 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/inhand-right.png index 083cf6092f..e6333b224b 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/science.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/science.rsi/equipped-BACKPACK.png index 9c7b04a38b..23afd82caf 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/science.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/science.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/science.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/science.rsi/icon.png index d1cf3b1540..bc9cca02f3 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/science.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/science.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png index c9e4989cd5..36b6899627 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/icon.png index 47613295e4..19115dfeb3 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/equipped-BACKPACK.png index fc977d86e7..21003e9eef 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/icon.png index a366d48aa5..ab4b059df1 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/icon.png index ec4cf4ab8e..ce67965c1e 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/clown.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/clown.rsi/equipped-BACKPACK.png index 781ad572bf..f450d65415 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/clown.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Duffels/clown.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/clown.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/clown.rsi/icon.png index d69734dc8a..9080df348a 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/clown.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/clown.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/clown.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/clown.rsi/inhand-left.png index da673dc3b7..c9d6c9db60 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/clown.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Duffels/clown.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/clown.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/clown.rsi/inhand-right.png index ca857332fb..e8824368a6 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/clown.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Duffels/clown.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/science.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/science.rsi/icon.png index 709e67d3a4..6655fbb71b 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/science.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/science.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/captain.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/equipped-BACKPACK.png index 8332a0c0a9..ae70111e1e 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/captain.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/captain.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/icon.png index a89cee8d79..3b0bd0547c 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/captain.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/equipped-BACKPACK.png index d9b5d89404..365e30b686 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/icon.png index ea5838f139..8feb895010 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/clown.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/clown.rsi/equipped-BACKPACK.png index 3b0ecb4902..fb8f0b0998 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/clown.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/clown.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/clown.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/clown.rsi/icon.png index 269df08fe3..1ab89aa581 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/clown.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/clown.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/clown.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/clown.rsi/inhand-left.png index 1c919ed8d3..f10df92afd 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/clown.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Satchels/clown.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/clown.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/clown.rsi/inhand-right.png index 966455d20d..4cb86bd338 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/clown.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Satchels/clown.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/equipped-BACKPACK.png index d5dbd754d5..7a84e0c0e3 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/icon.png index ec5b0363cb..e4b9442f02 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/equipped-BACKPACK.png index fc4a93d812..9ae968c9d0 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/icon.png index 2a5ea97c42..684aab50d7 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/medical.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/medical.rsi/equipped-BACKPACK.png index f80b1f2e6e..8e2fc11935 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/medical.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/medical.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/medical.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/medical.rsi/icon.png index 450a24e818..b6840d14b7 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/medical.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/medical.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/equipped-BACKPACK.png index c24f815bc1..34e981394a 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/icon.png index d390ee7c98..9e72773f76 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/science.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/science.rsi/equipped-BACKPACK.png index 2661a05b4c..7c1da2349b 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/science.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/science.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/science.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/science.rsi/icon.png index 53d96698ae..1b1c1e0ebf 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/science.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/science.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/security.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/security.rsi/equipped-BACKPACK.png index c33aec6307..db7f22da18 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/security.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/security.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/security.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/security.rsi/icon.png index 7f100adff6..c36b8c036d 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/security.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingblue.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingblue.rsi/meta.json index 0bb50af2c7..7c46eb548a 100644 --- a/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingblue.rsi/meta.json +++ b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingblue.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HAND", "directions": 4 }, + { + "name": "equipped-HAND-body-slim", + "directions": 4 + }, { "name": "equipped-HAND-kangaroo", "directions": 4 diff --git a/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxinggreen.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxinggreen.rsi/meta.json index 0bb50af2c7..7c46eb548a 100644 --- a/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxinggreen.rsi/meta.json +++ b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxinggreen.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HAND", "directions": 4 }, + { + "name": "equipped-HAND-body-slim", + "directions": 4 + }, { "name": "equipped-HAND-kangaroo", "directions": 4 diff --git a/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingred.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingred.rsi/meta.json index 0bb50af2c7..7c46eb548a 100644 --- a/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingred.rsi/meta.json +++ b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingred.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HAND", "directions": 4 }, + { + "name": "equipped-HAND-body-slim", + "directions": 4 + }, { "name": "equipped-HAND-kangaroo", "directions": 4 diff --git a/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingyellow.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingyellow.rsi/meta.json index 0bb50af2c7..7c46eb548a 100644 --- a/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingyellow.rsi/meta.json +++ b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingyellow.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HAND", "directions": 4 }, + { + "name": "equipped-HAND-body-slim", + "directions": 4 + }, { "name": "equipped-HAND-kangaroo", "directions": 4 diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/equipped-HAND.png index 33e36a316f..5599a2914e 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/equipped-HAND.png and b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/icon.png index 59d0d46baa..44e5dfe38a 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/icon.png and b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json index 88e3ebd509..7b34bad498 100644 --- a/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json +++ b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HAND", "directions": 4 }, + { + "name": "equipped-HAND-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/equipped-HAND.png index 776e6a1ff9..793a3115b7 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/equipped-HAND.png and b/Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/inhand-left.png index 5ec31202f1..b9842fb35b 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/inhand-left.png and b/Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/inhand-right.png index f9ea9a377a..a92a411614 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/inhand-right.png and b/Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/equipped-HAND.png index 789a7c00ed..f7a0c87185 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/equipped-HAND.png and b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/icon.png index b60662857e..e22806c85d 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/icon.png and b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json index ccb1c5dcaf..c77ebf22ca 100644 --- a/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json +++ b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json @@ -1 +1,35 @@ -{"version": 1, "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": {"x": 32, "y": 32}, "states": [{"name": "icon"}, {"name": "equipped-HAND", "directions": 4}, {"name": "inhand-left", "directions": 4}, {"name": "inhand-right", "directions": 4}, {"name": "equipped-HAND-vox", "directions": 4}]} +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "equipped-HAND-body-slim", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-HAND-vox", + "directions": 4, + "delays": [[1.0], [1.0], [1.0], [1.0]] + } + ] + } diff --git a/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png index 0a03d27619..f0733cd45a 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png and b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png index d7dbdbe152..ac1b020d5b 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png and b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/meta.json index 23e44f0be0..5396627604 100644 --- a/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/meta.json +++ b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HAND", "directions": 4 }, + { + "name": "equipped-HAND-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Hands/Gloves/fingerless.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/fingerless.rsi/equipped-HAND.png index 569d85e129..b49db4e5ed 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/fingerless.rsi/equipped-HAND.png and b/Resources/Textures/Clothing/Hands/Gloves/fingerless.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/fingerless.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/fingerless.rsi/icon.png index 010b2064b5..70ba03167b 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/fingerless.rsi/icon.png and b/Resources/Textures/Clothing/Hands/Gloves/fingerless.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/fingerless.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/fingerless.rsi/meta.json index e47f13296a..74d3de59a4 100644 --- a/Resources/Textures/Clothing/Hands/Gloves/fingerless.rsi/meta.json +++ b/Resources/Textures/Clothing/Hands/Gloves/fingerless.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HAND", "directions": 4 }, + { + "name": "equipped-HAND-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/equipped-HAND.png index 26464eaee7..57dd8882d3 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/equipped-HAND.png and b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/icon.png index 89889bd84c..11237e02a9 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/icon.png and b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/meta.json index 88e3ebd509..7b34bad498 100644 --- a/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/meta.json +++ b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HAND", "directions": 4 }, + { + "name": "equipped-HAND-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Hands/Gloves/leather.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/leather.rsi/meta.json index d1462f72ec..14a1ffdcaa 100644 --- a/Resources/Textures/Clothing/Hands/Gloves/leather.rsi/meta.json +++ b/Resources/Textures/Clothing/Hands/Gloves/leather.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HAND", "directions": 4 }, + { + "name": "equipped-HAND-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Hands/Gloves/powerglove.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/powerglove.rsi/meta.json index fb8682d39a..841d565db3 100644 --- a/Resources/Textures/Clothing/Hands/Gloves/powerglove.rsi/meta.json +++ b/Resources/Textures/Clothing/Hands/Gloves/powerglove.rsi/meta.json @@ -17,10 +17,18 @@ "name": "equipped-HAND", "directions": 4 }, + { + "name": "equipped-HAND-body-slim", + "directions": 4 + }, { "name": "on-equipped-HAND", "directions": 4 }, + { + "name": "on-equipped-HAND-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Hands/Gloves/robohands.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/robohands.rsi/meta.json index 88e3ebd509..7b34bad498 100644 --- a/Resources/Textures/Clothing/Hands/Gloves/robohands.rsi/meta.json +++ b/Resources/Textures/Clothing/Hands/Gloves/robohands.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HAND", "directions": 4 }, + { + "name": "equipped-HAND-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/meta.json index ca6ed489fe..7a47a094da 100644 --- a/Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/meta.json +++ b/Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/meta.json @@ -28,6 +28,18 @@ "name": "green-equipped-HAND", "directions": 4 }, + { + "name": "equipped-HAND-body-slim", + "directions": 4 + }, + { + "name": "red-equipped-HAND-body-slim", + "directions": 4 + }, + { + "name": "green-equipped-HAND-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/equipped-HELMET.png index aa455c496f..c9a347658c 100644 Binary files a/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png index fee14e7a8c..747d885b15 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png index 3a850ef0d8..57d5b47236 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png and b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-equipped-HELMET.png index 31760fce4e..909bac5fd5 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-left.png index 5c130ddc0d..be162bd0a0 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-right.png index 1d83642a05..ac2d1f67fa 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-equipped-HELMET.png index 54e729e107..bbb541a636 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-left.png index aeee8b15a7..80c17d64ae 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-right.png index 7bb8429146..1f069dec79 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png index ba88c23f72..eb5dbe122d 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png index 316cf7a9bc..57d5b47236 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-equipped-HELMET.png index ff4a3732bb..14e1a8e7b4 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-left.png index 1d3e030449..4e2955903b 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-right.png index 2900754a94..7c83a07d5e 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-equipped-HELMET.png index 5686662f41..7ba4874a8d 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-left.png index 61e9fd17dd..d3f7cdaf4c 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-right.png index 877bafcc6a..4e48d3745c 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png index 011962037d..7e0ae9838a 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png index 3a850ef0d8..57d5b47236 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-equipped-HELMET.png index 8a4c544352..59c7868010 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-left.png index 6d4ac23678..515cab6b2f 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-right.png index a76b8fc02e..10a5a6809c 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-equipped-HELMET.png index bfb5f6e1fc..f666b163ed 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-left.png index f8b08eeda0..6b1f9ab92b 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-right.png index b1f55babdd..a39346c8d2 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png index 2a5093d619..8147df63ed 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png index 316cf7a9bc..57d5b47236 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-equipped-HELMET.png index 7adb94de92..c6d41f90fe 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-left.png index 5693510c94..cb68e36e28 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-right.png index b9118b3740..e5a082c2ac 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-equipped-HELMET.png index daa76611f2..2890c3adac 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-left.png index 4328ca313a..e5a2d0db24 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-right.png index f5bc8e9427..87610635e8 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png index 1a3f49cc1b..ba217e4678 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png index 3a850ef0d8..57d5b47236 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-equipped-HELMET.png index 3184781883..68b1a44b6a 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-left.png index 200cced5f8..73797bda24 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-right.png index 1d47eeb0c8..7514ad28a3 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-equipped-HELMET.png index bea2ece2a3..46de28ac3a 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-left.png index fdafcd1a54..819e0d36b1 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-right.png index 6ad388244c..5407da7f80 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json index fe9f38cad4..2c29e1db67 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json @@ -36,14 +36,6 @@ { "name": "on-inhand-right", "directions": 4 - }, - { - "name": "off-equipped-HELMET-vulpkanin", - "directions": 4 - }, - { - "name": "on-equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/meta.json index fe9f38cad4..2c29e1db67 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/meta.json @@ -36,14 +36,6 @@ { "name": "on-inhand-right", "directions": 4 - }, - { - "name": "off-equipped-HELMET-vulpkanin", - "directions": 4 - }, - { - "name": "on-equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/meta.json index fe9f38cad4..2c29e1db67 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/meta.json @@ -36,14 +36,6 @@ { "name": "on-inhand-right", "directions": 4 - }, - { - "name": "off-equipped-HELMET-vulpkanin", - "directions": 4 - }, - { - "name": "on-equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/meta.json index fe9f38cad4..2c29e1db67 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/meta.json @@ -36,14 +36,6 @@ { "name": "on-inhand-right", "directions": 4 - }, - { - "name": "off-equipped-HELMET-vulpkanin", - "directions": 4 - }, - { - "name": "on-equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/meta.json index fe9f38cad4..2c29e1db67 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/meta.json @@ -36,14 +36,6 @@ { "name": "on-inhand-right", "directions": 4 - }, - { - "name": "off-equipped-HELMET-vulpkanin", - "directions": 4 - }, - { - "name": "on-equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-light.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-light.png index 9f75f28c05..42bc45b005 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-light.png and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-light.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head.png index f0a064cde4..bdadc8ccee 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head.png and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon-flash.png index bed72ecb13..a2ec510340 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon.png index e390363d61..fad00b583c 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json index 93d9fece1d..1faf3aa6d0 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -54,14 +54,6 @@ { "name": "inhand-right-light", "directions": 4 - }, - { - "name": "equipped-head-vulpkanin", - "directions": 4 - }, - { - "name": "equipped-head-harpy", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/meta.json index 8762076627..120d4d7723 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", "size": { "x": 32, "y": 32 @@ -21,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon.png index cee0d6f029..efb3981114 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json index cc8edd3819..ac71856cd7 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json @@ -36,14 +36,6 @@ { "name": "on-inhand-right", "directions": 4 - }, - { - "name": "off-equipped-HELMET-harpy", - "directions": 4 - }, - { - "name": "on-equipped-HELMET-harpy", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/icon.png index 5cfffd9203..8070f6af3a 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json index f6b8613891..855e3345c9 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json @@ -6,25 +6,21 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-HELMET", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-HELMET-harpy", - "directions": 4 - } - ] -} + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET.png index fe62e15b50..8df1903288 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/icon.png index 1b712fe674..12355e0a91 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json index 83e8e1a788..f1d91cbc4c 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin versions taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/091d9ec00f186052b87bd65125e896f78faefe38 and edited by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, edited by Emisse for SS14", "size": { "x": 32, "y": 32 @@ -21,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/icon-flash.png index be2593406a..31cab844de 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/icon.png index 85281322f0..36dc98d0a5 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json index 1ac1729cd2..7bea2d1a86 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin versions taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -36,22 +36,6 @@ { "name": "on-inhand-right", "directions": 4 - }, - { - "name": "on-equipped-HELMET-vulpkanin", - "directions": 4 - }, - { - "name": "off-equipped-HELMET-vulpkanin", - "directions": 4 - }, - { - "name": "on-equipped-HELMET-harpy", - "directions": 4 - }, - { - "name": "off-equipped-HELMET-harpy", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET.png index f394a8ea4c..5ef4fd4d56 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET.png index 6baf685a66..3e79a88dc4 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon-flash.png index d8e40277cc..91bbb14be1 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon.png index 45763e5696..9f3fd86951 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json index 4dae2c687d..7bea2d1a86 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin versions taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -36,14 +36,6 @@ { "name": "on-inhand-right", "directions": 4 - }, - { - "name": "on-equipped-HELMET-vulpkanin", - "directions": 4 - }, - { - "name": "off-equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET.png index 55b9fa1d3e..140240630c 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET.png index 896f1fe375..2eed616df6 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/icon-flash.png index 865873709e..4bbe0b81f0 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/icon.png index 3b8c23b7b5..94d2848ad0 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET.png index 95ed264c5e..3449f02b2e 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-left.png index b26ae9a31f..7115578827 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-right.png index fc0edd4a97..aa2103ca92 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET.png index 4377435a3b..d2bc595842 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-left.png index 3f5034da6c..14e6644a94 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-right.png index 45776a03b8..82edcbc9d9 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json index d168108fdf..7bea2d1a86 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -36,14 +36,6 @@ { "name": "on-inhand-right", "directions": 4 - }, - { - "name": "on-equipped-HELMET-vulpkanin", - "directions": 4 - }, - { - "name": "off-equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon-flash.png index 31e787f822..efe3a347df 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon.png index a134c90cca..f04ab4ca88 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json index a2c357d43f..7bea2d1a86 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin versions taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -36,14 +36,6 @@ { "name": "on-inhand-right", "directions": 4 - }, - { - "name": "on-equipped-HELMET-vulpkanin", - "directions": 4 - }, - { - "name": "off-equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET.png index f6e0018723..fb5a4df409 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png index dc16b147b8..b72196c27f 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png index e289c62a84..0c1a10b800 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET.png index 44ead9d1ae..91c6b631c3 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png index b107272dda..eef3f232c6 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png index 59a3181afb..a95b76ac72 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/icon-flash.png index 551d52bf04..38dd03e125 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/icon.png index 68733a17ff..7d9e036e64 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json index d168108fdf..7bea2d1a86 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -36,14 +36,6 @@ { "name": "on-inhand-right", "directions": 4 - }, - { - "name": "on-equipped-HELMET-vulpkanin", - "directions": 4 - }, - { - "name": "off-equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET.png index 370d0a28cf..3f096e899e 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-left.png index b11a533c26..f6c1dc2a0c 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-right.png index b9c9df2350..bf79ef6721 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET.png index 2e5db5827b..5ffb2bdb63 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-left.png index 12d13f0e18..5c2ec51b77 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-right.png index 141dc492a4..121276d6c3 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/icon-flash.png index 5d5b1e76d1..ded0a7f43e 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/icon.png index 5c5b4b53d6..ea60e98220 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json index 40c5c72b11..7bea2d1a86 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin versions taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/091d9ec00f186052b87bd65125e896f78faefe38 and edited by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -36,14 +36,6 @@ { "name": "on-inhand-right", "directions": 4 - }, - { - "name": "on-equipped-HELMET-vulpkanin", - "directions": 4 - }, - { - "name": "off-equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET.png index 3f16f842ce..27537e7ce7 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET.png index f7ec9d2fad..bc7111e644 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/icon-flash.png index c711b3b330..46a4fe23c9 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/icon.png index ce766f6f6e..1d638eb8df 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/meta.json index 14121523ca..0180f7feb0 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "sprite made by Gtheglorious based on the sprite made by Alekshhh for SS14 | vulpkanin versions made by Floofers", + "copyright": "sprite made by Gtheglorious based on the sprite made by Alekshhh for SS14", "size": { "x": 32, "y": 32 @@ -20,14 +20,6 @@ { "name": "on-equipped-HELMET", "directions": 4 - }, - { - "name": "on-equipped-HELMET-vulpkanin", - "directions": 4 - }, - { - "name": "off-equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET.png index 853f2d1868..5cca860649 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET.png index 26398a6b41..0ddb364119 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon-flash.png index 84f1b0ad31..1dc8c708fd 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon.png index 3301c0a0ab..a98172635b 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json index a2e10d4300..75d37bdc8e 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprite made by Gtheglorious based on the sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, | vulpkanin versions taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/091d9ec00f186052b87bd65125e896f78faefe38 and edited by Floofers", + "copyright": "Sprite made by Gtheglorious based on the sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e,", "size": { "x": 32, "y": 32 @@ -36,14 +36,6 @@ { "name": "on-inhand-right", "directions": 4 - }, - { - "name": "on-equipped-HELMET-vulpkanin", - "directions": 4 - }, - { - "name": "off-equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET.png index 2c953f28dd..aa41174ec2 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET.png index b2dfdc5d08..4c01c42982 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-light.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-light.png index e9fb8a3e1f..72cdd79b46 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-light.png and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-light.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-unshaded.png index e8aaf06567..54bd9a7443 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-unshaded.png and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-unshaded.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head.png index 4581e3275d..5a7b57a565 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head.png and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/icon-flash.png index 6f33c4c29b..288b70f403 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/icon-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/icon-unshaded.png index b6e9cb615d..448092db13 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/icon-unshaded.png and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/icon-unshaded.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/icon.png index b1692715e8..65dea71711 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left-light.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left-light.png index 7f1657d9e5..89f23c3f8f 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left-light.png and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left-light.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left-unshaded.png index fe450b8df1..513c673fab 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left-unshaded.png and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left-unshaded.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left.png index 81cecd01c2..49f5998633 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right-light.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right-light.png index 7749494c56..cd634ab3e4 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right-light.png and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right-light.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right-unshaded.png index be08f2c257..0f871ad358 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right-unshaded.png and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right-unshaded.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right.png index 2bbec0f04c..c9874269be 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/light-overlay.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/light-overlay.png index 477e8008ba..8a728db9fb 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/light-overlay.png and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/light-overlay.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json index 35a6a87bfd..663b0129d5 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Original by Emisse, modified by EmoGarbage404 | vulpkanin version made by Floofers", + "copyright": "Original by Emisse, modified by EmoGarbage404", "size": { "x": 32, @@ -55,10 +55,6 @@ { "name": "inhand-right-light", "directions": 4 - }, - { - "name": "equipped-head-vulpkanin", - "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon-flash.png index a2da102550..699a26c7bc 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon.png index 6a4a0e32a4..b97674fdfb 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET.png index e6aafcfcf0..32759d3244 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-left.png index 1b108753b3..ad32ce8f28 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-right.png index dc0500af77..a0cd6c22b7 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET.png index 4fd853dd13..f7f4fc1570 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-left.png index c1350c8242..e40883d319 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-right.png index db67f97b6f..2b7a0306d4 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon-flash.png index 8d5c3f58a5..2257c4a077 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon.png index 08b6d1d87c..972df70f3b 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET.png index 42926ed988..7b2870ea45 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-left.png index 79a96cd711..ed24b26b91 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-right.png index 0c7b0caddf..e92b71a40c 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET.png index 7be67fee63..a14b45c2c6 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-left.png index 505808fc9d..97d938f79d 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-right.png index 862f6294fb..92a54785a5 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon-flash.png index bbd6cdcfaf..8f40926b67 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon.png index 638b2358ff..a7298ff039 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET.png index 6a1d34f452..68ca980fb8 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-left.png index 22a8dd14b1..9cf29dbeee 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-right.png index 71572c0ffd..c01c8aba0d 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET.png index 6d330d446d..fbbd061014 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-left.png index 5a40993d72..d603248b3c 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-right.png index 27a27d1e8e..ac118a95a4 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json index d168108fdf..7bea2d1a86 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -36,14 +36,6 @@ { "name": "on-inhand-right", "directions": 4 - }, - { - "name": "on-equipped-HELMET-vulpkanin", - "directions": 4 - }, - { - "name": "off-equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hats/beret.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret.rsi/equipped-HELMET.png index 78c8b5ba38..b02cb63931 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/beret.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret.rsi/icon.png index e5d943c542..371e38b01a 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/beret.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret.rsi/inhand-left.png index bd379f8771..539a88cbf0 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/beret.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret.rsi/inhand-right.png index 9f338d183c..32f303bbaa 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/beret.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/equipped-HELMET.png index 9a6ed93c6d..46945895ac 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/icon.png index e64e214856..81556856b7 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-left.png index b516a3930b..295ec74b89 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-right.png index cc35f7a123..be478b48c7 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/meta.json index 11ea5a5b10..5258c784e2 100644 --- a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Hülle#2562 (Discord)", + "copyright": "6Mirage6", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png index 19048d7d1a..51ad84708a 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png index c025248263..2e86e9d9b8 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/centcom.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/centcom.rsi/equipped-HELMET.png index 3abd49cf75..b5938fc8b4 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/centcom.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/centcom.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/centcom.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/centcom.rsi/icon.png index 2a1b9d77c7..c42eefbbf8 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/centcom.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/centcom.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/equipped-HELMET.png index c147928c6b..e1df83ac43 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/icon.png index 73a8391787..dc0cf72c1d 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/equipped-HELMET.png index 26d5c11eea..18144f0ed1 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/icon.png index 8f180c9e45..7b80f4be1c 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/equipped-HELMET.png index abc293aa93..f60ea1cac3 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/icon.png index a1bc3ed151..ec7ebdb0a8 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/equipped-HELMET.png index 620dca461b..858fb9b868 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/icon.png index 03983f640b..0a9316cc1c 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/equipped-HELMET.png index 3abb582499..8b1762b572 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/icon-up.png b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/icon-up.png index bc82fd5f9f..cf910145af 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/icon-up.png and b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/icon-up.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/icon.png index 615a41f491..bed091cd36 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/up-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/up-equipped-HELMET.png index 534f366077..d42ab73a71 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/up-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/up-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png index 10dab5101f..bd3c93afe7 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/warden.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/warden.rsi/icon.png index 617f6b4579..86cdb6c0fb 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/warden.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/warden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ancientvoidsuit.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/ancientvoidsuit.rsi/meta.json index 3b63122f2f..ce6a86ea76 100644 --- a/Resources/Textures/Clothing/Head/Helmets/ancientvoidsuit.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/ancientvoidsuit.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/tree/fb2d71495bfe81446159ef528534193d09dd8d34, sprite repaletted by Flareguy for space-station-14 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/tree/fb2d71495bfe81446159ef528534193d09dd8d34, sprite repaletted by Flareguy for space-station-14", "size": { "x": 32, "y": 32 @@ -21,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon-flash.png index 36f945fe2a..7f19e2afbc 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon.png index b86a968e89..e5d79e13c1 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/eva.rsi/equipped-HELMET.png index 785dfd5da3..1cedd38117 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/eva.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/eva.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/eva.rsi/icon.png index b3927b1cba..70c2e96bea 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/eva.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/eva.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/eva.rsi/inhand-left.png index 801be1333e..269a71d988 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/eva.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/eva.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/eva.rsi/inhand-right.png index 3d87b5cdb2..5f7872a85f 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/eva.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/eva.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/eva.rsi/meta.json index 3c406ff57c..2e66e1d835 100644 --- a/Resources/Textures/Clothing/Head/Helmets/eva.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/eva.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d modified by Floofers", + "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", "size": { "x": 32, "y": 32 @@ -21,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET.png index c64f69b0d8..8eb6c61fce 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/icon.png index 25a7caf089..88663512a3 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/meta.json index 3c406ff57c..2e66e1d835 100644 --- a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d modified by Floofers", + "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", "size": { "x": 32, "y": 32 @@ -21,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/equipped-HELMET.png index f5054f7fd5..bb0cb9bddc 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/icon.png index 93a7db32e6..6bb5e17583 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/inhand-left.png index 5274c94828..5441ae6ca2 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/inhand-right.png index 93a06a90a7..dfe4874c30 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/meta.json index 3c406ff57c..2e66e1d835 100644 --- a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d modified by Floofers", + "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", "size": { "x": 32, "y": 32 @@ -21,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/meta.json index 4427c7fb51..a470e00944 100644 --- a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -21,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png index 3264d3cde6..9f9bbec6d5 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png index 59457ba90c..bcc1de5ab1 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png index a2892255be..1fbf17e69d 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png index 9640ec825f..2a04dafadd 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json index 5048ec6bb0..2bc1bffd09 100644 --- a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json @@ -10,10 +10,17 @@ { "name": "icon" }, + { + "name": "icon-on" + }, { "name": "equipped-HELMET", "directions": 4 }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -21,6 +28,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png index 4fd9f44ff2..8dc79d4be6 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png index 325084b69f..b5e41dfe7b 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png index f8f7501afc..af8936df8d 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png index a8bbe3dfac..7d352ec1d6 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json index 61c8ce163c..5463bcbfd2 100644 --- a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradise https://github.com/ParadiseSS13/Paradise/tree/master/icons (unknown commit) | vulpkanin version made by Floofers", + "copyright": "Taken from paradise https://github.com/ParadiseSS13/Paradise/tree/master/icons (unknown commit)", "size": { "x": 32, "y": 32 @@ -21,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Helmets/templar.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/templar.rsi/equipped-HELMET.png index 0f9309a59f..47f44183af 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/templar.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/templar.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/templar.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/templar.rsi/icon.png index 60753f558b..2ba7d7b8bb 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/templar.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/templar.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/equipped-HELMET.png index 6452d864d9..9605894bfd 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/icon.png index be430564ad..a5531a4c07 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/inhand-left.png index afe56631a3..22bc4bb8a8 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/inhand-right.png index 9102bdea1d..a59bb1c28c 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/meta.json index 4427c7fb51..a470e00944 100644 --- a/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -21,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/equipped-HELMET.png index 7e20448959..3917fddcce 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/icon.png index 149b6aa0cd..8f9f67bfc2 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/inhand-left.png index 2fd5441f3d..f8a134c204 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/inhand-right.png index 326846bc15..6b7515d083 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/meta.json index 4427c7fb51..a470e00944 100644 --- a/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -21,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/equipped-HELMET.png index 901c63fbcd..9605894bfd 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/icon.png index e04ac2e780..a5531a4c07 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/inhand-left.png index 38fc09939a..22bc4bb8a8 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/inhand-right.png index 00232804ed..a59bb1c28c 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/meta.json index 4427c7fb51..a470e00944 100644 --- a/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -21,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/equipped-HELMET.png index fa5e1929fe..d9299375dc 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/icon.png index 330da91a80..e1cb49d3bb 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/inhand-left.png index 42fdefb038..5e6e052dd4 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/inhand-right.png index 9f26186eec..b71f1b2620 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/meta.json index 4427c7fb51..a470e00944 100644 --- a/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -21,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/equipped-HELMET.png index a6515022f5..dd0654a1d6 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/icon.png index 1fb0a57b2b..d326ea41e4 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/inhand-left.png index cc69c3d0e4..6e23c2f043 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/inhand-right.png index a4f39b9f1a..724799d3db 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/meta.json index 4427c7fb51..a470e00944 100644 --- a/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -21,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png index d48c6efc30..ea6cd337e7 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png index b381513333..cbf20a83fb 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-left.png index b32137727b..e3ac688063 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png index 1c14b44f98..742decb6c8 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json index e830cae282..a470e00944 100644 --- a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -21,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/equipped-HELMET.png index d7c68c9b66..ead249371c 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/icon.png index 5642e2f5a2..0ce5c67153 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/inhand-left.png index 5f5845750c..ab6d8e1d1c 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/inhand-right.png index a86b5f2e17..49535df051 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/meta.json index 4427c7fb51..a470e00944 100644 --- a/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -21,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET.png index 8287d47952..38f3e2c455 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/icon.png index 9eaf4e5708..f62f3f8493 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json index 702e66d8a3..920a78a535 100644 --- a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7", "size": { "x": 32, "y": 32 @@ -13,10 +13,6 @@ { "name": "equipped-HELMET", "directions": 4 - }, - { - "name": "equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/icon-on.png b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/icon-on.png index 5bf3de9ec7..4a9684bb2f 100644 Binary files a/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/icon-on.png and b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/icon-on.png differ diff --git a/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/icon.png index 5cb5291fd5..da79653080 100644 Binary files a/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/icon.png and b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/off-equipped-HELMET.png index d4a118dbc0..a1fa80899f 100644 Binary files a/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/on-equipped-HELMET.png index 12c08bf7af..e27a9e8f32 100644 Binary files a/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/equipped-HELMET-hamster.png index 4017c9bd0e..dbc2b40105 100644 Binary files a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/equipped-HELMET-hamster.png and b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/equipped-HELMET.png index e9030a21e9..c6e6bd9a45 100644 Binary files a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/icon.png index adaa0df5f6..df911f2809 100644 Binary files a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/icon.png and b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/inhand-left.png index b6774ad96a..0cf3af48e7 100644 Binary files a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/inhand-right.png index 34898ae70c..9304882263 100644 Binary files a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/meta.json b/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/meta.json index 39eb54f44c..e52e61ea70 100644 --- a/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, icon by лазік#7305 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, icon by лазік#7305", "size": { "x": 32, "y": 32 @@ -36,14 +36,6 @@ { "name": "up-inhand-right", "directions": 4 - }, - { - "name": "equipped-HELMET-vulpkanin", - "directions": 4 - }, - { - "name": "up-equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/meta.json b/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/meta.json index 39eb54f44c..e52e61ea70 100644 --- a/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, icon by лазік#7305 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, icon by лазік#7305", "size": { "x": 32, "y": 32 @@ -36,14 +36,6 @@ { "name": "up-inhand-right", "directions": 4 - }, - { - "name": "equipped-HELMET-vulpkanin", - "directions": 4 - }, - { - "name": "up-equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/meta.json b/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/meta.json index 39eb54f44c..e52e61ea70 100644 --- a/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, icon by лазік#7305 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, icon by лазік#7305", "size": { "x": 32, "y": 32 @@ -36,14 +36,6 @@ { "name": "up-inhand-right", "directions": 4 - }, - { - "name": "equipped-HELMET-vulpkanin", - "directions": 4 - }, - { - "name": "up-equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Welding/welding.rsi/meta.json b/Resources/Textures/Clothing/Head/Welding/welding.rsi/meta.json index 3a84e3148e..90730cb2d0 100644 --- a/Resources/Textures/Clothing/Head/Welding/welding.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Welding/welding.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -44,14 +44,6 @@ { "name": "up-inhand-right", "directions": 4 - }, - { - "name": "equipped-HELMET-vulpkanin", - "directions": 4 - }, - { - "name": "up-equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/meta.json b/Resources/Textures/Clothing/Mask/breath.rsi/meta.json index bed9ae64b0..40340959f5 100644 --- a/Resources/Textures/Clothing/Mask/breath.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/breath.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github) equipped-MASK-secdog modified from equipped-MASK-dog by TJohnson. | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -30,10 +30,6 @@ "name": "equipped-MASK-dog", "directions": 4 }, - { - "name": "equipped-MASK-secdog", - "directions": 4 - }, { "name": "equipped-MASK-puppy", "directions": 4 @@ -73,14 +69,6 @@ { "name": "equipped-MASK-reptilian", "directions": 4 - }, - { - "name": "equipped-MASK-vulpkanin", - "directions": 4 - }, - { - "name": "up-equipped-MASK-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/clown.rsi/meta.json b/Resources/Textures/Clothing/Mask/clown.rsi/meta.json index b3709bcd83..5a2271a685 100644 --- a/Resources/Textures/Clothing/Mask/clown.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/clown.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -26,10 +26,6 @@ "name": "inhand-right", "directions": 4 }, - { - "name": "equipped-MASK-vulpkanin", - "directions": 4 - }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/cluwne.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/cluwne.rsi/equipped-MASK.png index 0681cdabba..54d7b36adc 100644 Binary files a/Resources/Textures/Clothing/Mask/cluwne.rsi/equipped-MASK.png and b/Resources/Textures/Clothing/Mask/cluwne.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/cluwne.rsi/icon.png b/Resources/Textures/Clothing/Mask/cluwne.rsi/icon.png index 1cc7520ee2..317ec669e9 100644 Binary files a/Resources/Textures/Clothing/Mask/cluwne.rsi/icon.png and b/Resources/Textures/Clothing/Mask/cluwne.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json b/Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json index 6ab2624c16..245ae49644 100644 --- a/Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github) for ss14. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", + "copyright": "Made by brainfood1183 (github) for ss14. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -14,10 +14,6 @@ "name": "equipped-MASK", "directions": 4 }, - { - "name": "equipped-MASK-vulpkanin", - "directions": 4 - }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/ert.rsi/meta.json b/Resources/Textures/Clothing/Mask/ert.rsi/meta.json index 57948ab9f7..9e9be3d62f 100644 --- a/Resources/Textures/Clothing/Mask/ert.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/ert.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Nimfar11 (GitHub) for Space Station 14. Reptilian edit by Nairod(Github) | vulpkanin version made by Floofers", + "copyright": "Made by Nimfar11 (GitHub) for Space Station 14. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -22,10 +22,6 @@ "name": "inhand-right", "directions": 4 }, - { - "name": "equipped-MASK-vulpkanin", - "directions": 4 - }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/gas.rsi/meta.json b/Resources/Textures/Clothing/Mask/gas.rsi/meta.json index 07a0c908b1..5a2271a685 100644 --- a/Resources/Textures/Clothing/Mask/gas.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gas.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -26,10 +26,6 @@ "name": "inhand-right", "directions": 4 }, - { - "name": "equipped-MASK-vulpkanin", - "directions": 4 - }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/gasatmos.rsi/meta.json b/Resources/Textures/Clothing/Mask/gasatmos.rsi/meta.json index 63476f222b..ad2f1bb02a 100644 --- a/Resources/Textures/Clothing/Mask/gasatmos.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gasatmos.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -22,10 +22,6 @@ "name": "inhand-right", "directions": 4 }, - { - "name": "equipped-MASK-vulpkanin", - "directions": 4 - }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json b/Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json index 4b2d043352..e94986f1c5 100644 --- a/Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, edited by Emisse for ss14. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, edited by Emisse for ss14. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -22,10 +22,6 @@ "name": "inhand-right", "directions": 4 }, - { - "name": "equipped-MASK-vulpkanin", - "directions": 4 - }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json b/Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json index 9ba629faae..ad2f1bb02a 100644 --- a/Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -22,10 +22,6 @@ "name": "inhand-right", "directions": 4 }, - { - "name": "equipped-MASK-vulpkanin", - "directions": 4 - }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/inhand-left.png index a4b0980e88..fa8af014a2 100644 Binary files a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/inhand-left.png and b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json index 600054012e..05b793baab 100644 --- a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github) | vulpkanin version edited by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -26,10 +26,6 @@ "name": "inhand-right", "directions": 4 }, - { - "name": "equipped-MASK-vulpkanin", - "directions": 4 - }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json b/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json index 9ed76c4839..05b793baab 100644 --- a/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -26,10 +26,6 @@ "name": "inhand-right", "directions": 4 }, - { - "name": "equipped-MASK-vulpkanin", - "directions": 4 - }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json index 1e01e88dc4..45d104113e 100644 --- a/Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -28,16 +28,6 @@ "name": "inhand-right", "directions": 4 }, - { - "name": "equipped-MASK-vulpkanin", - "directions": 4, - "delays": [ - [ 0.5, 0.5, 0.5 ], - [ 0.5, 0.5, 0.5 ], - [ 0.5, 0.5, 0.5 ], - [ 0.5, 0.5, 0.5 ] - ] - }, { "name": "equipped-MASK-reptilian", "directions": 4, diff --git a/Resources/Textures/Clothing/Mask/italian_moustache.rsi/meta.json b/Resources/Textures/Clothing/Mask/italian_moustache.rsi/meta.json index 9621b18fe9..3c25ce6906 100644 --- a/Resources/Textures/Clothing/Mask/italian_moustache.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/italian_moustache.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae", "size": { "x": 32, "y": 32 @@ -21,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-MASK-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/meta.json b/Resources/Textures/Clothing/Mask/medical.rsi/meta.json index 59e292cbd4..ca572b6d79 100644 --- a/Resources/Textures/Clothing/Mask/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/medical.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -64,14 +64,6 @@ "name": "inhand-right", "directions": 4 }, - { - "name": "equipped-MASK-vulpkanin", - "directions": 4 - }, - { - "name": "up-equipped-MASK-vulpkanin", - "directions": 4 - }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json index 99c06491bb..9f566f23b9 100644 --- a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by LinkUyx#6557. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Sprited by LinkUyx#6557. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -54,14 +54,6 @@ "name": "inhand-right", "directions": 4 }, - { - "name": "equipped-MASK-vulpkanin", - "directions": 4 - }, - { - "name": "up-equipped-MASK-vulpkanin", - "directions": 4 - }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/merc.rsi/meta.json b/Resources/Textures/Clothing/Mask/merc.rsi/meta.json index 6a07b4b956..77574344f3 100644 --- a/Resources/Textures/Clothing/Mask/merc.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/merc.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github) | vulpkanin version edited by Floofers", + "copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -22,10 +22,6 @@ "name": "inhand-right", "directions": 4 }, - { - "name": "equipped-MASK-vulpkanin", - "directions": 4 - }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/mime.rsi/meta.json b/Resources/Textures/Clothing/Mask/mime.rsi/meta.json index 34248cb9b9..0efd190e10 100644 --- a/Resources/Textures/Clothing/Mask/mime.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/mime.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -18,10 +18,6 @@ "name": "equipped-MASK-hamster", "directions": 4 }, - { - "name": "equipped-MASK-vulpkanin", - "directions": 4 - }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json b/Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json index 33176d73e7..6add0fab0d 100644 --- a/Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github) | vulpkanin version taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/091d9ec00f186052b87bd65125e896f78faefe38", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -22,13 +22,9 @@ "name": "inhand-right", "directions": 4 }, - { - "name": "equipped-MASK-vulpkanin", - "directions": 4 - }, { "name": "equipped-MASK-reptilian", "directions": 4 - } + } ] } diff --git a/Resources/Textures/Clothing/Mask/ninja.rsi/meta.json b/Resources/Textures/Clothing/Mask/ninja.rsi/meta.json index da51268a11..be28392cdb 100644 --- a/Resources/Textures/Clothing/Mask/ninja.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/ninja.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/33f7c1ef477fa67db5dda48078b469ab59aa7997 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", + "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/33f7c1ef477fa67db5dda48078b469ab59aa7997", "size": { "x": 32, "y": 32 @@ -21,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-MASK-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json index 0f2358a55f..42cb5ba01a 100644 --- a/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/e89db4dd4f42377b0adafb06806a763314a89034 , edited by Alekshhh | vulpkanin version taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/091d9ec00f186052b87bd65125e896f78faefe38", + "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/e89db4dd4f42377b0adafb06806a763314a89034 , edited by Alekshhh", "size": { "x": 32, "y": 32 @@ -21,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-MASK-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json b/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json index 7e61b10f34..165fd2d46b 100644 --- a/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -14,10 +14,6 @@ "name": "equipped-MASK", "directions": 4 }, - { - "name": "equipped-MASK-vulpkanin", - "directions": 4 - }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json b/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json index 5579d1b23a..165fd2d46b 100644 --- a/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github) | vulpkanin version taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/091d9ec00f186052b87bd65125e896f78faefe38 edited by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -14,10 +14,6 @@ "name": "equipped-MASK", "directions": 4 }, - { - "name": "equipped-MASK-vulpkanin", - "directions": 4 - }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/sexyclown.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/sexyclown.rsi/equipped-MASK.png index 93622d570c..024deaea35 100644 Binary files a/Resources/Textures/Clothing/Mask/sexyclown.rsi/equipped-MASK.png and b/Resources/Textures/Clothing/Mask/sexyclown.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/sexyclown.rsi/icon.png b/Resources/Textures/Clothing/Mask/sexyclown.rsi/icon.png index ce1f7b172b..0ed7d76cf8 100644 Binary files a/Resources/Textures/Clothing/Mask/sexyclown.rsi/icon.png and b/Resources/Textures/Clothing/Mask/sexyclown.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json b/Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json index da5fdbe7cd..7f056eb524 100644 --- a/Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/blob/ed466a4c67828b44ddb9d9550366be5c2d745955/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/blob/ed466a4c67828b44ddb9d9550366be5c2d745955/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -14,10 +14,6 @@ "name": "equipped-MASK", "directions": 4 }, - { - "name": "equipped-MASK-vulpkanin", - "directions": 4 - }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json b/Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json index 8c0842d68a..7f056eb524 100644 --- a/Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/blob/ed466a4c67828b44ddb9d9550366be5c2d745955/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/blob/ed466a4c67828b44ddb9d9550366be5c2d745955/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -14,10 +14,6 @@ "name": "equipped-MASK", "directions": 4 }, - { - "name": "equipped-MASK-vulpkanin", - "directions": 4 - }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/sterile.rsi/meta.json b/Resources/Textures/Clothing/Mask/sterile.rsi/meta.json index f61bba1a32..05b793baab 100644 --- a/Resources/Textures/Clothing/Mask/sterile.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/sterile.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -26,14 +26,6 @@ "name": "inhand-right", "directions": 4 }, - { - "name": "equipped-MASK-vulpkanin", - "directions": 4 - }, - { - "name": "up-equipped-MASK-vulpkanin", - "directions": 4 - }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/swat.rsi/meta.json b/Resources/Textures/Clothing/Mask/swat.rsi/meta.json index fb3b9e8f4a..e85e91678e 100644 --- a/Resources/Textures/Clothing/Mask/swat.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/swat.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/RemieRichards/-tg-station/blob/f8c05e21694cd3cb703e40edc5cfc375017944b1/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/RemieRichards/-tg-station/blob/f8c05e21694cd3cb703e40edc5cfc375017944b1/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -22,10 +22,6 @@ "name": "inhand-right", "directions": 4 }, - { - "name": "equipped-MASK-vulpkanin", - "directions": 4 - }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/equipped-NECK.png index b8b19a7492..c46b72cdc7 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/icon.png index 8cc45c4de2..8e1bffd9ca 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-left.png index b95b11e351..6c2a7c2ef9 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-left.png and b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-right.png index 7ef44eddff..9767a6693b 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-right.png and b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png index 13b1c2efce..f29a02b5cb 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png index 49d27a0e96..b7f2e5c6d1 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/equipped-NECK.png index e275a78fe9..4f83c72bf5 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/icon.png index 84e06eb4e8..24178516c1 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png index eb9216dea1..7efaa95aa1 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/icon.png index 67749028d3..ffd81c10f5 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/equipped-NECK.png index 9fc9e52b49..457cf34fc6 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/icon.png index c935d29b23..b6fcee6fd0 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/meta.json index fde00d6116..27194f90cb 100644 --- a/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875", + "copyright": "icon and equipped-NECK drawn by Gargarien (White Dream), sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.png index fe1077b134..29ed862b26 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/icon.png index 35bb3ef606..2b5c2b5552 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/equipped-NECK.png index b1d615465f..5ef23c94bf 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/icon.png index a02ce22658..2162168908 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/inhand-left.png index f073d57384..be27a9587b 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/inhand-left.png and b/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/inhand-right.png index 228a4d4848..2fc11a5afc 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/inhand-right.png and b/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/equipped-NECK.png index dbcb9c6403..c473c26f0b 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/icon.png index 3b292659ca..f6fa3db54c 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK.png index ee9a05fcdb..0b343eae4b 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png b/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png index 5264b993e4..24b5fe10dd 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png and b/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/equipped-NECK.png index 9ec0e02042..4c700f91d4 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/icon.png b/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/icon.png index ac1fd8367e..26421ad5a8 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/icon.png and b/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/equipped-NECK.png index be5f9402fa..d9694e7e0f 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/icon.png b/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/icon.png index e456036c67..1396487743 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/icon.png and b/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/equipped-NECK.png index e5898d7f1d..5eaf6241cf 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/icon.png b/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/icon.png index 5ed01af829..b756df1bc1 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/icon.png and b/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/equipped-NECK.png index c0af293f67..69fe2ff2df 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/icon.png b/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/icon.png index 8b044ac7be..5c49e55958 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/icon.png and b/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/equipped-NECK.png index 68c5c0bb23..c2258997cb 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/icon.png b/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/icon.png index dae1c51849..d78c6b43ba 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/icon.png and b/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png index abbb7a2555..3a8ae0290e 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png index 1caea2582b..e933cc0fbc 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json index b979f8bfb8..dc636547a9 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json @@ -14,6 +14,11 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, + { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/equipped-OUTERCLOTHING.png index 57f22a6c32..486c6767db 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/icon.png index 5d8cfcc494..b64e078a1c 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/meta.json index e482264df5..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/equipped-OUTERCLOTHING.png index c2d3934cbb..adfdc99fbe 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/icon.png index 3e9c24edaf..cd1bcd2e14 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/inhand-left.png index e5e277dbcc..0362284288 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/inhand-right.png index 0e0e6230ac..65eb36b9b4 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/meta.json index e482264df5..6f8f55125f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/meta.json @@ -14,6 +14,11 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, + { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/equipped-OUTERCLOTHING.png index 5ffa578618..0867d9794a 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/icon.png index cfdd191825..c439c7ab23 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/inhand-left.png index 6e98089bd4..51abed1325 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/inhand-right.png index 470def2a41..0aaa364525 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/meta.json index e482264df5..6f8f55125f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/meta.json @@ -14,6 +14,11 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, + { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/equipped-OUTERCLOTHING.png index acb3d355f2..fdc219ce20 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/icon.png index 71a603615b..1b9e8be421 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/inhand-left.png index 6920ec8f74..6011316bd2 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/inhand-right.png index e3d2c93b6c..f5743b6a55 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/meta.json index e482264df5..6f8f55125f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/meta.json @@ -14,6 +14,11 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, + { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/equipped-OUTERCLOTHING.png index a7d80f02b4..c9481ce8c3 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/icon.png index 4b16a3255c..8e9483e783 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/inhand-left.png index dced6667b0..b702994435 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/inhand-right.png index b69b0bbd20..33d4b9a599 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/meta.json index e482264df5..6f8f55125f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/meta.json @@ -14,6 +14,11 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, + { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png index a779b3812d..67a4f30ea5 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png index eea15cfb0a..5522eb9de4 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png index 36bd1257f2..d1164c39ab 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png index 89de6e8fc6..22bf56e0b7 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json index e482264df5..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/equipped-OUTERCLOTHING.png index e1e81a8409..6fae8df90d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/icon.png index 52bc430c98..ad0a604d21 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/inhand-left.png index c91403c123..b6815a0e79 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/inhand-right.png index b2a41d23cc..644533b009 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/meta.json index e482264df5..6f8f55125f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/meta.json @@ -14,6 +14,11 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, + { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/equipped-OUTERCLOTHING.png index df85eb0944..a084bd3d4c 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/icon.png index 381fdb8955..56d81ce3e0 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/meta.json index 442bfb2920..fb593b9d52 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/meta.json @@ -17,10 +17,19 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "open-equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "open-equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, + { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/meta.json index 13bf861137..0310d0eb7e 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/clownpriest.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/clownpriest.rsi/meta.json index bacde82361..cf369ebd1d 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/clownpriest.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/clownpriest.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/damedanecoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/damedanecoat.rsi/equipped-OUTERCLOTHING.png index 5428a1deea..df3d1b2e36 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/damedanecoat.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/damedanecoat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/damedanecoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/damedanecoat.rsi/meta.json index b82a1bb226..a28c85173e 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/damedanecoat.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/damedanecoat.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png index 24481b1f74..83ce2d2787 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png index ed3481d3d2..289e1496c2 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png index 9f79738900..8274ada74a 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png index b1315700d1..5e5f6f9816 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json index 18a65e16d7..025ed3a48f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/icon.png index 1ad384f197..f42ae3430c 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/inhand-left.png index 83e77f5dee..b07e5e8d68 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/inhand-right.png index f65865e5c2..005a40d6ed 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/meta.json index e482264df5..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png index 987679cecb..c45743726c 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png index 20ac8b6d18..3b4410b9a5 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png index aa0228cf31..52b9733ec1 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png index 4d6c934790..83e924a710 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json index 55e082d620..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e , edited by Alekshhh", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/icon.png index 61ad9f9517..7ecea2106b 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-left.png index 72db4712bb..9a76544f14 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-right.png index e50751b374..cd74981c7e 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/meta.json index e482264df5..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/icon.png index 3cc676e7b8..da5919d484 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/inhand-left.png index 78795216af..5c12b1d6cc 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/inhand-right.png index 9ccd33118a..8832941461 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/meta.json index e482264df5..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING.png index 1bb314f557..87658bf58d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon-open.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon-open.png index 9d10f67232..aa1ed9795b 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon-open.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon-open.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon.png index fc861707d8..d8d511a106 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-left.png index 330da9f29b..3c79e71b80 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-right.png index d866dd53b5..4d242231b3 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json index 442bfb2920..36e5ec61e5 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json @@ -17,10 +17,18 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "open-equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "open-equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING.png index b87f61827a..ab0dc88ef3 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-left.png index 489f958b9e..6bcdca16c0 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-right.png index 54bd14c8aa..82c918a782 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING.png index 3504723f9c..564a71592d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon-open.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon-open.png index dc68b688a5..4e3cc76502 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon-open.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon-open.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon.png index fea218c0cb..5f98915603 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-left.png index 647ae1247b..5874b7c2e1 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-right.png index 85e7cdc33e..c20728e8b2 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json index 442bfb2920..36e5ec61e5 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json @@ -17,10 +17,18 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "open-equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "open-equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING.png index c5ea5cd13d..6c0cb71f9d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-left.png index 57d3618504..6ae8234f0c 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-right.png index 5f3b6bdd5d..46ab3843f9 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING.png index 75baa15b11..ef6945707c 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon-open.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon-open.png index e0f37ab48f..98f94fc9a4 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon-open.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon-open.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon.png index 63861eb5bd..178aae3e79 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json index 02abb07806..c49df461df 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Flareguy for Space Station 14, original base sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -18,15 +18,15 @@ "directions": 4 }, { - "name": "open-equipped-OUTERCLOTHING", + "name": "equipped-OUTERCLOTHING-body-slim", "directions": 4 }, { - "name": "inhand-left", + "name": "open-equipped-OUTERCLOTHING", "directions": 4 }, { - "name": "inhand-right", + "name": "open-equipped-OUTERCLOTHING-body-slim", "directions": 4 }, { diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING.png index 695bc4535c..cc7fa6b486 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json index 442bfb2920..36e5ec61e5 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json @@ -17,10 +17,18 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "open-equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "open-equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-left.png index d95cfab8a7..708dea3d7b 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-right.png index 2fbbaa54df..04f6c36d3f 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/meta.json index 415d267995..4b2952e983 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/meta.json @@ -17,10 +17,18 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "open-equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "open-equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-left.png index 83d3f527c8..8f0c134721 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-right.png index 99937faf28..3c7f5e1abd 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json index 6cb239d8c8..b79cf91288 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json @@ -17,10 +17,18 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "open-equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "open-equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-left.png index 2dde993a3d..0fd1c0d840 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-right.png index 285c57c33f..b2596585fa 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/icon.png index 2f6e9ad588..2dc7906289 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/inhand-left.png index b0bd191877..d1ed5ac98e 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/inhand-right.png index e7c7c0db4c..7db7552514 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/meta.json index e482264df5..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/meta.json index 600bbc3d6d..8a66348a43 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/meta.json @@ -17,10 +17,18 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "open-equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "open-equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/open-inhand-left.png index 3a3f3f85b0..380a7eb5de 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/open-inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/open-inhand-right.png index 7be0d59725..c016a74bc3 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/open-inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-left.png index 5dc3a92fdc..26764735cc 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-right.png index c28ef52261..5d9906772f 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png index b62a0318da..8760a37e84 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png index b226550a5d..76eb0450fb 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json index e482264df5..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/windbreaker_paramedic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/windbreaker_paramedic.rsi/meta.json index 8e0b18f9a2..92acc53d28 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/windbreaker_paramedic.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/windbreaker_paramedic.rsi/meta.json @@ -17,10 +17,18 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "open-equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "open-equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/meta.json index dac47ccdf5..311a714a4c 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json index 4fbd43a08b..5881ba010a 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json index 4fbd43a08b..5881ba010a 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json index 4fbd43a08b..5881ba010a 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json index 4fbd43a08b..5881ba010a 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json index 4fbd43a08b..5881ba010a 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING.png index a6f1904a2c..84ef86445d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/icon.png index 87c3f8595a..8be6636410 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json index ef5e62cca4..e482264df5 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json @@ -6,25 +6,21 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json index 3067907ba9..2b3b93f196 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. Further modifications and derivate works (inhand-left and inhand-right) under same license, derivative monkey made by brainfood1183 (github) for ss14, harpy by VMSolidus", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. Further modifications and derivate works (inhand-left and inhand-right) under same license, derivative monkey made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 @@ -19,8 +19,8 @@ "directions": 4 }, { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 }, { "name": "inhand-left", diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json index 6cfe1ea214..9ecf4115a9 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by PuroSlavKing (github) for SS14, harpy by VMSolidus", + "copyright": "Made by PuroSlavKing (github) for SS14", "size": { "x": 32, "y": 32 @@ -14,10 +14,6 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING.png index 7ac2fbde5e..eeb9ddc4e0 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/icon.png index 77e0426ef4..6ddc87d92b 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-left.png index 0545ffa683..210b5a031d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-right.png index a0d0dd7125..15e8194012 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json index 7f50fdcf08..9c8886b0a0 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json @@ -6,25 +6,25 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json index 2de954bbf9..98e1271937 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by EmoGarbage404, harpy by VMSolidus", + "copyright": "Made by EmoGarbage404", "size": { "x": 32, "y": 32 @@ -15,8 +15,8 @@ "directions": 4 }, { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 }, { "name": "inhand-left", diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json index 090140fa8c..a9fe29a589 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by brainfood1183 (github), harpy by VMSolidus", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by brainfood1183 (github)", "size": { "x": 32, "y": 32 @@ -14,10 +14,6 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING.png index 17925efbf4..003645bb30 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/icon.png index 1c3177b459..79faa4c531 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-left.png index ab9ffc9a9a..0c126c8819 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-right.png index 560fb552f9..7a40cb38d8 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json index 1cfa2a9cfe..75028b1be4 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json @@ -1,30 +1,30 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprite made by Gtheglorious based on the sprite made by emisse for ss14, harpy variant by VMSolidus", + "copyright": "Sprite made by Gtheglorious based on the sprite made by emisse for ss14", "size": { "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - } - ] -} + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING.png index 6513ccf273..c76ab01fe2 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/icon.png index 6bcee818b2..29c6b2876f 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/inhand-left.png index 32dbb4bcbd..ed8c8a628e 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/inhand-right.png index 690d4cef20..b0f9bef933 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json index f6910b12aa..a15074bd77 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, edited by Emisse for SS14, harpy edit by VMSolidus", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, edited by Emisse for SS14", "size": { "x": 32, "y": 32 @@ -15,7 +15,7 @@ "directions": 4 }, { - "name": "equipped-OUTERCLOTHING-harpy", + "name": "equipped-OUTERCLOTHING-body-slim", "directions": 4 }, { diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING.png index a7fa5600f5..508fe626ca 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/icon.png index 9312de4a0c..c94a6aa352 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json index ef5e62cca4..e482264df5 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json @@ -6,25 +6,21 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING.png index d85158a7f5..74e738732b 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/icon.png index f014aca7cb..09f3b36e9a 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json index cbf3391af7..e482264df5 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json @@ -1,30 +1,26 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, harpy version by VMSolidus", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/meta.json index 0249e35995..81db056a94 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING.png index 9a49a516b5..16822d9610 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/icon.png index 128c637556..97ff15fce7 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/inhand-left.png index 6b99071d3d..5d513b0fbf 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/inhand-right.png index b56335aef5..dc44910e24 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json index 0261a0564f..d977572f2a 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json @@ -6,25 +6,21 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json index ef5e62cca4..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json @@ -6,25 +6,25 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING.png index 24837f4d9a..25c630df78 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/icon.png index 31f9e2f0e9..6788fa2cb2 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-left.png index 02bb28f88c..41ba71312a 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-right.png index 14e31e35ff..750412b5d0 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json index 64b98f1e79..d8be0975ed 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json @@ -6,25 +6,25 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING.png index 3465700d9b..799f08fe75 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/icon.png index 8081c5962d..cb64dc3f0f 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/inhand-left.png index 21b03dcf0e..66cc8c046e 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/inhand-right.png index dd794e37b0..eb83427e67 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json index def2d42704..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json @@ -15,8 +15,8 @@ "directions": 4 }, { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 }, { "name": "inhand-left", diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING.png index 6daf184ffd..93c119e4ed 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/icon.png index d81d730fb4..434a0e862a 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/inhand-left.png index fbc53c9c2c..93ad2875fb 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/inhand-right.png index 0ccb463801..aac450b870 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json index ef5e62cca4..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json @@ -6,25 +6,25 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING.png index a1ecf105b2..7cc473954b 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/icon.png index 4f04fd6bf4..0d08bfbd09 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/inhand-left.png index f808f0c975..d2403d9012 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/inhand-right.png index 1fb781159d..5162157c69 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json index e482264df5..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING.png index 391c62adad..a834f6aa05 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/icon.png index 2093000d23..6177793a02 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/inhand-left.png index 5532ef90e6..d2403d9012 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/inhand-right.png index 340f4d1a67..5162157c69 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING.png index ec979f4b51..3df3451fba 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/icon.png index e5d891560c..0d920b0a40 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING.png index ad53d33683..eaf6992676 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/icon.png index afcfd3527c..627d3d155a 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/inhand-left.png index d82cb186dc..7b242810f3 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/inhand-right.png index f9d91c922c..a4e25337d9 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json index f6a942a895..994daa4031 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json @@ -8,25 +8,25 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - } - ] -} + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png index 09402a1cb7..7f16c61a2a 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/icon.png index d8ace82fae..d94dd3bc29 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-left.png index 2102993402..268fde26b1 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-right.png index e4113194a3..29b67726d8 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json index b9b739337b..aa51fdfe10 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json @@ -19,15 +19,15 @@ "directions": 4 }, { - "name": "inhand-left", + "name": "equipped-OUTERCLOTHING-body-slim", "directions": 4 }, { - "name": "inhand-right", + "name": "inhand-left", "directions": 4 }, { - "name": "equipped-OUTERCLOTHING-harpy", + "name": "inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING.png index ecf87e190a..b7b52f0c41 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/icon.png index 7a423e798d..871fcbd074 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-left.png index 2102993402..a27d75760a 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-right.png index e4113194a3..11f4011e6e 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json index 4aa4d60ccb..135f4c3f2c 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json @@ -6,25 +6,25 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - } - ] -} + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING.png index 8a88030e8e..24970c7ac6 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/icon.png index 28c21b611b..0ba07b9c38 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-left.png index 0f415d109b..3ffcc52ad0 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-right.png index 75076efb12..a5ae29e366 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json index b85c75656c..135f4c3f2c 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd, harpy by VMSolidus", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd", "size": { "x": 32, "y": 32 @@ -15,8 +15,8 @@ "directions": 4 }, { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 }, { "name": "inhand-left", @@ -27,4 +27,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json index 88d91565d7..373d282410 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json @@ -1,30 +1,26 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Based on tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by EmoGarbage404 (github), harpy by VMSolidus", + "copyright": "Based on tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by EmoGarbage404 (github)", "size": { "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json index e482264df5..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/apron.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/apron.rsi/meta.json index e482264df5..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/apron.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/apron.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/apronbotanist.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/apronbotanist.rsi/meta.json index e482264df5..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/apronbotanist.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/apronbotanist.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/apronchef.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/apronchef.rsi/meta.json index e482264df5..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/apronchef.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/apronchef.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/meta.json index 442bfb2920..5b6d99efc8 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/meta.json @@ -17,10 +17,20 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "open-equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "open-equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, + + { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/equipped-OUTERCLOTHING.png index bfa5e02c5e..9e0c70f8ca 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/icon.png index 3f867edd70..044301f892 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/inhand-left.png index a12a5e9854..4fceca8ddf 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/inhand-right.png index 2fdd95a63f..9cb39f954a 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/chaplain_hoodie.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/chaplain_hoodie.rsi/meta.json index e482264df5..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/chaplain_hoodie.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/chaplain_hoodie.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/equipped-OUTERCLOTHING.png index 64b3aa3c5c..18c9d17ca2 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/icon.png index 693d215ff3..39c84373a3 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/inhand-left.png index 0c7f537a42..5fb79730ee 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/inhand-right.png index 23152285cb..7592e9e299 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/meta.json index e482264df5..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/classicponcho.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/classicponcho.rsi/meta.json index e482264df5..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/classicponcho.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/classicponcho.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/cultrobes.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/cultrobes.rsi/meta.json index e482264df5..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/cultrobes.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/cultrobes.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/meta.json index 442bfb2920..36e5ec61e5 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/meta.json @@ -17,10 +17,18 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "open-equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "open-equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/judge.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/judge.rsi/meta.json index e482264df5..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/judge.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/judge.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi/meta.json index 217a3f9511..8e27919ee1 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/meta.json index e39c53ebe1..5384df64fc 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/e89db4dd4f42377b0adafb06806a763314a89034 , edited by Alekshhh", + "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/e89db4dd4f42377b0adafb06806a763314a89034", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -23,4 +27,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/meta.json index e482264df5..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/santa.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/santa.rsi/meta.json index e482264df5..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/santa.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/santa.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/skubbody.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/skubbody.rsi/meta.json index 9a00c5741a..620e76d088 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/skubbody.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/skubbody.rsi/meta.json @@ -13,6 +13,10 @@ { "name": "equipped-OUTERCLOTHING", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.rsi/meta.json index b41f0209d7..ee5fa2e9c8 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.rsi/meta.json @@ -14,6 +14,10 @@ "name": "body-overlay-2", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/meta.json index e482264df5..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/meta.json index e482264df5..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/inhand-left.png index 2cfb3c17dd..50e3911105 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/inhand-right.png index 51c28fe103..531222e86a 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json index b05021b6c0..35372b2794 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/suit.dmi, harpy edit by VMSolidus", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/suit.dmi", "size": { "x": 32, "y": 32 @@ -15,8 +15,8 @@ "directions": 4 }, { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 }, { "name": "inhand-left", diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json index e9a9a4453d..9e775216e4 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json @@ -15,8 +15,8 @@ "directions": 4 }, { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 }, { "name": "inhand-left", diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/chicken.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/chicken.rsi/meta.json index e482264df5..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/chicken.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/chicken.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING.png index 48787f238c..e1f1fa005e 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/icon.png index 62d95e0186..aaa1191bd4 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json index 4dcd7b13b5..86e27c9c1f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, harpy edit by VMSolidus", + "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34", "size": { "x": 32, "y": 32 @@ -18,10 +18,6 @@ "name": "equipped-OUTERCLOTHING-monkey", "directions": 4 }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING.png index 8b85a77635..94b5262171 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/icon.png index 3fd01918c6..7f385e6d1f 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json index 8d09b75006..b2c50fc4c6 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, harpy edit by VMSolidus", + "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34", "size": { "x": 32, "y": 32 @@ -14,10 +14,6 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/equipped-OUTERCLOTHING.png index 3f9884ee64..b267c21f14 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/icon.png index 3fbb026d65..b5b8d8c351 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/meta.json index 0482d08642..e164425199 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, monkey derivative made by brainfood1183 (github) for ss14, harpy edit by VMSolidus", + "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, monkey derivative made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 @@ -18,10 +18,6 @@ "name": "equipped-OUTERCLOTHING-monkey", "directions": 4 }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/equipped-OUTERCLOTHING.png index 446f160a54..b9bab764ff 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/icon.png index 8e6e1c37a5..f2acf28298 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/meta.json index 0482d08642..e164425199 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, monkey derivative made by brainfood1183 (github) for ss14, harpy edit by VMSolidus", + "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, monkey derivative made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 @@ -18,10 +18,6 @@ "name": "equipped-OUTERCLOTHING-monkey", "directions": 4 }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING.png index 28f0ec6bd1..97f06bdea2 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/icon.png index 17f29de4c9..66b0e591a7 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/inhand-left.png index aa750ee200..ad84316953 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/inhand-right.png index 526891c823..30468f6ee3 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json index 0a8c670a89..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, harpy edit by VMSolidus", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -15,8 +15,8 @@ "directions": 4 }, { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 }, { "name": "inhand-left", diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/meta.json index e482264df5..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING.png index 50872d177e..96272297f2 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/icon.png index c125b0affd..13c3b241fa 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json index 0a8c670a89..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, harpy edit by VMSolidus", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -15,8 +15,8 @@ "directions": 4 }, { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 }, { "name": "inhand-left", diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/shrine-maiden.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/shrine-maiden.rsi/meta.json index af215f51ed..a032a26aff 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/shrine-maiden.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/shrine-maiden.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png index 2e86e34438..085b66f501 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png index e0de8c7ec9..fa5e1f9420 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json index e482264df5..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png index 17e322a695..9474a31375 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png index 57fe7a1def..36396bc3f0 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json index 05ec90135e..4012d2e90b 100644 --- a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/equipped-OUTERCLOTHING.png index b9273f213f..7007449a83 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/meta.json index e482264df5..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/meta.json index e482264df5..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/equipped-OUTERCLOTHING.png index a6947e2278..02eb4c8078 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/meta.json index e482264df5..1bf5021813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json index 7752722477..5f72602b97 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json index 7752722477..5f72602b97 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/meta.json index 7863947d1c..135f4c3f2c 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png index 0b3086ac58..687810dc88 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png index dd14ac0a8a..407dabf42b 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json index 46b3e631a0..0e9fcc1b32 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json index 7752722477..5f72602b97 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json index 7752722477..5f72602b97 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json index 7752722477..5f72602b97 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/meta.json index 146bd662b4..bf537859be 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json index 7752722477..5f72602b97 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/meta.json index 7863947d1c..135f4c3f2c 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json index 7752722477..5f72602b97 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json index 7752722477..5f72602b97 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json index 7752722477..5f72602b97 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json index 7752722477..5f72602b97 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/equipped-OUTERCLOTHING.png index 22b8a7a1c1..8e39e4df88 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/icon.png index b4b72c1784..855b6bb3e4 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json index 7752722477..5f72602b97 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json index 7752722477..5f72602b97 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json index 7752722477..5f72602b97 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json index 7752722477..5f72602b97 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json index 7863947d1c..135f4c3f2c 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json index 7752722477..5f72602b97 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/meta.json index af6075230c..30829caf0d 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json index 7752722477..5f72602b97 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json index 7752722477..5f72602b97 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json index 7752722477..5f72602b97 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json index 7752722477..5f72602b97 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json index 7752722477..5f72602b97 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/equipped-OUTERCLOTHING.png index 9d201dc1ec..6a6e97b9b3 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/icon.png index 00b5a10f03..deef07ea16 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json index 7752722477..5f72602b97 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json index 7752722477..5f72602b97 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING.png index 28cf03f49c..baeeca8781 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/icon.png index eaf984f437..854ea543e9 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-left.png index df033631e9..464c4bfc5e 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-right.png index 77baaca885..d537128b82 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json index 7863947d1c..edfc6f7f44 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json @@ -1,26 +1,26 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62, recolored by Github user Dutch-VanDerLinde.", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json index f5bb702feb..69d243f7a7 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Boots/explorer.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/explorer.rsi/meta.json index 53fe5af64d..9d0464a5d4 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/explorer.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/explorer.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/equipped-FEET.png index fce29d1595..0a9c79a61b 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/icon.png index 4ee3de12f2..36f8d3fd87 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/meta.json index 54b1191d42..e091f44eb9 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Boots/laceups.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/laceups.rsi/meta.json index c9cd5639c1..acd957a983 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/laceups.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/laceups.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/equipped-FEET.png index d38680fd86..16afeda1ba 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/icon-on.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/icon-on.png index 81c024c2da..9b0b7c706b 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/icon-on.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/icon-on.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/icon.png index ed83a21a61..89c3417b16 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/meta.json index 8d56bf0c2b..07277a5b74 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/meta.json @@ -15,6 +15,14 @@ "name": "on-equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-body-slim", + "directions": 4 + }, + { + "name": "on-equipped-FEET-body-slim", + "directions": 4 + }, { "name": "icon" }, diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/on-equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/on-equipped-FEET.png index 03bed4bbc9..ba9fdd9f0e 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/on-equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/on-equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/equipped-FEET.png index f83edfab43..46c3c07f2a 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon-on.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon-on.png index 68fd67a438..8ac7d47e22 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon-on.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon-on.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon.png index ef258167a2..d32bae80d9 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/meta.json index ead74d8896..80defebb20 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/meta.json @@ -15,6 +15,14 @@ "name": "on-equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-body-slim", + "directions": 4 + }, + { + "name": "on-equipped-FEET-body-slim", + "directions": 4 + }, { "name": "icon" }, diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-equipped-FEET.png index 569eda8481..cb52d744c4 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/equipped-FEET.png index 46b1be28c9..b72bb89dab 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/icon-on.png b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/icon-on.png index 6a94a728a6..974fd780c1 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/icon-on.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/icon-on.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/icon.png index 31ec6b6e46..a489f65b73 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/meta.json index 96b3f4109e..20def3a26e 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/meta.json @@ -15,6 +15,14 @@ "name": "on-equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-body-slim", + "directions": 4 + }, + { + "name": "on-equipped-FEET-body-slim", + "directions": 4 + }, { "name": "icon" }, diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/on-equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/on-equipped-FEET.png index cdc6751941..9ca69a7258 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/on-equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/on-equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/performer.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/performer.rsi/meta.json index 9f2d1bef54..3ccff66ca3 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/performer.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/performer.rsi/meta.json @@ -13,6 +13,10 @@ { "name": "equipped-FEET", "directions": 4 + }, + { + "name": "equipped-FEET-body-slim", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/equipped-FEET.png index a94840421a..80cca57bef 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/icon.png index d0337e0323..04a64ba539 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/meta.json index 54b1191d42..e091f44eb9 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/meta.json index 56e6395348..7a245cb84f 100644 --- a/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/meta.json @@ -15,6 +15,10 @@ "name": "equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Specific/chef.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/chef.rsi/meta.json index 54b1191d42..e091f44eb9 100644 --- a/Resources/Textures/Clothing/Shoes/Specific/chef.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Specific/chef.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/equipped-FEET.png index bb5c9be409..bad3c0b263 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/icon.png index 8ac232a0c3..7f19851051 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/inhand-left.png index 4eaae15df2..a098013dfd 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/inhand-left.png and b/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/inhand-right.png index 47856cd166..12f27fb144 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/inhand-right.png and b/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/equipped-FEET.png index 486cc15dfb..1a58b3f6c0 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/icon.png index c39f640a8e..746241911a 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/inhand-left.png index 0bb56ebfb0..9d6c6a01a0 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/inhand-left.png and b/Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/inhand-right.png index 28764263f1..af5efa88f4 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/inhand-right.png and b/Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/cluwne.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Specific/cluwne.rsi/equipped-FEET.png index cfa9828674..7afb90bc53 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/cluwne.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Specific/cluwne.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/cult.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/cult.rsi/meta.json index 54b1191d42..e091f44eb9 100644 --- a/Resources/Textures/Clothing/Shoes/Specific/cult.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Specific/cult.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/equipped-FEET.png index cbc8f41f50..0e57494719 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/icon.png index 40378b7353..6580f1da7e 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-left.png index 1ff3a792af..12edf43a23 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-left.png and b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-right.png index 65a7aba6c3..d135a13acc 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-right.png and b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/meta.json index 54b1191d42..e091f44eb9 100644 --- a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Specific/jester.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/jester.rsi/meta.json index 30fd407e21..eebdba4ba6 100644 --- a/Resources/Textures/Clothing/Shoes/Specific/jester.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Specific/jester.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/meta.json index 54b1191d42..e091f44eb9 100644 --- a/Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/equipped-FEET.png index e51ec2f86a..4e18d3135e 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/icon.png index f3fa77989f..6442f01f50 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/meta.json index 54b1191d42..e091f44eb9 100644 --- a/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/meta.json index 54b1191d42..e091f44eb9 100644 --- a/Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/equipped-INNERCLOTHING.png index 6a867d0ffd..205ff59c34 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/icon.png index 88e3456ff1..5632c57eb3 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/inhand-left.png index 0a44f2f3e9..5f31602b18 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/inhand-right.png index 815b2a813c..c5df8b73fb 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/meta.json index a0169cdcda..d5b2063814 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender.rsi/equipped-INNERCLOTHING.png index 2def1780b7..7d0f01c6a1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender.rsi/icon.png index aab7cc3411..7786d893a5 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender.rsi/inhand-left.png index f367313cf9..7e54e85c9a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender.rsi/inhand-right.png index 33aac693c4..9498ad18c5 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING-monkey.png index a09c68c7b9..bbccb82e24 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png index 081fd4fc04..9327c5f7d8 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/icon.png index d8b61ee3e0..f30a41488f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-left.png index 580490e1d9..037955f231 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-right.png index 19404ed83c..0fb7b3ead1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png index dbdb51cef9..032be6c35f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png index 67fd943b4c..2575dc3ac1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png index 9641f214a5..a221cc4eb4 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png index 0b3d008747..3e569369b3 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json index 6eb08f0f32..4037f1efb9 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "monkey derivative derived by brainfood1183 (github) for ss14 from tgstation at commit https://github.com/tgstation/tgstation/commit/dd97a0e45d904fffadd9d2caad22aedd0d09f3ab then edited by Skarletto (github). Other sprites taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 and edited by Skarletto (github), edited by Emisse for ss14", + "copyright": "monkey derivative derived by brainfood1183 (github) for ss14 from tgstation at commit https://github.com/tgstation/tgstation/commit/dd97a0e45d904fffadd9d2caad22aedd0d09f3ab then edited by Skarletto (github). Other sprites taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 and edited by Skarletto (github)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/equipped-INNERCLOTHING.png index a8c6d46508..1165db623a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/icon.png index 664c857ae4..5b7874e83b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/inhand-left.png index 7300529db9..4f271669a8 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/inhand-right.png index 72d82e7937..7b512340cf 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png index 3263c54ec9..0b9a452a71 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png index 5f662e0280..38f77ef6fa 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/meta.json index bbcef071e2..a870478ccb 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/meta.json index 75cbde9bb6..2f0aaa45e3 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/equipped-INNERCLOTHING.png index 600f014582..f973da5629 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/icon.png index a72665e993..0102558ed4 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/meta.json index 36ab573091..28ec49e882 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/equipped-INNERCLOTHING.png index 37435795c5..8fd7b18c8f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/icon.png index 6969d40be7..3cd2bace43 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/meta.json index 36ab573091..28ec49e882 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/equipped-INNERCLOTHING.png index 5608a2451c..f36a0ad781 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/icon.png index c5d3ad90e0..3fb69dcac1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/meta.json index bbcef071e2..a870478ccb 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/equipped-INNERCLOTHING.png index 955ee298f6..31d07ff06f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/icon.png index 029688868d..944f6fec68 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/meta.json index bbcef071e2..a870478ccb 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/equipped-INNERCLOTHING.png index 567a06b8d3..7195121f4b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/icon.png index 0d8ec23948..4de094e187 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/meta.json index 36ab573091..28ec49e882 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/equipped-INNERCLOTHING.png index 6e576b6e40..098ff6b108 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/icon.png index 737576e156..e948bb7737 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/meta.json index bbcef071e2..a870478ccb 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/equipped-INNERCLOTHING.png index 0fe314e778..3426f0eb92 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/icon.png index 76ea48170d..6190e526fd 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/meta.json index 36ab573091..28ec49e882 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/equipped-INNERCLOTHING.png index cf547d1ce9..3359a44239 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/icon.png index 69b9a2ff97..d9e02bac63 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/meta.json index bbcef071e2..a870478ccb 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png index 0eff0ab3fa..c0a5e94f2b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png index 31ba54e8af..a027c8c0ba 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json index bbcef071e2..a870478ccb 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/equipped-INNERCLOTHING.png index b8b3c25e76..839785267b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/icon.png index 682bc0ea02..ce2cfb87c9 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/meta.json index 36ab573091..28ec49e882 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/equipped-INNERCLOTHING.png index f27e553b99..d76f9614fe 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/icon.png index 9f82ea7673..129a24cbd1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/meta.json index bbcef071e2..a870478ccb 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/meta.json index 75cbde9bb6..2f0aaa45e3 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/equipped-INNERCLOTHING.png index f38f8dd3a7..51e0bce937 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/icon.png index a377a731b1..0b415d07ff 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/inhand-left.png index 34e4c4b3c1..37bab77b6c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/inhand-right.png index a9ba861650..de75bc9b5c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-left.png index 1e2476bae6..a35a5e9d2b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-right.png index a6427aecd2..1c3b595e90 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/meta.json index 4925be79c9..7c7d9e9fd2 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janitor.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janitor.rsi/meta.json index 36ab573091..28ec49e882 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janitor.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janitor.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblack.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblack.rsi/meta.json index 30d720217c..b1b3e82df7 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblack.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblack.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblue.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblue.rsi/meta.json index 30d720217c..b1b3e82df7 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblue.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblue.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyergood.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyergood.rsi/meta.json index 3f112c22d3..a1e56d00ca 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyergood.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyergood.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerpurple.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerpurple.rsi/meta.json index 298606c9e8..5cc6423313 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerpurple.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerpurple.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerred.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerred.rsi/meta.json index 30d720217c..b1b3e82df7 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerred.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerred.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/equipped-INNERCLOTHING.png index 3128383e68..ba9ea65cec 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/icon.png index 5afae7d932..715401b683 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/meta.json index bbcef071e2..a870478ccb 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/equipped-INNERCLOTHING.png index e6532029e4..5fd9c5ab7c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/icon.png index ae1f854292..873dee989c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-left.png index 59518c35c3..f52eeb1705 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-right.png index fa96803d56..c4392ea540 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/equipped-INNERCLOTHING.png index e38db3e03d..05de5d50b1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/icon.png index 26bcd5c075..5c91d2e37e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/meta.json index 69bafe6d05..8d14cef021 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/equipped-INNERCLOTHING.png index b582d02aa8..a13937f764 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/icon.png index 3440af11d7..7f61c958c1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/meta.json index bbcef071e2..a870478ccb 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/performer.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/performer.rsi/meta.json index 1143276ea0..6153048e18 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/performer.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/performer.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/equipped-INNERCLOTHING.png index 8eed62b0f7..b874dae0cc 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/icon.png index bd94c01bba..62605c2522 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-left.png index d91c9c28e7..4f271669a8 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-right.png index d85c9f7b60..7b512340cf 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/inhand-left.png index 9f940e51ff..46be5288e6 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/inhand-right.png index 169bf43315..f1911c7ec0 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/meta.json index bbcef071e2..a870478ccb 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/equipped-INNERCLOTHING.png index a55307841a..4b685f5b4c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/icon.png index cf454bc23a..0580e99b2a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/meta.json index bbcef071e2..a870478ccb 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png index 8ffa6e2e94..ded1c3536e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png index accf74dc8f..6cfd2a1e48 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json index 45e0f9141c..94051764dd 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png index 2f8c480cb5..7bf700cf1b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png index b3ecbd9712..d76f9614fe 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/icon.png index 18ab875179..129a24cbd1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-left.png index d90b6f3c45..a86cd5b0dc 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-right.png index 356e2a5ec2..d2d9fe0d74 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/meta.json index 7f498ead9b..a870478ccb 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Edit by Nairodian (github) of secskirt taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7779930358ba4776575975690d2c952f0d05c6cc", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png index 56e7e3567a..793f4c5d9a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png index 77db2ff028..e9ffea3990 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json index bbcef071e2..a870478ccb 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/equipped-INNERCLOTHING.png index e74a13048f..d5c3f51ea6 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/icon.png index 61b1d0694a..06f1de700a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/inhand-left.png index ae15d262d7..52c0703fda 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/inhand-right.png index 60bea1b51a..d2fd15bab9 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING.png index def12bafc6..8241820827 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/icon.png index 209d9a8ab3..2929d36092 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/inhand-left.png index 9cfedb2728..5f31602b18 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/inhand-right.png index e5035e20de..c5df8b73fb 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json index 9f268718cf..09f9d12590 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -27,4 +31,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/equipped-INNERCLOTHING.png index 4b5753f792..827abb6947 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/icon.png index a403b7442f..5749dad9f6 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/inhand-left.png index f367313cf9..7e54e85c9a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/inhand-right.png index 33aac693c4..9498ad18c5 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/meta.json index 3f72fb4460..966d27a61e 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "direction": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING-monkey.png index c4d767aaaa..be3b775d81 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png index 160d5a94ab..08b9fe5a74 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png index c0a4aa3346..9f7da370bc 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-left.png index fbb4b5e7a4..7a986a11dc 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png index 35244353f1..dad3f6f4ea 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png index fbd1b6aea5..210107b305 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png index 127e4ded44..c0ef848e60 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png index 5ad7eb1c1b..efa8c60bd5 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png index 0d6dc2631b..e0c9f86274 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png index 1bccf1eb46..a221cc4eb4 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png index e0b994af89..3e569369b3 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json index 6eb08f0f32..e725836a11 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "monkey derivative derived by brainfood1183 (github) for ss14 from tgstation at commit https://github.com/tgstation/tgstation/commit/dd97a0e45d904fffadd9d2caad22aedd0d09f3ab then edited by Skarletto (github). Other sprites taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 and edited by Skarletto (github), edited by Emisse for ss14", + "copyright": "monkey derivative derived by brainfood1183 (github) for ss14 from tgstation at commit https://github.com/tgstation/tgstation/commit/dd97a0e45d904fffadd9d2caad22aedd0d09f3ab then edited by Skarletto (github). Other sprites taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 and edited by Skarletto (github)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -27,4 +31,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING-monkey.png index 12e582665b..d831c9a728 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING.png index 2c4d0d5d46..760cb902bb 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/icon.png index fede092c27..a4f116164b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/inhand-left.png index 190f71c4a5..2e6a5e61db 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/inhand-right.png index 9885a2bd4a..7061517515 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png index e9165f29cc..4dfc92de50 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png index e2c37a0c2c..fcbdc143b1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json index 1d012747b8..c405753804 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json @@ -17,6 +17,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "s-equipped-INNERCLOTHING", "directions": 4 @@ -25,6 +29,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "s-equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png index 79e6727660..c509859469 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png index 3c407d9f12..dd26125b97 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING.png index aef08cee2c..be50ecee1e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/icon.png index 9fcf7ace5a..11cf6c6f98 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/meta.json index 1fb9cf1b66..10e90d2bf0 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/meta.json index e771fed56c..c8225d50b7 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/equipped-INNERCLOTHING.png index 7423a21e65..405115d7cb 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/icon.png index 01d31abcc8..26acc356bf 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/inhand-left.png index 3520c2732a..10c3ee465c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/inhand-right.png index 2c8df85d4d..2e45bb074c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/equipped-INNERCLOTHING.png index de50443a1b..cd40928f64 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/icon.png index cb5599f81c..d35381ba22 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/inhand-left.png index 84e5e83e3f..7f22a4bb37 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/inhand-right.png index 69ad696a10..581766f585 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/equipped-INNERCLOTHING.png index d2d87bb1b2..097f3a4be8 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/icon.png index 98cc641cd5..f83d6a7246 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json index 3f72fb4460..f2706e7fb6 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/equipped-INNERCLOTHING.png index 3fe3856e33..1236c84464 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/icon.png index c9b53df654..7c367ac1d5 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/inhand-left.png index 48cbc3898b..10b9669d0b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/inhand-right.png index 965b9229cb..6d8208a26f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi/equipped-INNERCLOTHING.png index 18da005b09..e850c88b63 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi/icon.png index 714b20859a..4bb8975f9c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi/inhand-left.png index 120eada100..5c08ccf078 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi/inhand-right.png index c1c3fa151b..1aa0a2ff5d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/equipped-INNERCLOTHING.png index 23e1e2bfb8..45024ef6d4 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/icon.png index 9381096adc..9ba01fecaf 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json index 3f72fb4460..f2706e7fb6 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/meta.json index 891a03fd12..2de059a383 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING.png index db9842a95e..0e87ed1406 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/icon.png index c08f4aa765..6b4f7b7020 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/meta.json index 1fb9cf1b66..10e90d2bf0 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/equipped-INNERCLOTHING.png index d83f6a8b21..bb4ab105cb 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/icon.png index dfe4f4f8b3..920a65dac4 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/meta.json index 3f72fb4460..f2706e7fb6 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING.png index f3b13e1ec2..b71c63fd6e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/icon.png index 51f8d000f6..3c6420e675 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/meta.json index 1fb9cf1b66..10e90d2bf0 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING.png index 1f0689cf05..abc09c9ecd 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/icon.png index 1432e6bea1..2b14937536 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/meta.json index 1fb9cf1b66..10e90d2bf0 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/meta.json index dca2585d6b..b3a2a145f8 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/meta.json index dca2585d6b..b3a2a145f8 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/meta.json index dca2585d6b..b3a2a145f8 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/meta.json index dca2585d6b..b3a2a145f8 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/meta.json index dca2585d6b..b3a2a145f8 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING.png index 807f99fc7d..4482c7ecc3 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/icon.png index f65a93f00d..72cd698b80 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json index 3f72fb4460..f2706e7fb6 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png index 80984c51c1..f385cd626d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png index 9400796353..bc816835b3 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json index 3f72fb4460..f2706e7fb6 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png index d034a9fbb8..871a1ab7fd 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/icon.png index 6dde5c525b..b318f04b3b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/meta.json index 1fb9cf1b66..10e90d2bf0 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/equipped-INNERCLOTHING.png index 98f4d7093c..3a8fe6889a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/icon.png index 6c0ef8efe3..5b03cfa5a2 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/meta.json index 3f72fb4460..f2706e7fb6 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING.png index 8863e61992..1bb81e47f4 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/icon.png index 547aab783b..983204447f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/meta.json index 3f72fb4460..f2706e7fb6 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/equipped-INNERCLOTHING.png index c9cb8ac622..5649656063 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/icon.png index c947c630e7..b2d7256ef0 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/meta.json index 3f72fb4460..f2706e7fb6 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/meta.json index e771fed56c..c8225d50b7 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/equipped-INNERCLOTHING.png index bf66e84ec6..d6c8bd53cd 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/icon.png index 5393fcdf4b..20bfd46815 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/inhand-left.png index 34e4c4b3c1..37bab77b6c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/inhand-right.png index a9ba861650..de75bc9b5c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/meta.json index 1fb9cf1b66..10e90d2bf0 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/equipped-INNERCLOTHING.png index 379ca3bce8..dc9f300245 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/icon.png index 70f76a475b..b6ea0e536e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/meta.json index 5dd83ef6e2..ec606ea91e 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/meta.json index 138aaf3905..02eca03a63 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/meta.json index 138aaf3905..02eca03a63 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/meta.json index 98f1cf18e2..9f6a32c000 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/meta.json index 50c6aadaa6..98668d474b 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/meta.json index 138aaf3905..02eca03a63 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png index 8aa89ef44e..de72d35aca 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/icon.png index 36cb47ba89..8b3720ec10 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png index 9feaebdb55..dffffbc988 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png index 6b8fccf1f4..aa45782ecd 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/meta.json index 0a48ac3e37..1906850342 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/equipped-INNERCLOTHING.png index d87ca22a54..f2ac23c948 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/icon.png index 26920f2469..662450d980 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/meta.json index 3f72fb4460..f2706e7fb6 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/equipped-INNERCLOTHING.png index 436ebe0bdb..3039793515 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/icon.png index 3c6f4de6e5..1337a565e5 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-left.png index 59518c35c3..f8b8f0cf99 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-right.png index fa96803d56..08260df4f9 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi/meta.json index 71cec7ae40..fbe6e47463 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi/meta.json index 71cec7ae40..fbe6e47463 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING.png index 23329b7245..da548fcc06 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/icon.png index c69974d2e7..6692cc9da7 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-left.png index 4896ed18ac..423a248b3f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-right.png index 60005dc4d1..2b8562e09e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/nanotrasen.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/nanotrasen.rsi/meta.json index 9fcf5f6f05..e0b23c4f52 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/nanotrasen.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/nanotrasen.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/equipped-INNERCLOTHING.png index 412c768774..a017df53e3 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/icon.png index e648d2e6c5..5f8f62440c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/meta.json index bb86428a94..848e83d6cd 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING.png index 42ea220dba..0ac333ae6c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/icon.png index 6f2f21e14b..9d3ca48f20 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-left.png index ef474f95ad..c6e604ffea 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-right.png index 79468f3b60..e3ee0522a1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/meta.json index e5e880415c..2207320646 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING.png index 33fafb9ea9..ec9299f9f3 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/icon.png index d5f5151370..7b21801944 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/meta.json index 3f72fb4460..f2706e7fb6 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/equipped-INNERCLOTHING.png index 2b83e34216..c7acb2b4a0 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/icon.png index e6d91f6afb..31a1a06958 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json index 5dd83ef6e2..ec606ea91e 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi/meta.json index 1fb9cf1b66..10e90d2bf0 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi/meta.json index 1fb9cf1b66..10e90d2bf0 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi/meta.json index 1fb9cf1b66..10e90d2bf0 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING.png index 98d51e2638..2fb1b2e939 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/icon.png index da4d765219..bcea405d4d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/equipped-INNERCLOTHING.png index e89ff84ba5..e17d3ba1a8 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/icon.png index ed407d3fcc..231336f54c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/meta.json index cb7720cb85..3a2964531d 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/equipped-INNERCLOTHING.png index 88f006a555..14aba72496 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/icon.png index f7ab944b20..76a00c1771 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/meta.json index 5dd83ef6e2..ec606ea91e 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-left.png index 9f940e51ff..46be5288e6 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-right.png index 169bf43315..f1911c7ec0 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/meta.json index 3f72fb4460..f2706e7fb6 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/meta.json index c83128c103..b7cc099ed1 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING.png index 31b0d774d3..8d8b82ae6f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/icon.png index f7ff607b25..12fcdd6329 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-left.png index d456f94f0f..4f271669a8 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-right.png index 24602b7b37..7b512340cf 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/equipped-INNERCLOTHING.png index 04e9223e76..9188d68ea5 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/icon.png index e21589c6dd..62aad21b71 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/meta.json index 3f72fb4460..f2706e7fb6 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png index b3977c9748..a540681ef2 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png index a3186ba4c1..b0c3f58dca 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json index 3f72fb4460..f2706e7fb6 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/equipped-INNERCLOTHING.png index b5676f523e..e471aaaa03 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/icon.png index 9265834ae3..639815f523 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/meta.json index 3f72fb4460..f2706e7fb6 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/meta.json index 3f72fb4460..f2706e7fb6 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png index 37bfef9fbd..24fb0f7d29 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING.png index 463828936c..5649656063 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/icon.png index 5f1d7e7506..b2d7256ef0 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-left.png index d90b6f3c45..a86cd5b0dc 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-right.png index 356e2a5ec2..d2d9fe0d74 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/meta.json index 913d940881..069d5656fc 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Edit by Nairodian (github) of secred_s taken from tgstation at pull request https://github.com/tgstation/tgstation/pull/2984", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png index a912ead177..b3fdd7e120 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png index 331203e531..c1d86b9d8f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json index 3f72fb4460..f2706e7fb6 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/icon.png b/Resources/Textures/Objects/Tools/crowbar.rsi/icon.png index 436a75975b..bfa4211a79 100644 Binary files a/Resources/Textures/Objects/Tools/crowbar.rsi/icon.png and b/Resources/Textures/Objects/Tools/crowbar.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json b/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json index 6cfbd90fac..d4cab89f8e 100644 --- a/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/eea0599511b088fdab9d43e562210cdbd51c6a98, storage and red-storage by Flareguy // Icon Tkan from https://github.com/ParadiseSS13/Paradise", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/eea0599511b088fdab9d43e562210cdbd51c6a98, storage and red-storage by Flareguy", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png b/Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png index 5b2364d32f..52e4fbfc26 100644 Binary files a/Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png and b/Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png differ diff --git a/Resources/Textures/Objects/Tools/drill.rsi/drill_bolt.png b/Resources/Textures/Objects/Tools/drill.rsi/drill_bolt.png index d7e908fa9c..c99774bfad 100644 Binary files a/Resources/Textures/Objects/Tools/drill.rsi/drill_bolt.png and b/Resources/Textures/Objects/Tools/drill.rsi/drill_bolt.png differ diff --git a/Resources/Textures/Objects/Tools/drill.rsi/drill_screw.png b/Resources/Textures/Objects/Tools/drill.rsi/drill_screw.png index 0951ee8d9b..d27dee1427 100644 Binary files a/Resources/Textures/Objects/Tools/drill.rsi/drill_screw.png and b/Resources/Textures/Objects/Tools/drill.rsi/drill_screw.png differ diff --git a/Resources/Textures/Objects/Tools/drill.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/drill.rsi/inhand-left.png index 2350f111f1..aeffd17fcf 100644 Binary files a/Resources/Textures/Objects/Tools/drill.rsi/inhand-left.png and b/Resources/Textures/Objects/Tools/drill.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/drill.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/drill.rsi/inhand-right.png index 27646ca214..8a1b51a61e 100644 Binary files a/Resources/Textures/Objects/Tools/drill.rsi/inhand-right.png and b/Resources/Textures/Objects/Tools/drill.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/drill.rsi/meta.json b/Resources/Textures/Objects/Tools/drill.rsi/meta.json index 0a315f41fa..90af7840e1 100644 --- a/Resources/Textures/Objects/Tools/drill.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/drill.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "modified from https://github.com/tgstation/tgstation at commit ea59fb4b810decbb5996b36d8876614b57c3d189 by KingFroozy (Github) // Icon taken from https://github.com/ParadiseSS13/Paradise", + "copyright": "modified from https://github.com/tgstation/tgstation at commit ea59fb4b810decbb5996b36d8876614b57c3d189 by KingFroozy (Github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/emag.rsi/icon.png b/Resources/Textures/Objects/Tools/emag.rsi/icon.png index 912fd6be82..61c283cfd0 100644 Binary files a/Resources/Textures/Objects/Tools/emag.rsi/icon.png and b/Resources/Textures/Objects/Tools/emag.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/emag.rsi/meta.json b/Resources/Textures/Objects/Tools/emag.rsi/meta.json index d90e37eb58..66fc62d663 100644 --- a/Resources/Textures/Objects/Tools/emag.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/emag.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation", + "copyright": "Taken from tgstation wiki at https://tgstation13.org/wiki/File:Emag.png, inhand sprites modified from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e", "size": { "x": 32, "y": 32 @@ -16,17 +16,7 @@ "directions": 4 }, { - "name": "icon", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] + "name": "icon" } ] } diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_base.png b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_base.png index 61a4a9b787..ccb97cbe60 100644 Binary files a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_base.png and b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_base.png differ diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_ext.png b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_ext.png index c4112f6525..fc41e60ff8 100644 Binary files a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_ext.png and b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_ext.png differ diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_high.png b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_high.png index 7b160b48d7..15edc91e52 100644 Binary files a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_high.png and b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_high.png differ diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_idle.png b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_idle.png index 704d654a6f..6c83622e34 100644 Binary files a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_idle.png and b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_idle.png differ diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_low.png b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_low.png index e2694136cb..015059c730 100644 Binary files a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_low.png and b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_low.png differ diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_med.png b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_med.png index 1fd176e822..c88de643eb 100644 Binary files a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_med.png and b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_med.png differ diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/meta.json b/Resources/Textures/Objects/Tools/geiger.rsi/meta.json index 11fbd43681..10968b4776 100644 --- a/Resources/Textures/Objects/Tools/geiger.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/geiger.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Paradise https://github.com/ParadiseSS13/Paradise", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/hand_labeler.rsi/hand_labeler.png b/Resources/Textures/Objects/Tools/hand_labeler.rsi/hand_labeler.png index 77fbcef30d..9938103840 100644 Binary files a/Resources/Textures/Objects/Tools/hand_labeler.rsi/hand_labeler.png and b/Resources/Textures/Objects/Tools/hand_labeler.rsi/hand_labeler.png differ diff --git a/Resources/Textures/Objects/Tools/hand_labeler.rsi/meta.json b/Resources/Textures/Objects/Tools/hand_labeler.rsi/meta.json index 3c793a9732..216140cec3 100644 --- a/Resources/Textures/Objects/Tools/hand_labeler.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/hand_labeler.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/. Inhand sprites by Macoron.", + "copyright": "Taken from https://github.com/tgstation/tgstation at commit 44636483b7b2868b3e42c92205539f11f6d7968f. Inhand sprites by Macoron.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/inhand-left.png index 8f0a816c3f..d97b1d9764 100644 Binary files a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/inhand-left.png and b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/inhand-right.png index 22750af053..0b0c85a819 100644 Binary files a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/inhand-right.png and b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_cutter.png b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_cutter.png index 42695acd7c..32dd8ae652 100644 Binary files a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_cutter.png and b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_cutter.png differ diff --git a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_pry.png b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_pry.png index 8877f81e18..ccfecf3dbd 100644 Binary files a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_pry.png and b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_pry.png differ diff --git a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_cutter.png b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_cutter.png index 973b1428b8..40749be79c 100644 Binary files a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_cutter.png and b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_cutter.png differ diff --git a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_pry.png b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_pry.png index ed36af3d67..5b77cad939 100644 Binary files a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_pry.png and b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_pry.png differ diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/green-unlit.png b/Resources/Textures/Objects/Tools/multitool.rsi/green-unlit.png index d0bac8b61e..fccc17e919 100644 Binary files a/Resources/Textures/Objects/Tools/multitool.rsi/green-unlit.png and b/Resources/Textures/Objects/Tools/multitool.rsi/green-unlit.png differ diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/icon.png b/Resources/Textures/Objects/Tools/multitool.rsi/icon.png index 1dcb102e80..bbb1c6bd8f 100644 Binary files a/Resources/Textures/Objects/Tools/multitool.rsi/icon.png and b/Resources/Textures/Objects/Tools/multitool.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/meta.json b/Resources/Textures/Objects/Tools/multitool.rsi/meta.json index c5c4ed87cb..bf4315734b 100644 --- a/Resources/Textures/Objects/Tools/multitool.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/multitool.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/94f27c7b25bbde39c1412e24fb32bf6470fcc394 // Icon Taken from https://github.com/ParadiseSS13/Paradise", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/94f27c7b25bbde39c1412e24fb32bf6470fcc394", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/red-unlit.png b/Resources/Textures/Objects/Tools/multitool.rsi/red-unlit.png index 71a6ee8f67..a141fec4bf 100644 Binary files a/Resources/Textures/Objects/Tools/multitool.rsi/red-unlit.png and b/Resources/Textures/Objects/Tools/multitool.rsi/red-unlit.png differ diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/yellow-unlit.png b/Resources/Textures/Objects/Tools/multitool.rsi/yellow-unlit.png index 911fad3088..f890dbd413 100644 Binary files a/Resources/Textures/Objects/Tools/multitool.rsi/yellow-unlit.png and b/Resources/Textures/Objects/Tools/multitool.rsi/yellow-unlit.png differ diff --git a/Resources/Textures/Objects/Tools/rcd.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/rcd.rsi/inhand-left.png index b305882226..7a07062f1c 100644 Binary files a/Resources/Textures/Objects/Tools/rcd.rsi/inhand-left.png and b/Resources/Textures/Objects/Tools/rcd.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/rcd.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/rcd.rsi/inhand-right.png index a9cca584d2..d93bb310ee 100644 Binary files a/Resources/Textures/Objects/Tools/rcd.rsi/inhand-right.png and b/Resources/Textures/Objects/Tools/rcd.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json b/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json index 47fc7c177e..17ec25991a 100644 --- a/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-map.png b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-map.png index 86ac05b87e..57c62e2b95 100644 Binary files a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-map.png and b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-map.png differ diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-screwybits.png b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-screwybits.png index f018f39ffd..6f2d047a2c 100644 Binary files a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-screwybits.png and b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-screwybits.png differ diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver.png b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver.png index 9e13699734..48d491dae1 100644 Binary files a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver.png and b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver.png differ diff --git a/Resources/Textures/Objects/Tools/seclite.rsi/meta.json b/Resources/Textures/Objects/Tools/seclite.rsi/meta.json index d466ad62d5..86f25b0b7a 100644 --- a/Resources/Textures/Objects/Tools/seclite.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/seclite.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/blob/master/icons/obj/lighting.dmi", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/52cbeaf94322209d4c6596818dda9fb3654729d3 and modified by Swept", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/seclite.rsi/seclite-on.png b/Resources/Textures/Objects/Tools/seclite.rsi/seclite-on.png index e02d6ee077..317e638c18 100644 Binary files a/Resources/Textures/Objects/Tools/seclite.rsi/seclite-on.png and b/Resources/Textures/Objects/Tools/seclite.rsi/seclite-on.png differ diff --git a/Resources/Textures/Objects/Tools/seclite.rsi/seclite-overlay.png b/Resources/Textures/Objects/Tools/seclite.rsi/seclite-overlay.png index 7ea22fa4c6..a5e9f773ed 100644 Binary files a/Resources/Textures/Objects/Tools/seclite.rsi/seclite-overlay.png and b/Resources/Textures/Objects/Tools/seclite.rsi/seclite-overlay.png differ diff --git a/Resources/Textures/Objects/Tools/seclite.rsi/seclite.png b/Resources/Textures/Objects/Tools/seclite.rsi/seclite.png index 1064101c28..d8ace36de9 100644 Binary files a/Resources/Textures/Objects/Tools/seclite.rsi/seclite.png and b/Resources/Textures/Objects/Tools/seclite.rsi/seclite.png differ diff --git a/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json b/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json index a7ed668444..056ba0a856 100644 --- a/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json @@ -1,5 +1,5 @@ { - "copyright" : "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/8e92e96d56f231f79dc16f95918d59b2803085aa/icons/obj/painting.dmi", + "copyright" : "Taken from https://github.com/tgstation/tgstation at commit a21274e56ae84b2c96e8b6beeca805df3d5402e8.", "license" : "CC-BY-SA-3.0", "size" : { "x" : 32, diff --git a/Resources/Textures/Objects/Tools/spray_painter.rsi/spray_painter.png b/Resources/Textures/Objects/Tools/spray_painter.rsi/spray_painter.png index 0c7ebdadcc..3b9c84af85 100644 Binary files a/Resources/Textures/Objects/Tools/spray_painter.rsi/spray_painter.png and b/Resources/Textures/Objects/Tools/spray_painter.rsi/spray_painter.png differ diff --git a/Resources/Textures/Objects/Tools/t-ray.rsi/tray-off.png b/Resources/Textures/Objects/Tools/t-ray.rsi/tray-off.png index 9ca7ff2ca4..eb108219af 100644 Binary files a/Resources/Textures/Objects/Tools/t-ray.rsi/tray-off.png and b/Resources/Textures/Objects/Tools/t-ray.rsi/tray-off.png differ diff --git a/Resources/Textures/Objects/Tools/t-ray.rsi/tray-on.png b/Resources/Textures/Objects/Tools/t-ray.rsi/tray-on.png index 5c4ba77cfe..5ec22e6031 100644 Binary files a/Resources/Textures/Objects/Tools/t-ray.rsi/tray-on.png and b/Resources/Textures/Objects/Tools/t-ray.rsi/tray-on.png differ diff --git a/Resources/Textures/Objects/Tools/welder.rsi/icon.png b/Resources/Textures/Objects/Tools/welder.rsi/icon.png index c6917c8ba5..dbb9e252b3 100644 Binary files a/Resources/Textures/Objects/Tools/welder.rsi/icon.png and b/Resources/Textures/Objects/Tools/welder.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/welder.rsi/meta.json b/Resources/Textures/Objects/Tools/welder.rsi/meta.json index 407f85d4cf..5f876da9ae 100644 --- a/Resources/Textures/Objects/Tools/welder.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/welder.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8 // Icon Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/3c5cb36e811725e1479c4c025b04220027230632/icons/obj/tools.dmi", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/welder.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder.rsi/welder_flame.png index 6c8ef525cc..20aa48abf6 100644 Binary files a/Resources/Textures/Objects/Tools/welder.rsi/welder_flame.png and b/Resources/Textures/Objects/Tools/welder.rsi/welder_flame.png differ diff --git a/Resources/Textures/Objects/Tools/welder_experimental.rsi/icon.png b/Resources/Textures/Objects/Tools/welder_experimental.rsi/icon.png index d33656a0be..446d4b21bf 100644 Binary files a/Resources/Textures/Objects/Tools/welder_experimental.rsi/icon.png and b/Resources/Textures/Objects/Tools/welder_experimental.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json b/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json index 1e4258956e..75650c1928 100644 --- a/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8 // Icon Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/3c5cb36e811725e1479c4c025b04220027230632/icons/obj/tools.dmi", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/welder_experimental.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder_experimental.rsi/welder_flame.png index c4cac4606a..1efc7aaa60 100644 Binary files a/Resources/Textures/Objects/Tools/welder_experimental.rsi/welder_flame.png and b/Resources/Textures/Objects/Tools/welder_experimental.rsi/welder_flame.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/icon.png b/Resources/Textures/Objects/Tools/welder_industrial.rsi/icon.png index c697fae1fa..353825f0c8 100644 Binary files a/Resources/Textures/Objects/Tools/welder_industrial.rsi/icon.png and b/Resources/Textures/Objects/Tools/welder_industrial.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/meta.json b/Resources/Textures/Objects/Tools/welder_industrial.rsi/meta.json index 1a92064078..ab4744aaa6 100644 --- a/Resources/Textures/Objects/Tools/welder_industrial.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/welder_industrial.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/782006a07ef7f16f70128489b3e78b210ee4bbbe // Icon Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/3c5cb36e811725e1479c4c025b04220027230632/icons/obj/tools.dmi", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/782006a07ef7f16f70128489b3e78b210ee4bbbe", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder_industrial.rsi/welder_flame.png index c4cac4606a..7814b74851 100644 Binary files a/Resources/Textures/Objects/Tools/welder_industrial.rsi/welder_flame.png and b/Resources/Textures/Objects/Tools/welder_industrial.rsi/welder_flame.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/icon.png b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/icon.png index 425cf3c4b3..e01273389d 100644 Binary files a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/icon.png and b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/meta.json b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/meta.json index 87568bcddb..ab4744aaa6 100644 --- a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/782006a07ef7f16f70128489b3e78b210ee4bbbe // Icon Icon Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/3c5cb36e811725e1479c4c025b04220027230632/icons/obj/tools.dmi", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/782006a07ef7f16f70128489b3e78b210ee4bbbe", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png index 809abc51ee..d8ba3f28bd 100644 Binary files a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png and b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png differ diff --git a/Resources/Textures/Objects/Tools/welder_mini.rsi/icon.png b/Resources/Textures/Objects/Tools/welder_mini.rsi/icon.png index 87e7882792..f400317c0a 100644 Binary files a/Resources/Textures/Objects/Tools/welder_mini.rsi/icon.png and b/Resources/Textures/Objects/Tools/welder_mini.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-cutty-thingy.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-cutty-thingy.png index 09cfe9a497..47d9fa26d9 100644 Binary files a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-cutty-thingy.png and b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-cutty-thingy.png differ diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-map.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-map.png index 4ad153c106..b6589228ef 100644 Binary files a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-map.png and b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-map.png differ diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters.png index 68c8a3ed71..d3caeea2ca 100644 Binary files a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters.png and b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters.png differ diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json b/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json index 826b1c44ca..cd29490826 100644 --- a/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d // Icon Taken from Paradise at https://github.com/ParadiseSS13/Paradise", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/wrench.rsi/icon.png b/Resources/Textures/Objects/Tools/wrench.rsi/icon.png index 1b8a2697e2..b5e37414cd 100644 Binary files a/Resources/Textures/Objects/Tools/wrench.rsi/icon.png and b/Resources/Textures/Objects/Tools/wrench.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/wrench.rsi/meta.json b/Resources/Textures/Objects/Tools/wrench.rsi/meta.json index ecd76812cd..a2c8f06819 100644 --- a/Resources/Textures/Objects/Tools/wrench.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/wrench.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d, storage by EmoGarbage404 (github) // Icon Taken from Paradise at https://github.com/ParadiseSS13/Paradise", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d, storage by EmoGarbage404 (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/icon.png b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/icon.png index aec9818274..f0b8a4b3ac 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/primed.png index 596bfb6a15..cdcae9ea1f 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/primed.png and b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/primed.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/icon.png b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/icon.png index 9c6bc8b164..429c7231b3 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json index 28d3e6969a..b84d54bcf9 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json @@ -1,27 +1,22 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b13d244d761a07e200a9a41730bd446e776020d5", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/d91390a4474e511279b6ee7525c5982266b9a858", + "size": { + "x": 32, + "y": 32 }, - { - "name": "primed", - "delays": [ - [ - 0.1, - 0.1 - ] - ] - }, - { - "name": "equipped-BELT", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "primed" + }, + { + "directions": 4, + "name": "equipped-BELT" + } + ] } + diff --git a/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/primed.png index 72df008d65..67f7e86d3a 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/primed.png and b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/primed.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/complete.png b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/complete.png index af0997e1f6..18d88d99af 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/complete.png and b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/complete.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/empty.png b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/empty.png index 7e577c3cc6..b5d5a4c474 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/empty.png and b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/empty.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/no-payload.png b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/no-payload.png index 39d3f2b365..18d88d99af 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/no-payload.png and b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/no-payload.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/primed.png index c5a39eab1d..26d9c52743 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/primed.png and b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/primed.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/wired.png b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/wired.png index fbdd845527..2dcd63d3cb 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/wired.png and b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/wired.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/icon.png b/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/icon.png index d6e9ebe4fb..5448dcd7a4 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/primed.png index 6938870e05..c066ca0ef3 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/primed.png and b/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/primed.png differ diff --git a/Resources/Textures/Objects/Weapons/pflash.rsi/flashing.png b/Resources/Textures/Objects/Weapons/pflash.rsi/flashing.png index 075fc53733..00375942fb 100644 Binary files a/Resources/Textures/Objects/Weapons/pflash.rsi/flashing.png and b/Resources/Textures/Objects/Weapons/pflash.rsi/flashing.png differ diff --git a/Resources/Textures/Objects/Weapons/pflash.rsi/off.png b/Resources/Textures/Objects/Weapons/pflash.rsi/off.png index b700748403..1db05eebb7 100644 Binary files a/Resources/Textures/Objects/Weapons/pflash.rsi/off.png and b/Resources/Textures/Objects/Weapons/pflash.rsi/off.png differ diff --git a/Resources/Textures/Objects/Weapons/pflash.rsi/on-unlit.png b/Resources/Textures/Objects/Weapons/pflash.rsi/on-unlit.png index 8057f65fe4..67f9704c39 100644 Binary files a/Resources/Textures/Objects/Weapons/pflash.rsi/on-unlit.png and b/Resources/Textures/Objects/Weapons/pflash.rsi/on-unlit.png differ diff --git a/Resources/Textures/Objects/Weapons/pflash.rsi/on.png b/Resources/Textures/Objects/Weapons/pflash.rsi/on.png index 2e04495726..524f313143 100644 Binary files a/Resources/Textures/Objects/Weapons/pflash.rsi/on.png and b/Resources/Textures/Objects/Weapons/pflash.rsi/on.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closed_unlit.png index c78d01c42d..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/meta.json index b935f1e5e3..d98fc3f459 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/9312f1fb7dcdf1c195e255a528f31092613fb60d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -19,6 +19,15 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ @@ -192,4 +201,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closed_unlit.png index c78d01c42d..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/meta.json index 588d48b46e..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/meta.json @@ -19,6 +19,15 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed_unlit.png index c78d01c42d..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/meta.json index 588d48b46e..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/meta.json @@ -19,6 +19,15 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/closed_unlit.png index c78d01c42d..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/meta.json index 6180afd17d..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/58e5354cdbc304847c9ef20963320d21f418b58e and edited by Nairod(github) for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -19,6 +19,15 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed_unlit.png index c78d01c42d..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/meta.json index 588d48b46e..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/meta.json @@ -19,6 +19,15 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed_unlit.png index c78d01c42d..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/meta.json index 588d48b46e..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/meta.json @@ -19,6 +19,15 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed_unlit.png index 79125cbe2e..b7a5f9ecca 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/emergency_unlit.png index 817f2fb3f9..a40cee44be 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/meta.json index 603c7588fd..5541feed65 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/meta.json @@ -19,6 +19,21 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "emergency_open_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, + { + "name": "bolted_open_unlit" + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closed_unlit.png index 1d33d3f366..b7a5f9ecca 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/emergency_unlit.png index 817f2fb3f9..a40cee44be 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/meta.json index 505b597a61..3e82aa90e5 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/meta.json @@ -19,6 +19,21 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "emergency_open_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, + { + "name": "bolted_open_unlit" + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed_unlit.png index c78d01c42d..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/meta.json index 9bb7e9bb72..16af217a8f 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/meta.json @@ -25,6 +25,15 @@ { "name": "closed_unlit" }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, + { + "name": "open_unlit" + }, { "name": "closed-fill" }, diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closed_unlit.png index c78d01c42d..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/meta.json index 588d48b46e..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/meta.json @@ -19,6 +19,15 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed_unlit.png index c78d01c42d..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/meta.json index 588d48b46e..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/meta.json @@ -19,6 +19,15 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/bolted_unlit.png index 9bce6022dc..8936e50021 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/closed_unlit.png index cd5c6b4700..6a4eae111c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/deny_unlit.png index adfb0cf39c..fb428de951 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/emergency_unlit.png index c018c3f9fd..2a7eb55f53 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/meta.json index f710aeb1ad..7ff576874e 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/meta.json @@ -19,6 +19,21 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/sparks.png index 4d9cab3c5c..77283c6284 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed_unlit.png index c78d01c42d..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/meta.json index 588d48b46e..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/meta.json @@ -19,6 +19,15 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed_unlit.png index c78d01c42d..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/meta.json index 588d48b46e..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/meta.json @@ -19,6 +19,15 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closed_unlit.png index 7c80bc210c..e1346fd80c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/meta.json index ded8386db5..54fc051558 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from CEV-Eris at commit https://github.com/discordia-space/CEV-Eris/commit/14517938186858388656a6aee14bf47af9e9649f - then modified by 20kdc & AJCM-git, glass by Peptide90", + "copyright": "Taken from CEV-Eris at commit https://github.com/discordia-space/CEV-Eris/commit/14517938186858388656a6aee14bf47af9e9649f - then modified by 20kdc & AJCM-git", "size": { "x": 32, "y": 32 @@ -19,6 +19,21 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/closed_unlit.png index 7c80bc210c..e1346fd80c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/meta.json index 1081b1b57d..54fc051558 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from CEV-Eris at commit https://github.com/discordia-space/CEV-Eris/commit/14517938186858388656a6aee14bf47af9e9649f - then modified by 20kdc & AJCM-git, glass by Peptide90, modified by brainfood1183 (github)", + "copyright": "Taken from CEV-Eris at commit https://github.com/discordia-space/CEV-Eris/commit/14517938186858388656a6aee14bf47af9e9649f - then modified by 20kdc & AJCM-git", "size": { "x": 32, "y": 32 @@ -19,6 +19,21 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed_unlit.png index c78d01c42d..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/meta.json index 6b8b84fc12..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24; Edited by Doru991", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -19,6 +19,15 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closed_unlit.png index c78d01c42d..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/meta.json index 588d48b46e..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/meta.json @@ -19,6 +19,15 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closed_unlit.png index c78d01c42d..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/meta.json index b935f1e5e3..d98fc3f459 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/9312f1fb7dcdf1c195e255a528f31092613fb60d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -19,6 +19,15 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ @@ -192,4 +201,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed_unlit.png index c78d01c42d..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/meta.json index 588d48b46e..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/meta.json @@ -19,6 +19,15 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed.png index 01ddc9fef0..d92c0ca3df 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed_unlit.png index c78d01c42d..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing.png index 9e9e14d1bd..399f965816 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/meta.json index 588d48b46e..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/meta.json @@ -19,6 +19,15 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open.png index 3fa424bafa..d0175d0f86 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening.png index 94b0291a5b..64f8116f45 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/closed_unlit.png index c78d01c42d..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/meta.json index 6180afd17d..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/58e5354cdbc304847c9ef20963320d21f418b58e and edited by Nairod(github) for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -19,6 +19,15 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed.png index 96349c2a29..c1793a1076 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed_unlit.png index c78d01c42d..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing.png index 2a861fa8a4..7b285ba601 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/meta.json index 588d48b46e..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/meta.json @@ -19,6 +19,15 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening.png index edcf9d92cc..ff2693c592 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed.png index b409f80c52..90c3f4cd90 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed_unlit.png index c78d01c42d..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing.png index c27f6aad6f..033682b7e3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/meta.json index 588d48b46e..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/meta.json @@ -19,6 +19,15 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening.png index 47dee90e59..38441d5bda 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed.png index 6699ff8154..296ef6a128 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed_unlit.png index 79125cbe2e..b7a5f9ecca 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing.png index f8d6f1e29e..5ae48c213d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/meta.json index 603c7588fd..48b8492423 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/meta.json @@ -19,6 +19,21 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening.png index be4300f51c..b71c4e1e41 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/assembly.png index ade0a87386..ec0074757c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed.png index 8c90b693a4..419e050645 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed_unlit.png index 1d33d3f366..b7a5f9ecca 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closing.png index 4347bf8afe..9e4b1edb57 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/deny.png index 225d45a82a..98675fc927 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/deny.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/deny.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/emergency_unlit.png index 817f2fb3f9..a40cee44be 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame1.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame1.png index 458698515f..d722a8a0f7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame1.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame1.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame2.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame2.png index 67f782bd89..47b5c0067b 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame2.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame2.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame3.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame3.png index 5421154834..6a8b30b912 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame3.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame3.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame4.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame4.png index 6252d37d1e..1717ef5404 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame4.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame4.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/locked.png index 12ccff5cb0..ec2d03812d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/locked.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/locked.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/meta.json index 7c1ec64f62..016eea47d8 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/meta.json @@ -19,6 +19,21 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/opening.png index 79a05996ad..39e81737fb 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed_unlit.png index c78d01c42d..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/meta.json index 588d48b46e..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/meta.json @@ -19,6 +19,15 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/bolted_unlit.png index 57f172d54f..cdf10f33eb 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closed_unlit.png index fdf7952dd8..611f458f91 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closing_unlit.png index a2f351482b..2f5fdecca2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/deny_unlit.png index ba26f190cb..14762d6697 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/emergency_unlit.png index 6a122fbcfd..7780d2478d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/meta.json index 5b0c9b55a7..60443e10ef 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/meta.json @@ -19,6 +19,15 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "emergency_open_unlit" + }, + { + "name": "bolted_open_unlit" + }, { "name": "closing", "delays": [ @@ -195,4 +204,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/opening_unlit.png index 051f78f757..a32084fafc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/bolted_unlit.png index 57f172d54f..cdf10f33eb 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closed_unlit.png index fdf7952dd8..611f458f91 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closing_unlit.png index a2f351482b..2f5fdecca2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/deny_unlit.png index ba26f190cb..14762d6697 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/emergency_unlit.png index 6a122fbcfd..7780d2478d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/meta.json index 5b0c9b55a7..60443e10ef 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/meta.json @@ -19,6 +19,15 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "emergency_open_unlit" + }, + { + "name": "bolted_open_unlit" + }, { "name": "closing", "delays": [ @@ -195,4 +204,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/opening_unlit.png index 051f78f757..a32084fafc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed.png index 9035162d43..03664aba10 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed_unlit.png index c78d01c42d..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing.png index d207ec7d21..df67d798ac 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/meta.json index 588d48b46e..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/meta.json @@ -19,6 +19,15 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening.png index d6d578a3be..39cb944eda 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed.png index b228a1487c..0d20d9f416 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed_unlit.png index c78d01c42d..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing.png index a124e930d2..0c4b9de2d6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/meta.json index 588d48b46e..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/meta.json @@ -19,6 +19,15 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening.png index 2f25dfe043..9f857363bc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/bolted_unlit.png index 9bce6022dc..8936e50021 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/closed_unlit.png index cd5c6b4700..6a4eae111c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/deny_unlit.png index adfb0cf39c..fb428de951 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/emergency_unlit.png index c018c3f9fd..2a7eb55f53 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/meta.json index f710aeb1ad..7ff576874e 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/meta.json @@ -19,6 +19,21 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/sparks.png index 4d9cab3c5c..77283c6284 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed.png index 814fba3422..52ab160fc5 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed_unlit.png index c78d01c42d..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing.png index 891dda16ce..d2c2320b7e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/meta.json index 588d48b46e..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/meta.json @@ -19,6 +19,15 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening.png index eeab16dca7..c2e139bd66 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed.png index 4cfd894f74..d80c06d5bb 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed_unlit.png index c78d01c42d..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing.png index 56ac2b4ead..42eda07286 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/meta.json index 588d48b46e..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/meta.json @@ -19,6 +19,15 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening.png index a9f90c4553..eee04d4977 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/closed_unlit.png index 7c80bc210c..e1346fd80c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/meta.json index 72a5cbe0d1..54fc051558 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/meta.json @@ -19,6 +19,21 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/closed_unlit.png index 7c80bc210c..e1346fd80c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/meta.json index 712b0ea1fc..54fc051558 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from CEV-Eris at commit https://github.com/discordia-space/CEV-Eris/commit/14517938186858388656a6aee14bf47af9e9649f - then modified by brainfood1183 (github)", + "copyright": "Taken from CEV-Eris at commit https://github.com/discordia-space/CEV-Eris/commit/14517938186858388656a6aee14bf47af9e9649f - then modified by 20kdc & AJCM-git", "size": { "x": 32, "y": 32 @@ -19,6 +19,21 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed.png index bc5174213c..f079442300 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed_unlit.png index c78d01c42d..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing.png index 5311eca045..9885931064 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/meta.json index b343ae11db..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24; Edited by @MaloTV on GitHub", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -19,6 +19,15 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening.png index cc155dc10b..c2f3f07d87 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closed.png index 9c33e5217d..94c93fd35c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closed_unlit.png index c78d01c42d..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closing.png index 42838cc43d..60b2c12cef 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/meta.json index 588d48b46e..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/meta.json @@ -19,6 +19,15 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/opening.png index c68f20d436..bf27e40cf8 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/assembly.png index 8f42abb532..60f0fb6f95 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/bolted_unlit.png index 847bfd4024..e823208219 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closed.png index ef026cecb5..cc82dfbd8f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closed_unlit.png index 585557b6b6..0a1d654364 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closing.png index 4487612111..6ada60c527 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closing_unlit.png index e1baf64ff7..57fd9e810f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/deny_unlit.png index 21284ae611..0d5ce30da9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/emergency_unlit.png index 539c5523d7..17d0110e71 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/meta.json index 80d3cabc01..6e03f86a00 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/meta.json @@ -19,6 +19,21 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/opening.png index 1e69cc0a90..34468d7acd 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/opening_unlit.png index eef8d9c12e..bf7cedb654 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks.png index 465d1a3214..fc242d9435 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/full.png index 2af9b7ff1b..4eed0b0b08 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/full.png and b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_0.png index 2ba1f779a2..b0eb81d2c9 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_0.png and b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_1.png index 27684dc258..2a982fa394 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_1.png and b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_2.png index 2ba1f779a2..b0eb81d2c9 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_2.png and b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_3.png index 27684dc258..2a982fa394 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_3.png and b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_4.png index f2df00c177..cc0ad2cf1c 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_4.png and b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_5.png index 682b8d26e1..47e94567e7 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_5.png and b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_6.png index f2df00c177..cc0ad2cf1c 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_6.png and b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/full.png index 41b2c199d1..f1af4a09e4 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/full.png and b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_0.png index 47ab5fc187..9e50a5c8ce 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_0.png and b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_1.png index 3e78a2531b..9b3544b36c 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_1.png and b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_2.png index 47ab5fc187..9e50a5c8ce 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_2.png and b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_3.png index 3e78a2531b..9b3544b36c 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_3.png and b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_4.png index f4f9168b07..b3d91efd76 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_4.png and b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_5.png index 0046d10029..9c6be8485b 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_5.png and b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_6.png index f4f9168b07..b3d91efd76 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_6.png and b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_7.png index 165f578dc0..ec0803e869 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_7.png and b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_7.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/full.png index 4c394c4650..cbcbd3a3b1 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/full.png and b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_0.png index 2ed3dbb4c0..d8d134f0cf 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_0.png and b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_1.png index f63429f102..4d979a5381 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_1.png and b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_2.png index 2ed3dbb4c0..d8d134f0cf 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_2.png and b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_3.png index f63429f102..4d979a5381 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_3.png and b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_4.png index 71d87be2d1..7ba52d1dd5 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_4.png and b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_5.png index 74794bbf34..16c34ffa59 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_5.png and b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_6.png index 71d87be2d1..7ba52d1dd5 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_6.png and b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_7.png index ecdf387b8f..c2e924aaaf 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_7.png and b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_7.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/full.png index 7345eb6591..7f999c5233 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/full.png and b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_0.png index a8791e01c1..5ff4a7ceac 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_0.png and b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_1.png index 4e04182a05..dab25bc1cd 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_1.png and b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_2.png index a8791e01c1..5ff4a7ceac 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_2.png and b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_3.png index 4e04182a05..dab25bc1cd 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_3.png and b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_4.png index 230838bfc6..34d673b2ea 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_4.png and b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_5.png index 2da0cebb25..428050b93c 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_5.png and b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_6.png index 230838bfc6..34d673b2ea 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_6.png and b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_7.png index 82880b87ad..aab0092a56 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_7.png and b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_7.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/full.png index be30ee84c5..c8fe53dcef 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/full.png and b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_0.png index 862aff9338..45a10476b9 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_0.png and b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_1.png index 8b97929d64..4a94a4dc54 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_1.png and b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_2.png index 862aff9338..45a10476b9 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_2.png and b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_3.png index 8b97929d64..4a94a4dc54 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_3.png and b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_4.png index 57fdbb30d7..324984a22d 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_4.png and b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_5.png index b3231dc972..320f94b8d0 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_5.png and b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_6.png index 57fdbb30d7..324984a22d 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_6.png and b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_7.png index 495a1103fb..e0c96576ed 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_7.png and b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_7.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/full.png index 19dec0a984..2f5453a7b1 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/full.png and b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_0.png index 1e061724e1..404478af38 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_0.png and b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_1.png index 428ae7c3e1..c2d558e91e 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_1.png and b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_2.png index 1e061724e1..404478af38 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_2.png and b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_3.png index 428ae7c3e1..c2d558e91e 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_3.png and b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_4.png index a822918179..3c95811c3f 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_4.png and b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_5.png index f57b63ecac..52dd2156eb 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_5.png and b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_6.png index a822918179..3c95811c3f 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_6.png and b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_7.png index 52bb74a0da..ec0803e869 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_7.png and b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_7.png differ diff --git a/Resources/Textures/Structures/Holo/holofan.rsi/icon.png b/Resources/Textures/Structures/Holo/holofan.rsi/icon.png index 5c8c069c37..e4fb0e9399 100644 Binary files a/Resources/Textures/Structures/Holo/holofan.rsi/icon.png and b/Resources/Textures/Structures/Holo/holofan.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Holo/wetfloor.rsi/icon.png b/Resources/Textures/Structures/Holo/wetfloor.rsi/icon.png index 57c6b72357..79b68c74bf 100644 Binary files a/Resources/Textures/Structures/Holo/wetfloor.rsi/icon.png and b/Resources/Textures/Structures/Holo/wetfloor.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/broken.png deleted file mode 100644 index 89d737bb11..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/broken.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/deny-unshaded.png deleted file mode 100644 index 30f71b97f2..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/deny-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/eject-unshaded.png deleted file mode 100644 index af1adcaaf0..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/eject-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/meta.json deleted file mode 100644 index 83128486b1..0000000000 --- a/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/meta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "normal-unshaded", - "delays": [ - [ - 0.5, - 0.5 - ] - ] - }, - { - "name": "broken" - }, - { - "name": "deny-unshaded", - "delays": [ - [ - 0.1, - 0.1 - ] - ] - }, - { - "name": "off" - }, - { - "name": "panel" - }, - { - "name": "eject-unshaded", - "delays": [ - [ - 0.5, - 0.05, - 0.5, - 0.05, - 0.1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/normal-unshaded.png deleted file mode 100644 index 35e8707b84..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/normal-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/off.png deleted file mode 100644 index 20b98097db..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/off.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/panel.png deleted file mode 100644 index b0b7e5a0f4..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/panel.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/broken.png deleted file mode 100644 index 506d3b065e..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/broken.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/meta.json deleted file mode 100644 index 1da3cf0661..0000000000 --- a/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/meta.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradise at https://github.com/ParadiseSS13/Paradise/commit/ae2258d9235752ac6d80ec11e36553fe3b6ae59e, modified by Peptide", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "normal-unshaded", - "delays": [ - [ - 2.5, - 0.1, - 3.4, - 0.1 - ] - ] - }, - { - "name": "broken" - }, - { - "name": "off" - }, - { - "name": "panel" - } - ] -} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/normal-unshaded.png deleted file mode 100644 index e338b4c745..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/normal-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/off.png deleted file mode 100644 index 01de7afea4..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/off.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/panel.png deleted file mode 100644 index d0677806d6..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/changs.rsi/panel.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/broken.png index 69a18345dd..671a4701fe 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/deny-unshaded.png index 1200d326bd..4b8fc2a3e5 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/eject-unshaded.png index 5479f208ea..505d5f3861 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/meta.json index 6467c18580..1c53b7c6cc 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/meta.json @@ -1,87 +1,45 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d", + "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177 and modified by potato1234x", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "normal-unshaded", - "directions": 4 + "name": "normal-unshaded" }, { - "name": "eject-unshaded", - "directions": 4, + "name": "broken" + }, + { + "name": "deny-unshaded", "delays": [ [ 0.1, 0.1, - 0.8, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.8, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.8, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.8, - 0.1, 0.1 ] ] }, { - "name": "deny-unshaded", - "directions": 4, + "name": "off" + }, + { + "name": "panel" + }, + { + "name": "eject-unshaded", "delays": [ [ 0.1, 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, + 0.8, 0.1, 0.1 ] ] - }, - { - "name": "off", - "directions": 4 - }, - { - "name": "broken", - "directions": 4 - }, - { - "name": "panel", - "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/normal-unshaded.png index 25b8cbb6ea..f92b13efd1 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/off.png index c2f1a7370a..c0e947c93f 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/panel.png index 9c868ef2cd..15e5dbcafb 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/broken.png index 0b413ac46d..a7608d24c1 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/deny-unshaded.png index e16f8bea12..826a5517e3 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/eject-unshaded.png index 283918001c..8b66206bd7 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/meta.json index 578976fe85..6a11e09a83 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/meta.json @@ -1,49 +1,38 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d", + "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177 and modified by potato1234x (github) for ss14", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "coffee-hellfire", + "name": "normal-unshaded" + }, + { + "name": "broken" + }, + { + "name": "deny-unshaded", "delays": [ [ - 0.25, - 0.25, - 0.25 + 0.1, + 0.1, + 0.1 ] ] }, { - "name": "normal-unshaded", - "directions": 4, + "name": "off" + }, + { + "name": "panel" + }, + { + "name": "screen", "delays": [ [ - 0.6, - 0.6, - 0.6, - 0.6, - 0.6 - ], - [ - 0.6, - 0.6, - 0.6, - 0.6, - 0.6 - ], - [ - 0.6, - 0.6, - 0.6, - 0.6, - 0.6 - ], - [ - 0.6, 0.6, 0.6, 0.6, @@ -53,7 +42,6 @@ }, { "name": "eject-unshaded", - "directions": 4, "delays": [ [ 0.2, @@ -70,124 +58,8 @@ 0.2, 0.2, 0.8 - ], - [ - 0.2, - 0.2, - 0.6, - 0.3, - 0.3, - 0.3, - 0.3, - 0.3, - 0.3, - 0.2, - 0.2, - 0.2, - 0.2, - 0.8 - ], - [ - 0.2, - 0.2, - 0.6, - 0.3, - 0.3, - 0.3, - 0.3, - 0.3, - 0.3, - 0.2, - 0.2, - 0.2, - 0.2, - 0.8 - ], - [ - 0.2, - 0.2, - 0.6, - 0.3, - 0.3, - 0.3, - 0.3, - 0.3, - 0.3, - 0.2, - 0.2, - 0.2, - 0.2, - 0.8 - ] - ] - }, - { - "name": "deny-unshaded", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1 ] ] - }, - { - "name": "off", - "directions": 4 - }, - { - "name": "broken", - "directions": 4 - }, - { - "name": "screen", - "directions": 4, - "delays": [ - [ - 0.6, - 0.6, - 0.6, - 0.6 - ], - [ - 0.6, - 0.6, - 0.6, - 0.6 - ], - [ - 0.6, - 0.6, - 0.6, - 0.6 - ], - [ - 0.6, - 0.6, - 0.6, - 0.6 - ] - ] - }, - { - "name": "panel", - "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/normal-unshaded.png index b58f33c433..1a7fd066cd 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/off.png index d314913811..8e7814af60 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/panel.png index 33fb7adec2..1d9416bb74 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/screen.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/screen.png index 4e18d0b306..cc64a9de57 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/screen.png and b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/screen.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/broken.png deleted file mode 100644 index a5d9db35a2..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/broken.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/deny-unshaded.png deleted file mode 100644 index 0a5ff43f0c..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/deny-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/eject-unshaded.png deleted file mode 100644 index 9efb08705f..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/eject-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/meta.json deleted file mode 100644 index 122f479d49..0000000000 --- a/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/meta.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "normal-unshaded", - "delays": [ - [ - 1.5, - 0.1, - 2.4, - 0.1 - ] - ] - }, - { - "name": "broken" - }, - { - "name": "normal" - }, - { - "name": "deny-unshaded", - "delays": [ - [ - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "eject-unshaded", - "delays": [ - [ - 0.5, - 0.1, - 1.0, - 0.1, - 0.1 - ] - ] - }, - { - "name": "off" - }, - { - "name": "panel" - } - ] -} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/normal-unshaded.png deleted file mode 100644 index 96ee10550b..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/normal-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/normal.png b/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/normal.png deleted file mode 100644 index 79b6a6e4c6..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/normal.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/off.png deleted file mode 100644 index 31f66705ba..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/off.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/panel.png deleted file mode 100644 index 9e3049e07d..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/panel.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/broken.png index 3cc0c94f53..6c296eb7b6 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/deny-unshaded.png index a2506b18b3..0a5ff43f0c 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/eject-unshaded.png index 15d0bf6f27..9efb08705f 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/meta.json index 83bee56da6..3f7f1d8a0a 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", "size": { "x": 32, "y": 32 @@ -9,82 +9,48 @@ "states": [ { "name": "normal-unshaded", - "directions": 4 - }, - { - "name": "eject-unshaded", - "directions": 4, "delays": [ [ + 2.5, 0.1, - 0.1, - 0.8, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.8, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.8, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.8, - 0.1, + 3.4, 0.1 ] ] }, + { + "name": "broken" + }, + { + "name": "normal" + }, { "name": "deny-unshaded", - "directions": 4, "delays": [ [ 0.1, 0.1, 0.1 - ], - [ - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1 - ], + ] + ] + }, + { + "name": "eject-unshaded", + "delays": [ [ + 0.5, 0.1, + 1.0, 0.1, 0.1 ] ] }, { - "name": "off", - "directions": 4 - }, - { - "name": "broken", - "directions": 4 - }, - { - "name": "panel", - "directions": 4 + "name": "off" }, { - "name": "normal" + "name": "panel" } ] } diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/normal-unshaded.png index 2861c3d7be..96ee10550b 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/off.png index e8c9485dcc..acc26679bd 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/panel.png index 4a1a54be10..9e3049e07d 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/broken.png index 1f7d6214ca..0f9501592a 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/eject-unshaded.png index 89fa2934a6..73678935bc 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/meta.json index 05888a6983..5c200a94a9 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/meta.json @@ -1,99 +1,54 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "normal-unshaded", - "directions": 4 + "name": "broken" }, { "name": "eject-unshaded", - "directions": 4, "delays": [ [ 0.1, - 0.1, - 0.1, - 0.6, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.6, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.6, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.6, - 0.1, - 0.1, - 0.1, + 0.7, + 0.7, + 0.7, + 0.7, + 0.7, + 0.7, + 0.7, + 0.7, + 0.7, + 0.7, + 0.7, + 0.7, + 0.7, + 0.7, 0.1 ] ] }, { - "name": "deny-unshaded", - "directions": 4, + "name": "normal-unshaded", "delays": [ [ - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1 + 2.5, + 0.05, + 3.4, + 0.05 ] ] }, { - "name": "off", - "directions": 4 - }, - { - "name": "broken", - "directions": 4 + "name": "off" }, { - "name": "panel", - "directions": 4 + "name": "panel" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/normal-unshaded.png index b008497203..5625997714 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/off.png index 9463f7ce99..dc61f221c0 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/panel.png index c0a5b763bc..80912168e4 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/broken.png index e90228b1bc..cfd081cf6b 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/deny-unshaded.png index 1de356b145..4bac2c91b1 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/eject-unshaded.png index 65ba08ddf0..99c7cfeea1 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/meta.json index 24c7cd05f4..35b29c7356 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/meta.json @@ -1,91 +1,52 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "normal-unshaded", - "directions": 4 + "name": "broken" }, { - "name": "eject-unshaded", - "directions": 4, + "name": "deny-unshaded", "delays": [ [ 0.1, - 0.4, - 0.1 - ], - [ - 0.1, - 0.4, 0.1 - ], + ] + ] + }, + { + "name": "eject-unshaded", + "delays": [ [ 0.1, 0.4, - 0.1 - ], - [ - 0.1, + 0.2, 0.4, 0.1 ] ] }, { - "name": "deny-unshaded", - "directions": 4, + "name": "normal-unshaded", "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 2.5, + 0.05, + 3.4, + 0.05 ] ] }, { - "name": "off", - "directions": 4 - }, - { - "name": "broken", - "directions": 4 + "name": "off" }, { - "name": "panel", - "directions": 4 + "name": "panel" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/normal-unshaded.png index a15f723ec9..d9f4a8ab47 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/off.png index 9eb4e5e650..b38fbe4133 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/panel.png index e50605569e..faddc53351 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/broken.png index 8384335831..be3c4f4d69 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/eject-unshaded.png index 329c15295b..d5814969aa 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/meta.json index 6467c18580..d45bae2bf9 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/meta.json @@ -1,87 +1,43 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "normal-unshaded", - "directions": 4 + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "eject-unshaded", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.8, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.8, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.8, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.8, - 0.1, - 0.1 - ] - ] - }, - { - "name": "deny-unshaded", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "off", - "directions": 4 - }, - { - "name": "broken", - "directions": 4 - }, - { - "name": "panel", - "directions": 4 - } - ] -} \ No newline at end of file + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/dd67e1e4e10bcf632b82b8b14b6a8479d80d5f78#diff-34173d670aca65c110ef18312c32abc4e05c84f33a9402248a32000e45acd0d3", + "states": [ + { + "name": "normal-unshaded", + "delays": [ + [ + 2.5, + 0.1, + 3.4, + 0.1 + ] + ] + }, + { + "name": "broken" + }, + { + "name": "eject-unshaded", + "delays": [ + [ + 0.5, + 0.1, + 1.0, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off" + }, + { + "name": "panel" + } + ] +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/normal-unshaded.png index a1578bfc39..d7ac9ba8c4 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/off.png index 39c2bfb50c..d688eea525 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/panel.png index 6922e23f3d..9e3049e07d 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/janidrobe.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/janidrobe.rsi/broken.png deleted file mode 100644 index 5050e71b15..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/janidrobe.rsi/broken.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/janidrobe.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/janidrobe.rsi/meta.json deleted file mode 100644 index 40a24e12c9..0000000000 --- a/Resources/Textures/Structures/Machines/VendingMachines/janidrobe.rsi/meta.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/a879151ef04192ae2a791278ee882c1bce7c5062 modified by Potato1234x (Github) for SS14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "broken" - }, - { - "name": "off" - }, - { - "name": "panel" - }, - { - "name": "normal-unshaded", - "delays": [ - [ - 1.5, - 0.1, - 1.5, - 0.1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/janidrobe.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/janidrobe.rsi/normal-unshaded.png deleted file mode 100644 index 0d6bebffab..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/janidrobe.rsi/normal-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/janidrobe.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/janidrobe.rsi/off.png deleted file mode 100644 index 3491c23bb3..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/janidrobe.rsi/off.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/janidrobe.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/janidrobe.rsi/panel.png deleted file mode 100644 index 0032751ff4..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/janidrobe.rsi/panel.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/broken.png index c33e51cae6..89d737bb11 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/deny-unshaded.png index 44041c3247..30f71b97f2 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/eject-unshaded.png index 45e87f4f7b..af1adcaaf0 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/meta.json index 71ffade3dd..83128486b1 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", "size": { "x": 32, "y": 32 @@ -9,87 +9,42 @@ "states": [ { "name": "normal-unshaded", - "directions": 4 - }, - { - "name": "eject-unshaded", - "directions": 4, "delays": [ [ - 0.1, - 0.8, - 0.1 - ], - [ - 0.1, - 0.8, - 0.1 - ], - [ - 0.1, - 0.8, - 0.1 - ], - [ - 0.1, - 0.8, - 0.1 + 0.5, + 0.5 ] ] }, + { + "name": "broken" + }, { "name": "deny-unshaded", - "directions": 4, "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, 0.1, 0.1 ] ] }, { - "name": "off", - "directions": 4 + "name": "off" }, { - "name": "broken", - "directions": 4 + "name": "panel" }, { - "name": "panel", - "directions": 4 + "name": "eject-unshaded", + "delays": [ + [ + 0.5, + 0.05, + 0.5, + 0.05, + 0.1 + ] + ] } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/normal-unshaded.png index 09951acb4c..35e8707b84 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/off.png index 31df8b753f..20b98097db 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/panel.png index 95ca9554d3..b0b7e5a0f4 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/broken.png index 2afa82d3d9..5050e71b15 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/deny-unshaded.png deleted file mode 100644 index 5ab0afa382..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/deny-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/eject-unshaded.png deleted file mode 100644 index a0e87b81c6..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/eject-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/meta.json index f66df2c079..40a24e12c9 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/meta.json @@ -1,109 +1,31 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/a879151ef04192ae2a791278ee882c1bce7c5062 modified by Potato1234x (Github) for SS14", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "normal-unshaded", - "directions": 4, - "delays": [ - [ - 1, - 1 - ], - [ - 1, - 1 - ], - [ - 1, - 1 - ], - [ - 1, - 1 - ] - ] + "name": "broken" }, { - "name": "eject-unshaded", - "directions": 4, - "delays": [ - [ - 0.2, - 0.2, - 0.8, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.8, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.8, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.8, - 0.2, - 0.2 - ] - ] + "name": "off" + }, + { + "name": "panel" }, { - "name": "deny-unshaded", - "directions": 4, + "name": "normal-unshaded", "delays": [ [ + 1.5, 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, + 1.5, 0.1 ] ] - }, - { - "name": "off", - "directions": 4 - }, - { - "name": "broken", - "directions": 4 - }, - { - "name": "panel", - "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/normal-unshaded.png index 810cf5086e..0d6bebffab 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/off.png index 22dbf40c47..3491c23bb3 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/panel.png index d5841bd9d3..0032751ff4 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/broken.png index 691470ec3a..17d7f7e595 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/meta.json index b340c35168..777f43a5fd 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/meta.json @@ -1,105 +1,31 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/3e1db725c152145b1682a31e5e54da7a63595436#diff-b4b731212dc8db8859d52ef3b762bccfb667f8783ad4c36f648db7f758f7eaf2", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "normal-unshaded", - "directions": 4, - "delays": [ - [ - 4, - 0.1 - ], - [ - 4, - 0.1 - ], - [ - 4, - 0.1 - ], - [ - 4, - 0.1 - ] - ] + "name": "broken" }, { - "name": "eject-unshaded", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.7, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.7, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.7, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.7, - 0.1, - 0.1 - ] - ] + "name": "off" + }, + { + "name": "panel" }, { - "name": "deny-unshaded", - "directions": 4, + "name": "normal-unshaded", "delays": [ [ + 2.7, 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, + 3.4, 0.1 ] ] - }, - { - "name": "off", - "directions": 4 - }, - { - "name": "broken", - "directions": 4 - }, - { - "name": "panel", - "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/normal-unshaded.png index 0c700c9ad3..21e74f3c7f 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/off.png index 481e7c0fac..3b3b865aa6 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/panel.png index a5d5634caf..9e3049e07d 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/broken.png deleted file mode 100644 index a6e60a2352..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/broken.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/deny-unshaded.png deleted file mode 100644 index 7c72182485..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/deny-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/eject-unshaded.png deleted file mode 100644 index 6c7cf1038d..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/eject-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/meta.json deleted file mode 100644 index 3035a0a0c8..0000000000 --- a/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/meta.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "normal-unshaded", - "delays": [ - [ - 0.5, - 0.5 - ] - ] - }, - { - "name": "broken" - }, - { - "name": "deny-unshaded", - "delays": [ - [ - 0.1, - 0.1 - ] - ] - }, - { - "name": "off" - }, - { - "name": "panel" - }, - { - "name": "eject-unshaded", - "delays": [ - [ - 0.1, - 0.4, - 0.1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/normal-unshaded.png deleted file mode 100644 index 5cafc8e3a4..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/normal-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/off.png deleted file mode 100644 index bc342677ab..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/off.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/panel.png deleted file mode 100644 index a797b42b18..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/panel.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/broken.png index 5a61cac92f..a6e60a2352 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/deny-unshaded.png index 1e094aca6d..7c72182485 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/eject-unshaded.png index c4ff338097..6c7cf1038d 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/meta.json index 24c7cd05f4..3035a0a0c8 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", "size": { "x": 32, "y": 32 @@ -9,83 +9,40 @@ "states": [ { "name": "normal-unshaded", - "directions": 4 - }, - { - "name": "eject-unshaded", - "directions": 4, "delays": [ [ - 0.1, - 0.4, - 0.1 - ], - [ - 0.1, - 0.4, - 0.1 - ], - [ - 0.1, - 0.4, - 0.1 - ], - [ - 0.1, - 0.4, - 0.1 + 0.5, + 0.5 ] ] }, + { + "name": "broken" + }, { "name": "deny-unshaded", - "directions": 4, "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, 0.1, 0.1 ] ] }, { - "name": "off", - "directions": 4 + "name": "off" }, { - "name": "broken", - "directions": 4 + "name": "panel" }, { - "name": "panel", - "directions": 4 + "name": "eject-unshaded", + "delays": [ + [ + 0.1, + 0.4, + 0.1 + ] + ] } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/normal-unshaded.png index 0c8b9fbf92..5cafc8e3a4 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/off.png index 923199a2c1..bc342677ab 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/panel.png index a40eb38dad..a797b42b18 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/broken.png deleted file mode 100644 index 0324187f46..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/broken.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/deny-unshaded.png deleted file mode 100644 index 9d14d111ab..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/deny-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/eject-unshaded.png deleted file mode 100644 index b1c7346ae4..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/eject-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/meta.json deleted file mode 100644 index 22676b9a09..0000000000 --- a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/meta.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "normal-unshaded", - "directions": 4 - }, - { - "name": "eject-unshaded", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1 - ], - [ - 0.1, - 0.1 - ], - [ - 0.1, - 0.1 - ], - [ - 0.1, - 0.1 - ] - ] - }, - { - "name": "deny-unshaded", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "off", - "directions": 4 - }, - { - "name": "broken", - "directions": 4 - }, - { - "name": "panel", - "directions": 4 - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/normal-unshaded.png deleted file mode 100644 index b90a6b7f08..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/normal-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/off.png deleted file mode 100644 index 0e586d3ba4..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/off.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/panel.png deleted file mode 100644 index d8247e3b06..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/panel.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/broken.png index 788e77a1c9..265c20ed44 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/deny-unshaded.png index 0ad3b337e5..51bcf34dc3 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/eject-unshaded.png index 8f10a97c64..c49dc97d28 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/meta.json index 22676b9a09..35b29c7356 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/meta.json @@ -1,32 +1,18 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "normal-unshaded", - "directions": 4 + "name": "broken" }, { - "name": "eject-unshaded", - "directions": 4, + "name": "deny-unshaded", "delays": [ - [ - 0.1, - 0.1 - ], - [ - 0.1, - 0.1 - ], - [ - 0.1, - 0.1 - ], [ 0.1, 0.1 @@ -34,54 +20,33 @@ ] }, { - "name": "deny-unshaded", - "directions": 4, + "name": "eject-unshaded", "delays": [ [ 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, + 0.4, + 0.2, + 0.4, 0.1 ] ] }, { - "name": "off", - "directions": 4 + "name": "normal-unshaded", + "delays": [ + [ + 2.5, + 0.05, + 3.4, + 0.05 + ] + ] }, { - "name": "broken", - "directions": 4 + "name": "off" }, { - "name": "panel", - "directions": 4 + "name": "panel" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/normal-unshaded.png index 10976cf5bb..275180babf 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/off.png index 329f13911b..f7a48db210 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/panel.png index d018408a2d..9e3049e07d 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/broken.png index c5a38c1b2d..0e73b4e957 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/deny-unshaded.png index 5dbb1b66dc..2a2832c15d 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/eject-unshaded.png index 3e0b2c656d..dffb340871 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/meta.json index b9b202a57b..d0d4a1f0e9 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad. Modified by potato1234x (github) for SS14", "size": { "x": 32, "y": 32 @@ -9,86 +9,48 @@ "states": [ { "name": "normal-unshaded", - "directions": 4 - }, - { - "name": "eject-unshaded", - "directions": 4, "delays": [ [ + 2.5, 0.1, - 0.4, - 0.1 - ], - [ - 0.1, - 0.4, - 0.1 - ], - [ - 0.1, - 0.4, - 0.1 - ], - [ - 0.1, - 0.4, + 3.4, 0.1 ] ] }, + { + "name": "broken" + }, + { + "name": "normal" + }, { "name": "deny-unshaded", - "directions": 4, "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, 0.1, 0.1, 0.1 - ], + ] + ] + }, + { + "name": "eject-unshaded", + "delays": [ [ + 0.5, 0.1, - 0.1, - 0.1, - 0.1, + 1.0, 0.1, 0.1 ] ] }, { - "name": "off", - "directions": 4 - }, - { - "name": "broken", - "directions": 4 - }, - { - "name": "panel", - "directions": 4 + "name": "off" }, { - "name": "normal" + "name": "panel" } ] } diff --git a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/normal-unshaded.png index 3f5a40ca5a..f98b47be44 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/off.png index aa1857d1b6..b9aa0c326a 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/panel.png index e8c4b1a79d..95f1e4d33e 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/broken.png deleted file mode 100644 index 3e35e625af..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/broken.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/deny-unshaded.png deleted file mode 100644 index 0e7b9b0c2b..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/deny-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/eject-unshaded.png deleted file mode 100644 index 018af16ab2..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/eject-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/meta.json deleted file mode 100644 index 8bf1a8af5d..0000000000 --- a/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/meta.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "normal-unshaded", - "delays": [ - [ - 2.5, - 0.05, - 3.4, - 0.05 - ] - ] - }, - { - "name": "eject-unshaded", - "delays": [ - [ - 0.1, - 0.4, - 0.2, - 0.4, - 0.1 - ] - ] - }, - { - "name": "deny-unshaded", - "delays": [ - [ - 0.5, - 0.1 - ] - ] - }, - { - "name": "broken" - }, - { - "name": "off" - }, - { - "name": "panel" - } - ] -} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/normal-unshaded.png deleted file mode 100644 index 9225854c7a..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/normal-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/off.png deleted file mode 100644 index 40a5993aae..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/off.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/panel.png deleted file mode 100644 index a797b42b18..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/panel.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/broken.png index b5f044ba68..3e35e625af 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/deny-unshaded.png index f9ee39fcf9..7e60e8b153 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/eject-unshaded.png index 5ca9a51ab3..9288161e61 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/meta.json index 24c7cd05f4..8bf1a8af5d 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", "size": { "x": 32, "y": 32 @@ -9,29 +9,22 @@ "states": [ { "name": "normal-unshaded", - "directions": 4 + "delays": [ + [ + 2.5, + 0.05, + 3.4, + 0.05 + ] + ] }, { "name": "eject-unshaded", - "directions": 4, "delays": [ [ 0.1, 0.4, - 0.1 - ], - [ - 0.1, - 0.4, - 0.1 - ], - [ - 0.1, - 0.4, - 0.1 - ], - [ - 0.1, + 0.2, 0.4, 0.1 ] @@ -39,53 +32,21 @@ }, { "name": "deny-unshaded", - "directions": 4, "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, + 0.5, 0.1 ] ] }, { - "name": "off", - "directions": 4 + "name": "broken" }, { - "name": "broken", - "directions": 4 + "name": "off" }, { - "name": "panel", - "directions": 4 + "name": "panel" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/normal-unshaded.png index bc32376a67..585454ce14 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/off.png index cf829676d4..40a5993aae 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/panel.png index c2148a09c8..a797b42b18 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/broken.png deleted file mode 100644 index 7e7601218e..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/broken.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/deny-unshaded.png deleted file mode 100644 index 11d9aa191d..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/deny-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/eject-unshaded.png deleted file mode 100644 index 65a59b4822..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/eject-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/meta.json deleted file mode 100644 index d24e37c145..0000000000 --- a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/meta.json +++ /dev/null @@ -1,239 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "normal-unshaded", - "directions": 4 - }, - { - "name": "eject-unshaded", - "directions": 4, - "delays": [ - [ - 0.1, - 0.4, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.4, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.4, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.4, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "deny-unshaded", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "off", - "directions": 4 - }, - { - "name": "broken", - "directions": 4 - }, - { - "name": "panel", - "directions": 4 - }, - { - "name": "seeds-shelf0", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "seeds-shelf1", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "seeds-shelf2", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "seeds-shelf3", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/normal-unshaded.png deleted file mode 100644 index 5d7ca257aa..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/normal-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/off.png deleted file mode 100644 index c7cf3fe4f3..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/off.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/panel.png deleted file mode 100644 index 7265126ffb..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/panel.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/seeds-shelf0.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/seeds-shelf0.png deleted file mode 100644 index f52017533a..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/seeds-shelf0.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/seeds-shelf1.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/seeds-shelf1.png deleted file mode 100644 index 454ca42943..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/seeds-shelf1.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/seeds-shelf2.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/seeds-shelf2.png deleted file mode 100644 index cd379eb938..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/seeds-shelf2.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/seeds-shelf3.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/seeds-shelf3.png deleted file mode 100644 index ad7eedec20..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/seeds-shelf3.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/broken.png index 84fb48d333..883a4a70e6 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/deny-unshaded.png index 47d437da3f..da34b0b104 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/eject-unshaded.png index ce930c3b8f..630ea5a1d0 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/meta.json index 59ee307d29..35b29c7356 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/meta.json @@ -1,295 +1,52 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "normal-unshaded", - "directions": 4 - }, - { - "name": "eject-unshaded", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] + "name": "broken" }, { "name": "deny-unshaded", - "directions": 4, "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, 0.1, 0.1 ] ] }, { - "name": "off", - "directions": 4 - }, - { - "name": "broken", - "directions": 4 - }, - { - "name": "panel", - "directions": 4 - }, - { - "name": "seeds_generic-shelf0", - "directions": 4, + "name": "eject-unshaded", "delays": [ [ 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, + 0.4, + 0.2, + 0.4, 0.1 ] ] }, { - "name": "seeds_generic-shelf1", - "directions": 4, + "name": "normal-unshaded", "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 2.5, + 0.05, + 3.4, + 0.05 ] ] }, { - "name": "seeds_generic-shelf2", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] + "name": "off" }, { - "name": "seeds_generic-shelf3", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] + "name": "panel" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/normal-unshaded.png index 2eab092987..8182e6a2c7 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/off.png index ded486fb6b..3ab3fec281 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/panel.png index 5b3e87d9d3..9e3049e07d 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/seeds_generic-shelf0.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/seeds_generic-shelf0.png deleted file mode 100644 index 5954a9c457..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/seeds_generic-shelf0.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/seeds_generic-shelf1.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/seeds_generic-shelf1.png deleted file mode 100644 index 95c15fb2eb..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/seeds_generic-shelf1.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/seeds_generic-shelf2.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/seeds_generic-shelf2.png deleted file mode 100644 index 2a59f75ff4..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/seeds_generic-shelf2.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/seeds_generic-shelf3.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/seeds_generic-shelf3.png deleted file mode 100644 index 038a01866d..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/seeds_generic-shelf3.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/broken.png index 16ce86dc2d..d08a87b760 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/deny-unshaded.png index 5a6d5e1d4b..b8221f982e 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/eject-unshaded.png index 3200386e08..49fcef45a1 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/meta.json index 0227985bb8..eaf66cff8f 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept and potato1234x", "size": { "x": 32, "y": 32 @@ -9,101 +9,44 @@ "states": [ { "name": "normal-unshaded", - "directions": 4, "delays": [ [ - 0.8, - 0.8, - 0.8 - ], - [ - 0.8, - 0.8, - 0.8 - ], - [ - 0.8, - 0.8, - 0.8 - ], - [ - 0.8, - 0.8, - 0.8 + 2.5, + 0.05, + 3.4 ] ] }, { - "name": "eject-unshaded", - "directions": 4, + "name": "broken" + }, + { + "name": "deny-unshaded", "delays": [ [ 0.1, 0.1, - 0.8, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.8, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.8, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.8, - 0.1, 0.1 ] ] }, { - "name": "deny-unshaded", - "directions": 4, + "name": "off" + }, + { + "name": "panel" + }, + { + "name": "eject-unshaded", "delays": [ [ 0.1, 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, + 0.8, 0.1, 0.1 ] ] - }, - { - "name": "off", - "directions": 4 - }, - { - "name": "broken", - "directions": 4 - }, - { - "name": "panel", - "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/normal-unshaded.png index 5748b25b90..f04f2db2af 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/off.png index 20540e67f0..4f84067486 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/panel.png index 12864f00cb..c60f5c3069 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/broken.png index 92c80e39eb..506d3b065e 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/deny-unshaded.png deleted file mode 100644 index 753fee7fee..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/deny-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/eject-unshaded.png deleted file mode 100644 index b5b9987bde..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/eject-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/fan.png b/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/fan.png deleted file mode 100644 index 0fc239d6cf..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/fan.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/meta.json index ef0b880049..1da3cf0661 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/meta.json @@ -1,163 +1,31 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d", + "copyright": "Taken from paradise at https://github.com/ParadiseSS13/Paradise/commit/ae2258d9235752ac6d80ec11e36553fe3b6ae59e, modified by Peptide", "size": { "x": 32, "y": 32 }, - "states": [ - { - "name": "normal-unshaded", - "directions": 4, - "delays": [ - [ - 4, - 0.1, - 3, - 0.5, - 0.5, - 0.5, - 0.5, - 0.5, - 0.5, - 0.5, - 0.5 - ], - [ - 4, - 0.1, - 3, - 0.5, - 0.5, - 0.5, - 0.5, - 0.5, - 0.5, - 0.5, - 0.5 - ], - [ - 4, - 0.1, - 3, - 0.5, - 0.5, - 0.5, - 0.5, - 0.5, - 0.5, - 0.5, - 0.5 - ], - [ - 4, - 0.1, - 3, - 0.5, - 0.5, - 0.5, - 0.5, - 0.5, - 0.5, - 0.5, - 0.5 - ] - ] - }, - { - "name": "eject-unshaded", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.8, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.8, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.8, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.8, - 0.1, - 0.1 - ] - ] - }, - { - "name": "deny-unshaded", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "off", - "directions": 4 - }, - { - "name": "broken", - "directions": 4 - }, - { - "name": "fan", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1 - ], - [ - 0.1, - 0.1 - ], - [ - 0.1, - 0.1 - ], - [ - 0.1, - 0.1 - ] - ] - }, - { - "name": "panel", - "directions": 4 - } - ] -} \ No newline at end of file + "states": [ + { + "name": "normal-unshaded", + "delays": [ + [ + 2.5, + 0.1, + 3.4, + 0.1 + ] + ] + }, + { + "name": "broken" + }, + { + "name": "off" + }, + { + "name": "panel" + } + ] +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/normal-unshaded.png index 083570790a..e338b4c745 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/off.png index fb11ce6be8..01de7afea4 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/panel.png index d5fa87b511..d0677806d6 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/broken.png index 835f27942a..72f8413919 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/deny-unshaded.png index b2e5c5c7a9..7f630c601c 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/eject-unshaded.png index 47b68325ef..bb21e6a5c5 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/meta.json index b1083273c3..d0d4a1f0e9 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad. Modified by potato1234x (github) for SS14", "size": { "x": 32, "y": 32 @@ -9,104 +9,48 @@ "states": [ { "name": "normal-unshaded", - "directions": 4, "delays": [ [ + 2.5, 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, + 3.4, 0.1 ] ] }, { - "name": "eject-unshaded", - "directions": 4, + "name": "broken" + }, + { + "name": "normal" + }, + { + "name": "deny-unshaded", "delays": [ [ 0.1, 0.1, - 0.8, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.8, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.8, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.8, - 0.1, 0.1 ] ] }, { - "name": "deny-unshaded", - "directions": 4, + "name": "eject-unshaded", "delays": [ [ + 0.5, 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, + 1.0, 0.1, 0.1 ] ] }, { - "name": "off", - "directions": 4 - }, - { - "name": "broken", - "directions": 4 - }, - { - "name": "panel", - "directions": 4 + "name": "off" }, { - "name": "normal" + "name": "panel" } ] } diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/normal-unshaded.png index 0abc407ddb..1328a3b041 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/off.png index 7b55385247..a5d20fa418 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/panel.png index 0dc9764776..9e3049e07d 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/broken.png index d447296df6..a5d9db35a2 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/deny-unshaded.png index dfc8b949c1..0a5ff43f0c 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/eject-unshaded.png index f005de716f..9efb08705f 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/meta.json index 6467c18580..122f479d49 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", "size": { "x": 32, "y": 32 @@ -9,79 +9,48 @@ "states": [ { "name": "normal-unshaded", - "directions": 4 - }, - { - "name": "eject-unshaded", - "directions": 4, "delays": [ [ + 1.5, 0.1, - 0.1, - 0.8, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.8, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.8, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.8, - 0.1, + 2.4, 0.1 ] ] }, + { + "name": "broken" + }, + { + "name": "normal" + }, { "name": "deny-unshaded", - "directions": 4, "delays": [ [ 0.1, 0.1, 0.1 - ], - [ - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1 - ], + ] + ] + }, + { + "name": "eject-unshaded", + "delays": [ [ + 0.5, 0.1, + 1.0, 0.1, 0.1 ] ] }, { - "name": "off", - "directions": 4 - }, - { - "name": "broken", - "directions": 4 + "name": "off" }, { - "name": "panel", - "directions": 4 + "name": "panel" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/normal-unshaded.png index 394a9f792c..96ee10550b 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/off.png index 8e0099b5ce..31f66705ba 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/panel.png index 4a1a54be10..9e3049e07d 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/deny-unshaded.png index 7847a34ee1..2da5364a63 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/eject-unshaded.png index 45fd62d159..d7d61922fd 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/normal-unshaded.png index d063e402aa..155ff448f8 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/normal.png b/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/normal.png index 6914a22448..6689f74926 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/normal.png and b/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/normal.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/off.png index d60aa24105..272cb31ed6 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/broken.png index 753f96ecb4..32fdbb98f3 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/deny-unshaded.png index bc889ec638..66e29f2bf0 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/eject-unshaded.png index 0a2d1ea233..865de78e60 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/meta.json index 057b1e8e94..8c67a03d35 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/meta.json @@ -1,69 +1,21 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d", + "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "normal-unshaded", - "directions": 4 + "name": "normal-unshaded" }, { - "name": "eject-unshaded", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.8, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.8, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.8, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.8, - 0.1, - 0.1 - ] - ] + "name": "broken" }, { "name": "deny-unshaded", - "directions": 4, "delays": [ - [ - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1 - ], [ 0.1, 0.1, @@ -72,29 +24,11 @@ ] }, { - "name": "off", - "directions": 4 - }, - { - "name": "broken", - "directions": 4 + "name": "off" }, { "name": "screen", - "directions": 4, "delays": [ - [ - 3, - 0.1 - ], - [ - 3, - 0.1 - ], - [ - 3, - 0.1 - ], [ 3, 0.1 @@ -102,8 +36,19 @@ ] }, { - "name": "panel", - "directions": 4 + "name": "panel" + }, + { + "name": "eject-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.8, + 0.1, + 0.1 + ] + ] } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/normal-unshaded.png index b7e0751ddd..027d2fe009 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/off.png index 3feefb11bf..069d91a373 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/panel.png index a2d8ea3320..6c43cd885b 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/screen.png b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/screen.png index 30c120bce7..a0bf454c8d 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/screen.png and b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/screen.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/broken.png index 3a2fbee2dd..783cf8af95 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/deny-unshaded.png index 066f7787bc..75081085a9 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/meta.json index 0201682c86..b34b3c2a11 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/meta.json @@ -1,87 +1,38 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d", + "copyright": "Taken from /tg/station at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae, off.png taken from /tg/station commit ede31369cfa5ea1bed9262b5ef4bbef85f60fe26 and edited by @Flareguy", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "normal-unshaded", - "directions": 4 + "name": "broken" + }, + { + "name": "panel" }, { - "name": "eject-unshaded", - "directions": 4, + "name": "deny-unshaded", "delays": [ [ 0.1, - 0.1, - 0.1, - 0.1, - 0.6 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.6 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.6 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.6 + 0.1 ] ] }, { - "name": "deny-unshaded", - "directions": 4, + "name": "normal-unshaded", "delays": [ [ - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, 0.1, 0.1 ] ] }, { - "name": "off", - "directions": 4 - }, - { - "name": "broken", - "directions": 4 - }, - { - "name": "panel", - "directions": 4 + "name": "off" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/normal-unshaded.png index b5cd555038..c94e7ba266 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/off.png index d3eed12c55..fb933b8612 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/panel.png index f67e50ee90..851c8b7893 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/broken.png index f4bf0a3929..18322391cc 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/deny-unshaded.png index 9ee002be45..9819fb3867 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/eject-unshaded.png index acc5b47a3d..9d19accfe1 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/meta.json index 24c7cd05f4..4e9ac60b73 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/meta.json @@ -1,91 +1,52 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "normal-unshaded", - "directions": 4 + "name": "broken" }, { - "name": "eject-unshaded", - "directions": 4, + "name": "deny-unshaded", "delays": [ [ - 0.1, - 0.4, + 0.5, 0.1 - ], - [ - 0.1, - 0.4, - 0.1 - ], + ] + ] + }, + { + "name": "eject-unshaded", + "delays": [ [ 0.1, 0.4, - 0.1 - ], - [ - 0.1, + 0.2, 0.4, 0.1 ] ] }, { - "name": "deny-unshaded", - "directions": 4, + "name": "normal-unshaded", "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 2.5, + 0.05, + 3.4, + 0.05 ] ] }, { - "name": "off", - "directions": 4 - }, - { - "name": "broken", - "directions": 4 + "name": "off" }, { - "name": "panel", - "directions": 4 + "name": "panel" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/normal-unshaded.png index 1aa08065ff..80ca6812f7 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/off.png index 1af7d16d17..2ac83c2eb8 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/panel.png index e50605569e..faddc53351 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/draining.png b/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/draining.png index d69c34fe57..87ce5806aa 100644 Binary files a/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/draining.png and b/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/draining.png differ diff --git a/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/icon-running.png b/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/icon-running.png index c145e2993e..2273bfc9db 100644 Binary files a/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/icon-running.png and b/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/icon-running.png differ diff --git a/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/icon.png b/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/icon.png index 06cf190185..992a4af0c5 100644 Binary files a/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/icon.png and b/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/meta.json index 82a7dfe0cb..dc2d09cb57 100644 --- a/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/meta.json +++ b/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/meta.json @@ -14,13 +14,23 @@ "name": "icon-running", "delays": [ [ - 0.2, - 0.2 + 0.1, + 0.1, + 0.1, + 0.1 ] ] }, { - "name": "unlit" + "name": "unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] }, { "name": "unlit-full" diff --git a/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/unlit-full.png b/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/unlit-full.png index b688c5b73a..832d466993 100644 Binary files a/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/unlit-full.png and b/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/unlit-full.png differ diff --git a/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/unlit.png b/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/unlit.png index 00695432c2..faf2e26cd8 100644 Binary files a/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/unlit.png and b/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/unlit.png differ diff --git a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/meta.json index 6528705be2..191aa398a9 100644 --- a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/meta.json +++ b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/meta.json @@ -5,25 +5,30 @@ "y":32 }, "license":"CC-BY-SA-3.0", - "copyright":"Taken from https://github.com/ParadiseSS13/Paradise/", + "copyright":"Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da", "states":[ { - "name":"scrub_off" + "name":"scrub_off", + "directions": 4 }, { - "name":"scrub_welded" + "name":"scrub_welded", + "directions": 4 }, { "name":"scrub_on", - "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]] + "directions": 4, + "delays": [[0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08], [0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08], [0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08], [0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08]] }, { "name": "scrub_purge", - "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]] + "directions": 4, + "delays": [[0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04], [0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04], [0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04], [0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04]] }, { "name": "scrub_wide", - "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]] + "directions": 4, + "delays": [[0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04], [0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04], [0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04], [0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04]] } ] } diff --git a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_off.png b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_off.png index 9752342e2d..efc173d893 100644 Binary files a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_off.png and b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_off.png differ diff --git a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_on.png b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_on.png index 5fcf53f314..9bc5d8c0bf 100644 Binary files a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_on.png and b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_on.png differ diff --git a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_purge.png b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_purge.png index e0e3e44556..75ba6d6de0 100644 Binary files a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_purge.png and b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_purge.png differ diff --git a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_welded.png b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_welded.png index b3a5445f74..96ab7b0825 100644 Binary files a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_welded.png and b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_welded.png differ diff --git a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_wide.png b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_wide.png index a93f3259b8..087777a888 100644 Binary files a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_wide.png and b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_wide.png differ diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/meta.json index 16ab91ee5c..0d11425210 100644 --- a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/meta.json +++ b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/meta.json @@ -5,21 +5,25 @@ "y":32 }, "license":"CC-BY-SA-3.0", - "copyright":"Taken from https://github.com/ParadiseSS13/Paradise/", + "copyright":"Taken from https://github.com/BeeStation/BeeStation-Hornet at commit 4ccd79de285e79e504308bcd6fa5908d6b7685f7", "states":[ { - "name":"vent_off" + "name":"vent_off", + "directions" : 4 }, { - "name":"vent_welded" + "name":"vent_welded", + "directions" : 4 }, { "name":"vent_out", - "delays":[ [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] ] + "directions" : 4, + "delays":[ [ 0.08, 0.08, 0.08, 0.08 ], [ 0.08, 0.08, 0.08, 0.08 ], [ 0.08, 0.08, 0.08, 0.08 ], [ 0.08, 0.08, 0.08, 0.08 ] ] }, { "name":"vent_in", - "delays":[ [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] ] + "directions" : 4, + "delays":[ [ 0.08, 0.08, 0.08, 0.08 ], [ 0.08, 0.08, 0.08, 0.08 ], [ 0.08, 0.08, 0.08, 0.08 ], [ 0.08, 0.08, 0.08, 0.08 ] ] } ] } diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_in.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_in.png index 2a7787aa4b..cf1b050c02 100644 Binary files a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_in.png and b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_in.png differ diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_off.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_off.png index e7634ef5a2..6208c59db7 100644 Binary files a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_off.png and b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_off.png differ diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_out.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_out.png index 396d8fb0f9..e038706b0e 100644 Binary files a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_out.png and b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_out.png differ diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_welded.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_welded.png index b00be657b6..b45ae1cb5f 100644 Binary files a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_welded.png and b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_welded.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/armory_door.png b/Resources/Textures/Structures/Storage/closet.rsi/armory_door.png index 73837efd90..c775ca7bf3 100644 Binary files a/Resources/Textures/Structures/Storage/closet.rsi/armory_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/armory_door.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/bio_door.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_door.png index 38bc16123e..3adc8e7349 100644 Binary files a/Resources/Textures/Structures/Storage/closet.rsi/bio_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/bio_door.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/bio_jan_door.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_jan_door.png index 09fc5d4fad..c84da65c4f 100644 Binary files a/Resources/Textures/Structures/Storage/closet.rsi/bio_jan_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/bio_jan_door.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/bio_sec_door.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_sec_door.png index de68858255..d3df95e383 100644 Binary files a/Resources/Textures/Structures/Storage/closet.rsi/bio_sec_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/bio_sec_door.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/bio_viro_door.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_viro_door.png index e031cfdeec..756ca7d16e 100644 Binary files a/Resources/Textures/Structures/Storage/closet.rsi/bio_viro_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/bio_viro_door.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/bomb_door.png b/Resources/Textures/Structures/Storage/closet.rsi/bomb_door.png index ef326afd36..5764f6102a 100644 Binary files a/Resources/Textures/Structures/Storage/closet.rsi/bomb_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/bomb_door.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/cap_door.png b/Resources/Textures/Structures/Storage/closet.rsi/cap_door.png index b80523d66e..b0a192aa83 100644 Binary files a/Resources/Textures/Structures/Storage/closet.rsi/cap_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/cap_door.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/ce_door.png b/Resources/Textures/Structures/Storage/closet.rsi/ce_door.png index 3d4a96e56d..b8a6fa714c 100644 Binary files a/Resources/Textures/Structures/Storage/closet.rsi/ce_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/ce_door.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/eng_rad_door.png b/Resources/Textures/Structures/Storage/closet.rsi/eng_rad_door.png index d2b2643b0a..5002c25a02 100644 Binary files a/Resources/Textures/Structures/Storage/closet.rsi/eng_rad_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/eng_rad_door.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/eng_secure_door.png b/Resources/Textures/Structures/Storage/closet.rsi/eng_secure_door.png index 48b6cc684d..99e2ccf317 100644 Binary files a/Resources/Textures/Structures/Storage/closet.rsi/eng_secure_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/eng_secure_door.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/hop_door.png b/Resources/Textures/Structures/Storage/closet.rsi/hop_door.png index c8ef16d934..3833ca9c22 100644 Binary files a/Resources/Textures/Structures/Storage/closet.rsi/hop_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/hop_door.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/hos_door.png b/Resources/Textures/Structures/Storage/closet.rsi/hos_door.png index 70a0617de9..97ca334496 100644 Binary files a/Resources/Textures/Structures/Storage/closet.rsi/hos_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/hos_door.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/hydro_door.png b/Resources/Textures/Structures/Storage/closet.rsi/hydro_door.png index 19471d491f..44265d41fc 100644 Binary files a/Resources/Textures/Structures/Storage/closet.rsi/hydro_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/hydro_door.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/Structures/Storage/closet.rsi/meta.json index d3802637c0..63ad0148f0 100644 --- a/Resources/Textures/Structures/Storage/closet.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/closet.rsi/meta.json @@ -4,7 +4,7 @@ "x": 32, "y": 32 }, - "copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github), CJ and Clerk lockers edited by Timemaster99 (Discord), n2_door state modified by Flareguy from fire_door, using sprites from /vg/station at https://github.com/vgstation-coders/vgstation13/commit/02b9f6894af4419c9f7e699a22c402b086d8067e", + "copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github). Inspector White Dream SS14 original by Gargarien", "license": "CC-BY-SA-3.0", "states": [ { @@ -163,24 +163,6 @@ { "name": "chemical_door" }, - { - "name": "cj" - }, - { - "name": "cj_door" - }, - { - "name": "cj_open" - }, - { - "name": "clerk" - }, - { - "name": "clerk_door" - }, - { - "name": "clerk_open" - }, { "name": "cmo" }, @@ -570,6 +552,15 @@ }, { "name": "representative_door" + }, + { + "name": "inspector" + }, + { + "name": "inspector_door" + }, + { + "name": "inspector_open" } ] } diff --git a/Resources/Textures/Structures/Storage/closet.rsi/rd_door.png b/Resources/Textures/Structures/Storage/closet.rsi/rd_door.png index aee46909d2..5e1e851af5 100644 Binary files a/Resources/Textures/Structures/Storage/closet.rsi/rd_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/rd_door.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/science_door.png b/Resources/Textures/Structures/Storage/closet.rsi/science_door.png index a407509523..cc94591a38 100644 Binary files a/Resources/Textures/Structures/Storage/closet.rsi/science_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/science_door.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/sec_door.png b/Resources/Textures/Structures/Storage/closet.rsi/sec_door.png index 0c211d159b..9b2645e5d1 100644 Binary files a/Resources/Textures/Structures/Storage/closet.rsi/sec_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/sec_door.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/tac_door.png b/Resources/Textures/Structures/Storage/closet.rsi/tac_door.png index 88b108ddb4..de4bd0909e 100644 Binary files a/Resources/Textures/Structures/Storage/closet.rsi/tac_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/tac_door.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/warden_door.png b/Resources/Textures/Structures/Storage/closet.rsi/warden_door.png index 4de649abc4..2a48635fd7 100644 Binary files a/Resources/Textures/Structures/Storage/closet.rsi/warden_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/warden_door.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/full.png b/Resources/Textures/Structures/Walls/solid.rsi/full.png index b4e991e345..c3f6fbc79f 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/full.png and b/Resources/Textures/Structures/Walls/solid.rsi/full.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/meta.json b/Resources/Textures/Structures/Walls/solid.rsi/meta.json index 246ebe31b9..85b809570d 100644 --- a/Resources/Textures/Structures/Walls/solid.rsi/meta.json +++ b/Resources/Textures/Structures/Walls/solid.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/c34c1b30abf18aa552e19294523924c39e5ea127/icons/turf/wall_masks.dmi and modified.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png index 1e2da3352b..fbf5e0dc10 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png index 501e4b2ab4..068d688357 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png index 23367ae824..1b69d47573 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png index 2b48ffb696..49696566a7 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png index 515b40760d..0474f78f9e 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png index bbff6b6584..fbdedd7886 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png index f6b33bcb18..07cdc8bf59 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png index a7800d9dcc..e607dc9aca 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png index f6b33bcb18..07cdc8bf59 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png index a7800d9dcc..e607dc9aca 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png index 9e8e9dd40a..48d4699466 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png index 3c0b42ddbf..3f12cdad39 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png index 9e8e9dd40a..48d4699466 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over7.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over7.png index b4bc95f4f0..3a5e0cb5ae 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over7.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over7.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png b/Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png index 1e2da3352b..0328bd2b84 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png and b/Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid0.png b/Resources/Textures/Structures/Walls/solid.rsi/solid0.png index 3849504b6f..404b6ac1c6 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid0.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid0.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid1.png b/Resources/Textures/Structures/Walls/solid.rsi/solid1.png index 9ac2271692..258b734263 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid1.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid1.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid2.png b/Resources/Textures/Structures/Walls/solid.rsi/solid2.png index 3849504b6f..404b6ac1c6 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid2.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid2.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid3.png b/Resources/Textures/Structures/Walls/solid.rsi/solid3.png index 9ac2271692..258b734263 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid3.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid3.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid4.png b/Resources/Textures/Structures/Walls/solid.rsi/solid4.png index a5a6dd2856..5af1322d5e 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid4.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid4.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid5.png b/Resources/Textures/Structures/Walls/solid.rsi/solid5.png index 3c0b42ddbf..773e85c48a 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid5.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid5.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid6.png b/Resources/Textures/Structures/Walls/solid.rsi/solid6.png index a5a6dd2856..5af1322d5e 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid6.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid6.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid7.png b/Resources/Textures/Structures/Walls/solid.rsi/solid7.png index b4bc95f4f0..47900fe305 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid7.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid7.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/full.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/full.png index 31911eddb8..26d0d7971f 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/full.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/full.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/meta.json b/Resources/Textures/Structures/Walls/solid_rust.rsi/meta.json index 3b1da2fdae..af5ebe04cf 100644 --- a/Resources/Textures/Structures/Walls/solid_rust.rsi/meta.json +++ b/Resources/Textures/Structures/Walls/solid_rust.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan.", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/67a5373b4649937dd63dd94153e05e8506f40a5d and modified.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-0.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-0.png index 81f7b75d7b..19200aaca0 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-0.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-0.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-1.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-1.png index 69acb77115..27ce52b1c6 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-1.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-1.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-2.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-2.png index 63c1502b8a..b75834cfa0 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-2.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-2.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-3.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-3.png index ad5094443b..dd4c9e9ac3 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-3.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-3.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-4.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-4.png index 50b465c63b..3d02e0ca28 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-4.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-4.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-5.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-5.png index c6d8dacab1..1f0edcf86b 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-5.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-5.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over0.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over0.png index ce5adc65b5..f82137acc2 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over0.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over0.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over1.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over1.png index dd8b232de2..66ad1db058 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over1.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over1.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over2.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over2.png index ce5adc65b5..f82137acc2 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over2.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over2.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over3.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over3.png index dd8b232de2..66ad1db058 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over3.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over3.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over4.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over4.png index e6c25bf954..ad489f8e06 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over4.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over4.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over5.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over5.png index d0384e6f2b..6dcf50aa02 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over5.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over5.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over6.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over6.png index e6c25bf954..ad489f8e06 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over6.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over6.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over7.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over7.png index 45a43655f6..593f745dd9 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over7.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over7.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/rgeneric.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/rgeneric.png index 81f7b75d7b..53e76c03a6 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/rgeneric.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/rgeneric.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid0.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid0.png index a82cf05337..b6f86f7f78 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid0.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid0.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid1.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid1.png index 88c852b396..bc3162a30d 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid1.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid1.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid2.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid2.png index a82cf05337..b6f86f7f78 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid2.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid2.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid3.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid3.png index 88c852b396..bc3162a30d 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid3.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid3.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid4.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid4.png index ba6ac0281f..35fd2ad1a7 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid4.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid4.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid5.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid5.png index d0384e6f2b..a7324792c9 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid5.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid5.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid6.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid6.png index ba6ac0281f..35fd2ad1a7 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid6.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid6.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid7.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid7.png index 45a43655f6..89fc2ab547 100644 Binary files a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid7.png and b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid7.png differ diff --git a/Resources/Textures/Structures/Windows/directional.rsi/frosted_window.png b/Resources/Textures/Structures/Windows/directional.rsi/frosted_window.png index 4f9bf4c955..a98794a792 100644 Binary files a/Resources/Textures/Structures/Windows/directional.rsi/frosted_window.png and b/Resources/Textures/Structures/Windows/directional.rsi/frosted_window.png differ diff --git a/Resources/Textures/Structures/Windows/directional.rsi/plasma_reinforced_window.png b/Resources/Textures/Structures/Windows/directional.rsi/plasma_reinforced_window.png index c1269b424e..63bdf7e422 100644 Binary files a/Resources/Textures/Structures/Windows/directional.rsi/plasma_reinforced_window.png and b/Resources/Textures/Structures/Windows/directional.rsi/plasma_reinforced_window.png differ diff --git a/Resources/Textures/Structures/Windows/directional.rsi/plasma_window.png b/Resources/Textures/Structures/Windows/directional.rsi/plasma_window.png index b1d1f4fef5..bc97d3350a 100644 Binary files a/Resources/Textures/Structures/Windows/directional.rsi/plasma_window.png and b/Resources/Textures/Structures/Windows/directional.rsi/plasma_window.png differ diff --git a/Resources/Textures/Structures/Windows/directional.rsi/reinforced_window.png b/Resources/Textures/Structures/Windows/directional.rsi/reinforced_window.png index 865f079317..bedb3ce7b2 100644 Binary files a/Resources/Textures/Structures/Windows/directional.rsi/reinforced_window.png and b/Resources/Textures/Structures/Windows/directional.rsi/reinforced_window.png differ diff --git a/Resources/Textures/Structures/Windows/directional.rsi/tinted_window.png b/Resources/Textures/Structures/Windows/directional.rsi/tinted_window.png index 4f9bf4c955..a98794a792 100644 Binary files a/Resources/Textures/Structures/Windows/directional.rsi/tinted_window.png and b/Resources/Textures/Structures/Windows/directional.rsi/tinted_window.png differ diff --git a/Resources/Textures/Structures/Windows/directional.rsi/window.png b/Resources/Textures/Structures/Windows/directional.rsi/window.png index a510742c94..8c02d08738 100644 Binary files a/Resources/Textures/Structures/Windows/directional.rsi/window.png and b/Resources/Textures/Structures/Windows/directional.rsi/window.png differ diff --git a/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/meta.json b/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/meta.json index 453a379722..2f98b3591b 100644 --- a/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github)", + "copyright": "Made by S_k_R_i_M_e_X", "states": [ { "name": "state0" diff --git a/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state0.png index 84f71e4833..c5e6e288fc 100644 Binary files a/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state0.png differ diff --git a/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state1.png index 3655b4b9d1..8052a13a19 100644 Binary files a/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state1.png differ diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/full.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/full.png index 41d24e9d2c..83be63e1d4 100644 Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/full.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/full.png differ diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json b/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json index 888b3527fb..4a03341090 100644 --- a/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b and modified by Swept", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png index a4adc74bb5..d6161707a9 100644 Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png differ diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png index b0289b7d65..e83c88efdc 100644 Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png differ diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png index a4adc74bb5..d6161707a9 100644 Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png differ diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png index b0289b7d65..e83c88efdc 100644 Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png differ diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png index 06f4275583..bbb7d68c58 100644 Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png differ diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png index b6847b9237..c9a4bf6f11 100644 Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png differ diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png index 06f4275583..bbb7d68c58 100644 Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png differ diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png index 897abc2b8e..a8b33109a5 100644 Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/meta.json b/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/meta.json index 453a379722..2f98b3591b 100644 --- a/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github)", + "copyright": "Made by S_k_R_i_M_e_X", "states": [ { "name": "state0" diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state0.png index 3e5ebf5036..53652e2770 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state0.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state1.png index 7bd92db59f..801ff6c4ac 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state1.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/full.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/full.png index a1c5c2115f..e58a142310 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/full.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/full.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json index e716cdf4ed..f66453a57d 100644 --- a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow0.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow0.png index 8944626009..a46c49976e 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow0.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow0.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow1.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow1.png index b4ba2ac007..55e5f01d0b 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow1.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow1.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow2.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow2.png index 8944626009..a46c49976e 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow2.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow2.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow3.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow3.png index 7f987f7a8e..55e5f01d0b 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow3.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow3.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow4.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow4.png index c9bd9b8699..a8ad461cd8 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow4.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow4.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow5.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow5.png index f16d149ec4..c171da053e 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow5.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow5.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow6.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow6.png index c9bd9b8699..a8ad461cd8 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow6.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow6.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow7.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow7.png index 4ad14d62d1..6c8777fc0e 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow7.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow7.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state0.png index fa6f83797c..facbfda3ad 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state0.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state1.png index c40b161092..3799df51bf 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state1.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/full.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/full.png index a1c44f239f..10342c5705 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/full.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/full.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/meta.json b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/meta.json index 84639dad70..739d63b247 100644 --- a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/meta.json @@ -1,46 +1,46 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "full" - }, - { - "name": "ruwindow0", - "directions": 4 - }, - { - "name": "ruwindow1", - "directions": 4 - }, - { - "name": "ruwindow2", - "directions": 4 - }, - { - "name": "ruwindow3", - "directions": 4 - }, - { - "name": "ruwindow4", - "directions": 4 - }, - { - "name": "ruwindow5", - "directions": 4 - }, - { - "name": "ruwindow6", - "directions": 4 - }, - { - "name": "ruwindow7", - "directions": 4 - } - ] -} + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "resprited by AsikKEsel | Original source: from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept ", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "ruwindow0", + "directions": 4 + }, + { + "name": "ruwindow1", + "directions": 4 + }, + { + "name": "ruwindow2", + "directions": 4 + }, + { + "name": "ruwindow3", + "directions": 4 + }, + { + "name": "ruwindow4", + "directions": 4 + }, + { + "name": "ruwindow5", + "directions": 4 + }, + { + "name": "ruwindow6", + "directions": 4 + }, + { + "name": "ruwindow7", + "directions": 4 + } + ] + } diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow0.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow0.png index ee38893001..dfe885bf85 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow0.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow0.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow1.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow1.png index cb46c4deda..e1ca7ea363 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow1.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow1.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow2.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow2.png index ee38893001..773a2b3fff 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow2.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow2.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow3.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow3.png index 7977b29f0c..e10cff828e 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow3.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow3.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow4.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow4.png index a50fafe0ed..2dff7e5127 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow4.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow4.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow5.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow5.png index 3fe3f626e7..0a54faafb0 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow5.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow5.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow6.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow6.png index a50fafe0ed..1f9ba05446 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow6.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow6.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow7.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow7.png index 6edfddd38d..5fb5fb0c7f 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow7.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow7.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png index 73b05e9b2a..aaf736ac44 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json b/Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json index 90c736a41c..456d8a2890 100644 --- a/Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png index f339bedb11..6649a73c1e 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png index defff91bc0..34faa5f891 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png index f339bedb11..6649a73c1e 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png index defff91bc0..34faa5f891 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png index 0324c05f17..10abeec265 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png index 6770b1a235..834e91e414 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png index 0324c05f17..10abeec265 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png index 0e02c2e8de..c261f07dbe 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/meta.json b/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/meta.json index 453a379722..4f32dc4044 100644 --- a/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github)", + "copyright": "Made by PurplePi for S_k_R_i_M_e_X", "states": [ { "name": "state0" diff --git a/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state0.png index cd8aca5579..18ed8298a3 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state0.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state1.png index 4130608cea..a1e144d39d 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state1.png differ diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/full.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/full.png index 371b38edb2..39d5d7f159 100644 Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/full.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/full.png differ diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json b/Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json index cdbfb466b4..30517fd0ac 100644 --- a/Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/ f141c349e063f7318d8c8a2417d840f0b2d06600, modified", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png index 5539fa6154..8df347bc07 100644 Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png differ diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png index a7a0cad53a..abce8d1aa6 100644 Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png differ diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png index 5539fa6154..8df347bc07 100644 Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png differ diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow3.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow3.png index a7a0cad53a..abce8d1aa6 100644 Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow3.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow3.png differ diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow4.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow4.png index ea4706b191..b4fa59bba9 100644 Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow4.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow4.png differ diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png index b26c7be0b2..f61e61e226 100644 Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png differ diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png index ea4706b191..b4fa59bba9 100644 Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png differ diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png index a422e8c152..537c4bead2 100644 Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png differ diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/full.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/full.png index 5695bc0c26..2bfece4158 100644 Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/full.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/full.png differ diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json b/Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json index e4e4f5004e..85e4798784 100644 --- a/Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json @@ -1,46 +1,46 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "full" - }, - { - "name": "uwindow0", - "directions": 4 - }, - { - "name": "uwindow1", - "directions": 4 - }, - { - "name": "uwindow2", - "directions": 4 - }, - { - "name": "uwindow3", - "directions": 4 - }, - { - "name": "uwindow4", - "directions": 4 - }, - { - "name": "uwindow5", - "directions": 4 - }, - { - "name": "uwindow6", - "directions": 4 - }, - { - "name": "uwindow7", - "directions": 4 - } - ] -} + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by S_k_R_i_M_e_X", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "uwindow0", + "directions": 4 + }, + { + "name": "uwindow1", + "directions": 4 + }, + { + "name": "uwindow2", + "directions": 4 + }, + { + "name": "uwindow3", + "directions": 4 + }, + { + "name": "uwindow4", + "directions": 4 + }, + { + "name": "uwindow5", + "directions": 4 + }, + { + "name": "uwindow6", + "directions": 4 + }, + { + "name": "uwindow7", + "directions": 4 + } + ] + } diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow0.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow0.png index 31bfc29cf0..192eeb17d6 100644 Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow0.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow0.png differ diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow1.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow1.png index e395832e8e..4d77485963 100644 Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow1.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow1.png differ diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow2.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow2.png index 31bfc29cf0..192eeb17d6 100644 Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow2.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow2.png differ diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow3.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow3.png index e395832e8e..4d77485963 100644 Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow3.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow3.png differ diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow4.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow4.png index 4097d024fc..825c1410b5 100644 Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow4.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow4.png differ diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow5.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow5.png index 5245aa4de5..fe7fbecd1b 100644 Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow5.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow5.png differ diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow6.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow6.png index 4097d024fc..825c1410b5 100644 Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow6.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow6.png differ diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow7.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow7.png index f2aec98846..778cf5e620 100644 Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow7.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow7.png differ diff --git a/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/meta.json b/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/meta.json index 453a379722..2f98b3591b 100644 --- a/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github)", + "copyright": "Made by S_k_R_i_M_e_X", "states": [ { "name": "state0" diff --git a/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state0.png index dc5081de2e..a480ae0458 100644 Binary files a/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state0.png differ diff --git a/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state1.png index 772c39f641..d6695ac532 100644 Binary files a/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state1.png differ diff --git a/Resources/Textures/Structures/Windows/window.rsi/full.png b/Resources/Textures/Structures/Windows/window.rsi/full.png index 897534dd8f..7790118815 100644 Binary files a/Resources/Textures/Structures/Windows/window.rsi/full.png and b/Resources/Textures/Structures/Windows/window.rsi/full.png differ diff --git a/Resources/Textures/Structures/Windows/window.rsi/meta.json b/Resources/Textures/Structures/Windows/window.rsi/meta.json index 9f6536937a..41b8be18b4 100644 --- a/Resources/Textures/Structures/Windows/window.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/window.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Windows/window.rsi/window0.png b/Resources/Textures/Structures/Windows/window.rsi/window0.png index 95094714d3..b5c290cafb 100644 Binary files a/Resources/Textures/Structures/Windows/window.rsi/window0.png and b/Resources/Textures/Structures/Windows/window.rsi/window0.png differ diff --git a/Resources/Textures/Structures/Windows/window.rsi/window1.png b/Resources/Textures/Structures/Windows/window.rsi/window1.png index 98f6b07bcb..2347e36561 100644 Binary files a/Resources/Textures/Structures/Windows/window.rsi/window1.png and b/Resources/Textures/Structures/Windows/window.rsi/window1.png differ diff --git a/Resources/Textures/Structures/Windows/window.rsi/window2.png b/Resources/Textures/Structures/Windows/window.rsi/window2.png index 95094714d3..b5c290cafb 100644 Binary files a/Resources/Textures/Structures/Windows/window.rsi/window2.png and b/Resources/Textures/Structures/Windows/window.rsi/window2.png differ diff --git a/Resources/Textures/Structures/Windows/window.rsi/window3.png b/Resources/Textures/Structures/Windows/window.rsi/window3.png index 98f6b07bcb..2347e36561 100644 Binary files a/Resources/Textures/Structures/Windows/window.rsi/window3.png and b/Resources/Textures/Structures/Windows/window.rsi/window3.png differ diff --git a/Resources/Textures/Structures/Windows/window.rsi/window4.png b/Resources/Textures/Structures/Windows/window.rsi/window4.png index 30629fcac2..b2be0ffdad 100644 Binary files a/Resources/Textures/Structures/Windows/window.rsi/window4.png and b/Resources/Textures/Structures/Windows/window.rsi/window4.png differ diff --git a/Resources/Textures/Structures/Windows/window.rsi/window5.png b/Resources/Textures/Structures/Windows/window.rsi/window5.png index df4ef65088..813a561157 100644 Binary files a/Resources/Textures/Structures/Windows/window.rsi/window5.png and b/Resources/Textures/Structures/Windows/window.rsi/window5.png differ diff --git a/Resources/Textures/Structures/Windows/window.rsi/window6.png b/Resources/Textures/Structures/Windows/window.rsi/window6.png index 30629fcac2..b2be0ffdad 100644 Binary files a/Resources/Textures/Structures/Windows/window.rsi/window6.png and b/Resources/Textures/Structures/Windows/window.rsi/window6.png differ diff --git a/Resources/Textures/Structures/Windows/window.rsi/window7.png b/Resources/Textures/Structures/Windows/window.rsi/window7.png index 0e02c2e8de..1a88ef394f 100644 Binary files a/Resources/Textures/Structures/Windows/window.rsi/window7.png and b/Resources/Textures/Structures/Windows/window.rsi/window7.png differ diff --git a/Resources/Textures/Structures/Windows/window_diagonal.rsi/meta.json b/Resources/Textures/Structures/Windows/window_diagonal.rsi/meta.json index 453a379722..2f98b3591b 100644 --- a/Resources/Textures/Structures/Windows/window_diagonal.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/window_diagonal.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github)", + "copyright": "Made by S_k_R_i_M_e_X", "states": [ { "name": "state0" diff --git a/Resources/Textures/Structures/Windows/window_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/window_diagonal.rsi/state0.png index 39ffd5be1f..c81cad86d2 100644 Binary files a/Resources/Textures/Structures/Windows/window_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Windows/window_diagonal.rsi/state0.png differ diff --git a/Resources/Textures/Structures/Windows/window_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/window_diagonal.rsi/state1.png index bb5136c8b0..637e143e38 100644 Binary files a/Resources/Textures/Structures/Windows/window_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Windows/window_diagonal.rsi/state1.png differ