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.

Sign up for GitHub

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

[DON'T MERGE] Modsuits #974

Closed
wants to merge 28 commits into from
Closed

[DON'T MERGE] Modsuits #974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
420f50f
AccessWeaponBlockerComponent
CatBackGround Nov 17, 2024
253b6a7
Merge branch 'AccessWeaponBlockerComp' of https://github.com/CatBackG…
CatBackGround Nov 17, 2024
2b822c2
Merge branch 'Rxup:master' into AccessWeaponBlockerComp
CatBackGround Nov 18, 2024
a1c3a2c
Update AccessWeaponBlockerSystem.cs
CatBackGround Nov 18, 2024
b4b9448
Update AccessWeaponBlockerSystem.cs
CatBackGround Nov 18, 2024
fe28acd
FIX
CatBackGround Nov 18, 2024
19993d3
Merge branch 'Rxup:master' into AccessWeaponBlockerComp
CatBackGround Nov 24, 2024
5b88ddb
upd
CatBackGround Nov 24, 2024
85bfd8e
upd x2
CatBackGround Nov 24, 2024
78e5a1b
FIX
CatBackGround Nov 24, 2024
34af9b3
FIX x2
CatBackGround Nov 24, 2024
b27c26b
Fix...
CatBackGround Nov 24, 2024
641e5ad
FIX x3
CatBackGround Nov 24, 2024
7d75b57
Merge branch 'Rxup:master' into AccessWeaponBlockerComp
CatBackGround Nov 30, 2024
6c93971
faction access
nomad0260 Nov 30, 2024
a4b241a
Modsuits
CatBackGround Dec 2, 2024
6d223b7
Merge branch 'Modsuits' of https://github.com/CatBackGround/space-sta…
CatBackGround Dec 2, 2024
403699a
Modsuits
CatBackGround Dec 2, 2024
c5617f2
Delete Content.Server/Backmen/AccessWeaponBlockerSystem directory
CatBackGround Dec 2, 2024
375d44e
Delete Content.Client/Backmen/AccessWeaponBlockerSystem directory
CatBackGround Dec 2, 2024
5e11ad9
Delete Content.Shared/Backmen/AccessWeaponBlockerSystem directory
CatBackGround Dec 2, 2024
7a62073
Fix chestplate
CatBackGround Dec 2, 2024
316241b
Merge branch 'Modsuits' of https://github.com/CatBackGround/space-sta…
CatBackGround Dec 2, 2024
cc82b8d
Fix again...
CatBackGround Dec 2, 2024
786b1c1
Fix again x2...
CatBackGround Dec 2, 2024
b7034df
Fix shitsuits.
CatBackGround Dec 2, 2024
e5e237e
Fix blyat'
CatBackGround Dec 2, 2024
6d58d71
Suka...
CatBackGround Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file added Resources/Audio/Backmen/Modsuits/ballin.ogg
View file
Open in desktop
Binary file not shown.
Binary file added Resources/Audio/Backmen/Modsuits/ballout.ogg
View file
Open in desktop
Binary file not shown.
523 changes: 523 additions & 0 deletions Resources/Prototypes/_Backmen/Modsuits/Clothing/boots.yml
View file
Open in desktop

Large diffs are not rendered by default.

670 changes: 670 additions & 0 deletions Resources/Prototypes/_Backmen/Modsuits/Clothing/chestplate.yml
View file
Open in desktop

Large diffs are not rendered by default.

502 changes: 502 additions & 0 deletions Resources/Prototypes/_Backmen/Modsuits/Clothing/control.yml
View file
Open in desktop

Large diffs are not rendered by default.

467 changes: 467 additions & 0 deletions Resources/Prototypes/_Backmen/Modsuits/Clothing/gauntlets.yml
View file
Open in desktop

Large diffs are not rendered by default.

462 changes: 462 additions & 0 deletions Resources/Prototypes/_Backmen/Modsuits/Clothing/helmet.yml
View file
Open in desktop

Large diffs are not rendered by default.

335 changes: 335 additions & 0 deletions Resources/Prototypes/_Backmen/Modsuits/Construction/modsuitconstruction.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,335 @@
- type: entity
parent: ClothingBackpack
id: ClothingControlModsuitBaseUnsealed #Nonsealed only
abstract: true
name: CE modsuit helmet
description: Special hardsuit helmet, made for the CE of the station.
Comment on lines +5 to +6
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Требуется обновление названий и описаний

Все компоненты модового костюма используют одинаковое название и описание от шлема главного инженера. Необходимо обновить для каждого компонента:

  • Уникальное название, отражающее его функцию
  • Соответствующее описание

Пример для компонента BootsModsuitConstructing:

-  name: CE modsuit helmet
-  description: Special hardsuit helmet, made for the CE of the station.
+  name: modsuit boots
+  description: Construction component for modsuit boots.

Also applies to: 21-22, 34-35, 47-48, 70-71, 85-86, 100-101, 115-116, 130-131, 145-146, 158-159, 171-172

components:
- type: Sprite
sprite: Backmen/Modsuits/Clothing/Back/advanced.rsi
- type: Clothing
sprite: Backmen/Modsuits/Clothing/Back/advanced.rsi
equipSound: /Audio/Items/Modsuits/ballin.ogg
unequipSound: /Audio/Items/Modsuits/ballout.ogg
- type: Storage
capacity: 30
Comment on lines +14 to +15
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

Let's analyze the findings. The search shows various capacity values across different types of items in the codebase. For storage components specifically, we can see:

  • Lockers: 40
  • Microwave: 10
  • Belts: 14
  • Big boxes: 5 (with an explanatory comment)
  • Most other storage capacities are either small (1-5) for specific items or large (100+) for ammunition/weapons

Given this context, I can now generate the final response:

Значение вместимости хранилища модового костюма требует пояснения

Текущее значение capacity: 30 выглядит высоким по сравнению с другими хранилищами в игре (шкафчики: 40, пояса: 14). Рекомендуется:

  • Добавить комментарий, объясняющий выбор значения 30
  • Рассмотреть возможность уменьшения значения до более сбалансированного (15-20)
🔗 Analysis chain

Проверьте значение вместимости хранилища

Значение capacity: 30 кажется произвольным. Рекомендуется добавить комментарий, объясняющий выбор этого значения, или использовать константу.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Поиск других определений capacity в проекте для сравнения
rg "capacity: \d+" --type yaml

Length of output: 16695

#Modsuit Parts start

- type: entity
parent: BaseItem
id: BootsModsuitConstructing
name: CE modsuit helmet
description: Special hardsuit helmet, made for the CE of the station.
components:
- type: Sprite
sprite: Backmen/Modsuits/constructing_modsuit.rsi
state: boots
- type: Tag
tags:
- ModsuitBoots

- type: entity
parent: BaseItem
id: ChestplateModsuitConstructing
name: CE modsuit helmet
description: Special hardsuit helmet, made for the CE of the station.
components:
- type: Sprite
sprite: Backmen/Modsuits/constructing_modsuit.rsi
state: chestplate
- type: Tag
tags:
- ModsuitChestplate

- type: entity
parent: BaseItem
id: ControlModsuitConstructingStart
name: CE modsuit helmet
description: Special hardsuit helmet, made for the CE of the station.
components:
- type: Sprite
sprite: Backmen/Modsuits/constructing_modsuit.rsi
state: CORE-equip0
noRot: true
- type: Tag
tags:
- ModsuitControlStart
- type: Appearance
- type: MechAssemblyVisuals
statePrefix: CORE-equip
- type: Construction
graph: ModsuitConstructed
node: start
defaultTarget: modsuitconstructed
- type: Item
size: Huge

- type: entity
parent: BaseItem
id: ControlModsuitAdvanced
name: CE modsuit helmet
description: Special hardsuit helmet, made for the CE of the station.
components:
- type: Sprite
sprite: Backmen/Modsuits/constructing_modsuit.rsi
state: CE
- type: Tag
tags:
- ModsuitControlAdvanced
- type: Item
size: Huge

- type: entity
parent: BaseItem
id: ControlModsuitSafeguard
name: CE modsuit helmet
description: Special hardsuit helmet, made for the CE of the station.
components:
- type: Sprite
sprite: Backmen/Modsuits/constructing_modsuit.rsi
state: HOS
- type: Tag
tags:
- ModsuitControlSafeguard
- type: Item
size: Huge

- type: entity
parent: BaseItem
id: ControlModsuitRescue
name: CE modsuit helmet
description: Special hardsuit helmet, made for the CE of the station.
components:
- type: Sprite
sprite: Backmen/Modsuits/constructing_modsuit.rsi
state: CMO
- type: Tag
tags:
- ModsuitControlRescue
- type: Item
size: Huge

- type: entity
parent: BaseItem
id: ControlModsuitMagnate
name: CE modsuit helmet
description: Special hardsuit helmet, made for the CE of the station.
components:
- type: Sprite
sprite: Backmen/Modsuits/constructing_modsuit.rsi
state: CAP
- type: Tag
tags:
- ModsuitControlMagnate
- type: Item
size: Huge

- type: entity
parent: BaseItem
id: ControlModsuitConstructingEnd
name: CE modsuit helmet
description: Special hardsuit helmet, made for the CE of the station.
components:
- type: Sprite
sprite: Backmen/Modsuits/constructing_modsuit.rsi
state: CORE-equip8
- type: Tag
tags:
- ModsuitControlEnd
- type: Item
size: Huge

- type: entity
parent: BaseItem
id: GauntletsModsuitConstructing
name: CE modsuit helmet
description: Special hardsuit helmet, made for the CE of the station.
components:
- type: Sprite
sprite: Backmen/Modsuits/constructing_modsuit.rsi
state: gauntlets
- type: Tag
tags:
- ModsuitGauntlets

- type: entity
parent: BaseItem
id: HelmetModsuitConstructing
name: CE modsuit helmet
description: Special hardsuit helmet, made for the CE of the station.
components:
- type: Sprite
sprite: Backmen/Modsuits/constructing_modsuit.rsi
state: helmet
- type: Tag
tags:
- ModsuitHelmet

- type: entity
parent: BaseItem
id: PaintKitModsuitConstructing
name: CE modsuit helmet
description: Special hardsuit helmet, made for the CE of the station.
components:
- type: Sprite
sprite: Backmen/Modsuits/constructing_modsuit.rsi
state: paintkit
- type: Tag
tags:
- ModsuitPaintKit #Modsuit Cores

- type: entity #cores end
parent: BaseItem
id: CoreModsuitConstructing
name: CoreModsuitConstructing
description: Special hardsuit helmet, made for the CE of the station.
Comment on lines +184 to +185
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Требуется обновить описание ядра костюма

Название корректно, но описание всё ещё ссылается на шлем главного инженера.

-  description: Special hardsuit helmet, made for the CE of the station.
+  description: Основной компонент модового костюма, необходимый для его сборки.
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
name: CoreModsuitConstructing
description: Special hardsuit helmet, made for the CE of the station.
name: CoreModsuitConstructing
description: Основной компонент модового костюма, необходимый для его сборки.

components:
- type: Sprite
sprite: Backmen/Modsuits/constructing_modsuit.rsi
state: mod-core
- type: Tag
tags:
- CoreModsuit #plating start

- type: entity
parent: BaseItem
id: PlatingCivillianModsuitConstructing
name: civillian-plating
description: Special hardsuit helmet, made for the CE of the station.
components:
- type: Sprite
sprite: Backmen/Modsuits/plating.rsi
state: civillian-plating
- type: Tag
tags:
- PlatingCivillianModsuit

- type: entity
parent: BaseItem
id: PlatingMedicalModsuitConstructing
name: medical-plating
description: Special hardsuit helmet, made for the CE of the station.
components:
- type: Sprite
sprite: Backmen/Modsuits/plating.rsi
state: medical-plating
- type: Tag
tags:
- PlatingMedicalModsuit

- type: entity
parent: BaseItem
id: PlatingParamedicModsuitConstructing
name: cmo-plating
description: Special hardsuit helmet, made for the CE of the station.
components:
- type: Sprite
sprite: Backmen/Modsuits/plating.rsi
state: cmo-plating
- type: Tag
tags:
- PlatingParamedicModsuit

- type: entity
parent: BaseItem
id: PlatingSecurityModsuitConstructing
name: CE modsuit helmet
description: Special hardsuit helmet, made for the CE of the station.
Comment on lines +236 to +237
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Некорректные имена компонентов брони

Некоторые компоненты брони используют название шлема главного инженера вместо специфичных названий:

  • PlatingSecurityModsuitConstructing
  • PlatingAsteroidModsuitConstructing
  • PlatingCEModsuitConstructing

Необходимо указать корректные названия, например:

-  name: CE modsuit helmet
-  description: Special hardsuit helmet, made for the CE of the station.
+  name: security plating
+  description: Armored plating for security modsuit.

Also applies to: 276-277, 288-289, 301-302

components:
- type: Sprite
sprite: Backmen/Modsuits/plating.rsi
state: security-plating
- type: Tag
tags:
- PlatingSecurityModsuit

- type: entity
parent: BaseItem #not parented bcs of tags
id: PlatingHOSModsuitConstructing
name: CE modsuit helmet
description: Special hardsuit helmet, made for the CE of the station.
components:
- type: Sprite
sprite: Backmen/Modsuits/plating.rsi
state: security-plating
- type: Tag
tags:
- PlatingHOSModsuit

- type: entity
parent: BaseItem
id: PlatingMagnateModsuitConstructing
name: magnate-plating
description: Special hardsuit helmet, made for the CE of the station.
components:
- type: Sprite
sprite: Backmen/Modsuits/plating.rsi
state: magnate-plating
- type: Tag
tags:
- PlatingMagnateModsuit

- type: entity
parent: BaseItem
id: PlatingEngineeringModsuitConstructing
name: CE modsuit helmet
description: Special hardsuit helmet, made for the CE of the station.
components:
- type: Sprite
sprite: Backmen/Modsuits/plating.rsi
state: engineering-plating
- type: Tag
tags:
- PlatingEngineerModsuit

- type: entity
parent: BaseItem
id: PlatingAsteroidModsuitConstructing
name: CE modsuit helmet
description: Special hardsuit helmet, made for the CE of the station.
components:
- type: Sprite
sprite: Backmen/Modsuits/plating.rsi
state: engineering-plating
- type: Tag
tags:
- PlatingAsteroidModsuit #same color pallete

- type: entity
parent: BaseItem
id: PlatingAtmosphericModsuitConstructing
name: CE modsuit helmet
description: Special hardsuit helmet, made for the CE of the station.
components:
- type: Sprite
sprite: Backmen/Modsuits/plating.rsi
state: atmospheric-plating
- type: Tag
tags:
- PlatingAtmosphericModsuit

- type: entity
parent: BaseItem
id: PlatingCEModsuitConstructing
name: CE modsuit helmet
description: Special hardsuit helmet, made for the CE of the station.
components:
- type: Sprite
sprite: Backmen/Modsuits/plating.rsi
state: ce-plating
- type: Tag
tags:
- PlatingCEModsuit

- type: entity
parent: BaseItem
id: PlatingRNDModsuitConstructing
name: CE modsuit helmet
description: Special hardsuit helmet, made for the CE of the station.
components:
- type: Sprite
sprite: Backmen/Modsuits/plating.rsi
state: rnd-plating
- type: Tag
tags:
- PlatingRNDModsuit
Loading
Loading