diff --git a/Resources/Locale/ru-RU/research/technologies.ftl b/Resources/Locale/ru-RU/research/technologies.ftl index 95a9ff500a10cf..7af85c74482b6a 100644 --- a/Resources/Locale/ru-RU/research/technologies.ftl +++ b/Resources/Locale/ru-RU/research/technologies.ftl @@ -65,3 +65,6 @@ research-technology-honk-mech = Х.О.Н.К. Меха research-technology-advanced-spray = Продвинутый спрей research-technology-bluespace-cargo-transport = Блюспейс грузовой транспорт research-technology-clarke-aplu = КШГ Кларк +research-technology-Odyssey = ГМС Одиссей +research-technology-gygax = АБНТ Гайгэкс +research-technology-durand = БМП Дюранд diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/mechs_locale.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/mechs_locale.ftl index 9cea37ede7fc54..27723fd2d1faf4 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/mechs_locale.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/mechs_locale.ftl @@ -1,5 +1,5 @@ -ent-MechMaulerReal = АБМС «Маулер» - .desc = Перекрашенный синдикатом мародёр, был изрядно изменен, но все тот же старый добрый мародёр. +ent-MechMaulerReal = АБМС «Маулер» + .desc = Перекрашенный синдикатом мародёр, был изрядно изменен, но все тот же старый добрый мародёр. .suffix = { "механоид" } ent-MechMaulerDestroyed = сломанный АБМС «Маулер» .desc = больше не выстрелит, теперь он груда металла и микросхем. Используйте его остатки как хотите. @@ -11,25 +11,25 @@ ent-MechMarauderDestroyed = сломанный БПМ «Мародёр» .desc = больше не выстрелит, теперь он лишь груда металла и схем. .suffix = { "" } ent-MechDarkGygax = АБМС «Гайгэкс» - .desc = Перекрашенный синдикатом АБМНТ «Гайгэкс», потрёпан и сильно изношен, но все еще функционирует в штатном режиме. Прямо как с последней корпоротивной войны. + .desc = Перекрашенный синдикатом АБМНТ «Гайгэкс», потрёпан и сильно изношен, но все еще функционирует в штатном режиме. Прямо как с последней корпоротивной войны. .suffix = { "механоид" } ent-MechSeraph = БКМ «Серафим» - .desc = Броне-Командный Мех «Серафим». Это особая модель, используемая только высокопоставленными военными. + .desc = Броне-Командный Мех «Серафим». Это особая модель, используемая только высокопоставленными военными. .suffix = { "механоид" } ent-MechDurand = ПВМ «Дюранд» - .desc = Полицейский мех правительства земли, зачастую его просто используют в правоохранительных органах, так как он зарекомендовал себя как надежный мех поддержки. А ещё он довольно дешевый. + .desc = Полицейский мех правительства земли, зачастую его просто используют в правоохранительных органах, так как он зарекомендовал себя как надежный мех поддержки. А ещё он довольно дешевый. .suffix = { "механоид" } ent-MechGygaxDestroyed = сломанный АБМНТ «Гайгэкс» .desc = не уже поможет в нужный момент, можете собрать из него стол, он будет благодарен. .suffix = { "" } ent-MechDarkHonker = АБМС тёмный «Х.О.Н.К.» - .desc = Боевой мех на службе Хонкоматери, ой, то есть Синдиката... Да... + .desc = Боевой мех на службе Хонкоматери, ой, то есть Синдиката... Да... .suffix = { "механоид" } ent-MechDarkHonkerDestroyed = сломанный АБМС тёмный «Х.О.Н.К.» .desc = Исходя из своего состояния, дошутился... .suffix = { "" } ent-MechOdysseus = ГСМ «Одиссей» - .desc = Если постараться, то с этим мехом можно спасти бесчисленное количество жизней. + .desc = Если постараться, то с этим мехом можно спасти бесчисленное количество жизней. .suffix = { "механоид" } ent-MechOdysseusDestroyed = сломанный ГСМ «Одиссей» .desc = уже вылечил последнего члена экипажа, отныне он красивая декорация. @@ -41,13 +41,13 @@ ent-MechHaulerDestroyed = сломанный АТМЕ «Хаулер» .desc = Слишком много работал. Достройте за него, он занят ничем. .suffix = { "" } ent-MechClarke = КШГ «Кларк» - .desc = Гражданский мех, сделанный специально для шахтерских задач. + .desc = Гражданский мех, сделанный специально для шахтерских задач. .suffix = { "механоид" } ent-MechClarkeDestroyed = сломанный КШГ «Кларк» .desc = Не донес руды на станцию, оставьте его гнить тут, или сделайте из него что-нибудь. .suffix = { "" } ent-MechGygax = АБМНТ «Гайгэкс» - .desc = броне-пехотный механоид Поддержки «Гайгэкс», один из старых но хорошо зарекомендовавший себя. Используеться НаноТрейзен как вторичный механоид поддержки. + .desc = броне-пехотный механоид Поддержки «Гайгэкс», один из старых но хорошо зарекомендовавший себя. Используеться НаноТрейзен как вторичный механоид поддержки. .suffix = { "механоид" } ent-MechDarkGygaxDestroyed = сломанный АБМНТ «Гайгэкс» .desc = Ему не хватает запчастей чтоб взорвать что-нибудь, сделайте это за него, чтобы он не грустил. @@ -56,5 +56,5 @@ ent-MechDurandDestroyed = сломанный ПВМ «Дюранд» .desc = Не в состоянии патрулировать, но он пойдет как не очень живой щит. .suffix = { "" } ent-MechSeraphDestroyed = сломанный БКМ «Серафим» - .desc = Устроил свою последнюю резню, не дайте ему попасть в руки синдиката! - .suffix = { "" } \ No newline at end of file + .desc = Устроил свою последнюю резню, не дайте ему попасть в руки синдиката! + .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/mech/mech_construction.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/mech/mech_construction.ftl index 92e953cfbaebb0..02dcccff2fe2da 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/mech/mech_construction.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/mech/mech_construction.ftl @@ -103,3 +103,63 @@ ent-ClarkRArm = правая рука кларка ent-ClarkChassis = ходовая часть кларка .desc = Незавершённая конструкция мехи КШГ "Кларк". .suffix = { "" } +ent-OdysseusHarness = упряжь Одиссея + .desc = Основа мехи ГМС "Одиссей" + .suffix = { "" } +ent-OdysseusLArm = левая рука Одиссея + .desc = Левая рука ГМС "Одиссей". Крепится на ходовую часть мехи. + .suffix = { "" } +ent-OdysseusLLeg = левая нога Одиссея + .desc = Левая нога ГМС "Одиссей". Крепится на ходовую часть мехи. + .suffix = { "" } +ent-OdysseusRLeg = правая нога Одиссея + .desc = Правая нога ГМС "Одиссей". Крепится на ходовую часть мехи. + .suffix = { "" } +ent-OdysseusRArm = правая рука Одиссея + .desc = Правая рука ГМС "Одиссей". Крепится на ходовую часть мехи. + .suffix = { "" } +ent-OdysseusChassis = ходовая часть Одиссея + .desc = Незавершённая конструкция мехи ГМС "Одиссей". + .suffix = { "" } +ent-DurandHarness = упряжь Дюранда + .desc = Основа мехи БМП "Дюранд" + .suffix = { "" } +ent-DurandLArm = левая рука Дюранда + .desc = Левая рука БМП "Дюранд". Крепится на ходовую часть мехи. + .suffix = { "" } +ent-DurandLLeg = левая нога Дюранда + .desc = Левая нога БМП "Дюранд". Крепится на ходовую часть мехи. + .suffix = { "" } +ent-DurandRLeg = правая нога Дюранда + .desc = Правая нога БМП "Дюранд". Крепится на ходовую часть мехи. + .suffix = { "" } +ent-DurandRArm = правая рука Дюранда + .desc = Правая рука БМП "Дюранд". Крепится на ходовую часть мехи. + .suffix = { "" } +ent-DurandChassis = ходовая часть Дюранда + .desc = Незавершённая конструкция мехи БМП "Дюранд". + .suffix = { "" } +ent-DurandArmor = броня Дюранда + .desc = Броня БМП "Дюранд". Крепится на завершенную ходовую часть мехи. + .suffix = { "" } +ent-GygaxHarness = упряжь Гайгэкса + .desc = Основа мехи АБНТ " Гайгэкс" + .suffix = { "" } +ent-GygaxLArm = левая рука Гайгэкса + .desc = Левая рука АБНТ " Гайгэкс". Крепится на ходовую часть мехи. + .suffix = { "" } +ent-GygaxLLeg = левая нога Гайгэкса + .desc = Левая нога АБНТ " Гайгэкс". Крепится на ходовую часть мехи. + .suffix = { "" } +ent-GygaxRLeg = правая нога Гайгэкса + .desc = Правая ногаАБНТ " Гайгэкс". Крепится на ходовую часть мехи. + .suffix = { "" } +ent-GygaxRArm = правая рука Гайгэкса + .desc = Правая рука АБНТ " Гайгэкс". Крепится на ходовую часть мехи. + .suffix = { "" } +ent-GygaxChassis = ходовая часть Гайгэкса + .desc = Незавершённая конструкция мехи АБНТ " Гайгэкс". + .suffix = { "" } +ent-GygaxArmor = броня Гайгэкса + .desc = Броня АБНТ " Гайгэкс". Крепится на завершенную ходовую часть мехи. + .suffix = { "" } diff --git a/Resources/Prototypes/Entities/Mobs/mechs.yml b/Resources/Prototypes/Entities/Mobs/mechs.yml index 563ba5e79d1a4d..236cc635f4aed0 100644 --- a/Resources/Prototypes/Entities/Mobs/mechs.yml +++ b/Resources/Prototypes/Entities/Mobs/mechs.yml @@ -218,6 +218,11 @@ MechMaulerDestroyed: min: 1 max: 1 + - type: Explosive + explosionType: Default + maxIntensity: 100 + intensitySlope: 1.5 + totalIntensity: 200 - type: Access groups: - AllAccess @@ -560,7 +565,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 300 + damage: 400 behaviors: - !type:DoActsBehavior acts: ["Destruction"] diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mech_construction.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mech_construction.yml index c15baa694359af..494bed5fd3cc50 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mech_construction.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mech_construction.yml @@ -610,4 +610,412 @@ - type: Construction graph: Clark node: start - defaultTarget: Clark \ No newline at end of file + defaultTarget: Clark + +#Odysseus + +- type: entity + id: BaseOdysseusPart + parent: BaseMechPart + abstract: true + components: + - type: Sprite + drawdepth: Items + noRot: false + sprite: Objects/Specific/Mech/odysseus_construction.rsi + +- type: entity + id: BaseOdysseusPartItem + parent: BaseOdysseusPart + abstract: true + components: + - type: Item + size: 50 + +- type: entity + parent: BaseOdysseusPart + id: OdysseusHarness + name: Odysseus harness + description: The core of the Odysseus APLU. + components: + - type: Appearance + - type: ItemMapper + mapLayers: + Odysseus_l_arm+o: + whitelist: + tags: + - OdysseusLArm + Odysseus_r_arm+o: + whitelist: + tags: + - OdysseusRArm + Odysseus_l_leg+o: + whitelist: + tags: + - OdysseusLLeg + Odysseus_r_leg+o: + whitelist: + tags: + - OdysseusRLeg + sprite: Objects/Specific/Mech/odysseus_construction.rsi + - type: ContainerContainer + containers: + mech-assembly-container: !type:Container + - type: MechAssembly + finishedPrototype: OdysseusChassis + requiredParts: + OdysseusLArm: false + OdysseusRArm: false + OdysseusLLeg: false + OdysseusRLeg: false + - type: Sprite + state: Odysseus_harness+o + noRot: true + +- type: entity + parent: BaseOdysseusPartItem + id: OdysseusLArm + name: Odysseus left arm + description: The left arm of the Odysseus APLU. It belongs on the chassis of the mech. + components: + - type: Sprite + state: Odysseus_l_arm + - type: Tag + tags: + - OdysseusLArm + +- type: entity + parent: BaseOdysseusPartItem + id: OdysseusLLeg + name: Odysseus left leg + description: The left leg of the Odysseus APLU. It belongs on the chassis of the mech. + components: + - type: Sprite + state: Odysseus_l_leg + - type: Tag + tags: + - OdysseusLLeg + +- type: entity + parent: BaseOdysseusPartItem + id: OdysseusRLeg + name: Odysseus right leg + description: The right leg of the Odysseus APLU. It belongs on the chassis of the mech. + components: + - type: Sprite + state: Odysseus_r_leg + - type: Tag + tags: + - OdysseusRLeg + +- type: entity + parent: BaseOdysseusPartItem + id: OdysseusRArm + name: Odysseus right arm + description: The right arm of the Ripley APLU. It belongs on the chassis of the mech. + components: + - type: Sprite + state: Odysseus_r_arm + - type: Tag + tags: + - OdysseusRArm + +- type: entity + id: OdysseusChassis + parent: BaseOdysseusPart + name: Odysseus chassis + description: An in-progress construction of the Ripley APLU mech. + components: + - type: Appearance + - type: ContainerContainer + containers: + battery-container: !type:Container + - type: MechAssemblyVisuals + statePrefix: Odysseus + - type: Sprite + noRot: true + state: odysseus0 + - type: Construction + graph: Odysseus + node: start + defaultTarget: Odysseus + +#Durand + +- type: entity + id: BaseDurandPart + parent: BaseMechPart + abstract: true + components: + - type: Sprite + drawdepth: Items + noRot: false + sprite: Objects/Specific/Mech/durand_construction.rsi + +- type: entity + id: BaseDurandPartItem + parent: BaseDurandPart + abstract: true + components: + - type: Item + size: 50 + +- type: entity + parent: BaseDurandPart + id: DurandHarness + name: Durand harness + description: The core of the Durand APLU. + components: + - type: Appearance + - type: ItemMapper + mapLayers: + Durand_l_arm+o: + whitelist: + tags: + - DurandLArm + Durand_r_arm+o: + whitelist: + tags: + - DurandRArm + Durand_l_leg+o: + whitelist: + tags: + - DurandLLeg + Durand_r_leg+o: + whitelist: + tags: + - DurandRLeg + sprite: Objects/Specific/Mech/durand_construction.rsi + - type: ContainerContainer + containers: + mech-assembly-container: !type:Container + - type: MechAssembly + finishedPrototype: DurandChassis + requiredParts: + DurandLArm: false + DurandRArm: false + DurandLLeg: false + DurandRLeg: false + - type: Sprite + state: Durand_harness+o + noRot: true + +- type: entity + parent: BaseDurandPartItem + id: DurandLArm + name: Durand left arm + description: The left arm of the Durand APLU. It belongs on the chassis of the mech. + components: + - type: Sprite + state: Durand_l_arm + - type: Tag + tags: + - DurandLArm + +- type: entity + parent: BaseDurandPartItem + id: DurandLLeg + name: Durand left leg + description: The left leg of the Durand APLU. It belongs on the chassis of the mech. + components: + - type: Sprite + state: Durand_l_leg + - type: Tag + tags: + - DurandLLeg + +- type: entity + parent: BaseDurandPartItem + id: DurandRLeg + name: Durand right leg + description: The right leg of the Durand APLU. It belongs on the chassis of the mech. + components: + - type: Sprite + state: Durand_r_leg + - type: Tag + tags: + - DurandRLeg + +- type: entity + parent: BaseDurandPartItem + id: DurandRArm + name: Durand right arm + description: The right arm of the Ripley APLU. It belongs on the chassis of the mech. + components: + - type: Sprite + state: Durand_r_arm + - type: Tag + tags: + - DurandRArm + +- type: entity + id: DurandChassis + parent: BaseDurandPart + name: Durand chassis + description: An in-progress construction of the Ripley APLU mech. + components: + - type: Appearance + - type: ContainerContainer + containers: + battery-container: !type:Container + - type: MechAssemblyVisuals + statePrefix: Durand + - type: Sprite + noRot: true + state: Durand0 + - type: Construction + graph: Durand + node: start + defaultTarget: Durand + +- type: entity + parent: BaseDurandPartItem + id: DurandArmor + name: Durand Armor + description: The armor of the Durand APLU. It belongs on the chassis of the mech. + components: + - type: Sprite + state: Durand_armor + - type: Tag + tags: + - DurandArmor + +#Gygax + +- type: entity + id: BaseGygaxPart + parent: BaseMechPart + abstract: true + components: + - type: Sprite + drawdepth: Items + noRot: false + sprite: Objects/Specific/Mech/gygax_construction.rsi + +- type: entity + id: BaseGygaxPartItem + parent: BaseGygaxPart + abstract: true + components: + - type: Item + size: 50 + +- type: entity + parent: BaseGygaxPart + id: GygaxHarness + name: Gygax harness + description: The core of the Gygax APLU. + components: + - type: Appearance + - type: ItemMapper + mapLayers: + Gygax_l_arm+o: + whitelist: + tags: + - GygaxLArm + Gygax_r_arm+o: + whitelist: + tags: + - GygaxRArm + Gygax_l_leg+o: + whitelist: + tags: + - GygaxLLeg + Gygax_r_leg+o: + whitelist: + tags: + - GygaxRLeg + sprite: Objects/Specific/Mech/gygax_construction.rsi + - type: ContainerContainer + containers: + mech-assembly-container: !type:Container + - type: MechAssembly + finishedPrototype: GygaxChassis + requiredParts: + GygaxLArm: false + GygaxRArm: false + GygaxLLeg: false + GygaxRLeg: false + - type: Sprite + state: Gygax_harness+o + noRot: true + +- type: entity + parent: BaseGygaxPartItem + id: GygaxLArm + name: Gygax left arm + description: The left arm of the Gygax APLU. It belongs on the chassis of the mech. + components: + - type: Sprite + state: Gygax_l_arm + - type: Tag + tags: + - GygaxLArm + +- type: entity + parent: BaseGygaxPartItem + id: GygaxLLeg + name: Gygax left leg + description: The left leg of the Gygax APLU. It belongs on the chassis of the mech. + components: + - type: Sprite + state: Gygax_l_leg + - type: Tag + tags: + - GygaxLLeg + +- type: entity + parent: BaseGygaxPartItem + id: GygaxRLeg + name: Gygax right leg + description: The right leg of the Gygax APLU. It belongs on the chassis of the mech. + components: + - type: Sprite + state: Gygax_r_leg + - type: Tag + tags: + - GygaxRLeg + +- type: entity + parent: BaseGygaxPartItem + id: GygaxRArm + name: Gygax right arm + description: The right arm of the Ripley APLU. It belongs on the chassis of the mech. + components: + - type: Sprite + state: Gygax_r_arm + - type: Tag + tags: + - GygaxRArm + +- type: entity + id: GygaxChassis + parent: BaseGygaxPart + name: Gygax chassis + description: An in-progress construction of the Ripley APLU mech. + components: + - type: Appearance + - type: ContainerContainer + containers: + battery-container: !type:Container + - type: MechAssemblyVisuals + statePrefix: Gygax + - type: Sprite + noRot: true + state: Gygax0 + - type: Construction + graph: Gygax + node: start + defaultTarget: Gygax + +- type: entity + parent: BaseGygaxPartItem + id: GygaxArmor + name: Gygax Armor + description: The armor of the Gygax APLU. It belongs on the chassis of the mech. + components: + - type: Sprite + state: Gygax_armor + - type: Tag + tags: + - GygaxArmor diff --git a/Resources/Prototypes/Entities/Objects/Weapons/mech.yml b/Resources/Prototypes/Entities/Objects/Weapons/mech.yml index a70086264c4221..256fd3c630871a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/mech.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/mech.yml @@ -49,7 +49,7 @@ - type: Item size: 80 - type: Gun - fireRate: 1 + fireRate: 2 selectedMode: FullAuto availableModes: - FullAuto @@ -60,7 +60,7 @@ whitelist: tags: - CartridgeRocket - capacity: 10 + capacity: 100 proto: CartridgeRocketSlow soundInsert: path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg @@ -88,7 +88,7 @@ - SemiAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/rpgfire.ogg - capacity: 20 + capacity: 100 proto: CartridgeRocket soundInsert: path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg @@ -107,8 +107,8 @@ sprite: Objects/Specific/Mech/mecha_equipment.rsi state: mecha_disabler - type: Gun - maxAngle: 30 - minAngle: 30 + maxAngle: 10 + minAngle: 0 fireRate: 2 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/taser2.ogg @@ -125,6 +125,9 @@ magState: mag steps: 5 zeroVisible: true + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 40 - type: Appearance - type: AmmoCounter - type: MechEquipment diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index f45ccda84f6930..720b9b418b366d 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -303,11 +303,6 @@ idleState: icon runningState: building dynamicRecipes: - - ClarkHarness - - ClarkLArm - - ClarkLLeg - - ClarkRLeg - - ClarkRArm - ThermomachineFreezerMachineCircuitBoard - PortableScrubberMachineCircuitBoard - CloningPodMachineCircuitboard @@ -496,12 +491,30 @@ - ClarkLLeg - ClarkRLeg - ClarkRArm + - OdysseusHarness + - OdysseusLArm + - OdysseusLLeg + - OdysseusRLeg + - OdysseusRArm + - DurandHarness + - DurandLArm + - DurandLLeg + - DurandRLeg + - DurandRArm + - DurandArmor + - GygaxHarness + - GygaxLArm + - GygaxLLeg + - GygaxRLeg + - GygaxRArm + - GygaxArmor - type: MaterialStorage whitelist: tags: - Sheet - RawMaterial - Ingot + - Uranium - type: GuideHelp guides: - Robotics diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/mechs/durand_construction.yml b/Resources/Prototypes/Recipes/Construction/Graphs/mechs/durand_construction.yml new file mode 100644 index 00000000000000..5eb9b48b89ca36 --- /dev/null +++ b/Resources/Prototypes/Recipes/Construction/Graphs/mechs/durand_construction.yml @@ -0,0 +1,104 @@ +- type: constructionGraph + id: Durand + start: start + graph: + - node: start + edges: + - to: Durand + steps: + - tool: Anchoring + doAfter: 1 + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 1 + + - tool: Screwing + doAfter: 1 + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 2 + + - material: Cable + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 3 + + - tool: Cutting + doAfter: 1 + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 4 + + - tool: Screwing + doAfter: 1 + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 5 + + - component: PowerCell + name: power cell + store: battery-container + doAfter: 1 + icon: + sprite: Objects/Power/power_cells.rsi + state: small + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 6 + + - tool: Screwing + doAfter: 2 + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 7 + + - material: Steel + amount: 5 + doAfter: 1 + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 8 + + - tool: Anchoring + doAfter: 1 + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 9 + + - tool: Welding + doAfter: 1 + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 10 + + - tag: DurandArmor + doAfter: 1 + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 11 + + - tool: Anchoring + doAfter: 1 + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 12 + + - tool: Welding + doAfter: 1 + + - node: Durand + actions: + - !type:BuildMech + mechPrototype: MechDurand diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/mechs/gygex_construction.yml b/Resources/Prototypes/Recipes/Construction/Graphs/mechs/gygex_construction.yml new file mode 100644 index 00000000000000..413d58e3e2af5f --- /dev/null +++ b/Resources/Prototypes/Recipes/Construction/Graphs/mechs/gygex_construction.yml @@ -0,0 +1,102 @@ +- type: constructionGraph + id: Gygax + start: start + graph: + - node: start + edges: + - to: Gygax + steps: + - tool: Anchoring + doAfter: 1 + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 1 + + - tool: Screwing + doAfter: 1 + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 2 + + - material: Cable + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 3 + + - tool: Cutting + doAfter: 1 + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 4 + + - tool: Screwing + doAfter: 1 + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 5 + + - component: PowerCell + name: power cell + store: battery-container + icon: + sprite: Objects/Power/power_cells.rsi + state: small + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 6 + + - tool: Screwing + doAfter: 1 + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 7 + + - material: Steel + amount: 5 + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 8 + + - tool: Anchoring + doAfter: 1 + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 9 + + - tool: Welding + doAfter: 1 + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 10 + + - tag: GygaxArmor + doAfter: 1 + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 11 + + - tool: Welding + doAfter: 1 + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 12 + + - tool: Screwing + doAfter: 1 + + - node: Gygax + actions: + - !type:BuildMech + mechPrototype: MechGygax \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/mechs/odissey_construction.yml b/Resources/Prototypes/Recipes/Construction/Graphs/mechs/odissey_construction.yml new file mode 100644 index 00000000000000..fe5474f0e24d15 --- /dev/null +++ b/Resources/Prototypes/Recipes/Construction/Graphs/mechs/odissey_construction.yml @@ -0,0 +1,98 @@ +- type: constructionGraph + id: Odysseus + start: start + graph: + - node: start + edges: + - to: Odysseus + steps: + - tool: Anchoring + doAfter: 1 + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 1 + + - tool: Screwing + doAfter: 1 + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 2 + + - material: Cable + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 3 + + - tool: Cutting + doAfter: 1 + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 4 + + - tool: Screwing + doAfter: 1 + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 5 + + - component: PowerCell + name: power cell + store: battery-container + doAfter: 1 + icon: + sprite: Objects/Power/power_cells.rsi + state: small + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 6 + + - tool: Screwing + doAfter: 2 + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 7 + + - material: Steel + amount: 5 + doAfter: 1 + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 8 + + - tool: Anchoring + doAfter: 1 + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 9 + + - tool: Welding + doAfter: 1 + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 10 + + - material: Plasteel + amount: 5 + doAfter: 1 + completed: + - !type:VisualizerDataInt + key: "enum.MechAssemblyVisuals.State" + data: 11 + + - tool: Welding + doAfter: 5 + + - node: Odysseus + actions: + - !type:BuildMech + mechPrototype: MechOdysseus diff --git a/Resources/Prototypes/Recipes/Lathes/mech_parts.yml b/Resources/Prototypes/Recipes/Lathes/mech_parts.yml index 73ed0baa5acc4a..5f2f5181c637f5 100644 --- a/Resources/Prototypes/Recipes/Lathes/mech_parts.yml +++ b/Resources/Prototypes/Recipes/Lathes/mech_parts.yml @@ -210,3 +210,162 @@ materials: Steel: 4000 Glass: 1250 + +#Odysseus +- type: latheRecipe + id: OdysseusHarness + result: OdysseusHarness + completetime: 10 + materials: + Steel: 5500 + Glass: 600 + +- type: latheRecipe + id: OdysseusLArm + result: OdysseusLArm + completetime: 10 + materials: + Steel: 3500 + Glass: 2000 + +- type: latheRecipe + id: OdysseusLLeg + result: OdysseusLLeg + completetime: 10 + materials: + Steel: 4000 + Glass: 1500 + +- type: latheRecipe + id: OdysseusRLeg + result: OdysseusRLeg + completetime: 10 + materials: + Steel: 4000 + Glass: 1500 + +- type: latheRecipe + id: OdysseusRArm + result: OdysseusRArm + completetime: 10 + materials: + Steel: 3500 + Glass: 2500 + +#Gygax + +- type: latheRecipe + id: GygaxHarness + result: GygaxHarness + completetime: 10 + materials: + Steel: 7000 + Glass: 1500 + Gold: 500 + Silver: 1000 + +- type: latheRecipe + id: GygaxLArm + result: GygaxLArm + completetime: 10 + materials: + Steel: 5500 + Glass: 1500 + Gold: 500 + Silver: 1000 + +- type: latheRecipe + id: GygaxLLeg + result: GygaxLLeg + completetime: 10 + materials: + Steel: 7000 + Silver: 2000 + Gold: 500 + +- type: latheRecipe + id: GygaxRLeg + result: GygaxRLeg + completetime: 10 + materials: + Steel: 7000 + Silver: 2000 + Gold: 500 + +- type: latheRecipe + id: GygaxRArm + result: GygaxRArm + completetime: 10 + materials: + Steel: 5500 + Glass: 1500 + Gold: 500 + Silver: 1000 + +- type: latheRecipe + id: GygaxArmor + result: GygaxArmor + completetime: 10 + materials: + Steel: 8000 + Glass: 500 + Silver: 2000 + Gold: 1000 + +#Durand + +- type: latheRecipe + id: DurandHarness + result: DurandHarness + completetime: 10 + materials: + Steel: 6000 + Glass: 1000 + Silver: 500 + Uranium: 1000 + +- type: latheRecipe + id: DurandLArm + result: DurandLArm + completetime: 10 + materials: + Steel: 5000 + Glass: 2000 + Silver: 500 + Uranium: 500 + +- type: latheRecipe + id: DurandLLeg + result: DurandLLeg + completetime: 10 + materials: + Steel: 6000 + Silver: 1000 + +- type: latheRecipe + id: DurandRLeg + result: DurandRLeg + completetime: 10 + materials: + Steel: 6000 + Silver: 1000 + +- type: latheRecipe + id: DurandRArm + result: DurandRArm + completetime: 10 + materials: + Steel: 5000 + Glass: 2000 + Silver: 500 + Uranium: 500 + +- type: latheRecipe + id: DurandArmor + result: DurandArmor + completetime: 10 + materials: + Steel: 8000 + Glass: 1000 + Silver: 1000 + Uranium: 1000 diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index fc530b8bbad4d8..c392dca4f92b82 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -136,8 +136,42 @@ - TelescopicShield - HoloprojectorSecurity +- type: technology + id: durandbmp + name: research-technology-durand + icon: + sprite: Objects/Specific/Mech/mecha.rsi + state: durand + discipline: Arsenal + tier: 2 + cost: 15000 + recipeUnlocks: + - DurandLArm + - DurandLLeg + - DurandRLeg + - DurandRArm + - DurandArmor + - DurandHarness + # Tier 3 +- type: technology + id: gygaxabnt + name: research-technology-gygax + icon: + sprite: Objects/Specific/Mech/mecha.rsi + state: gygax + discipline: Arsenal + tier: 3 + cost: 20000 + recipeUnlocks: + - GygaxHarness + - GygaxLArm + - GygaxLLeg + - GygaxRLeg + - GygaxRArm + - GygaxArmor + - type: technology id: HandheldElectricalPropulsion name: research-technology-handheld-electrical-propulsion diff --git a/Resources/Prototypes/Research/biochemical.yml b/Resources/Prototypes/Research/biochemical.yml index c0433ff06e63f9..f46e780371b882 100644 --- a/Resources/Prototypes/Research/biochemical.yml +++ b/Resources/Prototypes/Research/biochemical.yml @@ -116,6 +116,22 @@ recipeUnlocks: - HandheldCrewMonitor +- type: technology + id: Odysseygms + name: research-technology-Odyssey + icon: + sprite: Objects/Specific/Mech/mecha.rsi + state: odysseus + discipline: Biochemical + tier: 2 + cost: 7500 + recipeUnlocks: + - OdysseusRArm + - OdysseusLLeg + - OdysseusRLeg + - OdysseusRArm + - OdysseusHarness + - OdysseusLArm # Tier 3 - type: technology diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index c3c3949ed458ae..46d4e287ac0821 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -26,7 +26,7 @@ id: Balloon - type: Tag - id: BaseballBat + id: BaseballBat - type: Tag id: BBQsauce @@ -309,7 +309,7 @@ id: CluwneHorn - type: Tag #Ohioans die happy - id: Corn + id: Corn - type: Tag id: Coldsauce @@ -1047,7 +1047,7 @@ - type: Tag id: WallmountSubstationElectronics - + - type: Tag id: WeaponPistolCHIMPUpgradeKit @@ -1098,3 +1098,45 @@ - type: Tag id: ClarkRArm + +- type: Tag + id: OdysseusLArm + +- type: Tag + id: OdysseusLLeg + +- type: Tag + id: OdysseusRLeg + +- type: Tag + id: OdysseusRArm + +- type: Tag + id: DurandLArm + +- type: Tag + id: DurandLLeg + +- type: Tag + id: DurandRLeg + +- type: Tag + id: DurandRArm + +- type: Tag + id: DurandArmor + +- type: Tag + id: GygaxLArm + +- type: Tag + id: GygaxLLeg + +- type: Tag + id: GygaxRLeg + +- type: Tag + id: GygaxRArm + +- type: Tag + id: GygaxArmor diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand0.png b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand0.png new file mode 100644 index 00000000000000..b94f935a073e05 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand0.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand1.png b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand1.png new file mode 100644 index 00000000000000..9d8db1028ae022 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand1.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand10.png b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand10.png new file mode 100644 index 00000000000000..6bd4fd223aaf72 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand10.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand11.png b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand11.png new file mode 100644 index 00000000000000..3da36ede3822c8 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand11.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand12.png b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand12.png new file mode 100644 index 00000000000000..b3f022df3c7c34 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand12.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand2.png b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand2.png new file mode 100644 index 00000000000000..2f4c63b8c5a27f Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand2.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand3.png b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand3.png new file mode 100644 index 00000000000000..63cc45f39bccdc Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand3.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand4.png b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand4.png new file mode 100644 index 00000000000000..10a9b76423a386 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand4.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand5.png b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand5.png new file mode 100644 index 00000000000000..f310689c1cf61f Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand5.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand6.png b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand6.png new file mode 100644 index 00000000000000..95de1294167b1b Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand6.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand7.png b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand7.png new file mode 100644 index 00000000000000..32e8f4169b19c7 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand7.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand8.png b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand8.png new file mode 100644 index 00000000000000..c1cf6d5485f432 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand8.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand9.png b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand9.png new file mode 100644 index 00000000000000..da8af5a091b5ff Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand9.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_armor.png b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_armor.png new file mode 100644 index 00000000000000..b7925d3ecc93ec Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_armor.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_harness+o.png b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_harness+o.png new file mode 100644 index 00000000000000..09c1d9296edcdd Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_harness+o.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_harness.png b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_harness.png new file mode 100644 index 00000000000000..75bc46691edb7b Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_harness.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_l_arm+o.png b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_l_arm+o.png new file mode 100644 index 00000000000000..0c168d0cdb1831 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_l_arm+o.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_l_arm.png b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_l_arm.png new file mode 100644 index 00000000000000..ab3a803f54d05f Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_l_arm.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_l_leg+o.png b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_l_leg+o.png new file mode 100644 index 00000000000000..3603c6df8bc2fa Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_l_leg+o.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_l_leg.png b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_l_leg.png new file mode 100644 index 00000000000000..f6f9377ffe19e3 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_l_leg.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_r_arm+o.png b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_r_arm+o.png new file mode 100644 index 00000000000000..0000a1a5c62fc8 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_r_arm+o.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_r_arm.png b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_r_arm.png new file mode 100644 index 00000000000000..4934a7a277251a Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_r_arm.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_r_leg+o.png b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_r_leg+o.png new file mode 100644 index 00000000000000..21887b6dec6760 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_r_leg+o.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_r_leg.png b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_r_leg.png new file mode 100644 index 00000000000000..2daa3d391941cf Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/Durand_r_leg.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/meta.json b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/meta.json new file mode 100644 index 00000000000000..a18659f2b60905 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/meta.json @@ -0,0 +1,91 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation at at https://github.com/tgstation/tgstation/commit/d4391e19eaad2c9970ee5ec7547cda0980a223b1", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "Durand_harness\u002Bo" + }, + { + "name": "Durand_l_arm" + }, + { + "name": "Durand_l_arm\u002Bo" + }, + { + "name": "Durand_l_leg" + }, + { + "name": "Durand_l_leg\u002Bo" + }, + { + "name": "Durand_r_arm" + }, + { + "name": "Durand_r_arm\u002Bo" + }, + { + "name": "Durand_r_leg" + }, + { + "name": "Durand_r_leg\u002Bo" + }, + { + "name": "Durand_armor" + }, + { + "name": "Durand_harness" + }, + { + "name": "Durand10", + "delays": [ + [ + 0.5, + 1, + 0.5, + 1 + ] + ] + }, + { + "name": "Durand11" + }, + { + "name": "Durand12" + }, + { + "name": "Durand0" + }, + { + "name": "Durand1" + }, + { + "name": "Durand2" + }, + { + "name": "Durand3" + }, + { + "name": "Durand4" + }, + { + "name": "Durand5" + }, + { + "name": "Durand6" + }, + { + "name": "Durand7" + }, + { + "name": "Durand8" + }, + { + "name": "Durand9" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax0.png b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax0.png new file mode 100644 index 00000000000000..4444d195e696d5 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax0.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax1.png b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax1.png new file mode 100644 index 00000000000000..492836d79cd5ba Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax1.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax10.png b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax10.png new file mode 100644 index 00000000000000..4c101e4fcf7c06 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax10.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax11.png b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax11.png new file mode 100644 index 00000000000000..6fad0c0d1d1a37 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax11.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax12.png b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax12.png new file mode 100644 index 00000000000000..ae0f808c95812e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax12.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax2.png b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax2.png new file mode 100644 index 00000000000000..064c5734875680 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax2.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax3.png b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax3.png new file mode 100644 index 00000000000000..b338ea867be266 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax3.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax4.png b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax4.png new file mode 100644 index 00000000000000..cca6b2de54f7e2 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax4.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax5.png b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax5.png new file mode 100644 index 00000000000000..cd98f134f5d241 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax5.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax6.png b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax6.png new file mode 100644 index 00000000000000..4c101e4fcf7c06 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax6.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax7.png b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax7.png new file mode 100644 index 00000000000000..fad94386f0e28b Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax7.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax8.png b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax8.png new file mode 100644 index 00000000000000..1411d88dca3c6d Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax8.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax9.png b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax9.png new file mode 100644 index 00000000000000..7c33b55f170ca0 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax9.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_armor.png b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_armor.png new file mode 100644 index 00000000000000..70c43bd960ef90 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_armor.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_chassis.png b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_chassis.png new file mode 100644 index 00000000000000..ead41304ddb553 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_chassis.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_harness+o.png b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_harness+o.png new file mode 100644 index 00000000000000..5b6ad43d37391c Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_harness+o.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_harness.png b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_harness.png new file mode 100644 index 00000000000000..403a574ff5389a Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_harness.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_l_arm+o.png b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_l_arm+o.png new file mode 100644 index 00000000000000..7d8739484e56ff Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_l_arm+o.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_l_arm.png b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_l_arm.png new file mode 100644 index 00000000000000..ed756014a65c6a Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_l_arm.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_l_leg+o.png b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_l_leg+o.png new file mode 100644 index 00000000000000..42d6f7b35583cf Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_l_leg+o.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_l_leg.png b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_l_leg.png new file mode 100644 index 00000000000000..7fd0576f9e1bd7 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_l_leg.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_r_arm+o.png b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_r_arm+o.png new file mode 100644 index 00000000000000..e76face7962374 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_r_arm+o.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_r_arm.png b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_r_arm.png new file mode 100644 index 00000000000000..98137c1e50262b Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_r_arm.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_r_leg+o.png b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_r_leg+o.png new file mode 100644 index 00000000000000..4d494a0b097059 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_r_leg+o.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_r_leg.png b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_r_leg.png new file mode 100644 index 00000000000000..3b16a068e0c77f Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/Gygax_r_leg.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/meta.json b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/meta.json new file mode 100644 index 00000000000000..8da2d8a077462e --- /dev/null +++ b/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/meta.json @@ -0,0 +1,86 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation at at https://github.com/tgstation/tgstation/commit/d4391e19eaad2c9970ee5ec7547cda0980a223b1", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "Gygax0" + }, + { + "name": "Gygax1" + }, + { + "name": "Gygax2" + }, + { + "name": "Gygax9" + }, + { + "name": "Gygax10" + }, + { + "name": "Gygax8" + }, + { + "name": "Gygax11" + }, + { + "name": "Gygax12" + }, + { + "name": "Gygax3" + }, + { + "name": "Gygax4" + }, + { + "name": "Gygax5" + }, + { + "name": "Gygax7" + }, + { + "name": "Gygax_chassis" + }, + { + "name": "Gygax_harness\u002Bo" + }, + { + "name": "Gygax_harness" + }, + { + "name": "Gygax_l_arm\u002Bo" + }, + { + "name": "Gygax_l_arm" + }, + { + "name": "Gygax_l_leg\u002Bo" + }, + { + "name": "Gygax_l_leg" + }, + { + "name": "Gygax_r_arm\u002Bo" + }, + { + "name": "Gygax_r_arm" + }, + { + "name": "Gygax_r_leg\u002Bo" + }, + { + "name": "Gygax_r_leg" + }, + { + "name": "Gygax6" + }, + { + "name": "Gygax_armor" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/Odysseus_harness+o.png b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/Odysseus_harness+o.png new file mode 100644 index 00000000000000..8ab13256c402d1 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/Odysseus_harness+o.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/Odysseus_harness.png b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/Odysseus_harness.png new file mode 100644 index 00000000000000..0b43875ff22a25 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/Odysseus_harness.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/Odysseus_l_arm+o.png b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/Odysseus_l_arm+o.png new file mode 100644 index 00000000000000..3f28a039984301 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/Odysseus_l_arm+o.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/Odysseus_l_arm.png b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/Odysseus_l_arm.png new file mode 100644 index 00000000000000..8025fe8609582a Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/Odysseus_l_arm.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/Odysseus_l_leg+o.png b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/Odysseus_l_leg+o.png new file mode 100644 index 00000000000000..692cbcdc14d10d Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/Odysseus_l_leg+o.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/Odysseus_l_leg.png b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/Odysseus_l_leg.png new file mode 100644 index 00000000000000..483c75b3b25faf Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/Odysseus_l_leg.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/Odysseus_r_arm+o.png b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/Odysseus_r_arm+o.png new file mode 100644 index 00000000000000..116c024ceb7605 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/Odysseus_r_arm+o.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/Odysseus_r_arm.png b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/Odysseus_r_arm.png new file mode 100644 index 00000000000000..0ff60977f01345 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/Odysseus_r_arm.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/Odysseus_r_leg+o.png b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/Odysseus_r_leg+o.png new file mode 100644 index 00000000000000..b61f657b7c3d4e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/Odysseus_r_leg+o.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/Odysseus_r_leg.png b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/Odysseus_r_leg.png new file mode 100644 index 00000000000000..d1a84ea91c9901 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/Odysseus_r_leg.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/meta.json b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/meta.json new file mode 100644 index 00000000000000..8666231ea729fa --- /dev/null +++ b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/meta.json @@ -0,0 +1,85 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation at at https://github.com/tgstation/tgstation/commit/d4391e19eaad2c9970ee5ec7547cda0980a223b1", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "Odysseus_l_leg" + }, + { + "name": "Odysseus_l_leg\u002Bo" + }, + { + "name": "Odysseus_r_arm" + }, + { + "name": "Odysseus_r_arm\u002Bo" + }, + { + "name": "Odysseus_r_leg" + }, + { + "name": "Odysseus_r_leg\u002Bo" + }, + { + "name": "Odysseus_harness" + }, + { + "name": "Odysseus_harness\u002Bo" + }, + { + "name": "Odysseus_l_arm" + }, + { + "name": "Odysseus_l_arm\u002Bo" + }, + { + "name": "odysseus9" + }, + { + "name": "odysseus10", + "delays": [ + [ + 0.5, + 1, + 0.5, + 1 + ] + ] + }, + { + "name": "odysseus8" + }, + { + "name": "odysseus11" + }, + { + "name": "odysseus0" + }, + { + "name": "odysseus1" + }, + { + "name": "odysseus2" + }, + { + "name": "odysseus3" + }, + { + "name": "odysseus4" + }, + { + "name": "odysseus5" + }, + { + "name": "odysseus6" + }, + { + "name": "odysseus7" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus0.png b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus0.png new file mode 100644 index 00000000000000..7c2ee64d88998f Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus0.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus1.png b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus1.png new file mode 100644 index 00000000000000..7c2ee64d88998f Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus1.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus10.png b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus10.png new file mode 100644 index 00000000000000..0c8da5d326ee6d Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus10.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus11.png b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus11.png new file mode 100644 index 00000000000000..9ff22a11f584b8 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus11.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus2.png b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus2.png new file mode 100644 index 00000000000000..6c2a3784e36d3c Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus2.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus3.png b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus3.png new file mode 100644 index 00000000000000..4ff08bf48c4508 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus3.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus4.png b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus4.png new file mode 100644 index 00000000000000..80b40207ea5d8b Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus4.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus5.png b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus5.png new file mode 100644 index 00000000000000..e5ad089e3e1e8e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus5.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus6.png b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus6.png new file mode 100644 index 00000000000000..b31a4e3198fd03 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus6.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus7.png b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus7.png new file mode 100644 index 00000000000000..7360ed7d24dac9 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus7.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus8.png b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus8.png new file mode 100644 index 00000000000000..df73f2b5f4b96d Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus8.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus9.png b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus9.png new file mode 100644 index 00000000000000..a8639d95729959 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/odysseus_construction.rsi/odysseus9.png differ