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

[Tweak] Pilot not idiot #1057

Merged
merged 10 commits into from
Feb 16, 2025
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
loadout-group-security-pilot-jumpsuit = Pilot Jumpsuit
loadout-group-security-pilot-shoes = Pilot Shoes
loadout-group-security-pilot-head = Pilot Head
loadout-group-security-pilot-outerclothing = Pilot Outerclothing
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ent-LockerSecurityPilot = security pilot locker
.desc = This is where the pilot keeps his belongings.
ent-LockerSecurityPilotFilled = security pilot locker
.desc = This is where the pilot keeps his belongings.
.suffix = Filled
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
ent-ClothingOuterHardsuitSecurityPilot = security pilot hardsuit
.desc = A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor. Lightened especially for the pilot.
ent-ClothingHeadHelmetHardsuitSecurityPilot = security pilot hardsuit helmet
.desc = Armored hardsuit helmet for security needs.
ent-ClothingUniformJumpsuiSecurityPilot = security pilot jumpsuit
.desc = A jumpsuit specifically for a security pilot. Definitely not in the colors of the Syndicate...
ent-ClothingShoesBootsMagSecurity = security magboots
.desc = Magnetic boots are standard equipment for security services for work in zero gravity and outer space.
ent-ClothingHeadSecurityPilotHelmet = security pilot helmet
.desc = Standard security pilot gear. Protects the head from impacts.
ent-ClothingHeadCapSecurityPilot = security pilot cap
.desc = The cap of the security service pilot... Contains signs of communism...
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ent-RadioSecurityPilotSupplyPod = supply call radio
.desc = A portable radio for communication with the supply department, configured for one-way conversation.
.suffix = security pilot
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
loadout-group-security-pilot-jumpsuit = Пилот СБ, комбинезон
loadout-group-security-pilot-shoes = Пилот СБ, обувь
loadout-group-security-pilot-head = Пилот СБ, голова
loadout-group-security-pilot-outerclothing = Пилот СБ, верхняя одежда
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ent-LockerSecurityPilot = шкафчик пилота СБ
.desc = Тут пилот хранит свои пожитки.
ent-LockerSecurityPilotFilled = шкафчик пилота СБ
.desc = Тут пилот хранит свои пожитки.
.suffix = Заполненный
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
ent-ClothingOuterHardsuitSecurityPilot = скафандр пилота СБ
.desc = Специальный костюм, защищающий от опасных сред низкого давления. Имеет дополнительный слой брони. Облегчен специально для пилота.
ent-ClothingHeadHelmetHardsuitSecurityPilot = шлем скафандра пилота СБ
.desc = Бронированный шлем для нужд безопасности.
ent-ClothingUniformJumpsuiSecurityPilot = комбинезон пилота СБ
.desc = Комбинезон специально для пилота службы безопасности. Точно не в цветах Синидката...
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

Исправьте опечатку в идентификаторе сущности!

В идентификаторе сущности ent-ClothingUniformJumpsuiSecurityPilot пропущена буква 't' (должно быть Jumpsuit).

ent-ClothingShoesBootsMagSecurity = магнитные ботинки СБ
.desc = Магнитные сапоги являющиеся штатным снаряжением службы безопасности для работы в условиях отсутствия гравитации и открытого космоса.
ent-ClothingHeadSecurityPilotHelmet = шлем пилота СБ
.desc = Стандартное защитное снаряжение пилота. Защищает голову от ударов.
ent-ClothingHeadCapSecurityPilot = фуражка пилота СБ
.desc = Фуражка пилота службы безопасности... Содержит признаки коммунизма...
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ent-RadioSecurityPilotSupplyPod = рация вызова снабжения
.desc = Портативная рация для связи с отделом снабжения, настроена на односторонний разговор.
.suffix = скафандр пилота СБ
33 changes: 33 additions & 0 deletions Resources/Prototypes/Corvax/Loadouts/Jobs/Security/pilot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Head
- type: loadout
id: SecurityPilotHelmet
equipment:
head: ClothingHeadHelmetHardsuitSecurityPilot

- type: loadout
id: SecurityPilotCap
equipment:
head: ClothingHeadCapSecurityPilot

# Jumpsuit
- type: loadout
id: SecurityPilotJumpsuit
equipment:
jumpsuit: ClothingUniformJumpsuiSecurityPilot

# Outer
- type: loadout
id: CoatBomber
equipment:
outerClothing: ClothingOuterCoatBomber

# Shoes
- type: loadout
id: SecurityMagBoots
equipment:
shoes: ClothingShoesBootsMagSecurity

- type: loadout
id: Laceup
equipment:
shoes: ClothingShoesBootsLaceup
46 changes: 46 additions & 0 deletions Resources/Prototypes/Corvax/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,49 @@
- ChiefEngineerBackpack
- ChiefEngineerSatchel
- ChiefEngineerDuffel
#backmen start
- type: loadoutGroup
id: SecurityJumpsuitPilot
name: loadout-group-security-pilot-jumpsuit
loadouts:
- SecurityPilotJumpsuit
- SecurityJumpsuit
- SecurityJumpskirt
- SeniorOfficerJumpsuit
- SeniorOfficerJumpskirt
- TrooperUniform

- type: loadoutGroup
id: SecurityShoesPilot
name: loadout-group-security-pilot-shoes
loadouts:
- JackSecBoots # Corvax
- JackBoots
- SecurityWinterBoots
- SecurityMagBoots
- Laceup

- type: loadoutGroup
id: SecurityHeadPilot
name: loadout-group-security-pilot-head
loadouts:
- SecurityHelmet
- SecurityBeret
- SecurityHat
- ClothingHeadHatCapSec
- ClothingHeadHatPilotkaSec
- TrooperHat
- SecurityPilotHelmet
- SecurityPilotCap

- type: loadoutGroup
id: SecurityOuterClothingPilot
name: loadout-group-security-pilot-outerclothing
loadouts:
- ArmorVest
- ArmorVestSlim
- ClothingOuterCoatSecurityOvercoat
- ClothingOuterCoatSecurityOfficerOvercoat
- SecurityOfficerWintercoat
- CoatBomber
#backmen end
7 changes: 4 additions & 3 deletions Resources/Prototypes/Corvax/Loadouts/role_loadouts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@
- Werx #backmen
- Niz #backmen
- Socks #backmen
- SecurityJumpsuit
- SecurityJumpsuitPilot #backmen
- SecurityBackpack
- SecurityOuterClothing
- SecurityOuterClothingPilot #backmen
- SecurityHeadPilot #backmen
- SecurityBelt
- SecurityShoes
- SecurityShoesPilot #backmen
- Survival
- Trinkets
- GroupSpeciesBreathTool
Expand Down
10 changes: 6 additions & 4 deletions Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,16 @@
- type: startingGear
id: PilotGear
equipment:
jumpsuit: ClothingUniformJumpsuiSecurityPilot #backmen
eyes: ClothingEyesGlassesSecurity
head: ClothingHeadHatBeretSecurity
head: ClothingHeadCapSecurityPilot #backmen
id: PilotPDA
ears: ClothingHeadsetSecurity
neck: ClothingNeckTieRed
pocket1: WeaponPistolMk58
gloves: ClothingHandsGlovesCombat #backmen
pocket1: WeaponMultiphaseEnergyGun #backmen
pocket2: RadioSecurityPilotSupplyPod #backmen
storage:
back:
- BoxSurvivalSecurity
- Flash
- MagazinePistol
#- MagazinePistol (backmen)
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
- type: entity
parent: [LockerSecurityPilot, BaseRestrictedContraband]
id: LockerSecurityPilotFilled
name: security pilot locker
description: This is where the pilot keeps his belongings.
suffix: Filled
components:
- type: StorageFill
contents:
- id: ClothingHeadCapSecurityPilot
amount: 1
- id: ClothingHeadSecurityPilotHelmet
amount: 1
- id: ClothingShoesBootsMagSecurity
amount: 1
- id: ClothingUniformJumpsuiSecurityPilot
amount: 1
- id: ShuttleConsoleCircuitboard
amount: 1
- id: DoubleEmergencyNitrogenTankFilled
amount: 1
- id: DoubleEmergencyOxygenTankFilled
amount: 1
- id: ClothingMaskGasSecurity
amount: 1
- id: ClothingBeltSecurityFilled
amount: 1
- id: JetpackSecurityFilled
amount: 1
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,40 @@
contents:
- id: ClothingOuterHardsuitBlueShield

#pilot

- type: entity
id: DropPodMarkerSecurityPilot
parent: DropPodMarker
suffix: SecurityPilot, supply
components:
- type: TimedSpawner
prototypes:
- DropPodLaunchAnimationSecurityPilot

- type: entity
id: DropPodLaunchAnimationSecurityPilot
parent: DropPodLaunchAnimation
categories: [ HideSpawnMenu ]
components:
- type: Sprite
sprite: Backmen/Effects/droppod_falling.rsi
layers:
- state: supplypod_falling_animation
offset: "0,3.3"
- type: TimedSpawner
prototypes:
- SupplyDropPodSecurityPilotHardsuit

- type: entity
id: SupplyDropPodSecurityPilotHardsuit
parent: SupplyPodBase
categories: [ HideSpawnMenu ]
components:
- type: StorageFill
contents:
- id: ClothingOuterHardsuitSecurityPilot

#syndi

- type: entity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -279,3 +279,18 @@
highPressureMultiplier: 0.225
lowPressureMultiplier: 1000
- type: Unremoveable

