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

много одежды #689

Merged
merged 9 commits into from
Jul 16, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@
ClothingHeadHatGladiator: 1
ClothingUniformJumpsuitGladiator: 1
ClothingHeadHatStetson: 2 # backmen
ClothingHeadHatCowboyBrown: 1
ClothingHeadHatCowboyBlack: 1
ClothingHeadHatCowboyWhite: 1
ClothingHeadHatCowboyGrey: 1
ClothingShoesBootsCowboyBrown: 1
ClothingShoesBootsCowboyBlack: 1
ClothingShoesBootsCowboyWhite: 1
ClothingMaskNeckGaiterRed: 2
ClothingHeadHatCowboyBrown: 1
ClothingHeadHatCowboyBlack: 1
ClothingHeadHatCowboyWhite: 1
ClothingHeadHatCowboyGrey: 1
ClothingShoesBootsCowboyBrown: 1
ClothingShoesBootsCowboyBlack: 1
ClothingShoesBootsCowboyWhite: 1
ClothingMaskNeckGaiterRed: 2
emaggedInventory:
ClothingShoesBling: 1
ClothingShoesBootsCowboyFancy: 1
Expand Down
44 changes: 44 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Belt/belts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,51 @@
tags:
- CaptainSabre
- type: Appearance

- type: entity # backmen
parent: [ClothingBeltBase, ClothingSlotBase]
id: ClothingBeltYamato
name: Ножны Ямато
description: Ножны для Ямато. Найдено в секторе "Бекман"
components:
- type: Sprite
sprite: Backmen/Clothing/Belt/yamato.rsi
state: sheath
- type: Clothing
sprite: Backmen/Clothing/Belt/yamato.rsi
- type: Item
size: Ginormous
- type: ItemSlots
slots:
item:
name: Sabre
insertVerbText: sheath-insert-verb
ejectVerbText: sheath-eject-verb
insertSound: /Audio/Items/sheath.ogg
ejectSound: /Audio/Items/unsheath.ogg
whitelist:
tags:
- YamatoSabre
- type: ItemMapper
mapLayers:
sheath-sabre:
whitelist:
tags:
- YamatoSabre
- type: Appearance

- type: entity # backmen
id: ClothingBeltYamatoFilled
parent: ClothingBeltYamato
suffix: Filled
components:
- type: ContainerFill
containers:
item:
- YamatoSabre

- type: Tag
id: YamatoSabre
# Belts without visualizers

- type: entity
Expand Down
34 changes: 34 additions & 0 deletions Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -808,3 +808,37 @@
# - type: AlwaysRevolutionaryConvertible
- type: StealTarget
stealGroup: AnimalTropico

- type: entity # Backmen
name: Есперон
parent: MobCat
id: MobCatEsperon
description: Космический кот??! Найдено в секторе "Бекман"
components:
- type: Sprite
drawdepth: Mobs
sprite: Mobs/Pets/espeon.rsi
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: espeon
- type: DamageStateVisuals
states:
Alive:
Base: espeon
Critical:
Base: espeon_dead
Dead:
- type: NpcFactionMember
factions:
- PetsNT
- type: HTN
rootTask:
task: SimpleHostileCompound
- type: Grammar
attributes:
proper: true
gender: female
- type: Tag
tags:
- CannotSuicide
- VimPilot
18 changes: 18 additions & 0 deletions Resources/Prototypes/Loadouts/Jobs/Security/detective.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,24 @@
id: NoirJumpskirt
equipment:
jumpsuit: ClothingUniformJumpskirtDetectiveGrey

- type: loadout
id: JumpsuitDecSerii
equipment: JumpsuitDecSerii

- type: startingGear
id: JumpsuitDecSerii
equipment:
jumpsuit: ClothingUniformJumpsuitDecSerii

- type: loadout
id: ClothingJumpsuitDecSerii
equipment: ClothingJumpsuitDecSerii

- type: startingGear
id: ClothingJumpsuitDecSerii
equipment:
jumpsuit: ClothingJumpsuitDec

# OuterClothing
- type: loadout
Expand Down
14 changes: 14 additions & 0 deletions Resources/Prototypes/_Backmen/Entities/Clothing/Belt/belts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -293,3 +293,17 @@
whitelist:
tags:
- ShellShotgun

- type: entity
parent: ClothingBeltMilitaryWebbing
id: ClothingBeltTGMCwhite
name: белая боевая разгрузка
description: Бронеразгрузка для ваших боеприпасов или иных нужных штучек для слежки.
components:
- type: Sprite
sprite: Backmen/Clothing/Belt/webbingtgmcwhite.rsi
- type: Clothing
sprite: Backmen/Clothing/Belt/webbingtgmcwhite.rsi



Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,30 @@
priority: -12
event: !type:DashEvent
range: 0

