diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-1.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-1.ftl index 9d38f69184..3fa9443c6d 100644 --- a/Resources/Locale/ru-RU/locales-new/autotranslate-1.ftl +++ b/Resources/Locale/ru-RU/locales-new/autotranslate-1.ftl @@ -40,3 +40,5 @@ ent-ClothingHeadBandBlue = синяя бандана .desc = Синяя бандана, чтобы выглядеть круто. ent-ClothingHandsGlovesInspector = перчатки инспектора .desc = Длинные кожаные перчатки иснпектора со строгим дизайном. Блестяще! +ent-ClothingEyesGlassesMaid = очки прислуги + .desc = Чистые и милые. diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-2.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-2.ftl index 12f7b81b61..e5b6ca7d91 100644 --- a/Resources/Locale/ru-RU/locales-new/autotranslate-2.ftl +++ b/Resources/Locale/ru-RU/locales-new/autotranslate-2.ftl @@ -34,3 +34,9 @@ ent-ClothingHeadHatBeretBrigmedic = медицинский берет .desc = Белый берет выглядит как кремовый пирог на голове. ent-ClothingHeadHatBeretMerc = берет наемника .desc = Оливковый берет, на значке изображен шакал на скале. +ent-ClothingHeadHatMobCap = шапочка горничной + .desc = Чепец горничной - Идеальный головной убор для знающей свое дело прислуги. Вы же не хотите, чтобы ваши волосы мешались вам при работе? +ent-ClothingHeadHatBomzhHat = грязная шапка + .desc = Шапка ушедшего века. Она износилась и выглядит потрёпанной. +ent-ClothingHeadHatBomzhCap = помойная кепка + .desc = Кепка незваного гостя. Не внушает доверия. diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index d0b671151d..c4241b6af5 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -301,3 +301,19 @@ - HamsterWearable - WhitelistChameleon - type: ShowSecurityIcons + +- type: entity + parent: ClothingEyesBase + id: ClothingEyesGlassesMaid + name: maid's sunglasses + description: Maid's sunglasses. Clean and cute. + components: + - type: Sprite + sprite: White/Clothing/Eyes/Glasses/maidglasses.rsi + - type: Clothing + sprite: White/Clothing/Eyes/Glasses/maidglasses.rsi + - type: FlashImmunity + - type: Tag + tags: + - WhitelistChameleon + - type: ShowSecurityIcons diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 4a0580aeeb..6b92f8c94e 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -1124,3 +1124,46 @@ - type: AddAccentClothing accent: GnomeAccent +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatBomzhHat + name: bomzh hat + description: An old century hat. It's worn out and looks unkempt. + components: + - type: Sprite + sprite: White/Clothing/Head/bomzhhat.rsi + - type: Clothing + sprite: White/Clothing/Head/bomzhhat.rsi + - type: Tag + tags: + - HidesHair + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatBomzhCap + name: bomzh cap + description: Uninvited guest cap. Doesn't inspire confidence. + components: + - type: Sprite + sprite: White/Clothing/Head/bomzhcap.rsi + - type: Clothing + sprite: White/Clothing/Head/bomzhcap.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatMobCap + name: maid's mob cap + description: The headdress of a true servant. + components: + - type: Sprite + sprite: White/Clothing/Head/maidhat.rsi + - type: Clothing + sprite: White/Clothing/Head/maidhat.rsi diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 630caf8aa2..16c9404ef3 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -440,7 +440,7 @@ - state: silver - state: idbomzh - type: PresetIdCard - job: Passenger + job: Bomzh - type: entity parent: IDCardStandard diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/bomzh.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/bomzh.yml index 4d25ba2b76..5f14da8cc9 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/bomzh.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/bomzh.yml @@ -7,6 +7,31 @@ equipment: jumpsuit: ClothingUniformJumpsuitWhiteBomzh +# HEAD +- type: itemLoadout # WD + id: BomzhHeadCap + equipment: BomzhHeadCap +- type: startingGear + id: BomzhHeadCap + equipment: + head: ClothingHeadHatBomzhCap + +- type: itemLoadout # WD + id: BomzhHeadHat + equipment: BomzhHeadHat +- type: startingGear + id: BomzhHeadHat + equipment: + head: ClothingHeadHatBomzhHat + +- type: itemLoadout # WD + id: BomzhHeadHatMelon + equipment: BomzhHeadHatMelon +- type: startingGear + id: BomzhHeadHatMelon + equipment: + head: ClothingHeadHatWatermelon + # PDA - type: itemLoadout # WD id: BomzhPDA diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/maid.yml b/Resources/Prototypes/Loadouts/Jobs/Command/maid.yml index b527726184..cb51269069 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/maid.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/maid.yml @@ -15,6 +15,24 @@ equipment: jumpsuit: ClothingUniformJumpskirtMaidMini +# Head +- type: itemLoadout # WD + id: MaidHeadMobCap + equipment: MaidHeadMobCap +- type: startingGear + id: MaidHeadMobCap + equipment: + head: ClothingHeadHatMobCap + +# Eyes +- type: itemLoadout # WD + id: MaidGlasses + equipment: MaidGlasses +- type: startingGear + id: MaidGlasses + equipment: + eyes: ClothingEyesGlassesMaid + # Back - type: itemLoadout # WD id: MaidSatchel @@ -60,15 +78,6 @@ equipment: shoes: ClothingShoesMaid -# Glasses -- type: itemLoadout # WD - id: MaidGlasses - equipment: MaidGlasses -- type: startingGear - id: MaidGlasses - equipment: - eyes: ClothingEyesGlassesSecurity - # Job Trinkets - type: itemLoadout # WD id: MaidSpray diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 1608304140..205fec1ded 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -2150,6 +2150,13 @@ - InspectorBriefcaseInhand # Maid +- type: loadoutGroup # WD + id: MaidSelfDefenceDevices + name: loadout-group-self-defence-devices + minLimit: 0 + loadouts: + - Flash + - type: loadoutGroup # WD id: MaidGlasses name: loadout-group-eyes @@ -2157,6 +2164,13 @@ loadouts: - MaidGlasses +- type: loadoutGroup # WD + id: MaidHead + name: loadout-group-head + minLimit: 0 + loadouts: + - MaidHeadMobCap + - type: loadoutGroup # WD id: MaidJumpsuit name: loadout-group-jumpsuit @@ -2206,6 +2220,15 @@ loadouts: - BomzhJumpsuit +- type: loadoutGroup # WD + id: BomzhHead + name: loadout-group-head + minLimit: 0 + loadouts: + - BomzhHeadHat + - BomzhHeadCap + - BomzhHeadHatMelon + - type: loadoutGroup # WD id: BomzhPDA name: loadout-group-pda diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 3004759a28..d492b73e99 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -44,12 +44,13 @@ groups: - MaidGlasses # WD - CommonCommandHeadset # WD + - MaidHead - MaidJumpsuit - MaidGloves # WD - MaidBackpack - MaidShoes - MaidPDA # WD - - SelfDefenceDevices # WD + - MaidSelfDefenceDevices # WD - MaidJobTrinkets - CommonUnderwearBottom - CommonUnderwearBra @@ -254,6 +255,7 @@ groups: - BomzhJumpsuit - BomzhPDA + - BomzhHead - BomzhOuterclothing - BomzhJobTrinkets - CommonUnderwearBottom diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bomzh.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bomzh.yml index eaf82401c4..0d7df61428 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/bomzh.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/bomzh.yml @@ -24,7 +24,7 @@ whitelistedSpecies: - Human canBeAntag: true - accessGroups: + access: - Maintenance - type: startingGear diff --git a/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/equipped-EYES.png b/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/equipped-EYES.png new file mode 100644 index 0000000000..5ddbaa3fc2 Binary files /dev/null and b/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/icon.png b/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/icon.png new file mode 100644 index 0000000000..8655cec598 Binary files /dev/null and b/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/icon.png differ diff --git a/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/inhand-left.png b/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/inhand-left.png new file mode 100644 index 0000000000..d1176e7c07 Binary files /dev/null and b/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/inhand-right.png b/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/inhand-right.png new file mode 100644 index 0000000000..c526fca743 Binary files /dev/null and b/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/meta.json b/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/meta.json new file mode 100644 index 0000000000..b32643187f --- /dev/null +++ b/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Maid by omsoyk Discord", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/equipped-HELMET.png b/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..9a3fe2df9e Binary files /dev/null and b/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/icon.png b/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/icon.png new file mode 100644 index 0000000000..5c548039e3 Binary files /dev/null and b/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/icon.png differ diff --git a/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/inhand-left.png b/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/inhand-left.png new file mode 100644 index 0000000000..875e62d8f0 Binary files /dev/null and b/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/inhand-right.png b/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/inhand-right.png new file mode 100644 index 0000000000..f9bc89d903 Binary files /dev/null and b/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/meta.json b/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/meta.json new file mode 100644 index 0000000000..8500087d57 --- /dev/null +++ b/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by omsoyk (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/equipped-HELMET.png b/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..38f0bf8dc7 Binary files /dev/null and b/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/icon.png b/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/icon.png new file mode 100644 index 0000000000..6b5be817f5 Binary files /dev/null and b/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/icon.png differ diff --git a/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/inhand-left.png b/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/inhand-left.png new file mode 100644 index 0000000000..a2ea5b1655 Binary files /dev/null and b/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/inhand-right.png b/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/inhand-right.png new file mode 100644 index 0000000000..6cef5cd9ef Binary files /dev/null and b/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/meta.json b/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/meta.json new file mode 100644 index 0000000000..8500087d57 --- /dev/null +++ b/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by omsoyk (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Clothing/Head/maidhat.rsi/equipped-HELMET.png b/Resources/Textures/White/Clothing/Head/maidhat.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..de45b2bdf4 Binary files /dev/null and b/Resources/Textures/White/Clothing/Head/maidhat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/White/Clothing/Head/maidhat.rsi/icon.png b/Resources/Textures/White/Clothing/Head/maidhat.rsi/icon.png new file mode 100644 index 0000000000..9f34110dcc Binary files /dev/null and b/Resources/Textures/White/Clothing/Head/maidhat.rsi/icon.png differ diff --git a/Resources/Textures/White/Clothing/Head/maidhat.rsi/inhand-left.png b/Resources/Textures/White/Clothing/Head/maidhat.rsi/inhand-left.png new file mode 100644 index 0000000000..b6551f256b Binary files /dev/null and b/Resources/Textures/White/Clothing/Head/maidhat.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Clothing/Head/maidhat.rsi/inhand-right.png b/Resources/Textures/White/Clothing/Head/maidhat.rsi/inhand-right.png new file mode 100644 index 0000000000..56eb68a078 Binary files /dev/null and b/Resources/Textures/White/Clothing/Head/maidhat.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Clothing/Head/maidhat.rsi/meta.json b/Resources/Textures/White/Clothing/Head/maidhat.rsi/meta.json new file mode 100644 index 0000000000..8500087d57 --- /dev/null +++ b/Resources/Textures/White/Clothing/Head/maidhat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by omsoyk (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}