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

Хотфикс бригмедика #349

Closed
wants to merge 42 commits into from
Closed
Show file tree
Hide file tree
Changes from 38 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
bb67c02
brigmedic
AnderFan Aug 13, 2024
ccbe99a
merge_fix_i_think
AnderFan Aug 15, 2024
ffe6917
t
AnderFan Aug 15, 2024
f96eef6
a
AnderFan Aug 15, 2024
6fc178d
Merge branch 'master' into brigmedic
AnderFan Aug 15, 2024
1a2a2bd
delete hats.ftl
AnderFan Aug 15, 2024
279993a
test0
AnderFan Aug 15, 2024
9588c40
Delete Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/h…
AnderFan Aug 15, 2024
f2fec34
Merge branch 'master' of https://github.com/AnderFan/ADT_ss14_Fan int…
AnderFan Aug 15, 2024
8d973a7
fix01
AnderFan Aug 16, 2024
f90779d
fix02
AnderFan Aug 16, 2024
82644eb
Merge branch 'master' of https://github.com/AnderFan/ADT_ss14_Fan int…
AnderFan Aug 16, 2024
1d7845d
Merge branch 'master' of https://github.com/AnderFan/ADT_ss14_Fan int…
AnderFan Aug 16, 2024
7f3dfd3
fix03
AnderFan Aug 16, 2024
b8629e9
Merge branch 'master' into brigmedic
AnderFan Aug 17, 2024
581b7ea
Merge branch 'master' into brigmedic
Darkiich Aug 17, 2024
ea4aa1e
Merge branch 'master' into brigmedic
Darkiich Aug 17, 2024
e5dc3f4
add medipen, expanded Survival Box
AnderFan Aug 19, 2024
caa2fd6
merge_fixed
AnderFan Aug 19, 2024
1e2b129
merge_fixed0
AnderFan Aug 19, 2024
d04169c
fix04
AnderFan Aug 19, 2024
53531bb
reiewer_bomber
AnderFan Aug 20, 2024
8cd8e98
Merge branch 'master' into brigmedic
AnderFan Aug 20, 2024
4f0a6c3
Merge branch 'master' of https://github.com/AnderFan/ADT_ss14_Fan int…
AnderFan Aug 20, 2024
550d78b
Merge branch 'brigmedic' of https://github.com/AnderFan/ADT_ss14_Fan …
AnderFan Aug 20, 2024
3f108b8
Update play_time_trackers.yml
AnderFan Aug 20, 2024
2d51380
SlushuADT!
AnderFan Aug 21, 2024
0d81e58
Merge branch 'master' of https://github.com/AnderFan/ADT_ss14_Fan int…
AnderFan Aug 21, 2024
46b9069
Merge branch 'brigmedic' of https://github.com/AnderFan/ADT_ss14_Fan …
AnderFan Aug 21, 2024
8257ce6
fixs and add chanchelog
AnderFan Aug 21, 2024
c3e4391
chanchelog fix
AnderFan Aug 21, 2024
3eb2c9f
Merge branch 'master' into brigmedic
AnderFan Aug 21, 2024
ed1331d
Update ChangelogADT.yml
AnderFan Aug 21, 2024
33373f1
hotfix
AnderFan Aug 25, 2024
e2982b8
mergefix
AnderFan Aug 25, 2024
b762a1d
Merge branch 'brigmedic' of https://github.com/AnderFan/ADT_ss14_Fan …
AnderFan Aug 25, 2024
228a40a
fix_cash backpack and log
AnderFan Aug 25, 2024
9d95412
Update cargo_security.yml
AnderFan Aug 25, 2024
6f27410
fix
AnderFan Aug 30, 2024
b252cd0
loadout_update
AnderFan Aug 30, 2024
91578bf
merge
AnderFan Aug 30, 2024
9e037ee
merge0
AnderFan Aug 30, 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
17 changes: 17 additions & 0 deletions Resources/Changelog/ChangelogADT.yml
Copy link
Collaborator

Choose a reason for hiding this comment

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

Не.
Трогай.
Ченджлоги

