Skip to content

Commit

Permalink
мимикрические шутки (#646)
Browse files Browse the repository at this point in the history
## Описание PR
<!-- Что вы изменили в этом пулл реквесте? -->
добавила костюм и меч мимикрии
## Почему / Баланс
<!-- Почему оно было изменено? Ссылайтесь на любые обсуждения или
вопросы здесь. Пожалуйста, обсудите, как это повлияет на игровой баланс.
-->
**Ссылка на публикацию в Discord**
<!-- Укажите ссылки на соответствующие обсуждения, проблемы, баги,
заказы в разработку или предложения
- [Технические проблемы](ссылка)
- [Баги](ссылка)
- [Заказы-разработка](ссылка)
- [Предложения](ссылка)
- [Перенос контента](ссылка)-->
https://discord.com/channels/901772674865455115/1281005212429193247

## Медиа
<!--
Пулл реквесты, которые вносят внутриигровые изменения (добавление
одежды, предметов, новых возможностей и т.д.), должны содержать медиа,
демонстрирующие изменения.
Небольшие исправления/рефакторы не требуют медиа.

Если Вы не уверены в том, что Ваш пулл реквест требует медиа, спросите
мейнтейнера.
-->

## Требования
<!--
В связи с наплывом ПР'ов нам необходимо убедиться, что ПР'ы следуют
правильным рекомендациям.

Пожалуйста, уделите время прочтению, если делаете пулл реквест (ПР)
впервые.

Отметьте поля ниже, чтобы подтвердить, что Вы действительно видели их
(поставьте X в скобках, например [X]):
-->
- [x] Я прочитал(а) и следую [Руководство по созданию пулл
реквестов](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html).
Я понимаю, что в противном случае мой ПР может быть закрыт по усмотрению
мейнтейнера.
- [x] Я добавил скриншоты/видео к этому пулл реквесту, демонстрирующие
его изменения в игре, **или** этот пулл реквест не требует демонстрации
в игре
  • Loading branch information
Ratyyy authored Nov 1, 2024
1 parent 32d8801 commit 53dcfc8
Show file tree
Hide file tree
Showing 32 changed files with 273 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ ent-ADTClothingEyesGlassesMed = медицинские солнцезащитн
ent-ADTClothingEyesGlassesPink = розовые очки
.desc = Не замечай недостатков этого мира.
ent-ADTClothingEyesGlassesMimicry = мимикрические очки
.desc = Склизкие на вид очки, по одному виду чувствуется что они сделаны из кого-то...
ent-ADTNeonTacticalGlasses = неоновые тактические очки
.suffix = Хеллоуин
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,10 @@ ent-ADTClothingShoesBootsMagAdvSynd = улучшенные магнитные б
.desc = Созданые благодаря ревёрс инженерингу, эти ботинки защитят вас как от условий отсутвия гравитации, так и от клоунов.
.suffix = { "" }
ent-ADTClothingFootMimicry = мимикрические туфли
.desc = Пара туфель что были созданы буквально из кожи человека, выглядит ужасно!
.suffix = { "" }
ent-ADTClothingShoesHighboots = Походные сапоги
.desc = Пара высоких сапог, чтобы не заморать ноги во время ходьбы по лужам крови.
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,9 @@ ent-ADTClothingUniformJumpsuitTrader = комбинезон торговца
.desc = Это комбинезон, который носят торговцы ТСФ
.suffix = { "ТСФ" }
ent-ADTClothingUniformMimicry = мимикрический комбинезон
.desc = На вид как деловой костюм что агрессивно сшили из плоти, выглядит ужасно!
ent-ADTClothingUniformGuardOfficer = комбинезон надзирателя
.desc = Ничем не примечательная оранжевая униформа тюремного охранника.
Expand Down Expand Up @@ -347,3 +350,4 @@ ent-ADTClothingUniformAbibasBlackSuit = черный спортивный кос
ent-ADTClothingUniformJumpsuitCMOHike = походный костюм главного врача
.desc = Рубашка и мешковитые штаны, отлично подходящие для активной работы как вне, так и внутри своего отдела.
.suffix = { "" }
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,12 @@ ent-HereticBladeFlesh = кровавый клинок
ent-HereticBladeVoid = пустотный клинок
.desc = То, что нужно, когда вокруг тебя летают призраки.
ent-ADTWeaponSworldMimicry = мимикрический клинок
.desc = Вам становится не по себе от одного вида данного меча и его носителя...
ent-ADTJasonMachette = мачете Джейсона
.suffix = Хеллоуин
.desc = Мачете одного из самых ужасающих маньяков. Сбоку маленькая надпись "полиуретан".
14 changes: 14 additions & 0 deletions Resources/Prototypes/ADT/Actions/mimicry.yml
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
11 changes: 11 additions & 0 deletions Resources/Prototypes/ADT/Entities/Clothing/Shoes/Boots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -26,3 +36,4 @@
sprite: ADT/Clothing/Shoes/Boots/highboots.rsi
- type: Clothing
sprite: ADT/Clothing/Shoes/Boots/highboots.rsi

10 changes: 10 additions & 0 deletions Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 22 additions & 0 deletions Resources/Prototypes/ADT/Entities/Effects/mimicry.yml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions Resources/Textures/ADT/Clothing/Eyes/Glasses/mimicry.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions Resources/Textures/ADT/Clothing/Shoes/Boots/mimicry.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
]
]
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 53dcfc8

Please sign in to comment.