Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Мелкие исправления новакидов #137

Merged
merged 9 commits into from
Nov 20, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Resources/Changelog/ChangelogADT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -582,3 +582,11 @@ Entries:
- {message: Починка отображения лиц Новакидов, type: Fix}
id: 55608 #костыль отображения в Обновлениях
time: '2023-11-15T07:40:00.0000000+00:00'

- author: Friskis
changes:
- {message: Новакидов не ослепляет вспышка и сварка, type: Fix}
- {message: Новакиды теперь наносят урон ожогами в рукопашном, type: Fix}
- {message: Удален слот очков для Новакидов. Глазок-то нет :c, type: Remove}
id: 55607 #костыль отображения в Обновлениях
time: '2023-11-19T07:40:00.0000000+00:00'
10 changes: 7 additions & 3 deletions Resources/Prototypes/ADT/Novakid/Mobs/Species/novakid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
- type: Thirst
- type: PointLight
color: "#ffffff"
energy: 0.4
energy: 0.6
- type: Inventory
templateId: novakid
- type: Icon
sprite: ADT/Mobs/Novakid/parts.rsi
state: full_m
Expand Down Expand Up @@ -43,7 +45,7 @@
animation: WeaponArcPunch
damage:
types:
Piercing: 5
Heat: 5
- type: Temperature
heatDamageThreshold: 450
coldDamageThreshold: 193 #starting temperature damage treshold
Expand All @@ -54,7 +56,9 @@
Cold : 0.5 #per second, scales with temperature & other constants
heatDamage:
types:
Heat : 0.2 #per second, scales with temperature & other constants
Heat : 0.2 #per second, scales with temperature & other constants.
- type: FlashImmunity
- type: EyeProtection
- type: MovementSpeedModifier
baseWalkSpeed : 2.5
baseSprintSpeed : 4.5
Expand Down
139 changes: 139 additions & 0 deletions Resources/Prototypes/ADT/Novakid/novakid_inventory_template.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
- type: inventoryTemplate
id: novakid
slots:
- name: shoes
slotTexture: shoes
slotFlags: FEET
stripTime: 3
uiWindowPos: 1,3
strippingWindowPos: 1,3
displayName: Shoes
- name: socks #Sirena slot
slotTexture: socks
slotFlags: SOCKS
stripTime: 6
uiWindowPos: 4,1
strippingWindowPos: 2,4
displayName: Socks
whitelist:
tags:
- socks
- name: underwearb #Sirena slot
slotTexture: underwearb
slotFlags: UNDERWEARB
stripTime: 6
uiWindowPos: 4,2
strippingWindowPos: 0,4
displayName: Panties
whitelist:
tags:
- underwearb
- name: underweart #Sirena slot
slotTexture: underweart
slotFlags: UNDERWEART
stripTime: 6
uiWindowPos: 4,3
strippingWindowPos: 1,4
displayName: Bra
whitelist:
tags:
- underweart
- name: jumpsuit
slotTexture: uniform
slotFlags: INNERCLOTHING
stripTime: 6
uiWindowPos: 0,2
strippingWindowPos: 0,2
displayName: Jumpsuit
- name: outerClothing
slotTexture: suit
slotFlags: OUTERCLOTHING
slotGroup: MainHotbar
stripTime: 6
uiWindowPos: 1,2
strippingWindowPos: 1,2
displayName: Suit
- name: gloves
slotTexture: gloves
slotFlags: GLOVES
uiWindowPos: 2,2
strippingWindowPos: 2,2
displayName: Gloves
- name: neck
slotTexture: neck
slotFlags: NECK
uiWindowPos: 0,1
strippingWindowPos: 0,1
displayName: Neck
- name: mask
slotTexture: mask
slotFlags: MASK
uiWindowPos: 1,1
strippingWindowPos: 1,1
displayName: Mask
- name: ears
slotTexture: ears
slotFlags: EARS
stripTime: 3
uiWindowPos: 2,0
strippingWindowPos: 2,0
displayName: Ears
- name: head
slotTexture: head
slotFlags: HEAD
uiWindowPos: 1,0
strippingWindowPos: 1,0
displayName: Head
- name: pocket1
slotTexture: pocket
slotFlags: POCKET
slotGroup: MainHotbar
stripTime: 3
uiWindowPos: 0,3
strippingWindowPos: 0,5
dependsOn: jumpsuit
displayName: Pocket 1
stripHidden: true
- name: pocket2
slotTexture: pocket
slotFlags: POCKET
slotGroup: MainHotbar
stripTime: 3
uiWindowPos: 2,3
strippingWindowPos: 1,5
dependsOn: jumpsuit
displayName: Pocket 2
stripHidden: true
- name: suitstorage
slotTexture: suit_storage
slotFlags: SUITSTORAGE
stripTime: 3
uiWindowPos: 2,0
strippingWindowPos: 2,6
dependsOn: outerClothing
displayName: Suit Storage
- name: id
slotTexture: id
slotFlags: IDCARD
slotGroup: SecondHotbar
stripTime: 6
uiWindowPos: 2,1
strippingWindowPos: 2,5
dependsOn: jumpsuit
displayName: ID
- name: belt
slotTexture: belt
slotFlags: BELT
slotGroup: SecondHotbar
stripTime: 6
uiWindowPos: 3,1
strippingWindowPos: 1,6
displayName: Belt
- name: back
slotTexture: back
slotFlags: BACK
slotGroup: SecondHotbar
stripTime: 6
uiWindowPos: 3,0
strippingWindowPos: 0,6
displayName: Back
Loading