diff --git a/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl index 1cf09ac2859..7e3ad142294 100644 --- a/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl +++ b/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl @@ -15,7 +15,8 @@ loadout-group-blueshield-back = ОСЩ, рюкзак # Cargo # Engineering - +loadout-group-atmospheric-technician-neck = Атмосферный техник, плащ +loadout-group-atmospheric-technician-gasmask = Атмосферный техник, противогаз # Science loadout-group-roboticist-jumpsuit = Робототехник, комбинезон loadout-group-roboticist-outerclothing = Робототехник, верхняя одежда diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hats.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hats.ftl index f2fd5e3b885..697c9a51656 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hats.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hats.ftl @@ -25,3 +25,12 @@ ent-ADTClothingHeadHatsInvestigatorCap = фуражка следователя ent-ADTClothingHeadHatsBeretArmy = армейский берет .desc = Потрёпанный на службе военный берет. Имеет золотую нашивку сбоку. .suffix = { "Новая Мекка" } + +ent-ADTClothingHeadHatsBeretSupply = берет отдела снабжения + .desc = Берет медного цвета с вышитой эмблемой отдела снабжения. + +ent-ADTClothingHeadHatsBeretAtmos = берет атмосферного техника + .desc = Голубой берет с вышитой эмблемой инжерного отдела. Пахнет фрезоном. + +ent-ADTClothingHeadHatsBeretHOP = берет главы персонала + .desc = Синий берет с вышитой командирской эмблемой. Холодная рассудительность и твердая рука - вот что главное. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Mask/mask.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Mask/mask.ftl index 363163bf9ea..94e4512c651 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Mask/mask.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Mask/mask.ftl @@ -14,3 +14,6 @@ ent-ADTClothingMaskGasIlisium = дыхательная маска ent-ADTChronosMask = визор "Жертва Хроноса" .desc = Продвинутый визор, сделанный на заказ неким учёным. На боковой стороне визора видна роспись: Х.К. .suffix = { "Новая Мекка" } + +ent-ClothingMaskGasAtmosian = противогаз атмосианина + .desc = Улучшенный противогаз, используемый атмосианинами. Огнеупорный! diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Neck/cloaks.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Neck/cloaks.ftl index 17063cc3d58..7fbb2cfd7cc 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Neck/cloaks.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Neck/cloaks.ftl @@ -12,3 +12,10 @@ ent-ADTClothingNeckGothicCloak = готический плащ ent-ADTClothingNeckNewMekkaCloak = накидка Новой Мекки .desc = Зеленая накидка, очень удобная в носке. Скреплена застёжкой на шее. .suffix = { "Новая Мекка" } + +ent-ADTClothingNeckHoPAltCloak = торжественный плащ Главы Персонала + .desc = Плащ Главы Персонала для особых случаев + .suffix = { "" } + +ent-ClothingCloakAtmosian = плащ атмосианина + .desc = Плащ легендарного атмосианина. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/coats.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/coats.ftl index 5a4a19c95ba..f1f7212c2b0 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/coats.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/coats.ftl @@ -21,3 +21,6 @@ ent-ADTClothingOuterCoatIlisium = плащ Иллизиума ent-ADTClothingOuterCoatInvestigator = бушлат следователя Службы Безопасности .desc = Один вид этого бушлата повышает вероятность чистосердечного признания подозреваемого на 50%. .suffix = { "" } + +ent-ClothingOuterAtmosianBomberJacket = куртка-бомбер атмосианина + .desc = Плотная, поношенная куртка-бомбер атмосианина. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl index 16ec0c2cacf..5cdf5565f88 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl @@ -89,7 +89,7 @@ ent-ADTCMOJumpskirtWarm = водолазка главного врача .desc = Это комбинезон, носимый теми, у кого есть опыт работы на должности главного врача. Он обеспечивает слабую биологическую защиту. .suffix = {""} -ent-ADTHOPJumpskirtWarm = водолазка главы персонала +ent-ADTClothingUniformJumpskirtHopWarm = водолазка c юбкой главы персонала .desc = Довольно безвкусная и невзрачная. Идеально подходит для того, чтобы исчезнуть с лица Вселенной. .suffix = {""} @@ -108,3 +108,6 @@ ent-ADTCapJumpskirtWarm = { ent-ADTCapJumpsuitWarm } ent-ClothingUniformJumpskirtBlueshieldTurtleneck = юбка-водолазка офицера синего щита .desc = Белая удобная водолазка с юбкой для Офицера Синего Щита с пришитыми золотыми погонами и ярким именным бейджиком. К сожалению, если вы её наденете, это не будет значить, что вам дадут отпуск. + +ent-ADTClothingJumpskirtHopAlt = деловой костюм с юбкой главы персонала + .desc = Качетсвенно сделанная униформа для тех глав персонала, что могут себе такую позволить. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl index e7f120fdb72..583d82a78a6 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl @@ -152,7 +152,7 @@ ent-ADTCMOJumpsuitWarm = водолазка главного врача .desc = Это комбинезон, носимый теми, у кого есть опыт работы на должности главного врача. Он обеспечивает слабую биологическую защиту. .suffix = {""} -ent-ADTHOPJumpsuitWarm = водолазка главы персонала +ent-ADTClothingUniformJumpsuitHopWarm = водолазка главы персонала .desc = Довольно безвкусная и невзрачная. Идеально подходит для того, чтобы исчезнуть с лица Вселенной. .suffix = {""} @@ -199,3 +199,15 @@ ent-ADTClothingUniformInvestigatorSuit = форма следователя Сл ent-ADTClothingUniformNewMekka = униформа Новой Мекки .desc = Эта униформа имеет очень долгую и кровавую историю... .suffix = { "Новая Мекка" } + +ent-ADTClothingJumpsuitHopAlt = деловой костюм главы персонала + .desc = Качетсвенно сделанная униформа для тех глав персонала, что могут себе такую позволить. + +ent-ADTClothingJumpsuitSecOffMogesBrown = костюм офицера СБ с Могеса + .desc = Не совсем формальный, но очень подходящий для трофиков костюм офицера, служившего в филиале Нанотрейзен на планете Могес. Заслужить право носить такой может только ветеран СБ. Стоять, СБ Могеса! + +ent-ADTClothingJumpsuitSecOffMogesBlue = костюм офицера СБ с Могеса + .desc = Не совсем формальный, но очень подходящий для трофиков костюм офицера, служившего в филиале Нанотрейзен на планете Могес. Заслужить право носить такой может только ветеран СБ. Стоять, СБ Могеса! + +ent-ADTClothingJumpsuitSecOffMogesGray = костюм офицера СБ с Могеса + .desc = Не совсем формальный, но очень подходящий для трофиков костюм офицера, служившего в филиале Нанотрейзен на планете Могес. Заслужить право носить такой может только ветеран СБ. Стоять, СБ Могеса! diff --git a/Resources/Locale/ru-RU/foldable/components/foldable-component.ftl b/Resources/Locale/ru-RU/foldable/components/foldable-component.ftl index 67c7a72e75e..58d373a8d65 100644 --- a/Resources/Locale/ru-RU/foldable/components/foldable-component.ftl +++ b/Resources/Locale/ru-RU/foldable/components/foldable-component.ftl @@ -6,3 +6,6 @@ unfold-verb = Разложить fold-flip-verb = Перевернуть fold-zip-verb = Застегнуть fold-unzip-verb = Расстегнуть + +fold-pull-off-verb = Снять +fold-put-on-verb = Надеть diff --git a/Resources/Locale/ru-RU/job/job-names.ftl b/Resources/Locale/ru-RU/job/job-names.ftl index 28065b39666..f300cd5e11d 100644 --- a/Resources/Locale/ru-RU/job/job-names.ftl +++ b/Resources/Locale/ru-RU/job/job-names.ftl @@ -52,7 +52,7 @@ job-name-visitor = Посетитель job-name-geneticist = генетик job-name-no-id = нет ID job-name-prisoner = заключённый -job-name-roboticist = робототехник +job-name-roboticist = Робототехник job-name-syndicate = синдикат job-name-unknown = неизвестно job-name-virologist = вирусолог diff --git a/Resources/Locale/ru-RU/xenoarchaeology/artifact-analyzer.ftl b/Resources/Locale/ru-RU/xenoarchaeology/artifact-analyzer.ftl index 7a5917654b6..9ee33d8b5e6 100644 --- a/Resources/Locale/ru-RU/xenoarchaeology/artifact-analyzer.ftl +++ b/Resources/Locale/ru-RU/xenoarchaeology/artifact-analyzer.ftl @@ -19,7 +19,7 @@ analysis-console-info-triggered-true = АКТИВИРОВАН: ДА analysis-console-info-triggered-false = АКТИВИРОВАН: НЕТ analysis-console-info-effect = РЕАКЦИЯ: { $effect } analysis-console-info-trigger = СТИМУЛЯТОР: { $trigger } -analysis-console-info-edges = СОЕДИНЕНИЯ: { $edges } +analysis-console-info-edges = КРАЯ: { $edges } analysis-console-info-value = НЕИЗВЛЕЧЁННЫЕ_О.И.: { $value } analysis-console-info-scanner = Сканирование... analysis-console-info-scanner-paused = Приостановлено. diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml index 2709141fec6..691e6f3eef1 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml @@ -126,3 +126,47 @@ sprite: ADT/Clothing/Head/Hats/armyberet.rsi - type: Clothing sprite: ADT/Clothing/Head/Hats/armyberet.rsi + +#Береты профессий + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatsBeretAtmos + name: atmospheric techinican's beret + description: A blue beret with sewn emblem of engineering departament. Smells like frezon. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/beret_atmospheric_technician.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/beret_atmospheric_technician.rsi + - type: Tag + tags: + - HamsterWearable + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatsBeretHOP + name: head of personell's beret + description: A blue beret with sewn commander's emblem. The most important in work - cold mind and sure hand. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/beret_HOP.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/beret_HOP.rsi + - type: Tag + tags: + - HamsterWearable + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatsBeretSupply + name: suply departament beret + description: Copper beret with sewn Supply departament emblem. #медный берет? + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/beret_cargo.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/beret_cargo.rsi + - type: Tag + tags: + - HamsterWearable diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml b/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml index 0deab815c2d..1032d823505 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml @@ -287,3 +287,18 @@ Heat: 0.80 - type: StealTarget stealGroup: ADTClothingMaskGasCE + +- type: entity + parent: ClothingMaskGas + id: ClothingMaskGasAtmosian + name: atmosian gas mask + description: Improved gas mask utilized by atmospheric technicians. It's flameproof! + components: + - type: Sprite + sprite: ADT/Clothing/Mask/atmosian.rsi + - type: Clothing + sprite: ADT/Clothing/Mask/atmosian.rsi + - type: Armor + modifiers: + coefficients: + Heat: 0.80 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Neck/Cloaks.yml b/Resources/Prototypes/ADT/Entities/Clothing/Neck/Cloaks.yml index bf077ed3483..629c066fb69 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Neck/Cloaks.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Neck/Cloaks.yml @@ -39,3 +39,21 @@ components: - type: Sprite sprite: ADT/Clothing/Neck/Cloaks/newmekkacloak.rsi + +- type: entity + parent: ClothingNeckBase + id: ADTClothingNeckHoPAltCloak + name: HoP parade cloak + description: Cloak for Head of Personell for special events. + components: + - type: Sprite + sprite: ADT/Clothing/Neck/Cloaks/HoP_alt_cloak.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingCloakAtmosian + name: atmosian's cloak + description: The cloak of a legendary Atmosian. + components: + - type: Sprite + sprite: ADT/Clothing/Neck/Cloaks/atmosian.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml index 668269c9495..6bfbc649fbe 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml @@ -130,3 +130,14 @@ Slash: 0.8 Piercing: 0.7 Heat: 0.8 + +- type: entity + parent: ClothingOuterBase + id: ClothingOuterAtmosianBomberJacket + name: atmosian bomber jacket + description: A thick, well-worn atmosian leather bomber jacket. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Coats/atmosian.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Coats/atmosian.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml index 00a1c8c31fb..cd2d0af252d 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml @@ -597,3 +597,74 @@ sprite: ADT/Clothing/Uniforms/Jumpsuit/investigator_suit.rsi - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/investigator_suit.rsi + +#Альтернативная одежда для ГП +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformJumpsuitHopWarm + name: hop jumpsuit warm + description: Rather bland and inoffensive. Perfect for vanishing off the face of the universe. + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_hop.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_hop.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingJumpsuitHopAlt + name: head of personell's business suit + description: Fancy. + components: + #- type: Appearance + #- type: Foldable + # canFoldInsideContainer: true + # unfoldVerbText: fold-put-on-verb + # foldVerbText: fold-pull-off-verb + # - type: FoldableClothing + # foldedEquippedPrefix: vest + # foldedHeldPrefix: vest + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_alt_hop.rsi + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_alt_hop.rsi + # layers: + # - state: icon + # map: [ "unfoldedLayer" ] + # - state: icon_vest + # map: ["foldedLayer"] + # visible: false + +#Одежда для ветерана СБ +- type: entity + parent: ClothingUniformBase + id: ADTClothingJumpsuitSecOffMogesBrown + name: sec off suit from Moges + description: Freeze, Moges Vice! + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_brown.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_brown.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingJumpsuitSecOffMogesBlue + name: sec off suit from Moges + description: Freeze, Moges Vice! + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_blue.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_blue.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingJumpsuitSecOffMogesGray + name: sec off suit from Moges + description: Freeze, Moges Vice! + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_gray.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_gray.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml index 07c3265440f..7d1956fc495 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml @@ -249,3 +249,40 @@ sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brigmed.rsi - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brigmed.rsi + +#Альтернативная одежда для ГП +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformJumpskirtHopWarm + name: hop jumpskirt warm + description: Rather bland and inoffensive. Perfect for vanishing off the face of the universe. + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_hop.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_hop.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingJumpskirtHopAlt + name: head of personell's business suit + description: Fancy. + components: + #- type: Appearance + #- type: Foldable + # canFoldInsideContainer: true + # unfoldVerbText: fold-put-on-verb + # foldVerbText: fold-pull-off-verb + #- type: FoldableClothing + # foldedEquippedPrefix: vest + # foldedHeldPrefix: vest + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_alt_hop.rsi + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_alt_hop.rsi + # layers: + # - state: icon + # map: [ "unfoldedLayer" ] + # - state: icon_vest + # map: ["foldedLayer"] + # visible: false diff --git a/Resources/Prototypes/ADT/Loadouts/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/ADT/Loadouts/Jobs/Cargo/cargo_technician.yml new file mode 100644 index 00000000000..b59d10d9639 --- /dev/null +++ b/Resources/Prototypes/ADT/Loadouts/Jobs/Cargo/cargo_technician.yml @@ -0,0 +1,17 @@ +- type: loadoutEffectGroup + id: ADTCargoTechnician15hrs + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobCargoTechnician + time: 54000 #15 hrs + +# Head +- type: loadout + id: ADTCargoTechnicianBeret + effects: + - !type:GroupLoadoutEffect + proto: ADTCargoTechnician15hrs + equipment: + head: ADTClothingHeadHatsBeretSupply diff --git a/Resources/Prototypes/ADT/Loadouts/Jobs/Civilian/janitor.yml b/Resources/Prototypes/ADT/Loadouts/Jobs/Civilian/janitor.yml new file mode 100644 index 00000000000..418a16df135 --- /dev/null +++ b/Resources/Prototypes/ADT/Loadouts/Jobs/Civilian/janitor.yml @@ -0,0 +1,50 @@ +- type: loadoutEffectGroup + id: ADTJanitorialMaidDress50hours + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobJanitor + time: 180000 #50 часов + +- type: loadoutEffectGroup + id: ADTJanitorialMaidDress75hours + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobJanitor + time: 270000 #75 часов + +- type: loadoutEffectGroup + id: ADTJanitorialMaidDress100hours + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobJanitor + time: 360000 #100 часов + +- type: loadout + id: ADTJanitorJumpsuitJanimaid + effects: + - !type:GroupLoadoutEffect + proto: ADTJanitorialMaidDress50hours + equipment: + jumpsuit: ClothingUniformJumpskirtJanimaid + +- type: loadout + id: ADTJanitorJumpsuitJanimaidmini + effects: + - !type:GroupLoadoutEffect + proto: ADTJanitorialMaidDress75hours + equipment: + jumpsuit: ClothingUniformJumpskirtJanimaidmini + +- type: loadout + id: ADTJanitorJumpsuitJanimaidElegant + effects: + - !type:GroupLoadoutEffect + proto: ADTJanitorialMaidDress100hours + equipment: + jumpsuit: ClothingUniformJumpskirtElegantMaid diff --git a/Resources/Prototypes/ADT/Loadouts/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/ADT/Loadouts/Jobs/Command/head_of_personnel.yml new file mode 100644 index 00000000000..78469508a3b --- /dev/null +++ b/Resources/Prototypes/ADT/Loadouts/Jobs/Command/head_of_personnel.yml @@ -0,0 +1,50 @@ +# Jumpsuit +- type: loadout + id: ADTJumpsuitHopWarm + equipment: + jumpsuit: ADTClothingUniformJumpsuitHopWarm + effects: + - !type:GroupLoadoutEffect + proto: ProfessionalHoP + +- type: loadout + id: ADTJumpskirtHopWarm + equipment: + jumpsuit: ADTClothingUniformJumpskirtHopWarm + effects: + - !type:GroupLoadoutEffect + proto: ProfessionalHoP + +- type: loadout + id: ADTJumpsuitHopAlt + equipment: + jumpsuit: ADTClothingJumpsuitHopAlt + effects: + - !type:GroupLoadoutEffect + proto: MasterHoP + +- type: loadout + id: ADTJumpskirtHopAlt + equipment: + jumpsuit: ADTClothingJumpskirtHopAlt + effects: + - !type:GroupLoadoutEffect + proto: MasterHoP + +# Neck +- type: loadout + id: ADTHoPAltCloak + equipment: + neck: ADTClothingNeckHoPAltCloak + effects: + - !type:GroupLoadoutEffect + proto: MasterHoP + +# Outerclothing +- type: loadout + id: ADTCoatHOP + equipment: + outerClothing: ClothingOuterCoatHOP + effects: + - !type:GroupLoadoutEffect + proto: ProfessionalHoP diff --git a/Resources/Prototypes/ADT/Loadouts/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/ADT/Loadouts/Jobs/Engineering/atmospheric_technician.yml new file mode 100644 index 00000000000..f54f2b85348 --- /dev/null +++ b/Resources/Prototypes/ADT/Loadouts/Jobs/Engineering/atmospheric_technician.yml @@ -0,0 +1,36 @@ +- type: loadoutEffectGroup + id: ADTMasterAtmos + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobAtmosphericTechnician + time: 180000 #50 часов + +# OuterClothing +- type: loadout + id: ADTOuterAtmosianBomberJacket + equipment: + outerClothing: ClothingOuterAtmosianBomberJacket + effects: + - !type:GroupLoadoutEffect + proto: ADTMasterAtmos + +# Neck +- type: loadout + id: ADTCloakAtmosian + equipment: + neck: ClothingCloakAtmosian + effects: + - !type:GroupLoadoutEffect + proto: ADTMasterAtmos + +# Mask +- type: loadout + id: ADTMaskGasAtmosian + storage: + back: + - ClothingMaskGasAtmosian + effects: + - !type:GroupLoadoutEffect + proto: ADTMasterAtmos diff --git a/Resources/Prototypes/ADT/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/ADT/Loadouts/Jobs/Security/security_officer.yml index c7a899e78c0..3dc6e3200ed 100644 --- a/Resources/Prototypes/ADT/Loadouts/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/ADT/Loadouts/Jobs/Security/security_officer.yml @@ -1,5 +1,40 @@ +# Для разблокировки одежды ветерана СБ +- type: loadoutEffectGroup + id: ADTSecurityVeteran + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobSecurityOfficer + time: 1080000 #300 hrs + # Neck Security Officer ADT - type: loadout id: ADTSecurityOfficerNeck equipment: neck: ADTClothingNeckSecBadge + +# Jumpsuit +- type: loadout + id: ADTSecurityOfficerMogesBrown + equipment: + jumpsuit: ADTClothingJumpsuitSecOffMogesBrown + effects: + - !type:GroupLoadoutEffect + proto: ADTSecurityVeteran + +- type: loadout + id: ADTSecurityOfficerMogesBlue + equipment: + jumpsuit: ADTClothingJumpsuitSecOffMogesBlue + effects: + - !type:GroupLoadoutEffect + proto: ADTSecurityVeteran + +- type: loadout + id: ADTSecurityOfficerMogesGray + equipment: + jumpsuit: ADTClothingJumpsuitSecOffMogesGray + effects: + - !type:GroupLoadoutEffect + proto: ADTSecurityVeteran diff --git a/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml b/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml index c45ab817dba..738904589d2 100644 --- a/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml @@ -205,3 +205,17 @@ minLimit: 0 loadouts: - ADTSecurityCadetNeck + +#Плащ и маска атмосианина + +- type: loadoutGroup + id: ADTAtmosphericTechnicianNeck + name: loadout-group-atmospheric-technician-neck + loadouts: + - ADTCloakAtmosian + +- type: loadoutGroup + id: ADTAtmosphericTechnicianGasMask + name: loadout-group-atmospheric-technician-gasmask + loadouts: + - ADTMaskGasAtmosian diff --git a/Resources/Prototypes/ADT/Species/Tajaran.yml b/Resources/Prototypes/ADT/Species/Tajaran.yml index 65666dda3ed..3f7375944e3 100644 --- a/Resources/Prototypes/ADT/Species/Tajaran.yml +++ b/Resources/Prototypes/ADT/Species/Tajaran.yml @@ -42,7 +42,7 @@ points: 1 required: false Chest: - points: 1 + points: 2 required: false Tail: points: 1 diff --git a/Resources/Prototypes/ADT/Species/Ursus.yml b/Resources/Prototypes/ADT/Species/Ursus.yml index d2f7a2b6ed9..808cae47df3 100644 --- a/Resources/Prototypes/ADT/Species/Ursus.yml +++ b/Resources/Prototypes/ADT/Species/Ursus.yml @@ -60,10 +60,10 @@ points: 2 required: false Legs: - points: 2 + points: 4 required: false Arms: - points: 2 + points: 4 required: false - type: humanoidBaseSprite diff --git a/Resources/Prototypes/ADT/Species/Vulpkanin.yml b/Resources/Prototypes/ADT/Species/Vulpkanin.yml index 11469c9d3ce..6eaac2bf0a7 100644 --- a/Resources/Prototypes/ADT/Species/Vulpkanin.yml +++ b/Resources/Prototypes/ADT/Species/Vulpkanin.yml @@ -52,10 +52,10 @@ points: 1 required: false Arms: - points: 2 + points: 4 required: false Legs: - points: 2 + points: 4 required: false @@ -155,4 +155,4 @@ sprite: ADT/Mobs/Species/Vulpkanin/parts.rsi state: r_foot -# \ No newline at end of file +# diff --git a/Resources/Prototypes/ADT/Species/demon.yml b/Resources/Prototypes/ADT/Species/demon.yml index a5ff1c3d8f7..7e34894a03f 100644 --- a/Resources/Prototypes/ADT/Species/demon.yml +++ b/Resources/Prototypes/ADT/Species/demon.yml @@ -51,19 +51,19 @@ points: 1 required: false Chest: - points: 1 + points: 2 required: false Tail: points: 1 required: false Snout: - points: 1 + points: 2 required: false Legs: - points: 2 + points: 4 required: false Arms: - points: 2 + points: 4 required: false - type: humanoidBaseSprite diff --git a/Resources/Prototypes/ADT/Species/drask.yml b/Resources/Prototypes/ADT/Species/drask.yml index 7436e823c58..62c5020fbaa 100644 --- a/Resources/Prototypes/ADT/Species/drask.yml +++ b/Resources/Prototypes/ADT/Species/drask.yml @@ -50,19 +50,19 @@ points: 1 required: true Chest: - points: 1 + points: 2 required: true Tail: points: 1 required: false Snout: - points: 1 + points: 2 required: false Legs: - points: 2 + points: 4 required: false Arms: - points: 2 + points: 4 required: false defaultMarkings: [DraskArmRight,DraskArmLeft] diff --git a/Resources/Prototypes/ADT/Species/felinid.yml b/Resources/Prototypes/ADT/Species/felinid.yml index c3a12bf66d1..30925d5058b 100644 --- a/Resources/Prototypes/ADT/Species/felinid.yml +++ b/Resources/Prototypes/ADT/Species/felinid.yml @@ -28,11 +28,11 @@ required: true defaultMarkings: [ CatEars ] Chest: - points: 1 + points: 2 required: false Legs: - points: 2 + points: 4 required: false Arms: - points: 2 + points: 4 required: false diff --git a/Resources/Prototypes/ADT/Species/kobalt.yml b/Resources/Prototypes/ADT/Species/kobalt.yml index b9496673474..79607cbe43c 100644 --- a/Resources/Prototypes/ADT/Species/kobalt.yml +++ b/Resources/Prototypes/ADT/Species/kobalt.yml @@ -46,7 +46,7 @@ required: true defaultMarkings: [ LizardTailSmooth ] Snout: - points: 1 + points: 2 required: true defaultMarkings: [ LizardSnoutRound ] HeadTop: diff --git a/Resources/Prototypes/ADT/Species/moth.yml b/Resources/Prototypes/ADT/Species/moth.yml index 889fc2b9b5f..18a6981a99b 100644 --- a/Resources/Prototypes/ADT/Species/moth.yml +++ b/Resources/Prototypes/ADT/Species/moth.yml @@ -53,7 +53,7 @@ required: true defaultMarkings: [ MothWingsDefault ] Snout: - points: 1 + points: 2 required: false HeadTop: points: 1 @@ -66,13 +66,13 @@ points: 1 required: false Chest: - points: 1 + points: 2 required: false Legs: - points: 2 + points: 4 required: false Arms: - points: 2 + points: 4 required: false - type: humanoidBaseSprite diff --git a/Resources/Prototypes/ADT/Species/novakid.yml b/Resources/Prototypes/ADT/Species/novakid.yml index 3c26ebdc730..18833c469a5 100644 --- a/Resources/Prototypes/ADT/Species/novakid.yml +++ b/Resources/Prototypes/ADT/Species/novakid.yml @@ -51,20 +51,20 @@ required: true defaultMarkings: [ NovakidFace1 ] Chest: - points: 1 + points: 2 required: true defaultMarkings: [ TorsoNovakidDefolt ] Tail: points: 1 required: false Snout: - points: 1 + points: 2 required: false Legs: - points: 2 + points: 4 required: false Arms: - points: 2 + points: 4 required: false diff --git a/Resources/Prototypes/ADT/Species/shadekin.yml b/Resources/Prototypes/ADT/Species/shadekin.yml index 3bfd66a89f0..8d0376f4070 100644 --- a/Resources/Prototypes/ADT/Species/shadekin.yml +++ b/Resources/Prototypes/ADT/Species/shadekin.yml @@ -59,13 +59,13 @@ required: true defaultMarkings: [EarsShadekin] Chest: - points: 0 + points: 2 required: false Legs: - points: 0 + points: 4 required: false Arms: - points: 0 + points: 4 required: false Overlay: points: 1 diff --git a/Resources/Prototypes/ADT/Traits/quirks.yml b/Resources/Prototypes/ADT/Traits/quirks.yml index ed879134e32..f4bdbb71fdd 100644 --- a/Resources/Prototypes/ADT/Traits/quirks.yml +++ b/Resources/Prototypes/ADT/Traits/quirks.yml @@ -25,8 +25,8 @@ category: Quirks components: - type: Sprinter - modifier: 1.1 - cost: 2 + modifier: 1.05 + cost: 6 - type: trait id: ADTFastLockers diff --git a/Resources/Prototypes/ADT/tags.yml b/Resources/Prototypes/ADT/tags.yml index c14c04735be..e8ccc9811e6 100644 --- a/Resources/Prototypes/ADT/tags.yml +++ b/Resources/Prototypes/ADT/tags.yml @@ -1,6 +1,9 @@ - type: Tag id: ADTMothFriendlyFood +- type: Tag + id: ADTCarnivoreFriendlyFood + - type: Tag id: Patch diff --git a/Resources/Prototypes/Body/Organs/reptilian.yml b/Resources/Prototypes/Body/Organs/reptilian.yml index 34c736aec8b..bbbe3de9e98 100644 --- a/Resources/Prototypes/Body/Organs/reptilian.yml +++ b/Resources/Prototypes/Body/Organs/reptilian.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: OrganReptilianStomach parent: OrganAnimalStomach categories: [ HideSpawnMenu ] @@ -12,6 +12,7 @@ - Pill - Crayon - Paper + - ADTCarnivoreFriendlyFood #ADT_Tweak - type: SolutionContainerManager solutions: stomach: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml index 0fb3df4d278..32697d3d7b6 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml @@ -413,6 +413,10 @@ - state: plain - type: SliceableFood slice: FoodBreadPlainSlice + - type: Tag #ADT_Tweak - делаем хлеб съедобным для молей + tags: + - ADTMothFriendlyFood + - Bread - type: entity name: bread slice @@ -424,6 +428,11 @@ - type: Sprite layers: - state: plain-slice + - type: Tag #ADT_Tweak - делаем хлеб съедобным для молей + tags: + - ADTMothFriendlyFood + - Bread + - Slice - type: entity name: sausage bread @@ -745,6 +754,10 @@ Quantity: 5 - ReagentId: Vitamin Quantity: 1 + - type: Tag #ADT_Tweak - делаем хлеб съедобным для молей + tags: + - ADTMothFriendlyFood + - Bread # Tastes like bread, butter. - type: entity @@ -768,6 +781,10 @@ Quantity: 4 - ReagentId: Vitamin Quantity: 2 + - type: Tag #ADT_Tweak - делаем хлеб съедобным для молей + tags: + - ADTMothFriendlyFood + - Bread # Tastes like bread, butter. - type: entity @@ -792,6 +809,10 @@ Quantity: 6 - ReagentId: Vitamin Quantity: 5 + - type: Tag #ADT_Tweak - делаем хлеб съедобным для молей + tags: + - ADTMothFriendlyFood + - Bread # Tastes like garlic, Italy. - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml index 8b455fe872c..897c214f2f9 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml @@ -254,6 +254,7 @@ - type: Tag tags: - Pancake + - ADTMothFriendlyFood #ADT_Tweak - делаем обычные блинчики съедобными для молей - type: entity name: blueberry pancake @@ -385,6 +386,9 @@ Quantity: 8 - ReagentId: Vitamin Quantity: 1 + - type: Tag #ADT_Tweak - делаем вафли съедобными для молей + tags: + - ADTMothFriendlyFood - type: entity name: soy waffles @@ -658,6 +662,9 @@ Quantity: 1 - ReagentId: Vitamin Quantity: 1 + - type: Tag #ADT_Tweak - делаем луковые кольца съедобными для молей + tags: + - ADTMothFriendlyFood - type: entity name: croissant @@ -685,4 +692,7 @@ - type: DamageOtherOnHit damage: types: - Blunt: 0 # so the damage stats icon doesn't immediately give away the syndie ones \ No newline at end of file + Blunt: 0 # so the damage stats icon doesn't immediately give away the syndie ones + - type: Tag #ADT_Tweak - делаем круассаны съедобным для молей + tags: + - ADTMothFriendlyFood diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml index 4d51f20d78e..6fd811207fb 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml @@ -926,6 +926,9 @@ Quantity: 6 - ReagentId: Vitamin Quantity: 3 + - type: Tag #ADT_Tweak - делаем тофу-бургер съедобным для молей + tags: + - ADTMothFriendlyFood # Tastes like bun, tofu. - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index cf807d558a3..fa277f01e7e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -626,6 +626,9 @@ sprite: sprite: Objects/Consumable/Food/ingredients.rsi state: cheesewheel + - type: Tag #ADT_Tweak - делаем сыр съедобным для молей + tags: + - ADTMothFriendlyFood - type: entity name: cheese wedge @@ -648,6 +651,7 @@ - type: Tag tags: - Slice + - ADTMothFriendlyFood #ADT_Tweak - делаем сыр съедобным для молей - type: FoodSequenceElement sprite: sprite: Objects/Consumable/Food/ingredients.rsi diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml index 1ded684c77a..ca83c1d5688 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml @@ -37,6 +37,9 @@ - potatoes - type: Sprite state: loadedbakedpotato + - type: Tag #ADT_Tweak - делаем картофельные блюда съедобными для молей + tags: + - ADTMothFriendlyFood # Tastes like potato. - type: entity @@ -51,6 +54,9 @@ - salty - type: Sprite state: fries + - type: Tag #ADT_Tweak - делаем картофельные блюда съедобными для молей + tags: + - ADTMothFriendlyFood # Tastes like fries, salt. - type: entity @@ -66,6 +72,9 @@ - cheesy - type: Sprite state: fries-cheesy + - type: Tag #ADT_Tweak - делаем картофельные блюда съедобными для молей + tags: + - ADTMothFriendlyFood # Tastes like fries, cheese. - type: entity @@ -83,6 +92,7 @@ - type: Tag tags: - CarrotFries + - ADTMothFriendlyFood #ADT_Tweak - делаем картофельные блюда съедобными для молей - type: SolutionContainerManager solutions: food: @@ -90,6 +100,7 @@ reagents: - ReagentId: JuiceCarrot Quantity: 20 + # Tastes like carrots, salt. - type: entity @@ -215,6 +226,9 @@ - potatoes - type: Sprite state: yakiimo + - type: Tag #ADT_Tweak - делаем картофельные блюда съедобными для молей + tags: + - ADTMothFriendlyFood # Tastes like sweet potato. - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 01f6ba4070d..5f2c72bf696 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -515,6 +515,7 @@ - type: Tag tags: - Vegetable + - ADTMothFriendlyFood #ADT-Tweak - делаем капусту съедобной для молей - type: FoodSequenceElement sprite: sprite: Objects/Specific/Hydroponics/cabbage.rsi diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml index d5cb4311c46..e7a740d82b1 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml @@ -234,6 +234,10 @@ Quantity: 8 - ReagentId: Vitamin Quantity: 6 + - type: Tag #ADT_Tweak - делаем салат Цезарь съедобным для молей + tags: + - ADTMothFriendlyFood + - Soup - type: entity name: kimchi salad @@ -386,6 +390,10 @@ layers: - state: bowl - state: rice + - type: Tag #ADT_Tweak - делаем рис без добавок съедобным для молей + tags: + - ADTMothFriendlyFood + - Soup - type: entity name: egg-fried rice @@ -534,6 +542,10 @@ Quantity: 2 - ReagentId: Milk Quantity: 10 + - type: Tag #ADT_Tweak - делаем овсянку съедобной для молей + tags: + - ADTMothFriendlyFood + - Soup - type: entity name: space liberty duff diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml index 623951a7d00..c50d6aa4599 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml @@ -6,7 +6,7 @@ requirement: !type:RoleTimeRequirement role: JobHeadOfPersonnel - time: 72000 #20 hrs + time: 144000 #ADT_Tweak - увеличил до 40 часов # Professional HoP Time - type: loadoutEffectGroup @@ -16,7 +16,7 @@ requirement: !type:RoleTimeRequirement role: JobHeadOfPersonnel - time: 72000 #20 hrs, special reward for HoP mains # Corvax-RoleTime + time: 72000 #40 hrs, special reward for HoP mains # Corvax-RoleTime # Jumpsuit - type: loadout diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 8d8b315c024..38fc250a26e 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -139,6 +139,12 @@ - HoPJumpsuitTurtleneck - HoPJumpskirtTurtleneck # Corvax-Loadouts-End + # ADT-Loadouts-Start + - ADTJumpsuitHopWarm + - ADTJumpskirtHopWarm + - ADTJumpsuitHopAlt + - ADTJumpskirtHopAlt + # ADT-Loadouts-End - type: loadoutGroup id: HoPNeck @@ -147,6 +153,9 @@ loadouts: - HoPCloak - HoPMantle + # ADT-Loadouts-Start + - ADTHoPAltCloak + # ADT-Loadouts-End - type: loadoutGroup id: HoPBackpack @@ -163,6 +172,9 @@ minLimit: 0 loadouts: - HoPWintercoat + # ADT-Loadouts-Start + - ADTCoatHOP + # ADT-Loadouts-End # Civilian - type: loadoutGroup @@ -360,6 +372,11 @@ loadouts: - JanitorJumpsuit - JanitorJumpskirt + # ADT-Loadouts-Start + - ADTJanitorJumpsuitJanimaid + - ADTJanitorJumpsuitJanimaidmini + - ADTJanitorJumpsuitJanimaidElegant + # ADT-Loadouts-End - type: loadoutGroup id: JanitorGloves @@ -581,6 +598,9 @@ loadouts: - QuartermasterHead - QuartermasterBeret + # ADT-Loadouts-Start + - ADTCargoTechnicianBeret + # ADT-Loadouts-End - type: loadoutGroup id: QuartermasterJumpsuit @@ -620,6 +640,9 @@ minLimit: 0 loadouts: - CargoTechnicianHead + # ADT-Loadouts-Start + - ADTCargoTechnicianBeret + # ADT-Loadouts-End - type: loadoutGroup id: CargoTechnicianJumpsuit @@ -782,6 +805,9 @@ minLimit: 0 loadouts: - AtmosphericTechnicianWintercoat + # ADT-Loadouts-Start + - ADTOuterAtmosianBomberJacket + # ADT-Loadouts-End - type: loadoutGroup id: AtmosphericTechnicianBackpack @@ -1011,6 +1037,11 @@ - SecurityJumpskirtGrey - SeniorOfficerJumpsuit - SeniorOfficerJumpskirt + # ADT-Loadouts-Start + - ADTSecurityOfficerMogesBrown + - ADTSecurityOfficerMogesBlue + - ADTSecurityOfficerMogesGray + # ADT-Loadouts-End - type: loadoutGroup id: SecurityBackpack @@ -1074,7 +1105,12 @@ - DetectiveJumpskirt - NoirJumpsuit - NoirJumpskirt - - DetectiveInvestigatorSuit # ADT-Loadout + # ADT-Loadouts-Start + - DetectiveInvestigatorSuit + - ADTSecurityOfficerMogesBrown + - ADTSecurityOfficerMogesBlue + - ADTSecurityOfficerMogesGray + # ADT-Loadouts-End - type: loadoutGroup id: DetectiveOuterClothing diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index f4f89c12b4c..d8c7c08b625 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -301,6 +301,8 @@ - AtmosphericTechnicianJumpsuit - AtmosphericTechnicianBackpack - AtmosphericTechnicianOuterClothing + - ADTAtmosphericTechnicianNeck # ADT-Loadouts + - ADTAtmosphericTechnicianGasMask # ADT-Loadouts - AtmosphericTechnicianShoes - SurvivalExtended - Trinkets diff --git a/Resources/Prototypes/Species/reptilian.yml b/Resources/Prototypes/Species/reptilian.yml index 321e01cfe73..d3156801b3b 100644 --- a/Resources/Prototypes/Species/reptilian.yml +++ b/Resources/Prototypes/Species/reptilian.yml @@ -59,10 +59,10 @@ points: 3 required: false Legs: - points: 2 + points: 4 #ADT Tweak required: false Arms: - points: 2 + points: 4 #ADT Tweak required: false - type: humanoidBaseSprite diff --git a/Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml b/Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml index 839c8bb65bd..ba6b80930ad 100644 --- a/Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml +++ b/Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml @@ -12,7 +12,7 @@ - [color=#a4885c]Реакция:[/color] реакция, вызываемая стимулятором. Она часто имеет расплывчатый характер, поэтому рекомендуется проявлять осторожность. -- [color=#a4885c]Соединения:[/color] количество узлов, которые соединены с текущим узлом. Зная это, можно подсчитать общее количество узлов, а также составить карту их соединений. +- [color=#a4885c]Края:[/color] количество узлов, которые соединены с текущим узлом. Зная это, можно подсчитать общее количество узлов, а также составить карту их соединений. - [color=#a4885c]Неизвлеченная ценность:[/color] количество очков исследования, которое артефакт даст при извлечении. При извлечении это значение равно нулю, а при обходе новых узлов оно увеличивается. diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_HOP.rsi/equipped-HELMET-hamster.png b/Resources/Textures/ADT/Clothing/Head/Hats/beret_HOP.rsi/equipped-HELMET-hamster.png new file mode 100644 index 00000000000..063c8c897ef Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beret_HOP.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_HOP.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/beret_HOP.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..42e43b00fb9 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beret_HOP.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_HOP.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/beret_HOP.rsi/icon.png new file mode 100644 index 00000000000..18f7561ecea Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beret_HOP.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_HOP.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Head/Hats/beret_HOP.rsi/inhand-left.png new file mode 100644 index 00000000000..1d31131207b Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beret_HOP.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_HOP.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Head/Hats/beret_HOP.rsi/inhand-right.png new file mode 100644 index 00000000000..e1ba3f10a1a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beret_HOP.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_HOP.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/beret_HOP.rsi/meta.json new file mode 100644 index 00000000000..e43f00742ad --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/beret_HOP.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_atmospheric_technician.rsi/equipped-HELMET-hamster.png b/Resources/Textures/ADT/Clothing/Head/Hats/beret_atmospheric_technician.rsi/equipped-HELMET-hamster.png new file mode 100644 index 00000000000..bfe988cc21a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beret_atmospheric_technician.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_atmospheric_technician.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/beret_atmospheric_technician.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..a07cd8838c1 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beret_atmospheric_technician.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_atmospheric_technician.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/beret_atmospheric_technician.rsi/icon.png new file mode 100644 index 00000000000..eb8ff6f0e45 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beret_atmospheric_technician.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_atmospheric_technician.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Head/Hats/beret_atmospheric_technician.rsi/inhand-left.png new file mode 100644 index 00000000000..8f5db54e41e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beret_atmospheric_technician.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_atmospheric_technician.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Head/Hats/beret_atmospheric_technician.rsi/inhand-right.png new file mode 100644 index 00000000000..5196bf68ed6 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beret_atmospheric_technician.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_atmospheric_technician.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/beret_atmospheric_technician.rsi/meta.json new file mode 100644 index 00000000000..e43f00742ad --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/beret_atmospheric_technician.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_cargo.rsi/equipped-HELMET-hamster.png b/Resources/Textures/ADT/Clothing/Head/Hats/beret_cargo.rsi/equipped-HELMET-hamster.png new file mode 100644 index 00000000000..d8e11575eb7 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beret_cargo.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_cargo.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/beret_cargo.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..682ffe09ba4 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beret_cargo.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_cargo.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/beret_cargo.rsi/icon.png new file mode 100644 index 00000000000..d8d7ba7378a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beret_cargo.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_cargo.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Head/Hats/beret_cargo.rsi/inhand-left.png new file mode 100644 index 00000000000..255775b9763 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beret_cargo.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_cargo.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Head/Hats/beret_cargo.rsi/inhand-right.png new file mode 100644 index 00000000000..c2e685f62f3 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beret_cargo.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_cargo.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/beret_cargo.rsi/meta.json new file mode 100644 index 00000000000..e43f00742ad --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/beret_cargo.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Mask/atmosian.rsi/equipped-MASK.png b/Resources/Textures/ADT/Clothing/Mask/atmosian.rsi/equipped-MASK.png new file mode 100644 index 00000000000..e42c2a67caa Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Mask/atmosian.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/ADT/Clothing/Mask/atmosian.rsi/icon.png b/Resources/Textures/ADT/Clothing/Mask/atmosian.rsi/icon.png new file mode 100644 index 00000000000..be51a6de3dc Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Mask/atmosian.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Mask/atmosian.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Mask/atmosian.rsi/inhand-left.png new file mode 100644 index 00000000000..82e159590c4 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Mask/atmosian.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Mask/atmosian.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Mask/atmosian.rsi/inhand-right.png new file mode 100644 index 00000000000..a30b243b5db Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Mask/atmosian.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Mask/atmosian.rsi/meta.json b/Resources/Textures/ADT/Clothing/Mask/atmosian.rsi/meta.json new file mode 100644 index 00000000000..ba546e03a97 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Mask/atmosian.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by discord:OopsieDoopsie#0412", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Neck/Cloaks/HoP_alt_cloak.rsi/equipped-NECK.png b/Resources/Textures/ADT/Clothing/Neck/Cloaks/HoP_alt_cloak.rsi/equipped-NECK.png new file mode 100644 index 00000000000..69c3e113c7d Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Neck/Cloaks/HoP_alt_cloak.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/ADT/Clothing/Neck/Cloaks/HoP_alt_cloak.rsi/icon.png b/Resources/Textures/ADT/Clothing/Neck/Cloaks/HoP_alt_cloak.rsi/icon.png new file mode 100644 index 00000000000..d87574c361f Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Neck/Cloaks/HoP_alt_cloak.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Neck/Cloaks/HoP_alt_cloak.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Neck/Cloaks/HoP_alt_cloak.rsi/inhand-left.png new file mode 100644 index 00000000000..aea84228d88 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Neck/Cloaks/HoP_alt_cloak.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Neck/Cloaks/HoP_alt_cloak.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Neck/Cloaks/HoP_alt_cloak.rsi/inhand-right.png new file mode 100644 index 00000000000..7c736b2eb6e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Neck/Cloaks/HoP_alt_cloak.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Neck/Cloaks/HoP_alt_cloak.rsi/meta.json b/Resources/Textures/ADT/Clothing/Neck/Cloaks/HoP_alt_cloak.rsi/meta.json new file mode 100644 index 00000000000..2aed5d5a0f6 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Neck/Cloaks/HoP_alt_cloak.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "ADT Team", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Neck/Cloaks/atmosian.rsi/equipped-NECK.png b/Resources/Textures/ADT/Clothing/Neck/Cloaks/atmosian.rsi/equipped-NECK.png new file mode 100644 index 00000000000..95964195c9e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Neck/Cloaks/atmosian.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/ADT/Clothing/Neck/Cloaks/atmosian.rsi/icon.png b/Resources/Textures/ADT/Clothing/Neck/Cloaks/atmosian.rsi/icon.png new file mode 100644 index 00000000000..e221e8e64f6 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Neck/Cloaks/atmosian.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Neck/Cloaks/atmosian.rsi/meta.json b/Resources/Textures/ADT/Clothing/Neck/Cloaks/atmosian.rsi/meta.json new file mode 100644 index 00000000000..2bfdfbdb7d3 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Neck/Cloaks/atmosian.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by discord:OopsieDoopsie#0412", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/atmosian.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/atmosian.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..de32e031b8d Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/atmosian.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/atmosian.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/atmosian.rsi/icon.png new file mode 100644 index 00000000000..87afca5f41f Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/atmosian.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/atmosian.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/atmosian.rsi/inhand-left.png new file mode 100644 index 00000000000..6d338ca807e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/atmosian.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/atmosian.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/atmosian.rsi/inhand-right.png new file mode 100644 index 00000000000..de51a7503df Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/atmosian.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/atmosian.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/atmosian.rsi/meta.json new file mode 100644 index 00000000000..d014d8b9ae8 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/atmosian.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by discord:OopsieDoopsie#0412", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_alt_hop.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_alt_hop.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..7429f007082 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_alt_hop.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_alt_hop.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_alt_hop.rsi/icon.png new file mode 100644 index 00000000000..bf3b1e09d02 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_alt_hop.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_alt_hop.rsi/icon_vest.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_alt_hop.rsi/icon_vest.png new file mode 100644 index 00000000000..f155f143964 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_alt_hop.rsi/icon_vest.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_alt_hop.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_alt_hop.rsi/inhand-left.png new file mode 100644 index 00000000000..ac1bee6f952 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_alt_hop.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_alt_hop.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_alt_hop.rsi/inhand-right.png new file mode 100644 index 00000000000..b4ee3e11fef Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_alt_hop.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_alt_hop.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_alt_hop.rsi/meta.json new file mode 100644 index 00000000000..b011f9263a8 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_alt_hop.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by JustKekc", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon_vest" + }, + { + "name": "vest-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "vest-inhand-left", + "directions": 4 + }, + { + "name": "vest-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_alt_hop.rsi/vest-equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_alt_hop.rsi/vest-equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..ecd3998b8f1 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_alt_hop.rsi/vest-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_alt_hop.rsi/vest-inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_alt_hop.rsi/vest-inhand-left.png new file mode 100644 index 00000000000..e894b1d0759 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_alt_hop.rsi/vest-inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_alt_hop.rsi/vest-inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_alt_hop.rsi/vest-inhand-right.png new file mode 100644 index 00000000000..aaa60b093be Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_alt_hop.rsi/vest-inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_hop.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_hop.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..46aaefda95f Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_hop.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_hop.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_hop.rsi/icon.png new file mode 100644 index 00000000000..9a374d1bc50 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_hop.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_hop.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_hop.rsi/inhand-left.png new file mode 100644 index 00000000000..ad4bf2e37c3 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_hop.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_hop.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_hop.rsi/inhand-right.png new file mode 100644 index 00000000000..3448c361d65 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_hop.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_hop.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_hop.rsi/meta.json new file mode 100644 index 00000000000..fed61db9959 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_hop.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_alt_hop.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_alt_hop.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..fe70336253d Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_alt_hop.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_alt_hop.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_alt_hop.rsi/icon.png new file mode 100644 index 00000000000..5cebab9b8f0 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_alt_hop.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_alt_hop.rsi/icon_vest.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_alt_hop.rsi/icon_vest.png new file mode 100644 index 00000000000..3363177c901 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_alt_hop.rsi/icon_vest.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_alt_hop.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_alt_hop.rsi/inhand-left.png new file mode 100644 index 00000000000..ac1bee6f952 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_alt_hop.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_alt_hop.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_alt_hop.rsi/inhand-right.png new file mode 100644 index 00000000000..b4ee3e11fef Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_alt_hop.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_alt_hop.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_alt_hop.rsi/meta.json new file mode 100644 index 00000000000..b011f9263a8 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_alt_hop.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by JustKekc", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon_vest" + }, + { + "name": "vest-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "vest-inhand-left", + "directions": 4 + }, + { + "name": "vest-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_alt_hop.rsi/vest-equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_alt_hop.rsi/vest-equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..b94f47a7623 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_alt_hop.rsi/vest-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_alt_hop.rsi/vest-inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_alt_hop.rsi/vest-inhand-left.png new file mode 100644 index 00000000000..e894b1d0759 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_alt_hop.rsi/vest-inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_alt_hop.rsi/vest-inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_alt_hop.rsi/vest-inhand-right.png new file mode 100644 index 00000000000..aaa60b093be Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_alt_hop.rsi/vest-inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_hop.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_hop.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..ee74ba7d940 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_hop.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_hop.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_hop.rsi/icon.png new file mode 100644 index 00000000000..6e7ae9f410e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_hop.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_hop.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_hop.rsi/inhand-left.png new file mode 100644 index 00000000000..ad4bf2e37c3 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_hop.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_hop.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_hop.rsi/inhand-right.png new file mode 100644 index 00000000000..3448c361d65 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_hop.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_hop.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_hop.rsi/meta.json new file mode 100644 index 00000000000..fed61db9959 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_hop.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_blue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_blue.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..324cd7c6c3c Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_blue.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_blue.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_blue.rsi/icon.png new file mode 100644 index 00000000000..698a1a23be6 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_blue.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_blue.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_blue.rsi/inhand-left.png new file mode 100644 index 00000000000..6ecf0b4574c Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_blue.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_blue.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_blue.rsi/inhand-right.png new file mode 100644 index 00000000000..a9dca68336e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_blue.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_blue.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_blue.rsi/meta.json new file mode 100644 index 00000000000..d7f761e86f9 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_blue.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:mnogo_znal", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_brown.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_brown.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..218a308c8b1 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_brown.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_brown.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_brown.rsi/icon.png new file mode 100644 index 00000000000..579ffd02c31 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_brown.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_brown.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_brown.rsi/inhand-left.png new file mode 100644 index 00000000000..8de92e59002 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_brown.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_brown.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_brown.rsi/inhand-right.png new file mode 100644 index 00000000000..817c72b1639 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_brown.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_brown.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_brown.rsi/meta.json new file mode 100644 index 00000000000..d7f761e86f9 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_brown.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:mnogo_znal", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_gray.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_gray.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..2f5c5e00956 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_gray.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_gray.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_gray.rsi/icon.png new file mode 100644 index 00000000000..be11fe4aab7 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_gray.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_gray.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_gray.rsi/inhand-left.png new file mode 100644 index 00000000000..1ef38cf7f7b Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_gray.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_gray.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_gray.rsi/inhand-right.png new file mode 100644 index 00000000000..dabac804abe Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_gray.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_gray.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_gray.rsi/meta.json new file mode 100644 index 00000000000..d7f761e86f9 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_gray.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:mnogo_znal", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}