diff --git a/Content.Server/ADT/SwitchableWeapon/SwitchableWeaponSystem.cs b/Content.Server/ADT/SwitchableWeapon/SwitchableWeaponSystem.cs new file mode 100644 index 0000000000..61a21f984c --- /dev/null +++ b/Content.Server/ADT/SwitchableWeapon/SwitchableWeaponSystem.cs @@ -0,0 +1,83 @@ +using Content.Shared.Damage.Components; +using Content.Shared.Damage.Events; +using Content.Shared.Examine; +using Content.Shared.Interaction.Events; +using Content.Shared.Item; +using Content.Shared.ADT.SwitchableWeapon; +using Content.Shared.Toggleable; +using Content.Shared.Weapons.Melee.Events; +using Robust.Shared.Audio.Systems; + +namespace Content.Server.ADT.SwitchableWeapon; + +public sealed class SwitchableWeaponSystem : EntitySystem +{ + [Dependency] private readonly SharedItemSystem _item = default!; + [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(Toggle); + SubscribeLocalEvent(OnExamined); + SubscribeLocalEvent(OnStaminaHitAttempt); + SubscribeLocalEvent(OnGetMeleeDamage); + SubscribeLocalEvent(OnComponentAdded); + } + + private void OnComponentAdded(EntityUid uid, SwitchableWeaponComponent component, ComponentAdd args) + { + UpdateState(uid, component); + } + + //Non-stamina damage + private void OnGetMeleeDamage(EntityUid uid, SwitchableWeaponComponent component, ref GetMeleeDamageEvent args) + { + args.Damage = component.IsOpen ? component.DamageOpen : component.DamageFolded; + } + + private void OnStaminaHitAttempt(EntityUid uid, SwitchableWeaponComponent component, ref StaminaDamageOnHitAttemptEvent args) + { + if (!component.IsOpen) + return; + + //args.HitSoundOverride = component.BonkSound; + } + + private void OnExamined(EntityUid uid, SwitchableWeaponComponent comp, ExaminedEvent args) + { + var msg = comp.IsOpen + ? Loc.GetString("comp-switchable-examined-on") + : Loc.GetString("comp-switchable-examined-off"); + args.PushMarkup(msg); + } + + private void UpdateState(EntityUid uid, SwitchableWeaponComponent comp) + { + if (TryComp(comp.Owner, out var item)) + { + _item.SetSize(item.Owner, comp.IsOpen ? comp.SizeOpened : comp.SizeClosed, item); + _item.SetHeldPrefix(comp.Owner, comp.IsOpen ? "on" : "off", false, item); + } + + if (TryComp(comp.Owner, out var appearance)) + _appearance.SetData(comp.Owner, ToggleVisuals.Toggled, comp.IsOpen, appearance); + + // Change stamina damage according to state + if (TryComp(uid, out var stamComp)) + { + stamComp.Damage = comp.IsOpen ? comp.StaminaDamageOpen : comp.StaminaDamageFolded; + } + } + + private void Toggle(EntityUid uid, SwitchableWeaponComponent comp, UseInHandEvent args) + { + comp.IsOpen = !comp.IsOpen; + UpdateState(uid, comp); + + var soundToPlay = comp.IsOpen ? comp.OpenSound : comp.CloseSound; + _audio.PlayPvs(soundToPlay, args.User); + } +} \ No newline at end of file diff --git a/Content.Shared/ADT/SwitchableWeapon/SwitchableWeaponComponent.cs b/Content.Shared/ADT/SwitchableWeapon/SwitchableWeaponComponent.cs new file mode 100644 index 0000000000..1b9297f41a --- /dev/null +++ b/Content.Shared/ADT/SwitchableWeapon/SwitchableWeaponComponent.cs @@ -0,0 +1,50 @@ +using Content.Shared.Damage; +using Content.Shared.Item; +using Robust.Shared.Audio; +using Robust.Shared.Prototypes; + +namespace Content.Shared.ADT.SwitchableWeapon; + +[RegisterComponent] +public sealed partial class SwitchableWeaponComponent : Component +{ + [ViewVariables(VVAccess.ReadWrite)][DataField("damageFolded")] + public DamageSpecifier DamageFolded = new(){ + DamageDict = new() + { + { "Blunt", 0.0f }, + } + }; + + [ViewVariables(VVAccess.ReadWrite)][DataField("damageOpen")] + public DamageSpecifier DamageOpen = new(){ + DamageDict = new() + { + { "Blunt", 4.0f }, + } + }; + + [ViewVariables(VVAccess.ReadWrite)][DataField("staminaDamageFolded")] + public float StaminaDamageFolded = 0; + + [ViewVariables(VVAccess.ReadWrite)][DataField("staminaDamageOpen")] + public float StaminaDamageOpen = 28; + + [ViewVariables(VVAccess.ReadWrite)][DataField("isOpen")] + public bool IsOpen = false; + + [ViewVariables(VVAccess.ReadWrite)][DataField("openSound")] + public SoundSpecifier? OpenSound; + + [ViewVariables(VVAccess.ReadWrite)][DataField("closeSound")] + public SoundSpecifier? CloseSound; + + [ViewVariables(VVAccess.ReadWrite)][DataField("bonkSound")] + public SoundSpecifier? BonkSound; + + [ViewVariables(VVAccess.ReadWrite)][DataField("sizeOpened")] + public ProtoId SizeOpened = "Normal"; + + [ViewVariables(VVAccess.ReadWrite)][DataField("sizeClosed")] + public ProtoId SizeClosed = "Normal"; +} \ No newline at end of file diff --git a/Resources/Audio/ADT/close_telescopichka.ogg b/Resources/Audio/ADT/close_telescopichka.ogg new file mode 100644 index 0000000000..227ce64529 Binary files /dev/null and b/Resources/Audio/ADT/close_telescopichka.ogg differ diff --git a/Resources/Audio/ADT/open_telescopichka.ogg b/Resources/Audio/ADT/open_telescopichka.ogg new file mode 100644 index 0000000000..a812baff65 Binary files /dev/null and b/Resources/Audio/ADT/open_telescopichka.ogg differ diff --git a/Resources/Locale/ru-RU/ADT/Entities/Clothing/Belt/belt.ftl b/Resources/Locale/ru-RU/ADT/Entities/Clothing/Belt/belt.ftl new file mode 100644 index 0000000000..51e2ac276c --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Entities/Clothing/Belt/belt.ftl @@ -0,0 +1,3 @@ +ent-ADTClothingBeltInvestigatorHolster = кобура следователя СБ + .desc = Кобура с табельным оружием следователя СБ - пистолетом с магазинами нелетальных и летальных патронов. + .suffix = { "" } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/Entities/Clothing/Head/hats.ftl b/Resources/Locale/ru-RU/ADT/Entities/Clothing/Head/hats.ftl new file mode 100644 index 0000000000..ec691d724f --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Entities/Clothing/Head/hats.ftl @@ -0,0 +1,3 @@ +ent-ADTClothingHeadHatsInvestigatorCap = фуражка следователя Службы Безопасности + .desc = Слава NanoTrasen! + .suffix = { "" } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/Entities/Clothing/Neck/specific.ftl b/Resources/Locale/ru-RU/ADT/Entities/Clothing/Neck/specific.ftl new file mode 100644 index 0000000000..127372e87d --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Entities/Clothing/Neck/specific.ftl @@ -0,0 +1,2 @@ +ent-ADTClothingNeckSecBadge = жетон Службы Безопасности + .desc = Позолоченный жетон с символикой Службы Безопасности и индивидуальным номером сотрудника. Предмет особой гордости среди офицеров. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/Entities/Clothing/OuterClothing/coats.ftl b/Resources/Locale/ru-RU/ADT/Entities/Clothing/OuterClothing/coats.ftl new file mode 100644 index 0000000000..00d8f6b4eb --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Entities/Clothing/OuterClothing/coats.ftl @@ -0,0 +1,3 @@ +ent-ADTClothingOuterCoatInvestigator = бушлат следователя Службы Безопасности + .desc = Один вид этого бушлата повышает вероятность чистосердечного признания подозреваемого на 50%. + .suffix = { "" } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/Entities/Clothing/Uniform/jumpsuits.ftl b/Resources/Locale/ru-RU/ADT/Entities/Clothing/Uniform/jumpsuits.ftl new file mode 100644 index 0000000000..d1c0e665c8 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Entities/Clothing/Uniform/jumpsuits.ftl @@ -0,0 +1,3 @@ +ent-ADTClothingUniformInvestigatorSuit = форма следователя Службы Безопасности + .desc = Одежда для того, кто намерен докопаться до сути всех тайн. + .suffix = { "" } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/Entities/Objects/Device/pda.ftl b/Resources/Locale/ru-RU/ADT/Entities/Objects/Device/pda.ftl new file mode 100644 index 0000000000..eb40c357de --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Entities/Objects/Device/pda.ftl @@ -0,0 +1,2 @@ +ent-ADTInvestigatorPDA = КПК следователя СБ + .desc = Пахнет как чернила и дело, закрытое предварительно из-за смерти подозреваемого от несчастного случая на рабочем месте. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/Entities/Objects/Misc/identification_cards.ftl b/Resources/Locale/ru-RU/ADT/Entities/Objects/Misc/identification_cards.ftl new file mode 100644 index 0000000000..ebf60e3ab4 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Entities/Objects/Misc/identification_cards.ftl @@ -0,0 +1,2 @@ +ent-ADTInvestigatorIDCard = ID карта следователя СБ + .desc = { ent-IDCardStandard.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/Entities/Weapons/security.ftl b/Resources/Locale/ru-RU/ADT/Entities/Weapons/security.ftl new file mode 100644 index 0000000000..549c227bda --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Entities/Weapons/security.ftl @@ -0,0 +1,11 @@ +ent-ADTtelescopicBaton = Телескопическая дубинка + .desc = "Большая, опасная и выдвижная дубинка. Может храниться в карманах в сложенном состоянии." + .suffix = { "" } + +ent-ADTtelescopicBatonBob = Телескопическая дубинка Боба + .desc = "Эксклюзивная телескопическая дубинка, полностью из золота." + .suffix = { "" } + +ent-ADTtelescopicBatonKon = Телескопическая дубинка Йохана + .desc = "Непонятно, кровь это или цвет дубинки.." + .suffix = { "" } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/Job/job-description.ftl b/Resources/Locale/ru-RU/ADT/Job/job-description.ftl new file mode 100644 index 0000000000..9f3004d756 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Job/job-description.ftl @@ -0,0 +1 @@ +job-description-ADTInvestigator = Проводите допросы, опрашивайте потерпевших и свидетелей, помогайте детективу и смотрителю, ведите особо сложные уголовные дела. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/Job/job-names.ftl b/Resources/Locale/ru-RU/ADT/Job/job-names.ftl new file mode 100644 index 0000000000..f70f12c548 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Job/job-names.ftl @@ -0,0 +1 @@ +job-name-ADTInvestigator = Следователь СБ \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/ADT/Catalog/Fills/Items/belt.yml new file mode 100644 index 0000000000..1ba702350d --- /dev/null +++ b/Resources/Prototypes/ADT/Catalog/Fills/Items/belt.yml @@ -0,0 +1,11 @@ +#кобура следователя СБ + +- type: entity + id: ADTClothingBeltInvestigatorHolster + parent: ClothingBeltHolster + suffix: Filled + components: + - type: StorageFill + contents: + - id: WeaponPistolMk58 + - id: MagazinePistol \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml new file mode 100644 index 0000000000..5b68468f95 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml @@ -0,0 +1,14 @@ +#Фуражка следователя +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatsInvestigatorCap + name: investigator cap + description: Glory to NanoTrasen! + components: + - type: Tag + tags: # ignore "WhitelistChameleon" tag + - WhitelistChameleon + - type: Sprite + sprite: ADT/Clothing/Head/Hats/investigator_cap.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/investigator_cap.rsi \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Neck/specific.yml b/Resources/Prototypes/ADT/Entities/Clothing/Neck/specific.yml new file mode 100644 index 0000000000..0e4f0bbea2 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/Neck/specific.yml @@ -0,0 +1,8 @@ +- type: entity + parent: ClothingNeckBase + id: ADTClothingNeckSecBadge + name: sec badge + description: sec badge + components: + - type: Sprite + sprite: ADT/Clothing/Neck/secbadge.rsi \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml new file mode 100644 index 0000000000..35c5855005 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml @@ -0,0 +1,27 @@ +#бушлат следователя + +- type: entity + parent: ClothingOuterStorageBase + id: ADTClothingOuterCoatInvestigator + name: investigator bushlat + description: This pea jacket increases the chance of a suspect's confession by half. + components: + - type: Storage + grid: + - 0,0,3,1 + maxItemSize: Normal + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Coats/investigator_coat.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Coats/investigator_coat.rsi + - type: StorageFill + contents: + - id: CigarGoldCase + - id: Lighter + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.7 + Heat: 0.8 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml new file mode 100644 index 0000000000..b1a411070d --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml @@ -0,0 +1,12 @@ +#Комбинезон следователя + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformInvestigatorSuit + name: investigator suit + description: The costume of the one who will get to the bottom of all the secrets. + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/investigator_suit.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/investigator_suit.rsi \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml b/Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml new file mode 100644 index 0000000000..483b9713ed --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml @@ -0,0 +1,22 @@ +- type: entity + id: ADTSpawnPointJobBase + parent: MarkerBase + abstract: true + suffix: Job Spawn ADT + components: + - type: SpawnPoint + spawn_type: Job + - type: Sprite + sprite: ADT/Markers/job.rsi + +- type: entity + id: ADTSpawnPointInvestigator + parent: ADTSpawnPointJobBase + name: Investigator + components: + - type: SpawnPoint + job_id: ADTInvestigator + - type: Sprite + layers: + - state: green + - state: investigator \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/pda.yml b/Resources/Prototypes/ADT/Entities/Objects/Device/pda.yml new file mode 100644 index 0000000000..95c6e84ec9 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Device/pda.yml @@ -0,0 +1,15 @@ +# КПК Следователя + +- type: entity + parent: BasePDA + id: ADTInvestigatorPDA + name: investigator PDA + description: It smells like ink and the case is prematurely closed due to the death of a suspect at work. + components: + - type: Pda + id: ADTInvestigatorIDCard + state: pda-investigator + - type: PdaBorderColor + borderColor: "#774705" + - type: Icon + state: pda-investigator \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml new file mode 100644 index 0000000000..682efb3788 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml @@ -0,0 +1,14 @@ +# Айди карта следователя СБ + +- type: entity + parent: IDCardStandard + id: ADTInvestigatorIDCard + name: investigator ID card + components: + - type: Sprite + sprite: ADT/Objects/Misc/id_cards.rsi + layers: + - state: default + - state: idinvestigator + - type: PresetIdCard + job: ADTInvestigator \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/security.yml new file mode 100644 index 0000000000..475bb0f87b --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/security.yml @@ -0,0 +1,137 @@ +#Телескопическая дубинка + +- type: entity + name: TelescopicBaton + parent: BaseItem + id: ADTtelescopicBaton + description: Big, dangerous telescopic baton. Can be stored in pockets when turned off. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/telescopic_baton.rsi + layers: + - state: telescope_off + map: [ "enum.ToggleVisuals.Layer" ] + - type: SwitchableWeapon + openSound: "/Audio/ADT/open_telescopichka.ogg" + closeSound: "/Audio/ADT/close_telescopichka.ogg" + #bonkSound: "/Audio/ADT/bonk_dubinka.ogg" + damageOpen: + types: + Blunt: 2.4 + damageFolded: + types: + Blunt: 0 + staminaDamageFolded: 0 + staminaDamageOpen: 35 + sizeOpened: Normal + sizeClosed: Small + - type: StaminaDamageOnHit + damage: 0 + - type: MeleeWeapon + damage: + types: + Blunt: 2.4 + - type: Item + size: Small + sprite: ADT/Objects/Weapons/Melee/telescopic_baton.rsi + - type: UseDelay + delay: 1.0 + - type: DisarmMalus + malus: 0 + - type: Appearance + - type: GenericVisualizer + visuals: + enum.ToggleVisuals.Toggled: + enum.ToggleVisuals.Layer: + True: {state: telescope_on} + False: {state: telescope_off} + +- type: entity + name: TelescopicBatonBob + parent: ADTtelescopicBaton + id: ADTtelescopicBatonBob + description: Big, dangerous telescopic baton. Can be stored in pockets when turned off. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/telescopic_baton_bob.rsi + layers: + - state: telescope_off + map: [ "enum.ToggleVisuals.Layer" ] + - type: SwitchableWeapon + openSound: "/Audio/ADT/open_telescopichka.ogg" + closeSound: "/Audio/ADT/close_telescopichka.ogg" + #bonkSound: "/Audio/ADT/bonk_dubinka.ogg" + damageOpen: + types: + Blunt: 2.4 + damageFolded: + types: + Blunt: 0 + staminaDamageFolded: 0 + staminaDamageOpen: 35 + - type: StaminaDamageOnHit + damage: 0 + - type: MeleeWeapon + damage: + types: + Blunt: 2.4 + - type: Item + size: Small + sprite: ADT/Objects/Weapons/Melee/telescopic_baton_bob.rsi + - type: UseDelay + delay: 1.0 + - type: DisarmMalus + malus: 0 + - type: Appearance + - type: GenericVisualizer + visuals: + enum.ToggleVisuals.Toggled: + enum.ToggleVisuals.Layer: + True: {state: telescope_on} + False: {state: telescope_off} + + + +- type: entity + name: TelescopicBatonKon + parent: ADTtelescopicBaton + id: ADTtelescopicBatonKon + description: Big, dangerous telescopic baton. Can be stored in pockets when turned off. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/telescopic_baton_kon.rsi + layers: + - state: telescope_off + map: [ "enum.ToggleVisuals.Layer" ] + - type: SwitchableWeapon + openSound: "/Audio/ADT/open_telescopichka.ogg" + closeSound: "/Audio/ADT/close_telescopichka.ogg" + #bonkSound: "/Audio/ADT/bonk_dubinka.ogg" + damageOpen: + types: + Blunt: 2.4 + damageFolded: + types: + Blunt: 0 + staminaDamageFolded: 0 + staminaDamageOpen: 35 + - type: StaminaDamageOnHit + damage: 0 + - type: MeleeWeapon + damage: + types: + Blunt: 2.4 + - type: Item + size: Small + sprite: ADT/Objects/Weapons/Melee/telescopic_baton_kon.rsi + - type: UseDelay + delay: 1.0 + - type: DisarmMalus + malus: 0 + - type: Appearance + - type: GenericVisualizer + visuals: + enum.ToggleVisuals.Toggled: + enum.ToggleVisuals.Layer: + True: {state: telescope_on} + False: {state: telescope_off} \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Security/investigator.yml b/Resources/Prototypes/ADT/Roles/Jobs/Security/investigator.yml new file mode 100644 index 0000000000..75b2886f2d --- /dev/null +++ b/Resources/Prototypes/ADT/Roles/Jobs/Security/investigator.yml @@ -0,0 +1,53 @@ +- type: job + id: ADTInvestigator + name: job-name-ADTInvestigator + description: job-description-ADTInvestigator + playTimeTracker: JobADTInvestigator + requirements: + - !type:RoleTimeRequirement + role: JobWarden + time: 21600 #6 hrs + - !type:RoleTimeRequirement + role: JobIAA + time: 21600 #6 hrs + - !type:DepartmentTimeRequirement + department: Security + time: 108000 # 30 hours + startingGear: ADTInvestigatorGear + icon: "JobIconADTInvestigator" + supervisors: job-supervisors-hos + canBeAntag: false + access: + - Security + - Brig + - Maintenance + - Service + - Detective + - Investigator + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + +- type: startingGear + id: ADTInvestigatorGear + equipment: + jumpsuit: ADTClothingUniformInvestigatorSuit + #back: ADTClothingBackpackInvestigatorFilled + shoes: ClothingShoesBootsJackSec # Corvax-Resprite + eyes: ClothingEyesGlassesSunglasses + head: ADTClothingHeadHatsInvestigatorCap + outerClothing: ADTClothingOuterCoatInvestigator + id: ADTInvestigatorPDA + ears: ClothingHeadsetSecurity + pocket1: ADTtelescopicBaton + pocket2: ForensicScanner + belt: ADTClothingBeltInvestigatorHolster + gloves: ClothingHandsGlovesForensic + underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear + socks: ClothingUnderwearSocksNormal + neck: ADTClothingNeckSecBadge + # underweart: ClothingUnderwearTopBraSportsAlternative # Sirena-Underwear + # underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear + # innerClothingSkirt: ADTClothingUniformInvestigatorSuit + #satchel: ADTClothingBackpackSatchelInvestigatorFilled + #duffelbag: ADTClothingBackpackDuffelInvestigatorFilled \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Roles/play_time_trackers.yml b/Resources/Prototypes/ADT/Roles/play_time_trackers.yml new file mode 100644 index 0000000000..8aefbd2f03 --- /dev/null +++ b/Resources/Prototypes/ADT/Roles/play_time_trackers.yml @@ -0,0 +1,2 @@ +- type: playTimeTracker + id: JobADTInvestigator \ No newline at end of file diff --git a/Resources/Prototypes/ADT/StatusEffects/job.yml b/Resources/Prototypes/ADT/StatusEffects/job.yml new file mode 100644 index 0000000000..e51b3757b5 --- /dev/null +++ b/Resources/Prototypes/ADT/StatusEffects/job.yml @@ -0,0 +1,6 @@ +- type: statusIcon + parent: JobIcon + id: JobIconADTInvestigator + icon: + sprite: /Textures/ADT/Interface/Misc/job_icons.rsi + state: ADTInvestigator \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index a9d0e8e7a4..00d3460951 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -83,6 +83,7 @@ - Pilot # Corvax-Pilot - Detective - Warden + - ADTInvestigator # ADT - type: department id: Science diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/investigator_cap.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/investigator_cap.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..77b9e11033 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/investigator_cap.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/investigator_cap.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/investigator_cap.rsi/icon.png new file mode 100644 index 0000000000..2450fa9259 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/investigator_cap.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/investigator_cap.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Head/Hats/investigator_cap.rsi/inhand-left.png new file mode 100644 index 0000000000..fa4412be66 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/investigator_cap.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/investigator_cap.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Head/Hats/investigator_cap.rsi/inhand-right.png new file mode 100644 index 0000000000..732c63acf6 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/investigator_cap.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/investigator_cap.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/investigator_cap.rsi/meta.json new file mode 100644 index 0000000000..2ae5fa71f6 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/investigator_cap.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Pyotr Ignvatievich for Adventure Time MRP Server", + "size": { + "x": 32, + "y": 32 + }, + "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/ADT/Clothing/Neck/secbadge.rsi/equipped-NECK.png b/Resources/Textures/ADT/Clothing/Neck/secbadge.rsi/equipped-NECK.png new file mode 100644 index 0000000000..3377f7edf8 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Neck/secbadge.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/ADT/Clothing/Neck/secbadge.rsi/icon.png b/Resources/Textures/ADT/Clothing/Neck/secbadge.rsi/icon.png new file mode 100644 index 0000000000..9eaab9e2b2 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Neck/secbadge.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Neck/secbadge.rsi/meta.json b/Resources/Textures/ADT/Clothing/Neck/secbadge.rsi/meta.json new file mode 100644 index 0000000000..4433338928 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Neck/secbadge.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:combatbibis only for Время Приключений MRP", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/investigator_coat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/investigator_coat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..06fdd499cc Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/investigator_coat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/investigator_coat.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/investigator_coat.rsi/icon.png new file mode 100644 index 0000000000..ecb7702dda Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/investigator_coat.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/investigator_coat.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/investigator_coat.rsi/inhand-left.png new file mode 100644 index 0000000000..9c09a42d82 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/investigator_coat.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/investigator_coat.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/investigator_coat.rsi/inhand-right.png new file mode 100644 index 0000000000..37b536b55e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/investigator_coat.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/investigator_coat.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/investigator_coat.rsi/meta.json new file mode 100644 index 0000000000..eecc959aae --- /dev/null +++ b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/investigator_coat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Pyotr Ignvatievich for Adventure Time MRP Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/investigator_suit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/investigator_suit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..96513ae3a7 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/investigator_suit.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/investigator_suit.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/investigator_suit.rsi/icon.png new file mode 100644 index 0000000000..be24743c24 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/investigator_suit.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/investigator_suit.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/investigator_suit.rsi/inhand-left.png new file mode 100644 index 0000000000..a8b04cb674 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/investigator_suit.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/investigator_suit.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/investigator_suit.rsi/inhand-right.png new file mode 100644 index 0000000000..322e667897 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/investigator_suit.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/investigator_suit.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/investigator_suit.rsi/meta.json new file mode 100644 index 0000000000..7b5c2e3a82 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/investigator_suit.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Pyotr Ignvatievich for Adventure Time MRP Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/ADTInvestigator.png b/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/ADTInvestigator.png new file mode 100644 index 0000000000..d60aa57fc6 Binary files /dev/null and b/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/ADTInvestigator.png differ diff --git a/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/meta.json new file mode 100644 index 0000000000..60e71b2e19 --- /dev/null +++ b/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Make from Adventure Time", + + "size": { + "x": 8, + "y": 8 + }, + "states": [ + { + "name": "ADTInvestigator" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/ADT/Markers/job.rsi/green.png b/Resources/Textures/ADT/Markers/job.rsi/green.png new file mode 100644 index 0000000000..0becfdb0c5 Binary files /dev/null and b/Resources/Textures/ADT/Markers/job.rsi/green.png differ diff --git a/Resources/Textures/ADT/Markers/job.rsi/iaa.png b/Resources/Textures/ADT/Markers/job.rsi/iaa.png new file mode 100644 index 0000000000..f93b5d5034 Binary files /dev/null and b/Resources/Textures/ADT/Markers/job.rsi/iaa.png differ diff --git a/Resources/Textures/ADT/Markers/job.rsi/investigator.png b/Resources/Textures/ADT/Markers/job.rsi/investigator.png new file mode 100644 index 0000000000..998804ffc7 Binary files /dev/null and b/Resources/Textures/ADT/Markers/job.rsi/investigator.png differ diff --git a/Resources/Textures/ADT/Markers/job.rsi/magistrat.png b/Resources/Textures/ADT/Markers/job.rsi/magistrat.png new file mode 100644 index 0000000000..1e86415378 Binary files /dev/null and b/Resources/Textures/ADT/Markers/job.rsi/magistrat.png differ diff --git a/Resources/Textures/ADT/Markers/job.rsi/meta.json b/Resources/Textures/ADT/Markers/job.rsi/meta.json new file mode 100644 index 0000000000..40d0eda2dc --- /dev/null +++ b/Resources/Textures/ADT/Markers/job.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Adventure Time, justkekc", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "green" + }, + { + "name": "investigator" + }, + { + "name": "magistrat" + }, + { + "name": "iaa" + }, + { + "name": "urist" + }, + { + "name": "pathologist" + } + ] +} diff --git a/Resources/Textures/ADT/Markers/job.rsi/pathologist.png b/Resources/Textures/ADT/Markers/job.rsi/pathologist.png new file mode 100644 index 0000000000..1da905aca1 Binary files /dev/null and b/Resources/Textures/ADT/Markers/job.rsi/pathologist.png differ diff --git a/Resources/Textures/ADT/Markers/job.rsi/urist.png b/Resources/Textures/ADT/Markers/job.rsi/urist.png new file mode 100644 index 0000000000..b113c2c99e Binary files /dev/null and b/Resources/Textures/ADT/Markers/job.rsi/urist.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/default-inhand-left.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/default-inhand-left.png new file mode 100644 index 0000000000..f7848f63f6 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/default-inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/default-inhand-right.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/default-inhand-right.png new file mode 100644 index 0000000000..82b5598806 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/default-inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/default.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/default.png new file mode 100644 index 0000000000..95b3d54c27 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/default.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/idinvestigator.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/idinvestigator.png new file mode 100644 index 0000000000..d53d5389ba Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/idinvestigator.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/meta.json new file mode 100644 index 0000000000..df4a00c31a --- /dev/null +++ b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, pathologist made by JustKekc", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "default" + }, + { + "name": "idinvestigator" + }, + { + "name": "default-inhand-left", + "directions": 4 + }, + { + "name": "default-inhand-right", + "directions": 4 + } + ] + } \ No newline at end of file diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton.rsi/meta.json new file mode 100644 index 0000000000..9ce465ccac --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-3.0", + "copyright": "Sprited by mixnikita", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "telescope_on" + }, + { + "name": "telescope_off" + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-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/ADT/Objects/Weapons/Melee/telescopic_baton.rsi/off-inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton.rsi/off-inhand-left.png new file mode 100644 index 0000000000..d60eba8d49 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton.rsi/off-inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton.rsi/off-inhand-right.png new file mode 100644 index 0000000000..86e67af478 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton.rsi/on-inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton.rsi/on-inhand-left.png new file mode 100644 index 0000000000..48ffcd51d4 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton.rsi/on-inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton.rsi/on-inhand-right.png new file mode 100644 index 0000000000..9cea4086c4 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton.rsi/telescope_off.png b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton.rsi/telescope_off.png new file mode 100644 index 0000000000..e0875d24f5 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton.rsi/telescope_off.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton.rsi/telescope_on.png b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton.rsi/telescope_on.png new file mode 100644 index 0000000000..e253f25f0e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton.rsi/telescope_on.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_bob.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_bob.rsi/meta.json new file mode 100644 index 0000000000..9ce465ccac --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_bob.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-3.0", + "copyright": "Sprited by mixnikita", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "telescope_on" + }, + { + "name": "telescope_off" + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-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/ADT/Objects/Weapons/Melee/telescopic_baton_bob.rsi/off-inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_bob.rsi/off-inhand-left.png new file mode 100644 index 0000000000..7da0323b47 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_bob.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_bob.rsi/off-inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_bob.rsi/off-inhand-right.png new file mode 100644 index 0000000000..95b859847c Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_bob.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_bob.rsi/on-inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_bob.rsi/on-inhand-left.png new file mode 100644 index 0000000000..10512d90a3 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_bob.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_bob.rsi/on-inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_bob.rsi/on-inhand-right.png new file mode 100644 index 0000000000..f150a01e58 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_bob.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_bob.rsi/telescope_off.png b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_bob.rsi/telescope_off.png new file mode 100644 index 0000000000..a456a690e9 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_bob.rsi/telescope_off.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_bob.rsi/telescope_on.png b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_bob.rsi/telescope_on.png new file mode 100644 index 0000000000..0df0ef1f98 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_bob.rsi/telescope_on.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_kon.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_kon.rsi/meta.json new file mode 100644 index 0000000000..9ce465ccac --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_kon.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-3.0", + "copyright": "Sprited by mixnikita", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "telescope_on" + }, + { + "name": "telescope_off" + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-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/ADT/Objects/Weapons/Melee/telescopic_baton_kon.rsi/off-inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_kon.rsi/off-inhand-left.png new file mode 100644 index 0000000000..be086e63ec Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_kon.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_kon.rsi/off-inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_kon.rsi/off-inhand-right.png new file mode 100644 index 0000000000..431831404e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_kon.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_kon.rsi/on-inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_kon.rsi/on-inhand-left.png new file mode 100644 index 0000000000..a9b1a91c6b Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_kon.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_kon.rsi/on-inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_kon.rsi/on-inhand-right.png new file mode 100644 index 0000000000..199b35af1e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_kon.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_kon.rsi/telescope_off.png b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_kon.rsi/telescope_off.png new file mode 100644 index 0000000000..27a930b652 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_kon.rsi/telescope_off.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_kon.rsi/telescope_on.png b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_kon.rsi/telescope_on.png new file mode 100644 index 0000000000..4971a110b8 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/telescopic_baton_kon.rsi/telescope_on.png differ