diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Eyes/glasses.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Eyes/glasses.ftl index e01547f8e0..b238eb451b 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Eyes/glasses.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Eyes/glasses.ftl @@ -7,6 +7,8 @@ ent-ADTClothingEyesGlassesMed = медицинские солнцезащитн ent-ADTClothingEyesGlassesPink = розовые очки .desc = Не замечай недостатков этого мира. +ent-ADTClothingEyesGlassesMimicry = мимикрические очки + .desc = Склизкие на вид очки, по одному виду чувствуется что они сделаны из кого-то... ent-ADTNeonTacticalGlasses = неоновые тактические очки .suffix = Хеллоуин diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Shoes/boots.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Shoes/boots.ftl index 76e41f90f3..3bd19c39f8 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Shoes/boots.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Shoes/boots.ftl @@ -13,5 +13,10 @@ ent-ADTClothingShoesBootsMagAdvSynd = улучшенные магнитные б .desc = Созданые благодаря ревёрс инженерингу, эти ботинки защитят вас как от условий отсутвия гравитации, так и от клоунов. .suffix = { "" } +ent-ADTClothingFootMimicry = мимикрические туфли + .desc = Пара туфель что были созданы буквально из кожи человека, выглядит ужасно! + .suffix = { "" } + ent-ADTClothingShoesHighboots = Походные сапоги .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 cf674c265e..a50ba1252f 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 @@ -266,6 +266,9 @@ ent-ADTClothingUniformJumpsuitTrader = комбинезон торговца .desc = Это комбинезон, который носят торговцы ТСФ .suffix = { "ТСФ" } +ent-ADTClothingUniformMimicry = мимикрический комбинезон + .desc = На вид как деловой костюм что агрессивно сшили из плоти, выглядит ужасно! + ent-ADTClothingUniformGuardOfficer = комбинезон надзирателя .desc = Ничем не примечательная оранжевая униформа тюремного охранника. @@ -347,3 +350,4 @@ ent-ADTClothingUniformAbibasBlackSuit = черный спортивный кос ent-ADTClothingUniformJumpsuitCMOHike = походный костюм главного врача .desc = Рубашка и мешковитые штаны, отлично подходящие для активной работы как вне, так и внутри своего отдела. .suffix = { "" } + diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/melee.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/melee.ftl index bae7ed331b..c34729023e 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/melee.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/melee.ftl @@ -22,8 +22,12 @@ ent-HereticBladeFlesh = кровавый клинок ent-HereticBladeVoid = пустотный клинок .desc = То, что нужно, когда вокруг тебя летают призраки. - + +ent-ADTWeaponSworldMimicry = мимикрический клинок + .desc = Вам становится не по себе от одного вида данного меча и его носителя... + ent-ADTJasonMachette = мачете Джейсона .suffix = Хеллоуин .desc = Мачете одного из самых ужасающих маньяков. Сбоку маленькая надпись "полиуретан". + diff --git a/Resources/Prototypes/ADT/Actions/mimicry.yml b/Resources/Prototypes/ADT/Actions/mimicry.yml new file mode 100644 index 0000000000..41306f59f9 --- /dev/null +++ b/Resources/Prototypes/ADT/Actions/mimicry.yml @@ -0,0 +1,14 @@ +- type: entity + id: ADTActionTeatacles + name: tentacles + categories: [ HideSpawnMenu ] + components: + - type: InstantAction + useDelay: 10 + itemIconStyle: BigAction + icon: + sprite: ADT/Objects/Weapons/Melee/mimicria_sword.rsi + state: icon + event: !type:InstantSpawnSpellEvent + prototype: ADTEffectiMicriaTentacleSpawn + posData: !type:TargetInFront \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml index a83cb5a9b6..751e83dd71 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml @@ -53,6 +53,15 @@ - WhitelistChameleon - HudMedical +- type: entity + parent: ClothingEyesBase + id: ADTClothingEyesGlassesMimicry + name: mimicy glasses + components: + - type: Sprite + sprite: ADT/Clothing/Eyes/Glasses/mimicry.rsi + - type: Clothing + sprite: ADT/Clothing/Eyes/Glasses/mimicry.rsi # halloween diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Shoes/Boots.yml b/Resources/Prototypes/ADT/Entities/Clothing/Shoes/Boots.yml index 7eda0c54c5..a887972d48 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Shoes/Boots.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Shoes/Boots.yml @@ -10,6 +10,16 @@ - type: Clothing sprite: ADT/Clothing/Shoes/Boots/newmekka.rsi #спрайты от prazat911 +- type: entity + parent: ClothingShoesBaseButcherable + id: ADTClothingFootMimicry + name: mimicry boot + components: + - type: Sprite + sprite: ADT/Clothing/Shoes/Boots/mimicry.rsi + - type: Clothing + sprite: ADT/Clothing/Shoes/Boots/mimicry.rsi + - type: entity parent: ClothingShoesBootsCombat id: ADTClothingShoesBootsCombatTimePatrol @@ -26,3 +36,4 @@ sprite: ADT/Clothing/Shoes/Boots/highboots.rsi - type: Clothing sprite: ADT/Clothing/Shoes/Boots/highboots.rsi + diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml index 31fe57cbc6..a7cec9df4c 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml @@ -904,6 +904,16 @@ sprite: ADT/Clothing/Uniforms/Jumpsuit/trader.rsi +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformMimicry + name: mimicry jumpsuit + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/mimicry.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/mimicry.rsi + #halloween - type: entity diff --git a/Resources/Prototypes/ADT/Entities/Effects/mimicry.yml b/Resources/Prototypes/ADT/Entities/Effects/mimicry.yml new file mode 100644 index 0000000000..2989a47d2f --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Effects/mimicry.yml @@ -0,0 +1,22 @@ +- type: entity + id: ADTEffectiMicriaTentacleRetract + parent: BaseEffectGoliathTentacleSpawn + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/mimicria_sword.rsi + state: mimicria_tentacle_retract + - type: EffectVisuals + - type: AnimationPlayer + +- type: entity + id: ADTEffectiMicriaTentacleSpawn + parent: BaseEffectGoliathTentacleSpawn + categories: [ HideSpawnMenu ] + name: tentacle + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/mimicria_sword.rsi + state: mimicria_tentacle_spawn + - type: SpawnOnDespawn + prototype: ADTMimicriaTentacle diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/mimicria.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/mimicria.yml new file mode 100644 index 0000000000..e629271554 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/mimicria.yml @@ -0,0 +1,58 @@ +- type: entity + name: Mimicria + parent: BaseSword + id: ADTWeaponSworldMimicry + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/mimicria_sword.rsi + - type: MeleeWeapon + damage: + types: + Slash: 15 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: DisarmMalus + - type: Spellbook + learnTime: 0.01 + spellActions: + ADTActionTeatacles: -1 + - type: Item + sprite: ADT/Objects/Weapons/Melee/mimicria_sword.rsi + size: Huge + +- type: entity + id: ADTMimicriaTentacle + name: tentacle + categories: [ HideSpawnMenu ] + components: + - type: Transform + anchored: True + - type: Physics + bodyType: Static + canCollide: true + - type: InteractionOutline + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/mimicria_sword.rsi + layers: + - state: mimicria_tentacle_wiggle + - type: Fixtures + fixtures: + fix: + shape: + !type:PhysShapeAabb + bounds: "-0.45,-0.45,0.45,0.45" + mask: + - Impassable + layer: + - Impassable + hard: false + - type: TimedDespawn #do this shit by hand because of fucking course. + lifetime: 1 + - type: DamageContacts + damage: + types: + Slash: 20 + Piercing: 20 + - type: SpawnOnDespawn + prototype: ADTEffectiMicriaTentacleRetract + diff --git a/Resources/Textures/ADT/Clothing/Eyes/Glasses/mimicry.rsi/equipped-EYES.png b/Resources/Textures/ADT/Clothing/Eyes/Glasses/mimicry.rsi/equipped-EYES.png new file mode 100644 index 0000000000..8041a1cd73 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Eyes/Glasses/mimicry.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/ADT/Clothing/Eyes/Glasses/mimicry.rsi/icon.png b/Resources/Textures/ADT/Clothing/Eyes/Glasses/mimicry.rsi/icon.png new file mode 100644 index 0000000000..89c76123fe Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Eyes/Glasses/mimicry.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Eyes/Glasses/mimicry.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Eyes/Glasses/mimicry.rsi/inhand-left.png new file mode 100644 index 0000000000..464f96b072 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Eyes/Glasses/mimicry.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Eyes/Glasses/mimicry.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Eyes/Glasses/mimicry.rsi/inhand-right.png new file mode 100644 index 0000000000..840860af31 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Eyes/Glasses/mimicry.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Eyes/Glasses/mimicry.rsi/meta.json b/Resources/Textures/ADT/Clothing/Eyes/Glasses/mimicry.rsi/meta.json new file mode 100644 index 0000000000..c5f3f9aecd --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Eyes/Glasses/mimicry.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by decente", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "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/Shoes/Boots/mimicry.rsi/equipped-FEET.png b/Resources/Textures/ADT/Clothing/Shoes/Boots/mimicry.rsi/equipped-FEET.png new file mode 100644 index 0000000000..3223cc4c5e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Shoes/Boots/mimicry.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/ADT/Clothing/Shoes/Boots/mimicry.rsi/icon.png b/Resources/Textures/ADT/Clothing/Shoes/Boots/mimicry.rsi/icon.png new file mode 100644 index 0000000000..6204ab93e7 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Shoes/Boots/mimicry.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Shoes/Boots/mimicry.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Shoes/Boots/mimicry.rsi/inhand-left.png new file mode 100644 index 0000000000..050c719704 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Shoes/Boots/mimicry.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Shoes/Boots/mimicry.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Shoes/Boots/mimicry.rsi/inhand-right.png new file mode 100644 index 0000000000..0d01c93448 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Shoes/Boots/mimicry.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Shoes/Boots/mimicry.rsi/meta.json b/Resources/Textures/ADT/Clothing/Shoes/Boots/mimicry.rsi/meta.json new file mode 100644 index 0000000000..96e5f79f9d --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Shoes/Boots/mimicry.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by decente", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mimicry.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mimicry.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..f411c84d0f Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mimicry.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mimicry.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mimicry.rsi/icon.png new file mode 100644 index 0000000000..ae68180b2d Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mimicry.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mimicry.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mimicry.rsi/inhand-left.png new file mode 100644 index 0000000000..554e1e1b72 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mimicry.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mimicry.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mimicry.rsi/inhand-right.png new file mode 100644 index 0000000000..03aae26fe2 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mimicry.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mimicry.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mimicry.rsi/meta.json new file mode 100644 index 0000000000..d312f73190 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mimicry.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by decente", + "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/Objects/Weapons/Melee/mimicria_sword.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Melee/mimicria_sword.rsi/icon.png new file mode 100644 index 0000000000..f110dd1638 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/mimicria_sword.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/mimicria_sword.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/mimicria_sword.rsi/inhand-left.png new file mode 100644 index 0000000000..68a7b9216b Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/mimicria_sword.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/mimicria_sword.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/mimicria_sword.rsi/inhand-right.png new file mode 100644 index 0000000000..dc2a82b6bd Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/mimicria_sword.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/mimicria_sword.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/mimicria_sword.rsi/meta.json new file mode 100644 index 0000000000..946b206d55 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/mimicria_sword.rsi/meta.json @@ -0,0 +1,55 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Mage by decente", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "mimicria_tentacle_spawn", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.1 + ] + ] + }, + { + "name": "mimicria_tentacle_wiggle", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "mimicria_tentacle_retract", + "delays": [ + [ + 0.1, + 0.2, + 0.2, + 0.3 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/mimicria_sword.rsi/mimicria_tentacle_retract.png b/Resources/Textures/ADT/Objects/Weapons/Melee/mimicria_sword.rsi/mimicria_tentacle_retract.png new file mode 100644 index 0000000000..06d0d11b96 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/mimicria_sword.rsi/mimicria_tentacle_retract.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/mimicria_sword.rsi/mimicria_tentacle_spawn.png b/Resources/Textures/ADT/Objects/Weapons/Melee/mimicria_sword.rsi/mimicria_tentacle_spawn.png new file mode 100644 index 0000000000..135476eb19 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/mimicria_sword.rsi/mimicria_tentacle_spawn.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/mimicria_sword.rsi/mimicria_tentacle_wiggle.png b/Resources/Textures/ADT/Objects/Weapons/Melee/mimicria_sword.rsi/mimicria_tentacle_wiggle.png new file mode 100644 index 0000000000..99932a68ca Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/mimicria_sword.rsi/mimicria_tentacle_wiggle.png differ