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

Добавление в лодаут парамедика одежду Interdyne #2405

Merged
merged 5 commits into from
Dec 27, 2024
Merged
Show file tree
Hide file tree
Changes from 3 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
7 changes: 7 additions & 0 deletions Resources/Locale/ru-RU/ss220/clothing/Belt/belts.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,10 @@ ent-ClothingBeltWebbingBlueShield = РПС "Синий Щит"
ent-ClothingBeltWebbingBlueShieldFilled = { ent-ClothingBeltBlueShield }
.desc = { ent-ClothingBeltBlueShield.desc }
.suffix = Заполненный

ent-ClothingBeltMedicalInterdyne = РПС образца НМП-023
.desc = Ременно-плечевая система третьего поколения, разработанная для гражданских фельдшеров. В отличии от своего военного собрата, выдаваемого полевым санитарам, является более легкой в ношении. В узких кругах, имеет жаргонное прозвище «Кенгуру» за два больших кармана в районе живота.
.suffix = Interdyne, За время в игре, Парамедик
ent-ClothingBeltMedicalInterdyneFilled = { ent-ClothingBeltMedicalInterdyne }
.desc = { ent-ClothingBeltMedicalInterdyne }
.suffix = Interdyne, Заполненный, Парамедик
6 changes: 6 additions & 0 deletions Resources/Locale/ru-RU/ss220/clothing/Head/hats.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,9 @@ ent-ClothingHeadHatJanitorJRFlipped = зелёная рабочая кепка
.desc = { ent-ClothingHeadHatJanitorJRFlipped.desc }
ent-ClothingHeadBeretBlueshield = берет "Синий Щит"
.desc = Недорогой берет, излюбленный офицерами "Синий Щит". На нём изображена эмблема щита синего цвета.
ent-ClothingHeadHatInterdyne = кепка парамедика Interdyne
.desc = Обязательный элемент формы парамедика Interdyne. Пропахла бенефактором.
.suffix = Interdyne, За время в игре
ent-ClothingHeadHatInterdyneFlipped = кепка парамедика Interdyne
.suffix = Interdyne, За время в игре, Flipped
.desc = { ent-ClothingHeadHatInterdyneFlipped.desc }
4 changes: 4 additions & 0 deletions Resources/Locale/ru-RU/ss220/clothing/Uniforms/jumpsuit.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,7 @@ ent-ClothingUniformJumpsuitBlueShieldTShirt = футболка "Синий Щи
ent-ClothingUniformJumpsuitBlueShieldCombat = боевой комбинезон "Синий Щит"
.desc = Специальная одежда, предназначенная для боевых действий. Изготовлена из высокотехнологичных материалов с учётом требований к защите от внешних воздействий.
.suffix = За время в игре

ent-ClothingUniformJumpsuitInterdyne = форма парамедика Interdyne
.desc = Стандартизированная форма отрядов немедленной медицинской помощи особого назначения, компании Interdyne Pharmaceutics.
.suffix = Interdyne, За время в игре
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/ss220/loadout-groups/paramedic.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
loadout-group-paramedic-belt = Парамедик, пояс
2 changes: 2 additions & 0 deletions Resources/Prototypes/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1530,6 +1530,7 @@
minLimit: 0
loadouts:
- ParamedicHead
- ParamedInterdyneSoft #ss220-ParamedInterdyne

- type: loadoutGroup
id: ParamedicJumpsuit
Expand All @@ -1540,6 +1541,7 @@
- ParamedicJumpsuitTurtleneck #SS220-MoreTurtleneck-Begin
- ParamedicJumpskirtTurtleneck #SS220-MoreTurtleneck-End
- ParamedicFeldsher #SS220-ParamedFashion
- ParamedInterdyneJumpsuit #ss220-ParamedInterdyne

- type: loadoutGroup
id: ParamedicOuterClothing
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Loadouts/role_loadouts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,7 @@
- MedicalBackpack
- ParamedicOuterClothing
- ParamedicShoes
- ParamedicBelt #ss220 ParamedInterdyne
# - Glasses #SS220-TwoOne-Floppa-Iteration
- SurvivalMedical
- Trinkets
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
equipment:
id: ParamedicPDA
ears: ClothingHeadsetMedical
belt: ClothingBeltMedicalEMTFilled
# belt: ClothingBeltMedicalEMTFilled #ss220 paramedicinterdyne
storage:
back:
- EmergencyRollerBedSpawnFolded
26 changes: 26 additions & 0 deletions Resources/Prototypes/SS220/Entities/Clothing/Belt/belts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -450,3 +450,29 @@
amount: 2
- id: FlashlightLantern
- id: LightReplacer