- type: entity
parent: ClothingHeadHelmetHardsuitSecurity
id: ClothingHeadHelmetHardsuitSecurityPilot
name: security pilot hardsuit helmet
description: Armored hardsuit helmet for security needs.
components:
- type: Sprite
sprite: Backmen/Clothing/Head/Hardsuits/sec-pilot-hardsuit.rsi
- type: Clothing
sprite: Backmen/Clothing/Head/Hardsuits/sec-pilot-hardsuit.rsi
- type: PointLight
color: blue
radius: 7
energy: 3
11 changes: 11 additions & 0 deletions Resources/Prototypes/_Backmen/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -380,3 +380,14 @@
sprite: Backmen/Clothing/Head/Hats/blueushanka.rsi
- type: Clothing
sprite: Backmen/Clothing/Head/Hats/blueushanka.rsi

- type: entity
parent: [ClothingHeadBase, BaseSecurityContraband]
id: ClothingHeadCapSecurityPilot
name: security pilot cap
description: The cap of the security service pilot... Contains signs of communism...
components:
- type: Sprite
sprite: Backmen/Clothing/Head/Hats/secpilotcap.rsi
- type: Clothing
sprite: Backmen/Clothing/Head/Hats/secpilotcap.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -410,3 +410,18 @@
Heat: 0.8
- type: ExplosionResistance
damageCoefficient: 0.8

- type: entity
parent: [ClothingHeadHelmetBase, BaseSecurityContraband]
id: ClothingHeadSecurityPilotHelmet
name: security pilot helmet
description: Standard security pilot gear. Protects the head from impacts.
components:
- type: Sprite
sprite: Backmen/Clothing/Head/Helmets/helmet-sec-pilot.rsi
- type: Clothing
sprite: Backmen/Clothing/Head/Helmets/helmet-sec-pilot.rsi
- type: Tag
tags:
- WhitelistChameleon
- SecurityHelmet
Original file line number Diff line number Diff line change
Expand Up @@ -473,3 +473,20 @@
sprintModifier: 0.9
- type: HeldSpeedModifier
- type: Unremoveable

- type: entity
parent: ClothingOuterHardsuitSecurity
id: ClothingOuterHardsuitSecurityPilot
name: security pilot hardsuit
description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor. Lightened especially for the pilot.
components:
- type: Sprite
sprite: Backmen/Clothing/OuterClothing/Hardsuits/sec-pilot-hardsuit.rsi
- type: Clothing
sprite: Backmen/Clothing/OuterClothing/Hardsuits/sec-pilot-hardsuit.rsi
- type: ClothingSpeedModifier
walkModifier: 0.9
sprintModifier: 0.9
- type: HeldSpeedModifier
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitSecurityPilot
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,22 @@
collection: FootstepSoldier
params:
volume: -2

- type: entity
parent: [ClothingShoesBootsMagBase, BaseToggleClothing, BaseSecurityContraband]
id: ClothingShoesBootsMagSecurity
name: security magboots
description: Magnetic boots are standard equipment for security services for work in zero gravity and outer space.
components:
- type: Sprite
sprite: Backmen/Clothing/Shoes/Boots/magboots-security.rsi
state: icon
- type: Clothing
sprite: Backmen/Clothing/Shoes/Boots/magboots-security.rsi
- type: Magboots
- type: GenericVisualizer
visuals:
enum.ToggleVisuals.Toggled:
enum.ToggleVisuals.Layer:
True: {state: icon-on}
False: {state: icon}
Original file line number Diff line number Diff line change
Expand Up @@ -891,3 +891,14 @@
sprite: Backmen/Clothing/Uniforms/jumpsuit/bluesuit-alt.rsi
- type: Clothing
sprite: Backmen/Clothing/Uniforms/jumpsuit/bluesuit-alt.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuiSecurityPilot
name: security pilot jumpsuit
description: A jumpsuit specifically for a security pilot. Definitely not in the colors of the Syndicate...
components:
- type: Sprite
sprite: Backmen/Clothing/Uniforms/jumpsuit/sec_pilot.rsi
- type: Clothing
sprite: Backmen/Clothing/Uniforms/jumpsuit/sec_pilot.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,22 @@
- id: DropPodMarkerBlueShield
sound:
path: /Audio/Corvax/Effects/Footsteps/off2.ogg

- type: entity
name: supply call radio
description: A portable radio for communication with the supply department, configured for one-way conversation.
suffix: security pilot
parent: BaseItem
id: RadioSecurityPilotSupplyPod
components:
- type: Sprite
sprite: Objects/Devices/communication.rsi
state: radio
- type: Item
sprite: Objects/Devices/communication.rsi
heldPrefix: radio
- type: SpawnItemsOnUse
items:
- id: DropPodMarkerSecurityPilot
sound:
path: /Audio/Corvax/Effects/Footsteps/off2.ogg
Loading
Loading