Skip to content

Commit

Permalink
Merge pull request #103 from FrisKisDr/fire
Browse files Browse the repository at this point in the history
Новакиды
  • Loading branch information
FrisKisDr authored Nov 8, 2023
2 parents 79f1f9b + e73c8f9 commit 4081a04
Show file tree
Hide file tree
Showing 82 changed files with 1,441 additions and 7 deletions.
Binary file not shown.
Binary file added Resources/Audio/ADT/Novakid/novakid_laugh02.ogg
Binary file not shown.
Binary file added Resources/Audio/ADT/Novakid/novakid_laugh03.ogg
Binary file not shown.
Binary file added Resources/Audio/ADT/Novakid/novakid_laugh04.ogg
Binary file not shown.
Binary file added Resources/Audio/ADT/Novakid/novakid_laugh05.ogg
Binary file not shown.
Binary file added Resources/Audio/ADT/Novakid/novakid_scream01.ogg
Binary file not shown.
Binary file added Resources/Audio/ADT/Novakid/novakid_scream02.ogg
Binary file not shown.
Binary file added Resources/Audio/ADT/Novakid/novakid_scream03.ogg
Binary file not shown.
Binary file added Resources/Audio/ADT/Novakid/novakid_scream04.ogg
Binary file not shown.
15 changes: 12 additions & 3 deletions Resources/Changelog/ChangelogADT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ Entries:
- {message: Печать АВД на бумажке больше не ERROR, type: Fix}
- {message: Фикс лапок хвостатых и пушистых. Скажем нет лишним пикселям!, type: Fix}
id: 55560 #костыль отображения в Обновлениях
time: '2023-08-01T05:08:04.0000000+00:00'
time: '2023-08-01T05:08:04.0000000+00:00'

- author: Шрёдингер
changes:
Expand Down Expand Up @@ -116,10 +116,10 @@ Entries:
- {message: НТ улучшило поставляемые щиты на станции, type: Tweak}
- {message: Учёные цк пролили кофе на платы торгоматов снизив их шансы на самосознание и будущий захват мира, type: Tweak}
- {message: Робототехники перепрошили мозги таксиботов убрав ограничители на скорость, type: Tweak}
- {message: НТ заключило новый контракт на поставку боле продвинутых униврсальных наборов с кровью, type: Tweak}
- {message: НТ заключило новый контракт на поставку боле продвинутых униврсальных наборов с кровью, type: Tweak}
id: 55563 #костыль отображения в Обновлениях
time: '2023-09-18T03:19:00.0000000+00:00'

- author: Петр Игнатьевич
changes:
- {message: в результате успешного саботажа силами ДСО производства патронов калибра .357 их убойные возможности снизились, type: Tweak}
Expand Down Expand Up @@ -518,9 +518,18 @@ Entries:
id: 55601 #костыль отображения в Обновлениях
time: '2023-11-07T07:40:00.0000000+00:00'

#- author: Friskis
# changes:
# - {message: Новая мзуыка лобби, type: Add}
# - {message: Раса Новакидов, type: Add}
# id: 55602 #костыль отображения в Обновлениях
# time: '2023-11-14T07:40:00.0000000+00:00'
# ХихиХАха. До 14 числа

- author: Шрёдингер
changes:
- {message: Нижнее бельё также как и всю остальную одежду можно разделать на ткань., type: Add}
- {message: Добавил возможность Нианам кушать нижнее бельё(Носки трусы бра)., type: Add}
id: 55603 #костыль отображения в Обновлениях
time: '2023-11-07T04:20:00.0000000+00:00'

44 changes: 44 additions & 0 deletions Resources/Locale/ru-RU/ADT/Novakid/species.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
novakid-hurt-by-water-popup = Вода заставляет ваше пламя угасать
species-name-novakid = Новакид
marking-NovakidHair1 = сплетение
marking-NovakidHair2 = комета
marking-NovakidHair3 = дуализм
marking-NovakidHair4 = слава
marking-NovakidHair5 = газовое облако
marking-NovakidHair6 = газовая лавина
marking-NovakidHair7 = сияние света
marking-NovakidHair8 = огонек звездного блеска
marking-NovakidHair9 = звездочка
marking-NovakidHair10 = лунный день
marking-NovakidHair11 = метеоритный дождь
marking-NovakidHair12 = млечный путь
marking-NovakidHair13 = туманность
marking-NovakidHair14 = солнечная коронка
marking-NovakidHair15 = звездный дождь
marking-NovakidHair16 = звездопад
marking-NovakidHair17 = пламя звезды
marking-NovakidHair18 = солнечный свет
marking-NovakidHair19 = сверхновая
marking-NovakidHair20 = галактический стиль
marking-NovakidHair21 = дева
marking-NovakidHair22 = галактика
marking-NovakidFace1 = раскол
marking-NovakidFace2 = крест
marking-NovakidFace3 = распятие
marking-NovakidFace4 = двойственность
marking-NovakidFace5 = око
marking-NovakidFace6 = H
marking-NovakidFace7 = сердце
marking-NovakidFace8 = индикатор
marking-NovakidFace9 = нота
marking-NovakidFace10 = призма
marking-NovakidFace11 = руна
marking-NovakidFace12 = квадрат
marking-NovakidFace13 = напряжение
marking-NovakidFace14 = тройственность
marking-NovakidFace15 = перевёрнутое распятие
marking-NovakidFace16 = X
marking-NovakidFace17 = Y
marking-NovakidFace18 = зета
marking-TorsoNovakidDefolt = белое ядро
marking-HeadNovakidDefolt = белое ядро
15 changes: 15 additions & 0 deletions Resources/Prototypes/ADT/Novakid/Body/Organs/novakid.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
- type: entity
id: OrganNovakidStomach
parent: OrganAnimalStomach
noSpawn: true
components:
- type: Stomach
maxVol: 50