- type: entity
parent: ClothingBeltMedical
id: ClothingBeltMedicalInterdyne
name: the interdyne paramedic's RPS
description: A third-generation shoulder belt system designed for civilian paramedics. Unlike its military counterpart, issued to field orderlies, it is lighter to wear. In narrow circles, he has the slang nickname "Kangaroo" for two large pockets in the belly area.
suffix: For playtime
components:
- type: Sprite
sprite: SS220/Clothing/Belt/interdyne_belt.rsi
- type: Clothing
sprite: SS220/Clothing/Belt/interdyne_belt.rsi

- type: entity
id: ClothingBeltMedicalInterdyneFilled
parent: ClothingBeltMedicalInterdyne
suffix: Paramedic,Filled
components:
- type: StorageFill
contents:
- id: Brutepack
- id: Ointment
- id: Bloodpack
- id: Gauze
- id: EmergencyMedipen
amount: 3
22 changes: 21 additions & 1 deletion Resources/Prototypes/SS220/Entities/Clothing/Head/soft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
- type: entity
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatJanitorJR
name: Green work cap
name: Green work cap
description: Stylish JR baseball cap in eco-friendly green color. It looks professional.
suffix: JR, For playing time
components:
Expand All @@ -16,3 +16,23 @@
suffix: Flipped
id: ClothingHeadHatJanitorJRFlipped
name: Green work cap

# Парaмeд

- type: entity
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatInterdyne
name: interdyne Paramedic's Cap
description: A mandatory element of the Interdyne paramedic's uniform. She smelled like a benefactor.
suffix: For playtime
components:
- type: Sprite
sprite: SS220/Clothing/Head/Soft/interdyne_cap.rsi
- type: Clothing
sprite: SS220/Clothing/Head/Soft/interdyne_cap.rsi

- type: entity
parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatInterdyne]
suffix: Flipped
id: ClothingHeadHatInterdyneFlipped
name: interdyne Paramedic's Cap
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,18 @@
- type: Clothing
sprite: SS220/Clothing/Uniforms/Jumpsuit/paramedic_feldsher.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitInterdyne
name: interdyne Paramedic's Uniform
description: A standardized form of special-purpose immediate medical assistance units, provided by Interdyne Pharmaceuticals.
suffix: For playtime
components:
- type: Sprite
sprite: SS220/Clothing/Uniforms/Jumpsuit/interdyne_jumpsuit.rsi
- type: Clothing
sprite: SS220/Clothing/Uniforms/Jumpsuit/interdyne_jumpsuit.rsi

# Бригмедик
- type: entity
parent: ClothingUniformBase
Expand Down
38 changes: 38 additions & 0 deletions Resources/Prototypes/SS220/Loadouts/Jobs/Medical/paramedic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@
role: JobParamedic
time: 162000 # 45 hrs

- type: loadoutEffectGroup
id: ParamedInterdyne
effects:
- !type:JobRequirementLoadoutEffect
requirement:
!type:RoleTimeRequirement
role: JobParamedic
time: 234000 # 65 hrs

# Jumpsuit
- type: loadout
id: ParamedicJumpsuitTurtleneck
Expand All @@ -41,3 +50,32 @@
proto: Feldsher
equipment:
jumpsuit: ClothingUniformJumpsuitFeldsher

- type: loadout
id: ParamedInterdyneSoft
effects:
- !type:GroupLoadoutEffect
proto: ParamedInterdyne
equipment:
head: ClothingHeadHatInterdyne

- type: loadout
id: ParamedInterdyneJumpsuit
effects:
- !type:GroupLoadoutEffect
proto: ParamedInterdyne
equipment:
jumpsuit: ClothingUniformJumpsuitInterdyne

- type: loadout
id: ParamedInterdyneBelt
effects:
- !type:GroupLoadoutEffect
proto: ParamedInterdyne
equipment:
belt: ClothingBeltMedicalInterdyneFilled

- type: loadout
id: ParamedicBaseBelt
equipment:
belt: ClothingBeltMedicalEMTFilled
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 @@ -456,6 +456,15 @@
- GlassesChemical
- CyberRnDVisor
# Химик (Конец)

# Парамедик (начало)
- type: loadoutGroup
id: ParamedicBelt
name: loadout-group-paramedic-belt
loadouts:
- ParamedicBaseBelt
- ParamedInterdyneBelt
# Парамедик (конец)
#! Медицинский отдел (Конец)

#! Инженерный отдел (Начало)
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.
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": "Sprited by molochk (Discord) for SS200",

Choose a reason for hiding this comment

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

SS200 0.0

"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-BELT",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"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.
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,49 @@
{
"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 molochk (Discord) for SS220",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "icon_flipped"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "equipped-HELMET-hamster",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "flipped-equipped-HELMET",
"directions": 4
},
{
"name": "flipped-equipped-HELMET-hamster",
"directions": 4
},
{
"name": "flipped-inhand-left",
"directions": 4
},
{
"name": "flipped-inhand-right",
"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.
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,30 @@
{
"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 molochk (Discord) for SS200",

Choose a reason for hiding this comment

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

SS200 0.0

"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading