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

Фикс белья и отображение магистрата #645

Merged
merged 3 commits into from
Oct 17, 2024
Merged

Фикс белья и отображение магистрата #645

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03ffbb0
first
Filokini Oct 15, 2024
372fc91
Merge branch 'master' into fix
Filokini Oct 16, 2024
d251983
fix maps
Filokini Oct 16, 2024
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: 1 addition & 7 deletions Resources/Prototypes/ADT/Roles/Jobs/Security/brigmedic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,8 @@
id: BrigmedicGear
equipment:
jumpsuit: ADTClothingUniformBrigmedicJumpsuitTurtleneck
outerClothing: ADTClothingOuterCoatBrigmedicWB
back: ClothingBackpackBrigmedicFilled
shoes: ClothingShoesBootsJackSec
gloves: ClothingHandsGlovesLatex
eyes: ADTClothingEyesGlassesMed
head: ADTClothingHeadHatBeretBrigmedic
id: BrigmedicPDA
ears: ClothingHeadsetBrigmedic
belt: ClothingBeltMedicalFilled
pocket1: WeaponPistolMk58
# underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear
# socks: ClothingUnderwearSocksNormal
Expand All @@ -45,3 +38,4 @@
# innerClothingSkirt: ADTClothingUniformSkirtBrigmedicTurtleneck
# satchel: ClothingBackpackSatchelBrigmedicFilled
# duffelbag: ClothingBackpackDuffelBrigmedicFilled

10 changes: 10 additions & 0 deletions Resources/Prototypes/Corvax/Loadouts/role_loadouts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
- LawyerJumpsuit
- CommonBackpack
- Survival
# ADT underwear tweak start
- ADTTop
- ADTBottom
- ADTSocks
# ADT underwear tweak end
- Trinkets
- GroupSpeciesBreathTool

Expand All @@ -19,5 +24,10 @@
- SecurityBelt
- SecurityShoes
- Survival
# ADT underwear tweak start
- ADTTop
- ADTBottom
- ADTSocks
# ADT underwear tweak end
- Trinkets
- GroupSpeciesBreathTool
1 change: 1 addition & 0 deletions Resources/Prototypes/Roles/Jobs/departments.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
color: "#334E6D"
roles:
- Captain
- Magistrat # ADT tweak
Copy link
Contributor

Choose a reason for hiding this comment

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

Вроде нормально, а вроде и сомнительно смотрится

Copy link
Contributor

Choose a reason for hiding this comment

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

Ну в общем-то дело твое. Если нужен апрув, то пингуй

Copy link
Contributor Author

Choose a reason for hiding this comment

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

в каком плане сомнительно, даже авд есть в том списке.

Copy link
Contributor

Choose a reason for hiding this comment

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

в каком плане сомнительно, даже авд есть в том списке.

А..точно, сорян забыл

Copy link
Contributor

Choose a reason for hiding this comment

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

Ну уааа. Как бы магистрат не относится к КМД составу станции как я помню. @Filokini

- IAA # Corvax-IAA
- ChiefEngineer
- ChiefMedicalOfficer
Expand Down
Loading