- type: entity
id: OrganNovakidLungs
parent: OrganHumanLungs
suffix: "novakid"
components:
- type: Metabolizer
metabolizerTypes: [ Novakid ]
190 changes: 190 additions & 0 deletions Resources/Prototypes/ADT/Novakid/Body/Parts/novakid.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,190 @@
# TODO: Add descriptions (many)
# TODO BODY: Part damage
- type: entity
id: PartNovakid
parent: BaseItem
name: "novakid body part"
abstract: true
components:
- type: Damageable
damageContainer: Biological
- type: BodyPart
- type: ContainerContainer
containers:
bodypart: !type:Container
ents: []

- type: entity
id: TorsoNovakid
name: "novakid torso"
parent: PartNovakid
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Novakid/parts.rsi
state: "torso_m"
- type: Icon
sprite: ADT/Mobs/Novakid/parts.rsi
state: "torso_m"
- type: BodyPart
partType: Torso

- type: entity
id: HeadNovakid
name: "novakid head"
parent: PartNovakid
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Novakid/parts.rsi
state: "head_m"
- type: Icon
sprite: ADT/Mobs/Novakid/parts.rsi
state: "head_m"
- type: BodyPart
partType: Head
vital: true
- type: Input
context: "ghost"
- type: MovementSpeedModifier
baseWalkSpeed: 0
baseSprintSpeed: 0
- type: InputMover
- type: GhostOnMove
- type: Tag
tags:
- Head

- type: entity
id: LeftArmNovakid
name: "left novakid arm"
parent: PartNovakid
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Novakid/parts.rsi
state: "l_arm"
- type: Icon
sprite: ADT/Mobs/Novakid/parts.rsi
state: "l_arm"
- type: BodyPart
partType: Arm
symmetry: Left

- type: entity
id: RightArmNovakid
name: "right novakid arm"
parent: PartNovakid
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Novakid/parts.rsi
state: "r_arm"
- type: Icon
sprite: ADT/Mobs/Novakid/parts.rsi
state: "r_arm"
- type: BodyPart
partType: Arm
symmetry: Right

- type: entity
id: LeftHandNovakid
name: "left novakid hand"
parent: PartNovakid
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Novakid/parts.rsi
state: "l_hand"
- type: Icon
sprite: ADT/Mobs/Novakid/parts.rsi
state: "l_hand"
- type: BodyPart
partType: Hand
symmetry: Left

- type: entity
id: RightHandNovakid
name: "right novakid hand"
parent: PartNovakid
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Novakid/parts.rsi
state: "r_hand"
- type: Icon
sprite: ADT/Mobs/Novakid/parts.rsi
state: "r_hand"
- type: BodyPart
partType: Hand
symmetry: Right

- type: entity
id: LeftLegNovakid
name: "left novakid leg"
parent: PartNovakid
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Novakid/parts.rsi
state: "l_leg"
- type: Icon
sprite: ADT/Mobs/Novakid/parts.rsi
state: "l_leg"
- type: BodyPart
partType: Leg
symmetry: Left
- type: MovementBodyPart
walkSpeed : 2.5
sprintSpeed : 4.5

- type: entity
id: RightLegNovakid
name: "right novakid leg"
parent: PartNovakid
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Novakid/parts.rsi
state: "r_leg"
- type: Icon
sprite: ADT/Mobs/Novakid/parts.rsi
state: "r_leg"
- type: BodyPart
partType: Leg
symmetry: Right
- type: MovementBodyPart
walkSpeed : 2.5
sprintSpeed : 4.5

- type: entity
id: LeftFootNovakid
name: "left novakid foot"
parent: PartNovakid
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Novakid/parts.rsi
state: "l_foot"
- type: Icon
sprite: ADT/Mobs/Novakid/parts.rsi
state: "l_foot"
- type: BodyPart
partType: Foot
symmetry: Left

- type: entity
id: RightFootNovakid
name: "right novakid foot"
parent: PartNovakid
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Novakid/parts.rsi
state: "r_foot"
- type: Icon
sprite: ADT/Mobs/Novakid/parts.rsi
state: "r_foot"
- type: BodyPart
partType: Foot
symmetry: Right
49 changes: 49 additions & 0 deletions Resources/Prototypes/ADT/Novakid/Body/Prototypes/novakid.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
- type: body
name: "novakid"
id: Novakid
root: torso
slots:
head:
part: HeadNovakid
connections:
- torso
organs:
brain: OrganHumanBrain
eyes: OrganHumanEyes
torso:
part: TorsoNovakid
organs:
heart: OrganAnimalHeart
lungs: OrganNovakidLungs
stomach: OrganNovakidStomach
liver: OrganAnimalLiver
kidneys: OrganHumanKidneys
connections:
- left arm
- right arm
- left leg
- right leg
right arm:
part: RightArmNovakid
connections:
- right hand
left arm:
part: LeftArmNovakid
connections:
- left hand
right hand:
part: RightHandNovakid
left hand:
part: LeftHandNovakid
right leg:
part: RightLegNovakid
connections:
- right foot
left leg:
part: LeftLegNovakid
connections:
- left foot
right foot:
part: RightFootNovakid
left foot:
part: LeftFootNovakid
Loading

0 comments on commit 4081a04

Please sign in to comment.