diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/specific.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/specific.ftl index 3cf1ef8da246..3c855aa8b3aa 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/specific.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/specific.ftl @@ -3,3 +3,4 @@ ent-ClothingHeadHatChameleon = берет .suffix = Хамелеон ent-ClothingHeadHatDetGadget = гаджет-шляпа .desc = Инновационная шляпа со встроенным набором инструментов. Автоматически хранит и извлекает предметы по одной фразе! +switch-fedora = Изменить цвет diff --git a/Resources/Prototypes/Entities/Clothing/Head/specific.yml b/Resources/Prototypes/Entities/Clothing/Head/specific.yml index fcb6ba3a9691..f22565d43ae6 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/specific.yml @@ -28,11 +28,29 @@ type: ChameleonBoundUserInterface - type: entity - parent: ClothingHeadHatFedoraBrown + parent: [ClothingHeadBase, BaseFoldable, BaseSecurityContraband ] # неиспользуемая система контрабанды с губов id: ClothingHeadHatDetGadget name: go go hat description: A novel hat with a built in toolkit. Automatically stores and retrieves items at the say of a phrase! components: + - type: Clothing + sprite: Clothing/Head/Hats/gogogadgethat.rsi + - type: FoldableClothing + foldedEquippedPrefix: grey + foldedHeldPrefix: grey + - type: Appearance + - type: Foldable + canFoldInsideContainer: true + foldVerbText: switch-fedora + unfoldVerbText: switch-fedora + - type: Sprite + sprite: Clothing/Head/Hats/gogogadgethat.rsi + layers: + - state: icon + map: [ "unfoldedLayer" ] + - state: icon-grey + map: ["foldedLayer"] + visible: false - type: Tag tags: [] # ignore "WhitelistChameleon" tag - type: TriggerOnVoice @@ -57,3 +75,18 @@ containers: storagebase: !type:Container ents: [ ] + - type: Armor # Goob + coverage: + - Head + traumaDeductions: + Dismemberment: 0.2 + OrganDamage: 0.2 + BoneDamage: 0.2 + VeinsDamage: 0 + NerveDamage: 0 + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.8 + Heat: 0.8 diff --git a/Resources/Textures/Clothing/Head/Hats/gogogadgethat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/gogogadgethat.rsi/equipped-HELMET.png new file mode 100644 index 000000000000..5bd073560f65 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/gogogadgethat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/gogogadgethat.rsi/grey-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/gogogadgethat.rsi/grey-equipped-HELMET.png new file mode 100644 index 000000000000..2085c2639069 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/gogogadgethat.rsi/grey-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/gogogadgethat.rsi/grey-inhand-left.png b/Resources/Textures/Clothing/Head/Hats/gogogadgethat.rsi/grey-inhand-left.png new file mode 100644 index 000000000000..c6986385b62a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/gogogadgethat.rsi/grey-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/gogogadgethat.rsi/grey-inhand-right.png b/Resources/Textures/Clothing/Head/Hats/gogogadgethat.rsi/grey-inhand-right.png new file mode 100644 index 000000000000..15f87384784c Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/gogogadgethat.rsi/grey-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/gogogadgethat.rsi/icon-grey.png b/Resources/Textures/Clothing/Head/Hats/gogogadgethat.rsi/icon-grey.png new file mode 100644 index 000000000000..33a324b1a2e7 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/gogogadgethat.rsi/icon-grey.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/gogogadgethat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/gogogadgethat.rsi/icon.png new file mode 100644 index 000000000000..fd92ccefe515 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/gogogadgethat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/gogogadgethat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/gogogadgethat.rsi/inhand-left.png new file mode 100644 index 000000000000..8c51d5e5b2be Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/gogogadgethat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/gogogadgethat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/gogogadgethat.rsi/inhand-right.png new file mode 100644 index 000000000000..b1bf119a2820 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/gogogadgethat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/gogogadgethat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/gogogadgethat.rsi/meta.json new file mode 100644 index 000000000000..54716821f7ee --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/gogogadgethat.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5ea6d8b4422027d0c22cb415d1f05a08bf39aaa0", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-grey" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "grey-equipped-HELMET", + "directions": 4 + }, + { + "name": "grey-inhand-left", + "directions": 4 + }, + { + "name": "grey-inhand-right", + "directions": 4 + } + ] +}