diff --git a/Content.Client/ADT/NovakidFeatures/NovakidFeaturesSystem.cs b/Content.Client/ADT/NovakidFeatures/NovakidFeaturesSystem.cs new file mode 100644 index 00000000000..9db37abafca --- /dev/null +++ b/Content.Client/ADT/NovakidFeatures/NovakidFeaturesSystem.cs @@ -0,0 +1,31 @@ +using Content.Shared.ADT.NovakidFeatures; +using Robust.Client.GameObjects; + +namespace Content.Client.ADT.NovakidFeatures; +public sealed partial class NovakidFeaturesSystem : EntitySystem +{ + [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private readonly PointLightSystem _lights = default!; + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnEntityInit); + } + /// + /// Makes Novakid to glow with color of his skin — layer number 0 of SpriteComponent. + /// + /// Novakid + /// Компонент отвечающий за свечение новакида. Вообще-то говоря он нужен пока только для того, чтобы не пришлось перебирать сущности в поисках новакида. + /// + private void OnEntityInit(EntityUid uid, NovakidGlowingComponent component, ComponentInit args) + { + _entityManager.GetComponent(uid).TryGetLayer(0, out var layer); + + component.GlowingColor = _entityManager.GetComponent(uid).Color; + if (layer == null) return; + _lights.SetColor(uid, layer.Color); + //_lights.SetEnergy(uid, 0.6f); + _entityManager.Dirty(_entityManager.GetComponent(uid)); + } +} diff --git a/Content.Server/ADT/Hemophilia/HemophiliaSystem.cs b/Content.Server/ADT/Hemophilia/HemophiliaSystem.cs new file mode 100644 index 00000000000..eb84218b8e0 --- /dev/null +++ b/Content.Server/ADT/Hemophilia/HemophiliaSystem.cs @@ -0,0 +1,31 @@ +using Content.Server.Body.Components; +using Content.Shared.Traits; + +namespace Content.Server.Hemophilia; + +public sealed partial class HemophiliaSystem : EntitySystem +{ + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnInitHemophilia); + SubscribeLocalEvent(OnShutdown); + + } + + private void OnInitHemophilia(EntityUid uid, HemophiliaComponent component, MapInitEvent args) + { + if (TryComp(uid, out var bldcomp)) + { + bldcomp.BleedReductionAmount *= component.Modifier; + } + } + private void OnShutdown(EntityUid uid, HemophiliaComponent component, ComponentShutdown args) + { + if (TryComp(uid, out var bldcomp)) + { + bldcomp.BleedReductionAmount /= component.Modifier; + } + } +} diff --git a/Content.Server/Body/Components/BloodstreamComponent.cs b/Content.Server/Body/Components/BloodstreamComponent.cs index a6d2afab219..4bbb6bfee86 100644 --- a/Content.Server/Body/Components/BloodstreamComponent.cs +++ b/Content.Server/Body/Components/BloodstreamComponent.cs @@ -9,10 +9,11 @@ using Robust.Shared.Audio; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; +using Content.Server.Hemophilia; namespace Content.Server.Body.Components { - [RegisterComponent, Access(typeof(BloodstreamSystem), typeof(ReactionMixerSystem))] + [RegisterComponent, Access(typeof(BloodstreamSystem), typeof(ReactionMixerSystem), (typeof(HemophiliaSystem)))] public sealed partial class BloodstreamComponent : Component { public static string DefaultChemicalsSolutionName = "chemicals"; diff --git a/Content.Shared/ADT/NovakidFeatures/NovakidGlowingComponent.cs b/Content.Shared/ADT/NovakidFeatures/NovakidGlowingComponent.cs new file mode 100644 index 00000000000..b39ddf42cb2 --- /dev/null +++ b/Content.Shared/ADT/NovakidFeatures/NovakidGlowingComponent.cs @@ -0,0 +1,13 @@ +namespace Content.Shared.ADT.NovakidFeatures; + +[RegisterComponent] +public sealed partial class NovakidGlowingComponent : Component +{ + [DataField] + public Color GlowingColor; + + NovakidGlowingComponent(Color color) + { + GlowingColor = color; + } +} diff --git a/Content.Shared/ADT/hemophilia/HemophiliaComponent.cs b/Content.Shared/ADT/hemophilia/HemophiliaComponent.cs new file mode 100644 index 00000000000..2a82c95013d --- /dev/null +++ b/Content.Shared/ADT/hemophilia/HemophiliaComponent.cs @@ -0,0 +1,10 @@ +namespace Content.Shared.Traits; + +[RegisterComponent] +public sealed partial class HemophiliaComponent : Component +{ + [DataField] + public float Modifier = 0.3f; + + +} diff --git a/Resources/Locale/en-US/ADT/traits/traits.ftl b/Resources/Locale/en-US/ADT/traits/traits.ftl new file mode 100644 index 00000000000..92289cb406e --- /dev/null +++ b/Resources/Locale/en-US/ADT/traits/traits.ftl @@ -0,0 +1,2 @@ +trait-hemophilia-name = Hemophilia +trait-hemophilia-desc = Your blood is clotting extremely badly. diff --git a/Resources/Locale/ru-RU/ADT/Novakid/species.ftl b/Resources/Locale/ru-RU/ADT/Novakid/species.ftl new file mode 100644 index 00000000000..0e5d1d1fcc9 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Novakid/species.ftl @@ -0,0 +1,60 @@ +novakid-hurt-by-water-popup = Вода заставляет ваше пламя угасать +species-name-novakid = Новакид +marking-NovakidHair1 = сплетение +marking-NovakidHair2 = комета +marking-NovakidHair3 = дуализм +marking-NovakidHair4 = слава +marking-NovakidHair5 = газовое облако +marking-NovakidHair6 = газовая лавина +marking-NovakidHair7 = сияние света +marking-NovakidHair8 = огонек звездного блеска +marking-NovakidHair9 = звездочка +marking-NovakidHair10 = лунный день +marking-NovakidHair11 = метеоритный дождь +marking-NovakidHair12 = млечный путь +marking-NovakidHair13 = туманность +marking-NovakidHair14 = солнечная коронка +marking-NovakidHair15 = звездный дождь +marking-NovakidHair16 = звездопад +marking-NovakidHair17 = пламя звезды +marking-NovakidHair18 = солнечный свет +marking-NovakidHair19 = сверхновая +marking-NovakidHair20 = галактический стиль +marking-NovakidHair21 = дева +marking-NovakidHair22 = галактика +marking-NovakidFace1 = раскол +marking-NovakidFace2 = крест +marking-NovakidFace3 = распятие +marking-NovakidFace4 = двойственность +marking-NovakidFace5 = око +marking-NovakidFace6 = H +marking-NovakidFace7 = сердце +marking-NovakidFace8 = индикатор +marking-NovakidFace9 = нота +marking-NovakidFace10 = призма +marking-NovakidFace11 = руна +marking-NovakidFace12 = квадрат +marking-NovakidFace13 = напряжение +marking-NovakidFace14 = тройственность +marking-NovakidFace15 = перевёрнутое распятие +marking-NovakidFace16 = X +marking-NovakidFace17 = Y +marking-NovakidFace18 = зета +marking-NovakidFace19 = конус +marking-NovakidFace20 = cвязь +marking-NovakidFace21 = окружность +marking-NovakidFace22 = косательная +marking-NovakidFace23 = очи +marking-NovakidFace24 = G +marking-NovakidFace25 = домик +marking-NovakidFace26 = К +marking-NovakidFace27 = лима +marking-NovakidFace28 = обратная косательная +marking-NovakidFace29 = омега +marking-NovakidFace30 = плюс +marking-NovakidFace31 = роза +marking-NovakidFace32 = раскол +marking-NovakidFace33 = звезда +marking-NovakidFace34 = продовольные очки +marking-TorsoNovakidDefolt = белое ядро +marking-HeadNovakidDefolt = белое ядро diff --git a/Resources/Locale/ru-RU/ADT/traits/disabilities.ftl b/Resources/Locale/ru-RU/ADT/traits/disabilities.ftl new file mode 100644 index 00000000000..9fbced1d643 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/traits/disabilities.ftl @@ -0,0 +1,2 @@ +trait-hemophilia-name = Гемофилия +trait-hemophilia-desc = Ваша кровь сворачивается крайне плохо. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/novakid.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/novakid.ftl new file mode 100644 index 00000000000..f794a3be716 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/novakid.ftl @@ -0,0 +1,2 @@ +ent-MobNovakid = { ent-BaseMobNovakid } + .desc = { ent-BaseMobNovakid.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/species/novakid.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/species/novakid.ftl new file mode 100644 index 00000000000..69b575ece4b --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/species/novakid.ftl @@ -0,0 +1,3 @@ +ent-BaseMobNovakid = Урист МакНовакид + .desc = { ent-BaseMobSpeciesOrganic.desc } + .suffix = Новакид diff --git a/Resources/Prototypes/ADT/Body/Organs/novakid.yml b/Resources/Prototypes/ADT/Body/Organs/novakid.yml new file mode 100644 index 00000000000..b872a952dc6 --- /dev/null +++ b/Resources/Prototypes/ADT/Body/Organs/novakid.yml @@ -0,0 +1,31 @@ +- type: entity + id: OrganNovakidStomach + parent: OrganAnimalStomach + noSpawn: true + components: + - type: Stomach + maxVol: 50 + - type: Metabolizer + maxReagents: 5 + metabolizerTypes: [ Novakid ] + +- type: entity + id: OrganNovakidLungs + parent: OrganHumanLungs + suffix: "novakid" + components: + - type: Metabolizer + metabolizerTypes: [ Novakid ] + +- type: entity + id: OrganNovakidHeart + parent: OrganAnimalHeart + suffix: "novakid" + components: + - type: Metabolizer + maxReagents: 2 + metabolizerTypes: [ Novakid ] + groups: + - id: Medicine + - id: Poison + - id: Narcotic diff --git a/Resources/Prototypes/ADT/Body/Parts/novakid.yml b/Resources/Prototypes/ADT/Body/Parts/novakid.yml new file mode 100644 index 00000000000..165193689c9 --- /dev/null +++ b/Resources/Prototypes/ADT/Body/Parts/novakid.yml @@ -0,0 +1,190 @@ +# TODO: Add descriptions (many) +# TODO BODY: Part damage +- type: entity + id: PartNovakid + parent: BaseItem + name: "novakid body part" + abstract: true + components: + - type: Damageable + damageContainer: Biological + - type: BodyPart + - type: ContainerContainer + containers: + bodypart: !type:Container + ents: [] + +- type: entity + id: TorsoNovakid + name: "novakid torso" + parent: PartNovakid + components: + - type: Sprite + netsync: false + sprite: ADT/Mobs/Novakid/parts.rsi + state: "torso_m" + - type: Icon + sprite: ADT/Mobs/Novakid/parts.rsi + state: "torso_m" + - type: BodyPart + partType: Torso + +- type: entity + id: HeadNovakid + name: "novakid head" + parent: PartNovakid + components: + - type: Sprite + netsync: false + sprite: ADT/Mobs/Novakid/parts.rsi + state: "head_m" + - type: Icon + sprite: ADT/Mobs/Novakid/parts.rsi + state: "head_m" + - type: BodyPart + partType: Head + vital: true + - type: Input + context: "ghost" + - type: MovementSpeedModifier + baseWalkSpeed: 0 + baseSprintSpeed: 0 + - type: InputMover + - type: GhostOnMove + - type: Tag + tags: + - Head + +- type: entity + id: LeftArmNovakid + name: "left novakid arm" + parent: PartNovakid + components: + - type: Sprite + netsync: false + sprite: ADT/Mobs/Novakid/parts.rsi + state: "l_arm" + - type: Icon + sprite: ADT/Mobs/Novakid/parts.rsi + state: "l_arm" + - type: BodyPart + partType: Arm + symmetry: Left + +- type: entity + id: RightArmNovakid + name: "right novakid arm" + parent: PartNovakid + components: + - type: Sprite + netsync: false + sprite: ADT/Mobs/Novakid/parts.rsi + state: "r_arm" + - type: Icon + sprite: ADT/Mobs/Novakid/parts.rsi + state: "r_arm" + - type: BodyPart + partType: Arm + symmetry: Right + +- type: entity + id: LeftHandNovakid + name: "left novakid hand" + parent: PartNovakid + components: + - type: Sprite + netsync: false + sprite: ADT/Mobs/Novakid/parts.rsi + state: "l_hand" + - type: Icon + sprite: ADT/Mobs/Novakid/parts.rsi + state: "l_hand" + - type: BodyPart + partType: Hand + symmetry: Left + +- type: entity + id: RightHandNovakid + name: "right novakid hand" + parent: PartNovakid + components: + - type: Sprite + netsync: false + sprite: ADT/Mobs/Novakid/parts.rsi + state: "r_hand" + - type: Icon + sprite: ADT/Mobs/Novakid/parts.rsi + state: "r_hand" + - type: BodyPart + partType: Hand + symmetry: Right + +- type: entity + id: LeftLegNovakid + name: "left novakid leg" + parent: PartNovakid + components: + - type: Sprite + netsync: false + sprite: ADT/Mobs/Novakid/parts.rsi + state: "l_leg" + - type: Icon + sprite: ADT/Mobs/Novakid/parts.rsi + state: "l_leg" + - type: BodyPart + partType: Leg + symmetry: Left + - type: MovementBodyPart + walkSpeed : 2.5 + sprintSpeed : 4.5 + +- type: entity + id: RightLegNovakid + name: "right novakid leg" + parent: PartNovakid + components: + - type: Sprite + netsync: false + sprite: ADT/Mobs/Novakid/parts.rsi + state: "r_leg" + - type: Icon + sprite: ADT/Mobs/Novakid/parts.rsi + state: "r_leg" + - type: BodyPart + partType: Leg + symmetry: Right + - type: MovementBodyPart + walkSpeed : 2.5 + sprintSpeed : 4.5 + +- type: entity + id: LeftFootNovakid + name: "left novakid foot" + parent: PartNovakid + components: + - type: Sprite + netsync: false + sprite: ADT/Mobs/Novakid/parts.rsi + state: "l_foot" + - type: Icon + sprite: ADT/Mobs/Novakid/parts.rsi + state: "l_foot" + - type: BodyPart + partType: Foot + symmetry: Left + +- type: entity + id: RightFootNovakid + name: "right novakid foot" + parent: PartNovakid + components: + - type: Sprite + netsync: false + sprite: ADT/Mobs/Novakid/parts.rsi + state: "r_foot" + - type: Icon + sprite: ADT/Mobs/Novakid/parts.rsi + state: "r_foot" + - type: BodyPart + partType: Foot + symmetry: Right diff --git a/Resources/Prototypes/ADT/Body/Prototypes/fill.txt b/Resources/Prototypes/ADT/Body/Prototypes/fill.txt deleted file mode 100644 index b4954caf47d..00000000000 --- a/Resources/Prototypes/ADT/Body/Prototypes/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Body/Prototypes/novakid.yml b/Resources/Prototypes/ADT/Body/Prototypes/novakid.yml new file mode 100644 index 00000000000..7013f312679 --- /dev/null +++ b/Resources/Prototypes/ADT/Body/Prototypes/novakid.yml @@ -0,0 +1,49 @@ +- type: body + name: "novakid" + id: Novakid + root: torso + slots: + head: + part: HeadNovakid + connections: + - torso + organs: + brain: OrganHumanBrain + eyes: OrganHumanEyes + torso: + part: TorsoNovakid + organs: + heart: OrganNovakidHeart + lungs: OrganNovakidLungs + stomach: OrganNovakidStomach + liver: OrganAnimalLiver + kidneys: OrganHumanKidneys + connections: + - left arm + - right arm + - left leg + - right leg + right arm: + part: RightArmNovakid + connections: + - right hand + left arm: + part: LeftArmNovakid + connections: + - left hand + right hand: + part: RightHandNovakid + left hand: + part: LeftHandNovakid + right leg: + part: RightLegNovakid + connections: + - right foot + left leg: + part: LeftLegNovakid + connections: + - left foot + right foot: + part: RightFootNovakid + left foot: + part: LeftFootNovakid diff --git a/Resources/Prototypes/ADT/Chemistry/metabolizer_types.yml b/Resources/Prototypes/ADT/Chemistry/metabolizer_types.yml index a492dde8d02..1e5a37c520e 100644 --- a/Resources/Prototypes/ADT/Chemistry/metabolizer_types.yml +++ b/Resources/Prototypes/ADT/Chemistry/metabolizer_types.yml @@ -1,4 +1,4 @@ -# If your species wants to metabolize stuff differently, +# If your species wants to metabolize stuff differently, # you'll likely have to tag its metabolizers with something other than Human. - type: metabolizerType @@ -21,6 +21,10 @@ id: Slime name: metabolizer-type-slime +- type: metabolizerType + id: Novakid + name: novakid + - type: metabolizerType id: Vox name: metabolizer-type-vox @@ -45,10 +49,6 @@ id: Arachnid name: metabolizer-type-arachnid -- type: metabolizerType - id: Novakid - name: metabolizer-type-novakid - - type: metabolizerType id: Demon name: metabolizer-type-demon diff --git a/Resources/Prototypes/ADT/Datasets/Names/fill.txt b/Resources/Prototypes/ADT/Datasets/Names/fill.txt deleted file mode 100644 index b4954caf47d..00000000000 --- a/Resources/Prototypes/ADT/Datasets/Names/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Datasets/Names/first_novakid.yml b/Resources/Prototypes/ADT/Datasets/Names/first_novakid.yml new file mode 100644 index 00000000000..33ddab2efe1 --- /dev/null +++ b/Resources/Prototypes/ADT/Datasets/Names/first_novakid.yml @@ -0,0 +1,62 @@ +- type: dataset + id: firstNovakid + values: + - Пекло + - Холод + - Добро + - Тепло + - Любовь + - Эмпатия + - Надежда + - Мечтательность + - Красота + - Привлекательность + - Яркость + - Смелость + - Бесстрашие + - Сила + - Мощь + - Созидание + - Смышление + - Героизм + - Грация + - Милость + - Долговечность + - Абстрактность + - Многогранность + - Обобщённость + - Серость + - Грусть + - Печаль + - Тоска + - Черезмерность + - Расторопность + - Эгоизм + - Безразличие + - Хладнокровие + - Апатия + - Безвольность + - Глупость + - Злоба + - Ненависть + - Безумие + - Абсурдность + - Безэмоциональность + - Жадность + - Апатия + - Скупость + - Мрачность + - Открытость + - Беспристрастность + - Праведность + - Трусливость + - Красноречивость + - Чистота + - Миролюбивость + - Кучность + - Лень + - Слабость + - Надежда + - Безнадёжность + - Обречённость + - Безысходность diff --git a/Resources/Prototypes/ADT/Datasets/Names/last_novakid.yml b/Resources/Prototypes/ADT/Datasets/Names/last_novakid.yml new file mode 100644 index 00000000000..ef01797dc4e --- /dev/null +++ b/Resources/Prototypes/ADT/Datasets/Names/last_novakid.yml @@ -0,0 +1,139 @@ +- type: dataset + id: NovakidLast + values: + - Сверхновой + - Микроновой + - Псевдосверхновой + - Неудавшейся Сверхновой + - Гиперновой + - Звёзд + - Звезды + - Двойной Звезды + - Тройной Звезды + - Нейтронной Звезды + - Кварковой Звезды + - Пекулярной Звезды + - Оболочечной Звезды + - Преонной Звезды + - Кварковой Звезды + - Эруптивно-Переменной Звезды + - Симбиотической Звезды + - Килоновой + - Протозвезды + - Созвездия + - Небосвода + - Космоса + - Пространства + - Пустоты + - Галактики + - Туманности + - Тёмной Туманности + - Планет + - Планеты + - Бланеты + - Экзопланеты + - Газового Гиганта + - Ледяного Гиганта + - Спутника + - Солнца + - Лун + - Луны + - Астероида + - Кометы + - Пульсара + - Квазара + - Квазага + - Блазара + - Магнетара + - Микроквазара + - Кометы + - Чёрной Дыры + - Белой Дыры + - Сингулярности + - Горизонта Событий + - Планетезимали + - Вспышки + - Болида + - Гелиосферы + - Газового Облака + - Барстера + - Плериона + - Остатков Сверхновой + - Вселенной + - Мультивселенной + - Реликтового Излучения + - Космической Струны + - Кротовой Норы + - Гало + - Вимпа + - Галактической Нити + - Галактических Нитей + - Скопления Галактик + - Протоскопления Галактик + - Спирального Рукава + - Звездной Перемычки + - Галактического Диска + - Галактического Гало + - Полярного Кольца + - Релятивистской Струи + - Тёмной Галактики + - Алинды + - Кибелы + - Эос + - Флоры + - Хильды + - Венгрии + - Гигеи + - Корониды + - Марии + - Нисы + - Паллады + - Фокеи + - Фемиды + - Весты + - Атоны + - Аполлоны + - Амуры + - Атиры + - Вулканоида + - Антигравитации + - Гравитации + - Фотоэффекта + - Магнетосопротивления + - Дроплетона + - Сверхизлучения + - Туннелирования + - Рассеивания + - Полураспада + - Распада + - Квантового Сверхплотного Кодирования + - Анизотропии + - Аллотропии + - Спина + - Тензоэффекта + - Сцинтилляции + - Магнитострикции + - Фотопроводимости + - Мирового Эха + - Магнитной Бури + - Дождя + - Смога + - Снега + - Кислотного Дождя + - Тумана + - Грозы + - Смерча + - Шторма + - Альфы + - Беты + - Гаммы + - Дельты + - Дзеты + - Эты + - Тхэты + - Йоты + - Каппы + - Лямбды + - Омикрона + - Омеги + - Тау diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/novakid.yml b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/novakid.yml new file mode 100644 index 00000000000..be963fdacc0 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/novakid.yml @@ -0,0 +1,534 @@ + +- type: marking + id: NovakidHair1 + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: braid + +- type: marking + id: NovakidHair2 + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: comet + +- type: marking + id: NovakidHair3 + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: constellation + +- type: marking + id: NovakidHair4 + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: duality + +- type: marking + id: NovakidHair5 + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: fame + +- type: marking + id: NovakidHair6 + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: gas_cloud + +- type: marking + id: NovakidHair7 + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: gaseous_avalanche + +- type: marking + id: NovakidHair8 + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: light_shine + +- type: marking + id: NovakidHair9 + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: little_light_starshine + +- type: marking + id: NovakidHair10 + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: little_star + +- type: marking + id: NovakidHair11 + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: lunar_day + +- type: marking + id: NovakidHair12 + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: meteoric_shower + +- type: marking + id: NovakidHair13 + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: milky_way + +- type: marking + id: NovakidHair14 + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: Nebula + +- type: marking + id: NovakidHair15 + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: solar_corona + +- type: marking + id: NovakidHair16 + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: star_rain + +- type: marking + id: NovakidHair17 + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: starfall + +- type: marking + id: NovakidHair18 + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: starfire + +- type: marking + id: NovakidHair19 + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: sunshine + +- type: marking + id: NovakidHair20 + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: supernova + +- type: marking + id: NovakidHair21 + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: universal_style + +- type: marking + id: NovakidHair22 + bodyPart: Hair + markingCategory: Hair + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: virgo + +- type: marking + id: NovakidFace1 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: cross + +- type: marking + id: NovakidFace2 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: crack + +- type: marking + id: NovakidFace3 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: crucifix + +- type: marking + id: NovakidFace4 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: dual + +- type: marking + id: NovakidFace5 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: eye + +- type: marking + id: NovakidFace6 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: h + +- type: marking + id: NovakidFace7 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: heart + +- type: marking + id: NovakidFace8 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: indicator + +- type: marking + id: NovakidFace9 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: note + +- type: marking + id: NovakidFace10 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: prism + +- type: marking + id: NovakidFace11 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: rune + +- type: marking + id: NovakidFace12 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: squad + +- type: marking + id: NovakidFace13 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: thrill + +- type: marking + id: NovakidFace14 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: triple + +- type: marking + id: NovakidFace15 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: uncrucifix + +- type: marking + id: NovakidFace16 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: x + +- type: marking + id: NovakidFace17 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: ye + +- type: marking + id: NovakidFace18 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: zeta + +- type: marking + id: HeadNovakidDefolt + bodyPart: [ Head ] + markingCategory: HeadTop + speciesRestriction: [NovakidSpecies] + forcedColoring: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: head_novakid_defolt + +- type: marking + id: TorsoNovakidDefolt + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [NovakidSpecies] + forcedColoring: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: torso_novakid_defolt + +- type: marking + id: NovakidFace19 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: cone_a + +- type: marking + id: NovakidFace20 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: connect_a + +- type: marking + id: NovakidFace21 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: dot_a + +- type: marking + id: NovakidFace22 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: dotline_a + +- type: marking + id: NovakidFace23 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: eyes_a + +- type: marking + id: NovakidFace24 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: G_a + +- type: marking + id: NovakidFace25 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: house + +- type: marking + id: NovakidFace26 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: K + +- type: marking + id: NovakidFace27 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: lima-a + +- type: marking + id: NovakidFace28 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: linedot_a + +- type: marking + id: NovakidFace29 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: omega_a + +- type: marking + id: NovakidFace30 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: plus + +- type: marking + id: NovakidFace31 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: rose + +- type: marking + id: NovakidFace32 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: shatter_a + +- type: marking + id: NovakidFace33 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: star_a + +- type: marking + id: NovakidFace34 + bodyPart: Snout + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: two-a diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Player/novakid.yml b/Resources/Prototypes/ADT/Entities/Mobs/Player/novakid.yml new file mode 100644 index 00000000000..5e7e397ab01 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Mobs/Player/novakid.yml @@ -0,0 +1,47 @@ +- type: entity + save: false + name: "Urisst' Mzhand Novakid" + parent: BaseMobNovakid + id: MobNovakid + components: + - type: CombatMode + - type: InteractionPopup + successChance: 1 + interactSuccessString: hugging-success-generic + interactSuccessSound: /Audio/Effects/thudswoosh.ogg + messagePerceivedByOthers: hugging-success-generic-others + - type: MindContainer + showExamineInfo: true + - type: Input + context: "human" + - type: MobMover + - type: InputMover + - type: Alerts + - type: Eye + - type: CameraRecoil + - type: Examiner + - type: CanHostGuardian + - type: NpcFactionMember + factions: + - NanoTrasen + - type: Respirator + damage: + types: + Asphyxiation: 1.0 + damageRecovery: + types: + Asphyxiation: -1.0 +# - type: LanguageSpeaker +# speaks: +# - GalacticCommon +# - Fire +# understands: +# - GalacticCommon +# - Fire +# - type: SizeAttributeWhitelist # Frontier +# tall: true +# tallscale: 1.1 +# short: true +# shortscale: 0.9 + +#Weh diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/novakid.yml b/Resources/Prototypes/ADT/Entities/Mobs/Species/novakid.yml new file mode 100644 index 00000000000..abb62ca8757 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Mobs/Species/novakid.yml @@ -0,0 +1,135 @@ +- type: entity + save: false + name: Urisst' Mzhand Novakid + parent: BaseMobSpeciesOrganic + id: BaseMobNovakid + abstract: true + components: + - type: Hunger + baseDecayRate: 0.025 + currentHunger: 400 + thresholds: + Overfed: 400 + Okay: 300 + Peckish: 200 + Starving: 100 + Dead: 0 + starvationDamage: + types: + Cold: 0.12 + Caustic: 0.08 + - type: HumanoidAppearance + species: NovakidSpecies + - type: Bloodstream + bloodReagent: Plasma + - type: ZombieImmune + - type: NovakidGlowing # see NovakidFeaturesSystem.cs + - type: PointLight + color: "#ffffff" + energy: 0.6 + - type: Icon + sprite: ADT/Mobs/Novakid/parts.rsi + state: full_m + - type: Sprite + netsync: false + noRot: true + drawdepth: Mobs + - type: Body + prototype: Novakid + requiredLegs: 2 + - type: Speech + speechSounds: Lizard + - type: Vocal + sounds: + Male: MaleNovakid + Female: FemaleNovakid + Unsexed: UnisexNovakid + - type: Damageable + damageContainer: Biological + damageModifierSet: Demon # Потому что. Я зол, эта штука ломала мне мозг на протяжении двух часов, пока я искал ошибку >:c + - type: MeleeWeapon + hidden: true + soundHit: + path: /Audio/Weapons/pierce.ogg + angle: 30 + animation: WeaponArcPunch + damage: + types: + Heat: 5 + - type: Temperature + heatDamageThreshold: 450 + coldDamageThreshold: 193 #starting temperature damage treshold + currentTemperature: 310.15 + specificHeat: 46 + coldDamage: + types: + Cold : 0.5 #per second, scales with temperature & other constants + heatDamage: + types: + Heat : 0.2 #per second, scales with temperature & other constants. + - type: FlashImmunity + - type: EyeProtection + - type: MovementSpeedModifier + baseWalkSpeed : 2.5 + baseSprintSpeed : 4.5 + - type: Perishable + - type: Barotrauma + damage: + types: + Blunt: 0.01 # Супер пониженный дамаг от давления + - type: Reactive + groups: + Flammable: [ Touch ] + Extinguish: [ Touch ] + reactions: + - reagents: [ Water, SpaceCleaner ] + methods: [ Touch ] + effects: + - !type:WashCreamPieReaction + - reagents: [ Water, SpaceCleaner ] + methods: [ Touch ] + effects: + - !type:HealthChange + scaled: true + damage: + types: + Heat: 4 # Повышенный дамаг от водички и моющего средства. Пшик-пшик + - !type:PopupMessage + type: Local + visualType: Large + messages: [ "novakid-hurt-by-water-popup" ] + probability: 0.25 + - type: MobThresholds + thresholds: + 0: Alive + 100: Critical + 300: Dead + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 300 + behaviors: + - !type:SpawnEntitiesBehavior + spawn: + Ash: + min: 1 + max: 1 + - !type:GibBehavior { } + - type: Tag + tags: + - CanPilot + - FootstepSound + - DoorBumpOpener + + +- type: entity + save: false + name: Urist McHands + parent: MobHumanDummy + id: MobNovakidDummy + noSpawn: true + description: A dummy reptilian meant to be used in character setup. + components: + - type: HumanoidAppearance + species: NovakidSpecies diff --git a/Resources/Prototypes/ADT/SoundCollections/emotes.yml b/Resources/Prototypes/ADT/SoundCollections/emotes.yml index 3f6d3245480..361978866cc 100644 --- a/Resources/Prototypes/ADT/SoundCollections/emotes.yml +++ b/Resources/Prototypes/ADT/SoundCollections/emotes.yml @@ -14,3 +14,12 @@ id: DraskTalk files: - /Audio/ADT/Drask/drasktalk.ogg + +- type: soundCollection + id: NovakidLaugh + files: + - /Audio/ADT/Novakid/novakid_laugh01.ogg + - /Audio/ADT/Novakid/novakid_laugh02.ogg + - /Audio/ADT/Novakid/novakid_laugh03.ogg + - /Audio/ADT/Novakid/novakid_laugh04.ogg + - /Audio/ADT/Novakid/novakid_laugh05.ogg diff --git a/Resources/Prototypes/ADT/SoundCollections/fill.txt b/Resources/Prototypes/ADT/SoundCollections/fill.txt deleted file mode 100644 index b4954caf47d..00000000000 --- a/Resources/Prototypes/ADT/SoundCollections/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/SoundCollections/screams.yml b/Resources/Prototypes/ADT/SoundCollections/screams.yml new file mode 100644 index 00000000000..86ca70ae38c --- /dev/null +++ b/Resources/Prototypes/ADT/SoundCollections/screams.yml @@ -0,0 +1,7 @@ +- type: soundCollection + id: NovakidScreams + files: + - /Audio/ADT/Novakid/novakid_scream01.ogg + - /Audio/ADT/Novakid/novakid_scream02.ogg + - /Audio/ADT/Novakid/novakid_scream03.ogg + - /Audio/ADT/Novakid/novakid_scream04.ogg diff --git a/Resources/Prototypes/ADT/Species/fill.txt b/Resources/Prototypes/ADT/Species/fill.txt deleted file mode 100644 index b4954caf47d..00000000000 --- a/Resources/Prototypes/ADT/Species/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Species/novakid.yml b/Resources/Prototypes/ADT/Species/novakid.yml new file mode 100644 index 00000000000..e752eca6aeb --- /dev/null +++ b/Resources/Prototypes/ADT/Species/novakid.yml @@ -0,0 +1,153 @@ +- type: species + id: NovakidSpecies + name: species-name-novakid + roundStart: true + prototype: MobNovakid + sprites: MobNovakidSprites + defaultSkinTone: "#34a223" + markingLimits: MobNovakidMarkingLimits + dollPrototype: MobNovakidDummy + skinColoration: Hues + maleFirstNames: firstNovakid + femaleFirstNames: firstNovakid + maleLastNames: NovakidLast + femaleLastNames: NovakidLast + naming: firstlast + +- type: speciesBaseSprites + id: MobNovakidSprites + sprites: + Head: MobNovakidHead + Hair: MobHumanoidAnyMarking + HeadTop: MobHumanoidAnyMarking + HeadSide: MobHumanoidAnyMarking + Snout: MobHumanoidAnyMarking + Chest: MobNovakidTorso + LArm: MobNovakidLArm + RArm: MobNovakidRArm + LHand: MobNovakidLHand + RHand: MobNovakidRHand + LLeg: MobNovakidLLeg + RLeg: MobNovakidRLeg + LFoot: MobNovakidLFoot + RFoot: MobNovakidRFoot + +- type: markingPoints + id: MobNovakidMarkingLimits + onlyWhitelisted: true + points: + Head: + points: 1 + required: false + Hair: + points: 1 + required: false + HeadTop: + points: 1 + required: true + defaultMarkings: [HeadNovakidDefolt] + HeadSide: + points: 1 + required: true + defaultMarkings: [ NovakidFace1 ] + Chest: + points: 1 + required: true + defaultMarkings: [ TorsoNovakidDefolt ] + Tail: + points: 1 + required: false + Snout: + points: 1 + required: false + Legs: + points: 2 + required: false + Arms: + points: 2 + required: false + + +- type: humanoidBaseSprite + id: MobNovakidHead + baseSprite: + sprite: ADT/Mobs/Novakid/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobNovakidHeadMale + baseSprite: + sprite: ADT/Mobs/Novakid/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobNovakidHeadFemale + baseSprite: + sprite: ADT/Mobs/Novakid/parts.rsi + state: head_f + +- type: humanoidBaseSprite + id: MobNovakidTorso + baseSprite: + sprite: ADT/Mobs/Novakid/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobNovakidTorsoMale + baseSprite: + sprite: ADT/Mobs/Novakid/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobNovakidTorsoFemale + baseSprite: + sprite: ADT/Mobs/Novakid/parts.rsi + state: torso_f + +- type: humanoidBaseSprite + id: MobNovakidLLeg + baseSprite: + sprite: ADT/Mobs/Novakid/parts.rsi + state: l_leg + +- type: humanoidBaseSprite + id: MobNovakidLHand + baseSprite: + sprite: ADT/Mobs/Novakid/parts.rsi + state: l_hand + +- type: humanoidBaseSprite + id: MobNovakidLArm + baseSprite: + sprite: ADT/Mobs/Novakid/parts.rsi + state: l_arm + +- type: humanoidBaseSprite + id: MobNovakidLFoot + baseSprite: + sprite: ADT/Mobs/Novakid/parts.rsi + state: l_foot + +- type: humanoidBaseSprite + id: MobNovakidRLeg + baseSprite: + sprite: ADT/Mobs/Novakid/parts.rsi + state: r_leg + +- type: humanoidBaseSprite + id: MobNovakidRHand + baseSprite: + sprite: ADT/Mobs/Novakid/parts.rsi + state: r_hand + +- type: humanoidBaseSprite + id: MobNovakidRArm + baseSprite: + sprite: ADT/Mobs/Novakid/parts.rsi + state: r_arm + +- type: humanoidBaseSprite + id: MobNovakidRFoot + baseSprite: + sprite: ADT/Mobs/Novakid/parts.rsi + state: r_foot diff --git a/Resources/Prototypes/ADT/Traits/neutral.yml b/Resources/Prototypes/ADT/Traits/neutral.yml new file mode 100644 index 00000000000..17cd0d5aa33 --- /dev/null +++ b/Resources/Prototypes/ADT/Traits/neutral.yml @@ -0,0 +1,8 @@ +- type: trait + id: ADTHemophilia + name: trait-hemophilia-name + description: trait-hemophilia-desc + category: Disabilities + components: + - type: Hemophilia + modifier: 0.01 diff --git a/Resources/Prototypes/ADT/Voice/fill.txt b/Resources/Prototypes/ADT/Voice/fill.txt deleted file mode 100644 index b4954caf47d..00000000000 --- a/Resources/Prototypes/ADT/Voice/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Voice/speech_emote_sounds.yml b/Resources/Prototypes/ADT/Voice/speech_emote_sounds.yml index 8eb673d93f3..a8458542050 100644 --- a/Resources/Prototypes/ADT/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/ADT/Voice/speech_emote_sounds.yml @@ -31,6 +31,15 @@ collection: MaleCry Whistle: collection: Whistles + # ADT-Apathy Sounds. + Scream-apathy: + collection: NovakidScreams + Laugh-apathy: + collection: NovakidLaugh + Sigh-apathy: + collection: MaleSigh + Crying-apathy: + collection: MaleCry - type: emoteSounds id: FemaleDrask @@ -65,3 +74,132 @@ collection: FemaleCry Whistle: collection: Whistles + # ADT-Apathy Sounds. + Scream-apathy: + collection: NovakidScreams + Laugh-apathy: + collection: NovakidLaugh + Sigh-apathy: + collection: FemaleSigh + Crying-apathy: + collection: FemaleCry + +- type: emoteSounds + id: UnisexNovakid + params: + variation: 0.125 + sounds: + Scream: + collection: NovakidScreams + Laugh: + collection: NovakidLaugh + Sneeze: + collection: MaleSneezes + Cough: + collection: MaleCoughs + CatMeow: + collection: CatMeows + CatHisses: + collection: CatHisses + MonkeyScreeches: + collection: MonkeyScreeches + RobotBeep: + collection: RobotBeeps + Yawn: + collection: MaleYawn + Snore: + collection: Snores + Honk: + collection: BikeHorn + Sigh: + collection: MaleSigh + Crying: + collection: MaleCry + Whistle: + collection: Whistles + +- type: emoteSounds + id: MaleNovakid + params: + variation: 0.125 + sounds: + Scream: + collection: NovakidScreams + Laugh: + collection: NovakidLaugh + Sneeze: + collection: MaleSneezes + Cough: + collection: MaleCoughs + CatMeow: + collection: CatMeows + CatHisses: + collection: CatHisses + MonkeyScreeches: + collection: MonkeyScreeches + RobotBeep: + collection: RobotBeeps + Yawn: + collection: MaleYawn + Snore: + collection: Snores + Honk: + collection: BikeHorn + Sigh: + collection: MaleSigh + Crying: + collection: MaleCry + Whistle: + collection: Whistles + # ADT-Apathy Sounds. + Scream-apathy: + collection: NovakidScreams + Laugh-apathy: + collection: NovakidLaugh + Sigh-apathy: + collection: MaleSigh + Crying-apathy: + collection: MaleCry + +- type: emoteSounds + id: FemaleNovakid + params: + variation: 0.125 + sounds: + Scream: + collection: NovakidScreams + Laugh: + collection: NovakidLaugh + Sneeze: + collection: FemaleSneezes + Cough: + collection: FemaleCoughs + CatMeow: + collection: CatMeows + CatHisses: + collection: CatHisses + MonkeyScreeches: + collection: MonkeyScreeches + RobotBeep: + collection: RobotBeeps + Yawn: + collection: FemaleYawn + Snore: + collection: Snores + Honk: + collection: CluwneHorn + Sigh: + collection: FemaleSigh + Crying: + collection: FemaleCry + Whistle: + collection: Whistles + # ADT-Apathy Sounds. + Scream-apathy: + collection: NovakidScreams + Laugh-apathy: + collection: NovakidLaugh + Sigh-apathy: + collection: FemaleSigh + Crying-apathy: + collection: FemaleCry diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml index 2087d88655d..0a6f40dfbe0 100644 --- a/Resources/Prototypes/Reagents/gases.yml +++ b/Resources/Prototypes/Reagents/gases.yml @@ -4,7 +4,7 @@ desc: reagent-desc-oxygen physicalDesc: reagent-physical-desc-gaseous flavor: bitter - color: "#c4f5ff" + color: "#808080" boilingPoint: -183.0 meltingPoint: -218.4 metabolisms: @@ -20,6 +20,14 @@ - !type:OrganType type: Drask # End ADT tweak + - !type:Oxygenate + conditions: + - !type:OrganType + type: Drask + - !type:Oxygenate + conditions: + - !type:OrganType + type: Novakid - !type:Oxygenate conditions: - !type:OrganType @@ -41,25 +49,6 @@ ratios: CarbonDioxide: 1.0 Oxygen: -1.0 - - !type:HealthChange - conditions: - - !type:OrganType - type: Vox - scaleByQuantity: true - ignoreResistances: true - damage: - types: - Poison: - 7 - - !type:AdjustAlert - alertType: Toxins - conditions: - - !type:ReagentThreshold - min: 0.5 - - !type:OrganType - type: Vox - clear: true - time: 5 - type: reagent id: Plasma @@ -78,6 +67,10 @@ Poison: effects: - !type:HealthChange + conditions: + - !type:OrganType + type: Novakid + shouldHave: false damage: types: Poison: 3 @@ -87,18 +80,68 @@ Gas: effects: - !type:HealthChange + conditions: + - !type:OrganType + type: Novakid + shouldHave: false + - !type:ReagentThreshold + reagent: Plasma + min: 1 + ignoreResistances: true + damage: + types: + Poison: 1 + - !type:ChemVomit + probability: 0.12 + conditions: + - !type:OrganType + type: Novakid + shouldHave: false + - !type:ReagentThreshold + reagent: Plasma + min: 0.8 + - !type:HealthChange + conditions: + - !type:OrganType + type: Novakid + - !type:ReagentThreshold + reagent: Plasma + min: 0.6 scaleByQuantity: true ignoreResistances: true damage: types: - Poison: - 1 - # We need a metabolism effect on reagent removal + Blunt: -0.015 + Slash: -0.015 + Piercing: -0.015 + Heat: -0.015 + Poison: -0.012 + - !type:GenericStatusEffect + conditions: + - !type:OrganType + type: Novakid + - !type:ReagentThreshold + reagent: Plasma + min: 1 + key: SeeingRainbows + component: SeeingRainbows + type: Add + time: 5 + refresh: false + - !type:Drunk + conditions: + - !type:OrganType + type: Novakid + shouldHave: false + - !type:ReagentThreshold + reagent: Plasma + min: 1 + # Cant be added until I add metabolism effects on reagent removal - !type:AdjustAlert alertType: Toxins conditions: - - !type:ReagentThreshold - min: 1.5 + - !type:ReagentThreshold + min: 1.5 clear: True time: 5 reactiveEffects: diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/G_a.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/G_a.png new file mode 100644 index 00000000000..0fd11dfbf03 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/G_a.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/K.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/K.png new file mode 100644 index 00000000000..73aaba7c703 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/K.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/Nebula.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/Nebula.png new file mode 100644 index 00000000000..1d9b79f0be9 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/Nebula.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/braid.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/braid.png new file mode 100644 index 00000000000..a72899b001b Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/braid.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/comet.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/comet.png new file mode 100644 index 00000000000..59bd89c4002 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/comet.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/cone_a.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/cone_a.png new file mode 100644 index 00000000000..089b9cf2413 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/cone_a.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/connect_a.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/connect_a.png new file mode 100644 index 00000000000..fea84cbd100 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/connect_a.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/constellation.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/constellation.png new file mode 100644 index 00000000000..243326ec58d Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/constellation.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/crack.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/crack.png new file mode 100644 index 00000000000..331ecd59f4f Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/crack.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/cross.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/cross.png new file mode 100644 index 00000000000..4ad828ac8e8 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/cross.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/crucifix.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/crucifix.png new file mode 100644 index 00000000000..7b4214f1265 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/crucifix.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/dot_a.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/dot_a.png new file mode 100644 index 00000000000..9d4cee00e2b Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/dot_a.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/dotline_a.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/dotline_a.png new file mode 100644 index 00000000000..d8167b82a2c Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/dotline_a.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/dual.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/dual.png new file mode 100644 index 00000000000..c18bad8ad69 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/dual.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/duality.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/duality.png new file mode 100644 index 00000000000..a9603ea3120 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/duality.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/eye.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/eye.png new file mode 100644 index 00000000000..74f1b5e9c40 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/eye.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/eyes_a.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/eyes_a.png new file mode 100644 index 00000000000..16a01c2d04c Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/eyes_a.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/fame.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/fame.png new file mode 100644 index 00000000000..af8be8f2f59 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/fame.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/gas_cloud.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/gas_cloud.png new file mode 100644 index 00000000000..476c5c8b4ba Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/gas_cloud.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/gaseous_avalanche.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/gaseous_avalanche.png new file mode 100644 index 00000000000..1185d0898c4 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/gaseous_avalanche.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/h.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/h.png new file mode 100644 index 00000000000..6eac0e64249 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/h.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/head_novakid_defolt.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/head_novakid_defolt.png new file mode 100644 index 00000000000..21dfe804c9f Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/head_novakid_defolt.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/heart.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/heart.png new file mode 100644 index 00000000000..7905f6b125c Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/heart.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/house.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/house.png new file mode 100644 index 00000000000..23f1fd23e77 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/house.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/indicator.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/indicator.png new file mode 100644 index 00000000000..6bd869539a5 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/indicator.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/light_shine.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/light_shine.png new file mode 100644 index 00000000000..569ecdb286d Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/light_shine.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/lima-a.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/lima-a.png new file mode 100644 index 00000000000..8ac210b8f3f Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/lima-a.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/linedot_a.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/linedot_a.png new file mode 100644 index 00000000000..edf1ba1a7c5 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/linedot_a.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/little_light_starshine.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/little_light_starshine.png new file mode 100644 index 00000000000..4485419ccfa Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/little_light_starshine.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/little_star.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/little_star.png new file mode 100644 index 00000000000..0ede7940891 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/little_star.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/lunar_day.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/lunar_day.png new file mode 100644 index 00000000000..02c6db03f1f Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/lunar_day.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/meta.json b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/meta.json new file mode 100644 index 00000000000..18285e3b99c --- /dev/null +++ b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/meta.json @@ -0,0 +1,244 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:lunalita", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "braid", + "directions": 4 + }, + { + "name": "comet", + "directions": 4 + }, + { + "name": "constellation", + "directions": 4 + }, + { + "name": "crack", + "directions": 4 + }, + { + "name": "cross", + "directions": 4 + }, + { + "name": "crucifix", + "directions": 4 + }, + { + "name": "dual", + "directions": 4 + }, + { + "name": "duality", + "directions": 4 + }, + { + "name": "eye", + "directions": 4 + }, + { + "name": "fame", + "directions": 4 + }, + { + "name": "gas_cloud", + "directions": 4 + }, + { + "name": "gaseous_avalanche", + "directions": 4 + }, + { + "name": "h", + "directions": 4 + }, + { + "name": "heart", + "directions": 4 + }, + { + "name": "indicator", + "directions": 4 + }, + { + "name": "light_shine", + "directions": 4 + }, + { + "name": "little_light_starshine", + "directions": 4 + }, + { + "name": "little_star", + "directions": 4 + }, + { + "name": "lunar_day", + "directions": 4 + }, + { + "name": "meteoric_shower", + "directions": 4 + }, + { + "name": "milky_way", + "directions": 4 + }, + { + "name": "Nebula", + "directions": 4 + }, + { + "name": "note", + "directions": 4 + }, + { + "name": "prism", + "directions": 4 + }, + { + "name": "rune", + "directions": 4 + }, + { + "name": "solar_corona", + "directions": 4 + }, + { + "name": "squad", + "directions": 4 + }, + { + "name": "star_rain", + "directions": 4 + }, + { + "name": "starfall", + "directions": 4 + }, + { + "name": "starfire", + "directions": 4 + }, + { + "name": "sunshine", + "directions": 4 + }, + { + "name": "supernova", + "directions": 4 + }, + { + "name": "thrill", + "directions": 4 + }, + { + "name": "triple", + "directions": 4 + }, + { + "name": "uncrucifix", + "directions": 4 + }, + { + "name": "universal_style", + "directions": 4 + }, + { + "name": "virgo", + "directions": 4 + }, + { + "name": "x", + "directions": 4 + } + , + { + "name": "ye", + "directions": 4 + }, + { + "name": "zeta", + "directions": 4 + }, + { + "name": "head_novakid_defolt", + "directions": 4 + }, + { + "name": "torso_novakid_defolt", + "directions": 4 + }, + { + "name": "cone_a", + "directions": 4 + }, + { + "name": "connect_a", + "directions": 4 + }, + { + "name": "dot_a", + "directions": 4 + }, + { + "name": "dotline_a", + "directions": 4 + }, + { + "name": "G_a", + "directions": 4 + }, + { + "name": "house", + "directions": 4 + }, + { + "name": "K", + "directions": 4 + }, + { + "name": "lima-a", + "directions": 4 + }, + { + "name": "linedot_a", + "directions": 4 + }, + { + "name": "omega_a", + "directions": 4 + }, + { + "name": "plus", + "directions": 4 + }, + { + "name": "rose", + "directions": 4 + }, + { + "name": "shatter_a", + "directions": 4 + }, + { + "name": "star_a", + "directions": 4 + }, + { + "name": "two-a", + "directions": 4 + }, + { + "name": "eyes_a", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/meteoric_shower.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/meteoric_shower.png new file mode 100644 index 00000000000..b18fb864a1d Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/meteoric_shower.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/milky_way.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/milky_way.png new file mode 100644 index 00000000000..435f3551fb6 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/milky_way.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/note.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/note.png new file mode 100644 index 00000000000..b84fef13b21 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/note.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/omega_a.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/omega_a.png new file mode 100644 index 00000000000..f11693883a1 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/omega_a.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/plus.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/plus.png new file mode 100644 index 00000000000..361b003705b Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/plus.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/prism.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/prism.png new file mode 100644 index 00000000000..ef6dbd7ca7d Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/prism.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/rose.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/rose.png new file mode 100644 index 00000000000..e4e8447260c Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/rose.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/rune.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/rune.png new file mode 100644 index 00000000000..94418036a25 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/rune.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/shatter_a.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/shatter_a.png new file mode 100644 index 00000000000..96022e17ad4 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/shatter_a.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/solar_corona.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/solar_corona.png new file mode 100644 index 00000000000..ceaca8e3fa1 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/solar_corona.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/squad.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/squad.png new file mode 100644 index 00000000000..281985ffe71 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/squad.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/star_a.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/star_a.png new file mode 100644 index 00000000000..a5201c7a81c Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/star_a.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/star_rain.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/star_rain.png new file mode 100644 index 00000000000..8663a796eb8 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/star_rain.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/starfall.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/starfall.png new file mode 100644 index 00000000000..8fd73d0b099 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/starfall.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/starfire.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/starfire.png new file mode 100644 index 00000000000..70ecc1dc05a Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/starfire.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/sunshine.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/sunshine.png new file mode 100644 index 00000000000..b8fa56ffc02 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/sunshine.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/supernova.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/supernova.png new file mode 100644 index 00000000000..f32e05e3490 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/supernova.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/thrill.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/thrill.png new file mode 100644 index 00000000000..de21f219e9e Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/thrill.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/torso_novakid_defolt.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/torso_novakid_defolt.png new file mode 100644 index 00000000000..ebf121a6074 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/torso_novakid_defolt.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/triple.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/triple.png new file mode 100644 index 00000000000..be2bf559f09 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/triple.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/two-a.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/two-a.png new file mode 100644 index 00000000000..f6092ce9a98 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/two-a.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/uncrucifix.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/uncrucifix.png new file mode 100644 index 00000000000..08b6f3757f9 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/uncrucifix.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/universal_style.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/universal_style.png new file mode 100644 index 00000000000..7cdf64170e2 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/universal_style.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/virgo.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/virgo.png new file mode 100644 index 00000000000..8c17db7d161 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/virgo.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/x.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/x.png new file mode 100644 index 00000000000..57376f1cd1e Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/x.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/ye.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/ye.png new file mode 100644 index 00000000000..177e6fb2154 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/ye.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/zeta.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/zeta.png new file mode 100644 index 00000000000..a1def612c94 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/zeta.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/full_f.png b/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/full_f.png new file mode 100644 index 00000000000..5a4a6898d6e Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/full_f.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/full_m.png b/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/full_m.png new file mode 100644 index 00000000000..0349a404745 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/full_m.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/head_f.png b/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/head_f.png new file mode 100644 index 00000000000..ac696334e0d Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/head_f.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/head_m.png b/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/head_m.png new file mode 100644 index 00000000000..ac696334e0d Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/head_m.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/l_arm.png b/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/l_arm.png new file mode 100644 index 00000000000..f4d0d602735 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/l_arm.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/l_foot.png b/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/l_foot.png new file mode 100644 index 00000000000..5fb4181af43 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/l_foot.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/l_hand.png b/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/l_hand.png new file mode 100644 index 00000000000..63b021fdc1d Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/l_hand.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/l_leg.png b/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/l_leg.png new file mode 100644 index 00000000000..5ff37fb6468 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/l_leg.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/meta.json b/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/meta.json new file mode 100644 index 00000000000..c7fcca2b0f3 --- /dev/null +++ b/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:lunalita", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full_f" + }, + { + "name": "full_m" + }, + { + "name": "head_f", + "directions": 4 + }, + { + "name": "head_m", + "directions": 4 + }, + { + "name": "l_arm", + "directions": 4 + }, + { + "name": "l_foot", + "directions": 4 + }, + { + "name": "l_hand", + "directions": 4 + }, + { + "name": "l_leg", + "directions": 4 + }, + { + "name": "r_arm", + "directions": 4 + }, + { + "name": "r_foot", + "directions": 4 + }, + { + "name": "r_hand", + "directions": 4 + }, + { + "name": "r_leg", + "directions": 4 + }, + { + "name": "torso_f", + "directions": 4 + }, + { + "name": "torso_m", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/r_arm.png b/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/r_arm.png new file mode 100644 index 00000000000..ef130727fcc Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/r_arm.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/r_foot.png b/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/r_foot.png new file mode 100644 index 00000000000..c9f1019a721 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/r_foot.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/r_hand.png b/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/r_hand.png new file mode 100644 index 00000000000..613af0bade2 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/r_hand.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/r_leg.png b/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/r_leg.png new file mode 100644 index 00000000000..0c59528eed1 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/r_leg.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/torso_f.png b/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/torso_f.png new file mode 100644 index 00000000000..eb11c35ac60 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/torso_f.png differ diff --git a/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/torso_m.png b/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/torso_m.png new file mode 100644 index 00000000000..29c02bec0dc Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Novakid/parts.rsi/torso_m.png differ diff --git a/RobustToolbox b/RobustToolbox index fc1cca4f48f..860c9af2bfb 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit fc1cca4f48f2f2d3fbf41aa42b80b4e43b1095a4 +Subproject commit 860c9af2bfbf1477b96519067ef5e62b2525d987