- type: entity
parent: ClothingHandsBase
id: ClothingHandsGlovesTGMCwhite
name: белые боевые перчатки
description: Эти тактические белые перчатки огнеупорны и ударопрочны.
components:
- type: Sprite
sprite: Backmen/Clothing/Hands/Gloves/whitetgmc.rsi
- type: Clothing
sprite: Backmen/Clothing/Hands/Gloves/whitetgmc.rsi
- type: Fiber
fiberMaterial: fibers-durathread
- type: FingerprintMask
- type: Armor
modifiers:
coefficients:
Blunt: 0.90
Slash: 0.90
Piercing: 0.95
Heat: 0.95
- type: Thieving
stripTimeReduction: 1
stealthy: true
- type: GloveHeatResistance
heatResistance: 1400
- type: Insulated
55 changes: 55 additions & 0 deletions Resources/Prototypes/_Backmen/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,28 @@
sprite: Backmen/Clothing/Head/Hats/seccap.rsi
- type: Clothing
sprite: Backmen/Clothing/Head/Hats/seccap.rsi

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatBeretVet
name: Берет ветерана
description: Зелёный берет ветерана, в милитарическом стиле.
components:
- type: Sprite
sprite: Backmen/Clothing/Head/Hats/beretvet.rsi
- type: Clothing
sprite: Backmen/Clothing/Head/Hats/beretvet.rsi

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatChapa
name: Камилавка
description: Шляпа из верблюжьей шерсти, крайне похожа на древний головной убор священника.
components:
- type: Sprite
sprite: Backmen/Clothing/Head/Hats/headchap.rsi
- type: Clothing
sprite: Backmen/Clothing/Head/Hats/headchap.rsi

- type: entity
parent: ClothingHeadBase
Expand Down Expand Up @@ -357,3 +379,36 @@
sprite: Backmen/Clothing/Head/Hats/tony.rsi
- type: IngestionBlocker
- type: IdentityBlocker

- type: entity # backmen
parent: ClothingMaskBase
id: ClothingMaskBal
name: баллаклава SWAT
description: аааа!
components:
- type: Sprite
sprite: Backmen/Clothing/Head/Masks/balaclawa.rsi
- type: Clothing
sprite: Backmen/Clothing/Head/Masks/balaclawa.rsi

- type: entity # backmen
parent: ClothingHeadBase
id: ClothingHeadJeester
name: шляпа Джестера
description: Младший единокровный брат Короля и дядя Принца.
components:
- type: Sprite
sprite: Backmen/Clothing/Head/Hats/jeester.rsi
- type: Clothing
sprite: Backmen/Clothing/Head/Hats/jeester.rsi

- type: entity # backmen
parent: ClothingHeadBase
id: ClothingHeadPlet
name: плетенная шляпа
description: Шляпа прямиком с восточной части земли, где она популярна среди туристов и земляков
components:
- type: Sprite
sprite: Backmen/Clothing/Head/Hats/hatfriz.rsi
- type: Clothing
sprite: Backmen/Clothing/Head/Hats/hatfriz.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -292,3 +292,79 @@
slots:
- Hair
- Snout

- type: entity # backmen
parent: ClothingHeadBase
id: ClothingHeadHelmetSWAT
name: шлем SWAT
description: Шлем SWATа, способен выдержать выстрел оружия.
components:
- type: Sprite
sprite: Backmen/Clothing/Head/Helmets/helm.rsi
- type: Clothing
sprite: Backmen/Clothing/Head/Helmets/helm.rsi
- type: IngestionBlocker
- type: Armor
modifiers:
coefficients:
Blunt: 0.60
Slash: 0.8
Piercing: 0.9
Heat: 0.80

- type: entity # backmen
parent: ClothingHeadBase
id: ClothingHeadHelmetGreenMilee
name: шлем милитарист
description: Шлем милитарист, способен выдержать выстрел оружия.
components:
- type: Sprite
sprite: Backmen/Clothing/Head/Helmets/helmetgrin.rsi
- type: Clothing
sprite: Backmen/Clothing/Head/Helmets/helmetgrin.rsi
- type: IngestionBlocker
- type: Armor
modifiers:
coefficients:
Blunt: 0.40
Slash: 0.3
Piercing: 0.9
Heat: 0.60

- type: entity # backmen
parent: ClothingHeadBase
id: ClothingHeadHelmetTGMCwhite
name: белый боевой шлем
description: Белый боевой шлем, способен выдержать выстрел оружия.
components:
- type: Sprite
sprite: Backmen/Clothing/Head/Helmets/helmwhitetgmc.rsi
- type: Clothing
sprite: Backmen/Clothing/Head/Helmets/helmwhitetgmc.rsi
- type: IngestionBlocker
- type: Armor
modifiers:
coefficients:
Blunt: 0.30
Slash: 0.3
Piercing: 0.9
Heat: 0.60

- type: entity # backmen
parent: ClothingHeadBase
id: ClothingHeadHelmetTGMCwhiteMed
name: белый медицинский шлем
description: Белый боевой-медицинский шлем, способен выдержать выстрел оружия.
components:
- type: Sprite
sprite: Backmen/Clothing/Head/Helmets/helm_medtgmc.rsi
- type: Clothing
sprite: Backmen/Clothing/Head/Helmets/helm_medtgmc.rsi
- type: IngestionBlocker
- type: Armor
modifiers:
coefficients:
Blunt: 0.30
Slash: 0.3
Piercing: 0.9
Heat: 0.60
11 changes: 11 additions & 0 deletions Resources/Prototypes/_Backmen/Entities/Clothing/Head/masks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -248,3 +248,14 @@
Slash: 0.90
Piercing: 0.95
Heat: 0.95

- type: entity
parent: ClothingMaskBase
id: ClothingMaskTGMCwhite
name: белая боевая маска
description: Белая боевая маска, помогает не дышать пылью.
components:
- type: Sprite
sprite: Backmen/Clothing/Head/Masks/masktgmcwhite.rsi
- type: Clothing
sprite: Backmen/Clothing/Head/Masks/masktgmcwhite.rsi
Loading
Loading