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

Дополнительные аксессуары к комбинезону "Корпоративная одежда глав.врача" #2483

Merged
merged 3 commits into from
Jan 15, 2025
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
4 changes: 4 additions & 0 deletions Resources/Locale/ru-RU/ss220/clothing/Eyes/glasses.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,7 @@ ent-ClothingEyesBlueShieldTacticGlasses = тактические очки "Си

ent-ClothingEyesGlassesBallistic = баллистические очки
.desc = Эти очки не защитят ваши глаза от осколков, но дополнят ваш тактический образ. Имеют функции стандартных очков СБ.

ent-ClothingEyesCMOCorporate = корпоративные очки главного врача
.desc = Мечта одного главврача с -3 на обоих глаза, позже, ставшее повсеместным явлением. Удобно и стильно.
.suffix = За время в игре
3 changes: 3 additions & 0 deletions Resources/Locale/ru-RU/ss220/clothing/Shoes/boots.ftl
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
ent-ClothingShoesBootsMagDQ = магнитные ботинки Эскадрона Смерти
.suffix = Эскадрон Смерти, dq
.desc = Самые современные магнитные ботинки в незабываемых цветах.
ent-ClothingShoesCMOCorporate = корпоративные туфли главного врача
.desc = Прошли кровь и пот, буквально. Тем не менее выглядят как новые.
.suffix = За время в игре
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
loadout-group-chef-medical-neck = Главный врач, шея
loadout-group-chief-medical-officer-eyes = Главный врач, очки
4 changes: 2 additions & 2 deletions Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
- id: ClothingHeadMirror
- id: ClothingEyesGlasses
- id: ClothingOuterWinterCMO
- id: ClothingUniformJumpsuitCMOCorporate #SS220-CMOCorporate
- id: ClothingUniformJumpskirtCMOCorporate #SS220-CMOCorporate
# - id: ClothingUniformJumpsuitCMOCorporate #SS220-CMOCorporate remove only in loadout
# - id: ClothingUniformJumpskirtCMOCorporate #SS220-CMOCorporate remove only in loadout
- id: ClothingOuterCoatCMOFormalDress #SS220-FormalDress
# - id: ClothingCloakCmo #SS220-cloak-dress-tweak

Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1410,6 +1410,7 @@
loadouts:
- BrownShoes
- MedicalWinterBoots
- CMOCorpShoes #ss220 new cmo

- type: loadoutGroup
id: MedicalDoctorHead
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Loadouts/role_loadouts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@
groups:
- GroupTankHarness
- ChiefMedicalOfficerHead
- MedicalGlasses #SS220-TwoOne-Floppa-Iteration
- ChiefMedicalOfficerGlasses #SS220-TwoOne-Floppa-Iteration / ss220 cmo new
- MedicalMask
- ChiefMedicalOfficerJumpsuit
- MedicalGloves
Expand Down
12 changes: 12 additions & 0 deletions Resources/Prototypes/SS220/Entities/Clothing/Eyes/glasses.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,15 @@
sprite: SS220/Clothing/Eyes/blueshield_tactic_glasses.rsi
- type: Clothing
sprite: SS220/Clothing/Eyes/blueshield_tactic_glasses.rsi

- type: entity
parent: [ClothingEyesBase, ShowMedicalIcons]
id: ClothingEyesCMOCorporate
name: corporate glasses of chief medical officer
description: The dream of one head doctor with -3 in both eyes, later became a ubiquitous phenomenon. Comfortable and stylish.
suffix: For playtime
components:
- type: Sprite
sprite: SS220/Clothing/Eyes/cmocorporate_glasses.rsi
- type: Clothing
sprite: SS220/Clothing/Eyes/cmocorporate_glasses.rsi
12 changes: 12 additions & 0 deletions Resources/Prototypes/SS220/Entities/Clothing/Shoes/boots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,3 +124,15 @@
type: GasTankBoundUserInterface
- type: Jetpack
moleUsage: 0.00085

- type: entity
parent: ClothingShoesBase
id: ClothingShoesCMOCorporate
name: corporate shoes of the chief medical officer
description: There was sweat and blood, literally. Nevertheless, they look like new.
suffix: For playtime
components:
- type: Sprite
sprite: SS220/Clothing/Shoes/Boots/cmocorporateboots.rsi
- type: Clothing
sprite: SS220/Clothing/Shoes/Boots/cmocorporateboots.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,21 @@
proto: CMOCorporate
equipment:
jumpsuit: ClothingUniformJumpskirtCMOCorporate

# Glasses
- type: loadout
id: CMOCorpGlasses
effects:
- !type:GroupLoadoutEffect
proto: CMOCorporate
equipment:
eyes: ClothingEyesCMOCorporate

# Shoes
- type: loadout
id: CMOCorpShoes
effects:
- !type:GroupLoadoutEffect
proto: CMOCorporate
equipment:
eyes: ClothingShoesCMOCorporate
9 changes: 9 additions & 0 deletions Resources/Prototypes/SS220/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,15 @@
- ParamedicBaseBelt
- ParamedInterdyneBelt
# Парамедик (конец)

# Главный врач (Начало)
- type: loadoutGroup
id: ChiefMedicalOfficerGlasses
name: loadout-group-chief-medical-officer-eyes
loadouts:
- Glasses
- CyberMedVisor
- CMOCorpGlasses
#! Медицинский отдел (Конец)

#! Инженерный отдел (Начало)
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
@@ -0,0 +1,34 @@
{
"version": 1,
"license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
"copyright": "Sprited by cream_bag (Discord) for SS220",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-EYES",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-EYES-vox",
"directions": 4
},
{
"name": "equipped-EYES-hamster",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
"copyright": "Made by cream_bag (Discord) for SS220",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-FEET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading