Skip to content
Open
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
6abe04e
cqc
kerfus-owo Jan 30, 2026
d18f2b4
Merge remote-tracking branch 'upstream/master' into cqc-is-real
kerfus-owo Jan 31, 2026
4db20da
не CQC а мистер Чанг
kerfus-owo Jan 31, 2026
f9a68dc
Чанг
kerfus-owo Jan 31, 2026
640d19a
Merge branch 'master' into cqc-is-real
kerfus-owo Jan 31, 2026
24c0e46
кулинарная книга приёмов
kerfus-owo Jan 31, 2026
efebf41
Merge branch 'cqc-is-real' of https://github.com/kerfus-owo/space_sta…
kerfus-owo Jan 31, 2026
47cc4ad
фикс?
kerfus-owo Jan 31, 2026
fe23344
запятая
kerfus-owo Jan 31, 2026
8e750dc
апдейт
kerfus-owo Jan 31, 2026
5bf8341
улучшение спрайта
kerfus-owo Jan 31, 2026
1858ed6
Merge branch 'master' into cqc-is-real
kerfus-owo Feb 1, 2026
73435c4
ПРОБЕЛ
kerfus-owo Feb 1, 2026
d7f9005
точно
kerfus-owo Feb 1, 2026
f97a5b3
Merge branch 'master' into cqc-is-real
kerfus-owo Feb 2, 2026
1c97ec6
Merge branch 'master' into cqc-is-real
kerfus-owo Feb 2, 2026
380eba2
ы
kerfus-owo Feb 3, 2026
3c6bef5
Merge branch 'master' into cqc-is-real
kerfus-owo Feb 3, 2026
0ecf6c8
апдейт
kerfus-owo Feb 3, 2026
595d8ad
Merge branch 'cqc-is-real' of https://github.com/kerfus-owo/space_sta…
kerfus-owo Feb 3, 2026
12c6778
Merge branch 'master' into cqc-is-real
kerfus-owo Feb 3, 2026
6974980
no meow
kerfus-owo Feb 3, 2026
d0a615f
Merge branch 'cqc-is-real' of https://github.com/kerfus-owo/space_sta…
kerfus-owo Feb 3, 2026
c015a52
Merge branch 'master' into cqc-is-real
kerfus-owo Feb 4, 2026
e9a2d3d
Merge branch 'master' into cqc-is-real
kerfus-owo Feb 6, 2026
a537692
Merge branch 'master' into cqc-is-real
kerfus-owo Feb 8, 2026
da34213
Merge branch 'master' into cqc-is-real
kerfus-owo Feb 9, 2026
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ ent-ADTScrollSleepingCarp = сказ о спящем карпе
.desc = Одноразовый свиток который обучает пользователя боевому искусству «Путь Спящего Карпа».
ent-ADTBookPTCR = как получить ПТСР
.desc = Полный сборник особенностей, правил и приёмов Полицейской Техники Самообороны им. Робаста. Взгляд на тысячу ярдов не входит в комплект и приобретается отдельно.
ent-ADTCqcManualWeak = мануал CQC для самых маленьких
.desc = Одноразовый мануал, обучающий пользователя Тактике Ближнего Боя на базовом уровне.
ent-ADTChangTechniques = приёмы от мистера Чанга
.desc = Одноразовый мануал, обучающий молодого повара Тактике Ближнего Боя для защиты кухни.
100 changes: 100 additions & 0 deletions Resources/Prototypes/ADT/Entities/Objects/Specific/material_args.yml
Original file line number Diff line number Diff line change
Expand Up @@ -235,3 +235,103 @@
- !type:ComboAudioEffect
sound:
collection: GenericHit

- type: entity
id: ADTChangTechniques
name: techniques from Mr. Chang
description: A one-off manual teaching the user Mideast Combat Tactics at a basic level.
parent: BaseItem
components:
- type: Sprite
sprite: ADT/Objects/Specific/material_art_book.rsi
state: chang
- type: SpawnItemsOnUse
items:
- id: Ash
sound:
path: /Audio/Items/Lighters/lighter3.ogg
- type: AddComponentsOnUse
components:
- type: MeleeWeapon
animation: WeaponArcFist
damage:
types:
Blunt: 10
- type: Combo
availableMoves:
- actionsNeeds:
- Grab
- Hit
comboEvent:
- !type:ComboPopupEffect
localeText: combo-slam-end
- !type:ComboDamageEffect
damage:
types:
Blunt: 10
- !type:ComboFallEffect
dropItems: false
- !type:ComboStopGrabEffect
- !type:ComboAudioEffect
sound:
collection: GenericHit
- actionsNeeds:
- Hit
- Disarm
- Hit
comboEvent:
- !type:ComboPopupEffect
localeText: combo-cqc-kick-end
- !type:ComboDamageEffect
damage:
types:
Blunt: 15
- !type:ComboFallEffect
dropItems: false
- !type:ComboAudioEffect
sound:
collection: GenericHit
- actionsNeeds:
- Disarm
- Grab
comboEvent:
- !type:ComboPopupEffect
localeText: combo-cqc-pressure-end
- !type:ComboStaminaDamageEffect
staminaDamage: 65
- actionsNeeds:
- Grab
- Grab
comboEvent:
- !type:ComboPopupEffect
localeText: combo-cqc-restain-end
- !type:ComboStunEffect
stunTime: 2
- actionsNeeds:
- Disarm
- Disarm
- Hit
comboEvent:
- !type:ComboPopupEffect
localeText: combo-cqc-consecutive-end
- !type:ComboMoreDamageToDownedEffect
damage:
types:
Blunt: 15
- !type:ComboFallEffect
- !type:ComboStaminaDamageEffect
staminaDamage: 60
- !type:ComboAudioEffect
sound:
collection: GenericHit
- actionsNeeds:
- Grab
- Disarm
comboEvent:
- !type:ComboPopupEffect
localeText: combo-leg-sweep-end
- !type:ComboFallEffect
dropItems: false
- !type:ComboAudioEffect
sound:
collection: GenericHit
8 changes: 8 additions & 0 deletions Resources/Prototypes/ADT/Loadouts/Jobs/Civilian/chef.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@
role: JobChef
time: 36000 #10 часов

- type: loadout
id: ADTChefChang
effects:
- !type:GroupLoadoutEffect
proto: ADTMasterChef
equipment:
pocket1: ADTChangTechniques

# PDA
- type: loadout
id: ChefPDA
Expand Down
8 changes: 8 additions & 0 deletions Resources/Prototypes/ADT/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -744,6 +744,14 @@

## повар

- type: loadoutGroup
id: ADTChefPocket1
name: loadout-chef-pocket1-adt
minLimit: 0
maxLimit: 1
loadouts:
- ADTChefChang

- type: loadoutGroup
id: ADTChefGloves
name: loadout-group-chef-gloves-adt
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Loadouts/role_loadouts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@
- ChefOuterClothing
- Glasses
# ADT-Tweak-Start
- ADTChefPocket1
- ADTChefPDA
# ADT-Tweak-End
# ADT underwear tweak start
Expand Down
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
@@ -1,5 +1,5 @@
{
"version": 1,
"version": 2,
"size": {
"x": 32,
"y": 32
Expand All @@ -15,6 +15,9 @@
},
{
"name": "sleeping_carp"
},
{
"name": "chang"
}
]
}
Loading