diff --git a/Resources/Locale/ru-RU/ADT/Job/job-description.ftl b/Resources/Locale/ru-RU/ADT/Job/job-description.ftl index 1d579e08d9..87e82b63bf 100644 --- a/Resources/Locale/ru-RU/ADT/Job/job-description.ftl +++ b/Resources/Locale/ru-RU/ADT/Job/job-description.ftl @@ -2,4 +2,6 @@ job-description-ADTPathologist = Осматривайте тела мёртво job-description-roboticist = Собирайте боргов, мехов, обслуживайте синтетиков и поражайте (либо пугайте) экипаж своими новейшими разработками. -job-description-magistrat = Самый грозный и богатый на станции. \ No newline at end of file +job-description-magistrat = Самый грозный и богатый на станции. + +job-description-ADTBlueShieldOfficer = Защищайте капитана и глав отделов от опасностей, а прежде всего - от них самих. diff --git a/Resources/Locale/ru-RU/ADT/Job/job-names.ftl b/Resources/Locale/ru-RU/ADT/Job/job-names.ftl index abc0bf8711..ac8f69c468 100644 --- a/Resources/Locale/ru-RU/ADT/Job/job-names.ftl +++ b/Resources/Locale/ru-RU/ADT/Job/job-names.ftl @@ -5,4 +5,7 @@ job-name-roboticist = робототехник JobRoboticist = робототехник job-name-magistrat = Магистрат -JobMagistrat = Магистрат \ No newline at end of file +JobMagistrat = Магистрат + +job-name-ADTBlueShieldOfficer = офицер Синего Щита +JobADTBlueShieldOfficer = офицер Синего Щита diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Access/accesses.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Access/accesses.ftl index 0c64681745..a36408757e 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Access/accesses.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Access/accesses.ftl @@ -1,2 +1,3 @@ id-card-access-level-iaa = Агент Внутренних Дел id-card-access-level-magistrate = Магистрат +id-card-access-level-blueshield = Офицер Синего Щита diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Markers/Spawners/jobs.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Markers/Spawners/jobs.ftl index 331c8aebb8..991e8d9a7d 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Markers/Spawners/jobs.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Markers/Spawners/jobs.ftl @@ -3,3 +3,6 @@ ent-SpawnPointMagistrat = Точка спавна магистрата ent-ADTSpawnPointRoboticist = робототехник .desc = { ent-SpawnPointJobBase.desc } + +ent-SpawnADTBlueShieldOfficer = офицер синего щита + .desc = { ent-SpawnPointJobBase.desc } diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/pda.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/pda.ftl index 8e9a814064..968ce8bbae 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/pda.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/pda.ftl @@ -6,3 +6,6 @@ ent-ADTPathologistPDA = КПК патологоанатома ent-ADTRoboticistPDA = КПК робототехника .desc = Почему это всё ещё не робот?! + +ent-ADTBlueShieldOfficerPDA = КПК офицера синего щита + .desc = Покажи им, какой он стильный, как он прочен, ведь в нём вся сила NT. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Fun/figurines.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Fun/figurines.ftl new file mode 100644 index 0000000000..0a10fa2b88 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Fun/figurines.ftl @@ -0,0 +1,2 @@ +ent-ToyFigurineBlueshieldOfficer = фигурка офицера синего щита + .desc = Фигурка, изображающая Офицера Синего Щита - благородного защитника глав станции, готового отдать свою жизнь в бою против врагов НТ, ради исполнения своего долга. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/identification_cards.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/identification_cards.ftl index a87586d412..2389736d63 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/identification_cards.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/identification_cards.ftl @@ -6,3 +6,6 @@ ent-ADTPathologistIDCard = ID карта патологоанатома ent-ADTRoboticistIDCard = ID карта робототехника .desc = { ent-IDCardStandard.desc } + +ent-ADTBlueShieldOfficerIDCard = ID карта офицера синего щита + .desc = Блестящая карта офицера Синего Щита. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Power/powercell.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Power/powercell.ftl new file mode 100644 index 0000000000..9489be8898 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Power/powercell.ftl @@ -0,0 +1,2 @@ +ent-ADTPowerCellLasgunRevolver = барабанная батарея револьвера + .desc = Барабанная батарея энергетического меча-револьвера обычной ёмкости. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Storage/bsweaponcase.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Storage/bsweaponcase.ftl new file mode 100644 index 0000000000..043394a0e9 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Storage/bsweaponcase.ftl @@ -0,0 +1,3 @@ +ent-BaseWeaponCaseNTBS = оружейный кейс + .suffix = ОСЩ + .desc = Строгий оружейный кейс, скрывающий в себе что-то смертоносное. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Guns.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Guns.ftl index 717929ece8..af4401cbbb 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Guns.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Guns.ftl @@ -1,3 +1,7 @@ ent-ADTWeaponPistolDesertEagle = Дезерт Игл .desc = Дезерт Игл, также известный как "пустынный орёл", - это мощный пистолет калибра .44, который выглядит металлическим и блестящим. - .suffix = { "Пистолет" } \ No newline at end of file + .suffix = { "Пистолет" } + +ent-ADTWeaponSaberRevBlueshield = энергетический меч-револьвер +.desc = NTRS-01 - Nanotrasen energy Revolver-Saber model-1, первый рабочий прототип энергетического револьвера с портативном аккумулятором, с интегрированным энергетическим клинком, выданный в полевое испытание всем Офицерам Синего Щита. Крайне редкая и дорогая технология NT, вымеренная до каждой детали, НЕ ПОТЕРЯЙТЕ ЕГО! +.suffix = { "ОСЩ" } diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.ftl new file mode 100644 index 0000000000..7771af9657 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.ftl @@ -0,0 +1,2 @@ +ent-LockerBlueshield = шкаф офицера синего щита + .desc = { ent-LockerBaseSecure.desc } diff --git a/Resources/Locale/ru-RU/corvax/hidden-description/hiddenDescription.ftl b/Resources/Locale/ru-RU/corvax/hidden-description/hiddenDescription.ftl index 27109f363c..bba51441d0 100644 --- a/Resources/Locale/ru-RU/corvax/hidden-description/hiddenDescription.ftl +++ b/Resources/Locale/ru-RU/corvax/hidden-description/hiddenDescription.ftl @@ -91,3 +91,5 @@ corvax-hidden-desc-BibleNecronomicon-service = [color=#9FED58]Этот древ corvax-hidden-desc-Telecrystal-syndicate = [color=#e31735]Валюта чёрного рынка синдиката. Позволяет покупать через редспейс пространство посредством аплинка различное нелегальное вооружение.[/color] corvax-hidden-desc-Telecrystal-cargo = [color=#D381C9]Выглядят, как необычные фрагменты артефактов.[/color] corvax-hidden-desc-Telecrystal-research = [color=#A46106]Эти кристаллы изучают аномальное редспейс-излучение.[/color] +corvax-hidden-desc-ADTWeaponSaberRevBlueshield-syndicate = [color=#e31735]Энергетический револьвер Офицера Синего Щита. Прекрасная замена энергетическому мечу, технологию которого украло НТ, ради модернизации этого жалкого оружия.[/color] +corvax-hidden-desc-ADTWeaponSaberRevBlueshield-security = [color=#DE3A3A]Это энергетический меч-револьвер! Кажется, это принадлежит Офицеру Синего Щита, очень опасное оружие, если попадёт не в те руки.[/color] diff --git a/Resources/Prototypes/ADT/Access/blueshield.yml b/Resources/Prototypes/ADT/Access/blueshield.yml new file mode 100644 index 0000000000..d8edb9453a --- /dev/null +++ b/Resources/Prototypes/ADT/Access/blueshield.yml @@ -0,0 +1,3 @@ +- type: accessLevel + id: BlueShield + name: id-card-access-level-blueshield diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Lockers/centcomm.yml b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/centcomm.yml new file mode 100644 index 0000000000..87d7e02e9a --- /dev/null +++ b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/centcomm.yml @@ -0,0 +1,41 @@ +# Blueshield +- type: entity + id: LockerBlueshieldFilledHardsuit + suffix: Filled, Hardsuit + parent: LockerBlueshield + components: + - type: StorageFill + contents: + - id: BlueshieldSuit + - id: MedkitCombatFilled + - id: MedkitBruteFilled + - id: WeaponDisabler + - id: BaseWeaponCaseNTBS + # - id: ADTUnderwearBoxBlueshield + - id: ClothingHeadsetAltBlueshield + - id: ADTClothingHeadHatBeretBlueshield + - id: ClothingNeckCloakBlueshield + - id: ClothingOuterWinterBlueshield + - id: ClothingShoesBootsJack + - id: ClothingUniformJumpskirtBlueshieldTurtleneck + - id: ClothingUniformJumpsuitBlueshieldTurtleneck + +- type: entity + id: LockerBlueshieldFilled + suffix: Filled + parent: LockerBlueshield + components: + - type: StorageFill + contents: + - id: MedkitCombatFilled + - id: MedkitBruteFilled + - id: WeaponDisabler + - id: BaseWeaponCaseNTBS + # - id: ADTUnderwearBoxBlueshield + - id: ClothingHeadsetAltBlueshield + - id: ADTClothingHeadHatBeretBlueshield + - id: ClothingNeckCloakBlueshield + - id: ClothingOuterWinterBlueshield + - id: ClothingShoesBootsJack + - id: ClothingUniformJumpskirtBlueshieldTurtleneck + - id: ClothingUniformJumpsuitBlueshieldTurtleneck diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/suit_storage.yml new file mode 100644 index 0000000000..96cae81499 --- /dev/null +++ b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/suit_storage.yml @@ -0,0 +1,13 @@ +#Blueshield's hardsuit +- type: entity + id: SuitStorageBlueshield + parent: SuitStorageBase + suffix: Blueshield + components: + - type: StorageFill + contents: + - id: OxygenTankFilled + - id: BlueshieldSuit + - id: ClothingMaskBreath + - type: AccessReader + access: [["BlueShield"]] diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml new file mode 100644 index 0000000000..dd6576cfd2 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml @@ -0,0 +1,19 @@ +- type: entity + parent: ClothingOuterArmorBasic + id: ADTClothingBlueshieldArmor + name: blueshield bulletproof vest + description: A Type III heavy bulletproof vest that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.4 + Heat: 0.8 + - type: ExplosionResistance + damageCoefficient: 0.80 diff --git a/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml index 8b7daec37e..92a30c384f 100644 --- a/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml @@ -56,3 +56,15 @@ layers: - state: green - state: scientist + +- type: entity + id: SpawnADTBlueShieldOfficer + parent: ADTSpawnPointJobBase + name: ADTBlueShieldOfficer + components: + - type: SpawnPoint + job_id: ADTBlueShieldOfficer + - type: Sprite + layers: + - state: green + - state: blueshield diff --git a/Resources/Prototypes/ADT/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/ADT/Entities/Objects/Devices/pda.yml index 2660c105ac..f5af95083c 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Devices/pda.yml @@ -39,3 +39,24 @@ accentVColor: "#15616b" - type: Icon state: pda-pathologist + +- type: entity + parent: BasePDA + id: ADTBlueshieldOfficerPDA + name: BlueShield PDA + description: Smells like protection. + components: + - type: Sprite + sprite: ADT/Objects/Devices/pda.rsi + - type: Pda + id: ADTBlueShieldOfficerIDCard + state: pda-blueshield + - type: PdaBorderColor + borderColor: "#424248" + accentHColor: "#2851a4" + accentVColor: "#e1e1e1" + - type: Icon + sprite: ADT/Objects/Devices/pda.rsi + state: pda-blueshield + - type: HealthAnalyzer + scanDelay: 1.2 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/figurines.yml new file mode 100644 index 0000000000..60d43b1d84 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/figurines.yml @@ -0,0 +1,9 @@ +- type: entity + parent: BaseFigurine + id: ToyFigurineBlueshieldOfficer + name: blueshield officer figure + description: A figurine depicting the blueshield officer, austere and blue, stands guard over the station government. I guess. + components: + - type: Sprite + sprite: ADT/Objects/Fun/figurines.rsi + state: blueshield diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml index 83d6930836..613f791ef8 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml @@ -35,3 +35,16 @@ - state: idroboticist - type: PresetIdCard job: ADTRoboticist + +- type: entity + parent: IDCardStandard + id: ADTBlueShieldOfficerIDCard + name: Blue Shield Officer ID card + components: + - type: Sprite + sprite: ADT/Objects/Misc/id_cards.rsi + layers: + - state: centcom + - state: idblueshield + - type: PresetIdCard + job: ADTBlueShieldOfficer diff --git a/Resources/Prototypes/ADT/Entities/Objects/Power/powercell.yml b/Resources/Prototypes/ADT/Entities/Objects/Power/powercell.yml new file mode 100644 index 0000000000..304e24770d --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Power/powercell.yml @@ -0,0 +1,44 @@ +- type: entity + name: revolver power cell + description: lasgun power sell + id: ADTPowerCellLasgunRevolver + parent: BaseItem + components: + - type: Battery + maxCharge: 1500 + startingCharge: 1500 + - type: Explosive + explosionType: Default + maxIntensity: 200 + intensitySlope: 1.5 + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 4 + zeroVisible: false + - type: SolutionContainerManager + solutions: + battery: + maxVol: 5 + - type: InjectableSolution + solution: battery + - type: DrawableSolution + solution: battery + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Zinc + Quantity: 5 + - type: Tag + tags: + - ADTLasgunRevolverCell + - type: Appearance + - type: ProjectileBatteryAmmoProvider + proto: ADTBulletLaserMK2 + fireCost: 220 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml new file mode 100644 index 0000000000..b89220336a --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml @@ -0,0 +1,28 @@ +- type: entity + id: BaseWeaponCaseNTBS + name: weapon case + description: Weapon case, special designed for ERT. + parent: [ BaseStorageItem, BaseBagOpenClose ] + components: + - type: Sprite + sprite: ADT/Objects/Storage/weaponcase.rsi + layers: + - state: closed + - state: open + map: ["openLayer"] + - type: Appearance + - type: Item + sprite: ADT/Objects/Storage/weaponcase.rsi + size: Ginormous + - type: Storage + maxItemSize: Normal + grid: + - 0,0,1,0 + - 0,1,0,1 + - 3,0,6,1 + - type: StorageFill + contents: + - id: ADTWeaponSaberRevBlueshield + - id: ADTPowerCellLasgunRevolver + - id: ADTPowerCellLasgunRevolver + - id: ADTPowerCellLasgunRevolver diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index c91b859733..9dc4683fc4 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -30,3 +30,23 @@ forceSound: true - type: EmpOnCollide energyConsumption: 80000 + +- type: entity + name: Laser bolt + id: ADTBulletLaserMK2 + parent: BulletDisabler + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi + layers: + - state: omnilaser + shader: unshaded + - type: Projectile + impactEffect: BulletImpactEffectDisabler + damage: + types: + Heat: 25 + soundHit: + collection: WeakHit + forceSound: true diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Revolvers/saber_revolvers.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Revolvers/saber_revolvers.yml new file mode 100644 index 0000000000..83f1746d7c --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Revolvers/saber_revolvers.yml @@ -0,0 +1,112 @@ +- type: entity + name: NTRS-01 energy revolver-saber + parent: [EnergySword, BaseWeaponPowerCellSmall] + id: ADTWeaponSaberRevBlueshield + description: + components: + - type: Item + size: Small + sprite: ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi + inhandVisuals: + left: + - state: inhand-left + right: + - state: inhand-right + shape: + - 0,0,1,0 + - 0,1,0,1 + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi + layers: + - state: icon_saber + color: "#FFFFFF" + visible: false + shader: unshaded + map: [ "blade" ] + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: AmmoCounter + - type: PointLight + enabled: false + radius: 2 + energy: 2 + color: white + netsync: false + - type: Gun + fireRate: 1.8 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg + useKey: false + - type: Wieldable + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 5 + Slash: 5 + Structural: 10 + - type: MeleeWeapon + wideAnimationRotation: -135 + attackRate: 1 + damage: + types: + Blunt: 4.5 + - type: ItemToggleMeleeWeapon + activatedSoundOnHit: + path: /Audio/Weapons/eblade1.ogg + params: + variation: 0.250 + activatedSoundOnHitNoDamage: + path: /Audio/Weapons/eblade1.ogg + params: + variation: 0.250 + volume: -10 + activatedSoundOnSwing: + path: /Audio/Weapons/eblademiss.ogg + params: + variation: 0.125 + activatedDamage: + types: + Slash: 5 + Heat: 5 + Structural: 20 + - type: GunRequiresWield + - type: ToggleableLightVisuals + spriteLayer: blade + inhandVisuals: + left: + - state: inhand-left-blade + shader: unshaded + right: + - state: inhand-right-blade + shader: unshaded + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: true + - type: HiddenDescription + entries: + - label: corvax-hidden-desc-ADTWeaponSaberRevBlueshield-syndicate + whitelistMind: + components: + - TraitorRole + - NukeOperative + - label: corvax-hidden-desc-ADTWeaponSaberRevBlueshield-security + jobRequired: + - HeadOfSecurity + - Detective + - SecurityCadet + - SecurityOfficer + - Warden + - type: Appearance + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: ADTPowerCellLasgunRevolver + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + whitelist: + tags: + - ADTLasgunRevolverCell diff --git a/Resources/Prototypes/ADT/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/ADT/Entities/Structures/Storage/Closets/Lockers/lockers.yml new file mode 100644 index 0000000000..3987944f66 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -0,0 +1,14 @@ +- type: entity + id: LockerBlueshield + parent: LockerBaseSecure + name: blue shield's locker + components: + - type: Appearance + - type: Sprite + sprite: ADT/Structures/Storage/closet.rsi + - type: EntityStorageVisuals + stateBaseClosed: blueshield + stateDoorOpen: blueshield_open + stateDoorClosed: blueshield_door + - type: AccessReader + access: [["BlueShield"]] diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Command/blueshieldofficer.yml b/Resources/Prototypes/ADT/Roles/Jobs/Command/blueshieldofficer.yml new file mode 100644 index 0000000000..6c98cae9a4 --- /dev/null +++ b/Resources/Prototypes/ADT/Roles/Jobs/Command/blueshieldofficer.yml @@ -0,0 +1,56 @@ +- type: job + id: ADTBlueShieldOfficer + name: job-name-ADTBlueShieldOfficer + description: job-description-ADTBlueShieldOfficer + playTimeTracker: JobADTBlueShieldOfficer + requirements: + - !type:RoleTimeRequirement + role: JobCaptain + time: 36000 #10 hrs + - !type:RoleTimeRequirement + role: JobHeadOfSecurity + time: 36000 #10 hrs + - !type:RoleTimeRequirement + role: JobChiefMedicalOfficer + time: 18000 #5 hrs + weight: 15 + startingGear: ADTBlueShieldOfficerGear + icon: "JobIconADTBlueShieldOfficer" + supervisors: job-supervisors-centcom + canBeAntag: false + access: + - Captain + - Command + - Brig + - Security + - Armory + - Maintenance + - Service + - External + - Research + - Medical + - Engineering + - Cargo + # - Centcom + - BlueShield + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + +- type: startingGear + id: ADTBlueShieldOfficerGear + equipment: + head: ADTClothingHeadHatBeretBlueshieldBlack + eyes: ClothingEyesGlassesBlueshield + ears: ClothingHeadsetBlueshield + jumpsuit: ClothingUniformJumpsuitBlueshield + back: ADTClothingBlueshieldBackpack + shoes: ClothingShoesBootsCombatFilled + outerClothing: ADTClothingBlueshieldArmor + belt: ClothingBeltMedicalSecurity + gloves: ClothingHandsGlovesCombat + id: ADTBlueshieldOfficerPDA + pocket2: HandheldCrewMonitor + innerClothingSkirt: ClothingUniformJumpskirtBlueshield + satchel: ADTClothingBackpackSatchelBlueshield + duffelbag: ADTClothingBackpackDuffelBlueshield diff --git a/Resources/Prototypes/ADT/Roles/play_time_trackers.yml b/Resources/Prototypes/ADT/Roles/play_time_trackers.yml index dc77c0fb41..65533b16dc 100644 --- a/Resources/Prototypes/ADT/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/ADT/Roles/play_time_trackers.yml @@ -6,3 +6,6 @@ - type: playTimeTracker id: JobRoboticist + +- type: playTimeTracker + id: JobADTBlueShieldOfficer diff --git a/Resources/Prototypes/ADT/StatusIcon/job.yml b/Resources/Prototypes/ADT/StatusIcon/job.yml index aef4c3dbf9..82788676db 100644 --- a/Resources/Prototypes/ADT/StatusIcon/job.yml +++ b/Resources/Prototypes/ADT/StatusIcon/job.yml @@ -4,3 +4,10 @@ icon: sprite: /Textures/ADT/Interface/Misc/job_icons.rsi state: Magistrat + +- type: statusIcon + parent: JobIcon + id: JobIconADTBlueShieldOfficer + icon: + sprite: /Textures/ADT/Interface/Misc/job_icons.rsi + state: ADTBlueShieldOfficer diff --git a/Resources/Prototypes/ADT/tags.yml b/Resources/Prototypes/ADT/tags.yml index 5088199c6e..aa6cfab49a 100644 --- a/Resources/Prototypes/ADT/tags.yml +++ b/Resources/Prototypes/ADT/tags.yml @@ -6,3 +6,6 @@ - type: Tag id: Defibrillator + +- type: Tag + id: ADTLasgunRevolverCell diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml index 0ac85d29ee..cd0deb57e8 100644 --- a/Resources/Prototypes/Access/misc.yml +++ b/Resources/Prototypes/Access/misc.yml @@ -34,3 +34,4 @@ - Atmospherics - IAA - Magistrate + - BlueShield diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml b/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml index dbbe86678f..12dfd99e80 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml @@ -100,6 +100,8 @@ orGroup: SpacemenFig - id: ToyFigurineGreytider orGroup: SpacemenFig + - id: ToyFigurineBlueshieldOfficer + orGroup: SpacemenFig - id: ToyFigurineWizard prob: 0.50 orGroup: SpacemenFig diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 62e027d9e2..a6b9d4365b 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -44,6 +44,7 @@ - HeadOfSecurity - ResearchDirector - Quartermaster + - ADTBlueShieldOfficer primary: false weight: 100 diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..e8860c6a0c Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi/icon.png new file mode 100644 index 0000000000..288d50bf9d Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi/inhand-left.png new file mode 100644 index 0000000000..47e41ba6df Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi/inhand-right.png new file mode 100644 index 0000000000..374aa98a73 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi/meta.json new file mode 100644 index 0000000000..944d77bbc0 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Skyrat-TG at https://github.com/Skyrat-SS13/Skyrat-tg", + "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/Interface/Misc/job_icons.rsi/ADTBlueShieldOfficer.png b/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/ADTBlueShieldOfficer.png new file mode 100644 index 0000000000..6a66a5d9a2 Binary files /dev/null and b/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/ADTBlueShieldOfficer.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 index a71d57c807..21398452aa 100644 --- a/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "ADTPathologist icon made by JustKeks(github) | Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/master/icons/mob/huds/hud.dmi . Blueshield made by Tamioki.", + "copyright": "ADTPathologist icon made by JustKeks(github), Blueshield made by Tamioki| Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/master/icons/mob/huds/hud.dmi . Blueshield made by Tamioki.", "size": { "x": 8, @@ -13,6 +13,9 @@ }, { "name": "ADTPathologist" + }, + { + "name": "ADTBlueShieldOfficer" } ] } diff --git a/Resources/Textures/ADT/Markers/jobs.rsi/blueshield.png b/Resources/Textures/ADT/Markers/jobs.rsi/blueshield.png new file mode 100644 index 0000000000..12577cfbd5 Binary files /dev/null and b/Resources/Textures/ADT/Markers/jobs.rsi/blueshield.png differ diff --git a/Resources/Textures/ADT/Markers/jobs.rsi/meta.json b/Resources/Textures/ADT/Markers/jobs.rsi/meta.json index 40d0eda2dc..113f5fcf2f 100644 --- a/Resources/Textures/ADT/Markers/jobs.rsi/meta.json +++ b/Resources/Textures/ADT/Markers/jobs.rsi/meta.json @@ -1,29 +1,32 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by Adventure Time, justkekc", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "green" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Adventure Time, justkekc, Blueshield made by Tamioki", + "size": { + "x": 32, + "y": 32 }, - { - "name": "investigator" - }, - { - "name": "magistrat" - }, - { - "name": "iaa" - }, - { - "name": "urist" - }, - { - "name": "pathologist" - } - ] + "states": [ + { + "name": "green" + }, + { + "name": "investigator" + }, + { + "name": "magistrat" + }, + { + "name": "iaa" + }, + { + "name": "urist" + }, + { + "name": "pathologist" + }, + { + "name": "blueshield" + } + ] } diff --git a/Resources/Textures/ADT/Objects/Devices/pda.rsi/equipped-BELT.png b/Resources/Textures/ADT/Objects/Devices/pda.rsi/equipped-BELT.png new file mode 100644 index 0000000000..6901e6c33b Binary files /dev/null and b/Resources/Textures/ADT/Objects/Devices/pda.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/ADT/Objects/Devices/pda.rsi/equipped-IDCARD.png b/Resources/Textures/ADT/Objects/Devices/pda.rsi/equipped-IDCARD.png new file mode 100644 index 0000000000..6901e6c33b Binary files /dev/null and b/Resources/Textures/ADT/Objects/Devices/pda.rsi/equipped-IDCARD.png differ diff --git a/Resources/Textures/ADT/Objects/Devices/pda.rsi/id_overlay.png b/Resources/Textures/ADT/Objects/Devices/pda.rsi/id_overlay.png new file mode 100644 index 0000000000..3f5d310e70 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Devices/pda.rsi/id_overlay.png differ diff --git a/Resources/Textures/ADT/Objects/Devices/pda.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Devices/pda.rsi/inhand-left.png new file mode 100644 index 0000000000..12b784f81e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Devices/pda.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Devices/pda.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Devices/pda.rsi/inhand-right.png new file mode 100644 index 0000000000..6919215bcf Binary files /dev/null and b/Resources/Textures/ADT/Objects/Devices/pda.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Devices/pda.rsi/insert_overlay.png b/Resources/Textures/ADT/Objects/Devices/pda.rsi/insert_overlay.png new file mode 100644 index 0000000000..61ba781c1f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Devices/pda.rsi/insert_overlay.png differ diff --git a/Resources/Textures/ADT/Objects/Devices/pda.rsi/light_overlay.png b/Resources/Textures/ADT/Objects/Devices/pda.rsi/light_overlay.png new file mode 100644 index 0000000000..286a6c3255 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Devices/pda.rsi/light_overlay.png differ diff --git a/Resources/Textures/ADT/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/ADT/Objects/Devices/pda.rsi/meta.json new file mode 100644 index 0000000000..6ee50a50ae --- /dev/null +++ b/Resources/Textures/ADT/Objects/Devices/pda.rsi/meta.json @@ -0,0 +1,54 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Blueshield made by Tamioki.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "id_overlay" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "insert_overlay" + }, + { + "name": "light_overlay" + }, + { + "name": "pda-blueshield", + "delays": [ + [ + 0.9, + 0.9, + 0.9, + 0.9 + ] + ] + }, + { + "name": "pda-centcom", + "delays": [ + [ + 1.2, + 1.2, + 1.2, + 1.2 + ] + ] + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Devices/pda.rsi/pda-blueshield.png b/Resources/Textures/ADT/Objects/Devices/pda.rsi/pda-blueshield.png new file mode 100644 index 0000000000..7d57432535 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Devices/pda.rsi/pda-blueshield.png differ diff --git a/Resources/Textures/ADT/Objects/Devices/pda.rsi/pda-centcom.png b/Resources/Textures/ADT/Objects/Devices/pda.rsi/pda-centcom.png new file mode 100644 index 0000000000..be7e66fd03 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Devices/pda.rsi/pda-centcom.png differ diff --git a/Resources/Textures/ADT/Objects/Fun/figurines.rsi/blueshield.png b/Resources/Textures/ADT/Objects/Fun/figurines.rsi/blueshield.png new file mode 100644 index 0000000000..837bd66247 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Fun/figurines.rsi/blueshield.png differ diff --git a/Resources/Textures/ADT/Objects/Fun/figurines.rsi/meta.json b/Resources/Textures/ADT/Objects/Fun/figurines.rsi/meta.json new file mode 100644 index 0000000000..278318f7fb --- /dev/null +++ b/Resources/Textures/ADT/Objects/Fun/figurines.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites Blueshield made by Tamioki.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "blueshield" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/blue-inhand-left.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/blue-inhand-left.png new file mode 100644 index 0000000000..49a145c26b Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/blue-inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/blue-inhand-right.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/blue-inhand-right.png new file mode 100644 index 0000000000..f7742aa89b Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/blue-inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/centcom.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/centcom.png new file mode 100644 index 0000000000..cca1e3a51d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/centcom.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_chaplain.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_chaplain.png new file mode 100644 index 0000000000..efe5ab7546 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_chaplain.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_commander.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_commander.png new file mode 100644 index 0000000000..d9c8b6e261 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_commander.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_engineer.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_engineer.png new file mode 100644 index 0000000000..b3284fe4ef Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_engineer.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_janitor.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_janitor.png new file mode 100644 index 0000000000..8434e5129f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_janitor.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_medic.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_medic.png new file mode 100644 index 0000000000..eb80a9fa55 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_medic.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_security.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_security.png new file mode 100644 index 0000000000..d3e94c61f9 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_security.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/idblueshield.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/idblueshield.png new file mode 100644 index 0000000000..4261138688 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/idblueshield.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/idcentcom.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/idcentcom.png new file mode 100644 index 0000000000..7fad7c7a80 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/idcentcom.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 index f8b4aa32c5..5892ac1b15 100644 --- a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/meta.json @@ -18,8 +18,43 @@ "directions": 4 }, { - "name": "default-inhand-right", + "name": "default-inhand-right", + "directions": 4 + }, + { + "name": "idblueshield" + }, + { + "name": "centcom" + }, + { + "name": "ert_chaplain" + }, + { + "name": "ert_commander" + }, + { + "name": "ert_engineer" + }, + { + "name": "ert_janitor" + }, + { + "name": "ert_medic" + }, + { + "name": "ert_security" + }, + { + "name": "idcentcom" + }, + { + "name": "blue-inhand-left", + "directions": 4 + }, + { + "name": "blue-inhand-right", "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/bluelaser.rsi/beam.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/bluelaser.rsi/beam.png new file mode 100644 index 0000000000..3f784bcb9f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/bluelaser.rsi/beam.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/bluelaser.rsi/impact_laser.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/bluelaser.rsi/impact_laser.png new file mode 100644 index 0000000000..dc69da91c4 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/bluelaser.rsi/impact_laser.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/bluelaser.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/bluelaser.rsi/meta.json new file mode 100644 index 0000000000..ff930420e1 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/bluelaser.rsi/meta.json @@ -0,0 +1,59 @@ +{ + "version": 1, + "license": "Custom", + "copyright": "Create by not_so_big_chungus only for Adventure Time MRP Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "muzzle_laser", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.5 + ] + ] + }, + { + "name": "beam", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.5 + ] + ] + }, + { + "name": "impact_laser", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.5 + ] + ] + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/bluelaser.rsi/muzzle_laser.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/bluelaser.rsi/muzzle_laser.png new file mode 100644 index 0000000000..f1b472f67c Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/bluelaser.rsi/muzzle_laser.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/impact_bullet.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/impact_bullet.png new file mode 100644 index 0000000000..9af9ad53d6 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/impact_bullet.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/impact_laser_greyscale.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/impact_laser_greyscale.png new file mode 100644 index 0000000000..a2bdccf882 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/impact_laser_greyscale.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/impact_laser_red.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/impact_laser_red.png new file mode 100644 index 0000000000..13d69ab363 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/impact_laser_red.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/meta.json new file mode 100644 index 0000000000..ee65042bd3 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/meta.json @@ -0,0 +1,51 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "drawn by nopeingeneer", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "omnilaser" + }, + { + "name": "omnilaser_greyscale" + }, + { + "name": "impact_bullet", + "delays": [ + [ + 0.05, + 0.05, + 0.05, + 0.05, + 0.05 + ] + ] + }, + { + "name": "impact_laser_red", + "delays": [ + [ + 0.05, + 0.05, + 0.05, + 0.05 + ] + ] + }, + { + "name": "impact_laser_greyscale", + "delays": [ + [ + 0.05, + 0.05, + 0.05, + 0.05 + ] + ] + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/omnilaser.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/omnilaser.png new file mode 100644 index 0000000000..41d3e03009 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/omnilaser.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/omnilaser_greyscale.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/omnilaser_greyscale.png new file mode 100644 index 0000000000..5f4efba75e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/omnilaser_greyscale.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/base.png new file mode 100644 index 0000000000..10aa5fec82 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/inhand-left.png new file mode 100644 index 0000000000..0e56c82e17 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/inhand-right.png new file mode 100644 index 0000000000..fc784723cf Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/mag-1.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/mag-1.png new file mode 100644 index 0000000000..ef3119c3fe Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/mag-1.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/mag-2.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/mag-2.png new file mode 100644 index 0000000000..a8869cf77e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/mag-2.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/mag-3.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/mag-3.png new file mode 100644 index 0000000000..5f4990accc Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/mag-3.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/meta.json new file mode 100644 index 0000000000..d83ad25fbb --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "Custom", + "copyright": "Made by Tamioki", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic-inhands.rsi/inhand-left-blade.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic-inhands.rsi/inhand-left-blade.png new file mode 100644 index 0000000000..61e6149c37 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic-inhands.rsi/inhand-left-blade.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic-inhands.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic-inhands.rsi/inhand-left.png new file mode 100644 index 0000000000..1cd0726f37 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic-inhands.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic-inhands.rsi/inhand-right-blade.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic-inhands.rsi/inhand-right-blade.png new file mode 100644 index 0000000000..42e8b189bc Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic-inhands.rsi/inhand-right-blade.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic-inhands.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic-inhands.rsi/inhand-right.png new file mode 100644 index 0000000000..9bcd0b183e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic-inhands.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic-inhands.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic-inhands.rsi/meta.json new file mode 100644 index 0000000000..61acf9cff2 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic-inhands.rsi/meta.json @@ -0,0 +1,63 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Inhands by Tamioki", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "inhand-left-blade", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-right-blade", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic.rsi/icon.png new file mode 100644 index 0000000000..69b8f43c38 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic.rsi/icon_saber.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic.rsi/icon_saber.png new file mode 100644 index 0000000000..57b348ff86 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic.rsi/icon_saber.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic.rsi/meta.json new file mode 100644 index 0000000000..d2cc87018d --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "Custom", + "copyright": "Made by Tamioki", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_saber", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi/inhand-left-blade.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi/inhand-left-blade.png new file mode 100644 index 0000000000..61e6149c37 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi/inhand-left-blade.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi/inhand-left.png new file mode 100644 index 0000000000..fe3bf8944b Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi/inhand-right-blade.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi/inhand-right-blade.png new file mode 100644 index 0000000000..42e8b189bc Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi/inhand-right-blade.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi/inhand-right.png new file mode 100644 index 0000000000..ee0f338795 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi/meta.json new file mode 100644 index 0000000000..988beef92a --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi/meta.json @@ -0,0 +1,99 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Inhands by Tamioki", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "inhand-left-blade", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-right-blade", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 0.5, + 0.5 + ], + [ + 0.5, + 0.5 + ], + [ + 0.5, + 0.5 + ], + [ + 0.5, + 0.5 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 0.5, + 0.5 + ], + [ + 0.5, + 0.5 + ], + [ + 0.5, + 0.5 + ], + [ + 0.5, + 0.5 + ] + ] + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi/base.png new file mode 100644 index 0000000000..5ab0f44a5c Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi/icon_saber.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi/icon_saber.png new file mode 100644 index 0000000000..908db302f7 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi/icon_saber.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi/mag-0.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi/mag-0.png new file mode 100644 index 0000000000..49382ecebc Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi/mag-0.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi/mag-1.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi/mag-1.png new file mode 100644 index 0000000000..95acd50407 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi/mag-1.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi/meta.json new file mode 100644 index 0000000000..da3f60f38f --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "Custom", + "copyright": "Made by Tamioki", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "mag-1" + }, + { + "name": "icon_saber", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic.png new file mode 100644 index 0000000000..9fb79da87e Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic_door.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic_door.png new file mode 100644 index 0000000000..dc7d1924fa Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic_door.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic_open.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic_open.png new file mode 100644 index 0000000000..70bd872400 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic_open.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist.png new file mode 100644 index 0000000000..9c30d08321 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist_door.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist_door.png new file mode 100644 index 0000000000..7c70b7a648 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist_door.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist_open.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist_open.png new file mode 100644 index 0000000000..cacaa5ac99 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist_open.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/blueshield.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/blueshield.png new file mode 100644 index 0000000000..fb5d01ccb2 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/blueshield.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/blueshield_door.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/blueshield_door.png new file mode 100644 index 0000000000..676e5d87cb Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/blueshield_door.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/blueshield_open.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/blueshield_open.png new file mode 100644 index 0000000000..fa74babe4b Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/blueshield_open.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/cc.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/cc.png new file mode 100644 index 0000000000..6a5cd1f7a9 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/cc.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/cc_door.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/cc_door.png new file mode 100644 index 0000000000..26017e463b Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/cc_door.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/cc_open.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/cc_open.png new file mode 100644 index 0000000000..b99850e38b Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/cc_open.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic.png new file mode 100644 index 0000000000..cd0c0ff2ea Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_door.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_door.png new file mode 100644 index 0000000000..2649852777 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_door.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_icon.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_icon.png new file mode 100644 index 0000000000..2487eae1fd Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_icon.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_open.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_open.png new file mode 100644 index 0000000000..01ed5bf73b Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_open.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/locked.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/locked.png new file mode 100644 index 0000000000..d90218d19e Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/locked.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/ADT/Structures/Storage/closet.rsi/meta.json new file mode 100644 index 0000000000..ade760f274 --- /dev/null +++ b/Resources/Textures/ADT/Structures/Storage/closet.rsi/meta.json @@ -0,0 +1,79 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "copyright": "Taken from tgstation. Bio Pathologist and Paramedic made by JustKekc. Central Command (cc) and blueshield made by Tamioki.", + "license": "CC-BY-SA-3.0", + "states": [ + { + "name": "generic" + }, + { + "name": "generic_door" + }, + { + "name": "generic_open" + }, + { + "name": "generic_icon" + }, + { + "name": "welded" + }, + { + "name": "cc" + }, + { + "name": "cc_door" + }, + { + "name": "cc_open" + }, + { + "name": "blueshield" + }, + { + "name": "blueshield_door" + }, + { + "name": "blueshield_open" + }, + { + "name": "bio_pathologist" + }, + { + "name": "bio_pathologist_door" + }, + { + "name": "bio_pathologist_open" + }, + { + "name": "bio_paramedic" + }, + { + "name": "bio_paramedic_door" + }, + { + "name": "bio_paramedic_open" + }, + { + "name": "locked" + }, + { + "name": "unlocked" + }, + { + "name": "sparking", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/sparking.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/sparking.png new file mode 100644 index 0000000000..b027535b06 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/sparking.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/unlocked.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/unlocked.png new file mode 100644 index 0000000000..418607bfaf Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/unlocked.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/welded.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/welded.png new file mode 100644 index 0000000000..5ba5dcc896 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/welded.png differ