Original file line number Diff line number Diff line change
Expand Up @@ -2526,3 +2526,20 @@ Entries:
цвета для аркан. Короче - гетерохромия., type: Add}
time: '2024-08-24T22:38:34Z'
id: 286
- author: Tamioki&RevengenRat and some AnderFan
changes:
- { message: "Удалены шлем и броня Бригмедика добавленная к нам с Corvax'а.", type: Remove}
- { message: "Изменена большая часть спрайтов экипировки Бригмедика.", type: Tweak}
- { message: "Изменены все спрайты основных HUD визоров.", type: Tweak}
- { message: "Изменены спрайты очков с HUD'ами.", type: Tweak}
- { message: "Изменена экипировка Бригмедика, а так же содержимое его шкафчика.", type: Tweak}
- { message: "Изменено время СБ для получения Бригмедика - 10800 Минут, или же 3 часа.", type: Tweak}
- { message: "Изменены характеристики скафандра Бригмедика.", type: Tweak}
- { message: "Изменена вместимость аварийных наборов.", type: Tweak}
- { message: "Ящик бригмедика в консоли заказов заменён на шкаф бригмедика.", type: Tweak}
- { message: "Добавлены медицинские солнцезащитные очки.", type: Add}
- { message: "Добавлены медипены в аварийные наборы.", type: Add}
- { message: "Добавлена новая экипировка для Бригмедика.", type: Add}
- { message: "Добавлена фигурка Бригмедика.", type: Add}
id: 287
time: '2024-08-25T21:41:00Z'
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ADT/Catalog/Cargo/cargo_security.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-CargoLockerBrigmedic = { ent-LockerBrigmedicFilled }
.desc = { LockerBrigmedicFilled.desc }
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ ent-ClothingOuterCoatWardenAlt = куртка смотрителя
.desc = Тёмно-синяя бронированная куртка с синими отметками на плечах и нашивкой "/Смотритель/" на одном из нагрудных карманов.
ent-ClothingOuterCoatSecurityOvercoat = шинель службы безопасности
.desc = Легкобронированная кожаная шинель, предназначенная для повседневной носки высокопоставленными офицерами. Имеет логотип компании Nanotrasen Security.
ent-ClothingOuterCoatLabSecurityMedic = лабораторный халат бригмедика
.desc = Костюм, защищающий от небольших разливов химикатов.
ent-ClothingOuterCoatCaptain = торжественная куртка капитана
.desc = Капитанская торжественная куртка, инкрустированная золотом.
ent-ClothingOuterCoatHOP = куртка главы персонала
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/ADT/Catalog/Cargo/cargo_security.yml
Copy link
Collaborator

Choose a reason for hiding this comment

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

Убери пустой файл

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Copy link
Contributor

Choose a reason for hiding this comment

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

Эмэ кажется тут должно что то быть

Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@
components:
- type: StorageFill
contents:
# - id: BoxSurvivalBrigmedic
# - id: BoxSurvivalBrigmedic
- id: Flash
- id: MagazinePistol
# - id: ADTSpaceLaw
# - id: SpaceCash500
# - id: SpaceCash500
2 changes: 0 additions & 2 deletions Resources/Prototypes/ADT/Catalog/Fills/Lockers/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@
prob: 0.15
- id: ClothingOuterVestSecurityMedic # Corvax-Resprite
prob: 0.5
- id: ClothingOuterCoatLabSecurityMedic # Corvax-Resprite
prob: 0.5
- id: BoxSyringe
- id: BoxPillCanister
- id: BoxBodyBag
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,18 +61,6 @@
- type: StaticPrice
price: 800

- type: entity
parent: ClothingOuterCoatLab
id: ADTClothingOuterCoatLabPathologist
name: pathologist's lab coat
description: A suit that protects against minor chemical spills. But still a bit too white for blood stains.
components:
- type: Sprite
sprite: ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi
state: icon-open
- type: Clothing
sprite: ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi

Copy link
Collaborator

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.

- type: entity
parent: ClothingOuterStorageBase
id: ADTClothingOuterCoatBrigmedicWB
Expand All @@ -86,4 +74,4 @@
- type: Armor
modifiers:
coefficients:
Caustic: 0.75
Caustic: 0.75
Original file line number Diff line number Diff line change
Expand Up @@ -70,21 +70,6 @@
Piercing: 0.6
Heat: 0.9

- type: entity
parent: ClothingOuterStorageBase
id: ClothingOuterCoatLabSecurityMedic
name: security medic labcoat
description: A suit that protects against minor chemical spills.
Copy link
Contributor

@Bolper Bolper Aug 25, 2024

Choose a reason for hiding this comment

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

Я б покомментил Корваксов а не рубил с чистой руки.

components:
- type: Sprite
sprite: Corvax/Clothing/OuterClothing/Coats/labcoat_security_medic.rsi
- type: Clothing
sprite: Corvax/Clothing/OuterClothing/Coats/labcoat_security_medic.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.75

- type: entity
parent: ClothingOuterStorageBase
id: ClothingOuterCoatCaptain
Expand Down
Loading