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 f7350ff9466..29d979a2bfd 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 @@ -36,6 +36,9 @@ ent-ADTClothingHeadHatsGuardOfficer = кепка надзирателя ent-ADTClothingHeadHatsGuardOfficerMaster = фуражка надзирателя .desc = Фуражка тюремного надзирателя, которая выдается сотрудникам с опытом работы. +ent-ADTClothingHeadGreyHatsGuardOfficer = серая фуражка надзирателя + .desc = Серая фуражка тюремного надзирателя, которая выдается сотрудникам с чуть меньшим опытом работы. + ent-ADTClothingHeadCapIlisium = фуражка .suffix = Иллизиум .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 c83dce3bcf3..cf674c265e9 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 @@ -272,6 +272,9 @@ ent-ADTClothingUniformGuardOfficer = комбинезон надзирателя ent-ADTClothingUniformGuardOfficerMaster = комбинезон заслуженного надзирателя .desc = Обновленная оранжевая форма тюремного охранника для сотрудников с опытом работы, украшенная черными полосками на рукавах, символизирующая годы службы и опыт. +ent-ADTClothingUniformGreyGuardOfficer = серый комбинезон заслуженного надзирателя + .desc = Обновленная серая форма тюремного охранника для сотрудников с чуть меньшим опытом работы, но всё же заслуженным. + ent-ADTOtherworldClownCostume = костюм потустороннего клоуна .suffix = Хеллоуин .desc = Костюм древнего существа, прибывшего из другого измерения, чтобы пугать людей и питаться их страхами... звучит как работа клоуна! diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml index 1e884eff001..b4e40f12356 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml @@ -150,6 +150,17 @@ - type: Clothing sprite: ADT/Clothing/Head/Hats/guard_officer_cap_master.rsi +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadGreyHatsGuardOfficer + name: grey guard officer cap + description: Glory to NanoTrasen! + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/grey_guard_officer_cap.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/grey_guard_officer_cap.rsi + #Береты профессий - type: entity diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml index e786a36c9b3..31fe57cbc6b 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml @@ -879,6 +879,17 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/guard_officer_master.rsi +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformGreyGuardOfficer + name: grey uniform guard officer + description: grey uniform guard officer + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/grey_guard_officer.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/grey_guard_officer.rsi + # ТСФ - type: entity diff --git a/Resources/Prototypes/ADT/Loadouts/Jobs/Security/guard_officer.yml b/Resources/Prototypes/ADT/Loadouts/Jobs/Security/guard_officer.yml index 626b7e72b36..9cab82797f2 100644 --- a/Resources/Prototypes/ADT/Loadouts/Jobs/Security/guard_officer.yml +++ b/Resources/Prototypes/ADT/Loadouts/Jobs/Security/guard_officer.yml @@ -22,6 +22,11 @@ - !type:GroupLoadoutEffect proto: MasterGuardOfficer # Нужно наиграть 600 минут на надзирателе для открытия +- type: loadout + id: ADTHeadHatGuardGreyOfficer + equipment: + head: ADTClothingHeadGreyHatsGuardOfficer + # Jumpsuit - type: loadout id: ADTUniformJumpsuitGuardOfficer @@ -35,3 +40,8 @@ effects: - !type:GroupLoadoutEffect proto: MasterGuardOfficer # Нужно наиграть 600 минут на надзирателе для открытия + +- type: loadout + id: ADTUniformJumpsuitGreyGuardOfficer + equipment: + jumpsuit: ADTClothingUniformGreyGuardOfficer diff --git a/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml b/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml index 205f00af287..1337b73466b 100644 --- a/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml @@ -602,6 +602,7 @@ maxLimit: 1 loadouts: - ADTHeadHatGuardOfficer + - ADTHeadHatGuardGreyOfficer - ADTHeadHatGuardOfficerMaster @@ -613,4 +614,5 @@ maxLimit: 1 loadouts: - ADTUniformJumpsuitGuardOfficer + - ADTUniformJumpsuitGreyGuardOfficer - ADTUniformJumpsuitGuardOfficerMaster diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/grey_guard_officer_cap.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/grey_guard_officer_cap.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..d6176cf74f2 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/grey_guard_officer_cap.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/grey_guard_officer_cap.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/grey_guard_officer_cap.rsi/icon.png new file mode 100644 index 00000000000..44cde4b1c37 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/grey_guard_officer_cap.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/grey_guard_officer_cap.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Head/Hats/grey_guard_officer_cap.rsi/inhand-left.png new file mode 100644 index 00000000000..e3d61365d76 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/grey_guard_officer_cap.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/grey_guard_officer_cap.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Head/Hats/grey_guard_officer_cap.rsi/inhand-right.png new file mode 100644 index 00000000000..41a24f7dd67 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/grey_guard_officer_cap.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/grey_guard_officer_cap.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/grey_guard_officer_cap.rsi/meta.json new file mode 100644 index 00000000000..2486a392de2 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/grey_guard_officer_cap.rsi/meta.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by discord: prazat911 for Adventure Time Project team", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left" + }, + { + "name": "inhand-right" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/grey_guard_officer.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/grey_guard_officer.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 00000000000..5e8e0f2af03 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/grey_guard_officer.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/grey_guard_officer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/grey_guard_officer.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..957637421ae Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/grey_guard_officer.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/grey_guard_officer.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/grey_guard_officer.rsi/icon.png new file mode 100644 index 00000000000..e642cdbbe47 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/grey_guard_officer.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/grey_guard_officer.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/grey_guard_officer.rsi/inhand-left.png new file mode 100644 index 00000000000..e2b0c27050a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/grey_guard_officer.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/grey_guard_officer.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/grey_guard_officer.rsi/inhand-right.png new file mode 100644 index 00000000000..2e1ac7e5ba0 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/grey_guard_officer.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/grey_guard_officer.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/grey_guard_officer.rsi/meta.json new file mode 100644 index 00000000000..86f01a96080 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/grey_guard_officer.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by discord: prazat911 for Adventure Time Project team", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}