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

Добавил роль Офицер «Синий Щит» #5

Closed
wants to merge 4 commits into from
Closed
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
8 changes: 8 additions & 0 deletions Resources/Changelog/ChangelogSunrise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -200,3 +200,11 @@ Entries:
type: Tweak
id: 17
time: '2024-06-01T07:17:10.387799+00:00'
- author: SplikZerys
changes:
- message: "\u0414\u043E\u0431\u0430\u0432\u0438\u043B \u043D\u043E\u0432\u0443\u044E\
\ \u0440\u043E\u043B\u044C \u041E\u0444\u0438\u0446\u0435\u0440 \xAB\u0421\u0438\
\u043D\u0438\u0439 \u0429\u0438\u0442\xBB"
type: Add
id: 18
time: '2024-06-01T14:53:50.740808+00:00'
24 changes: 24 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Items/misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,27 @@
item:
- KukriKnife

- type: entity
id: ClothingBeltBlueShieldWebbingFilled
parent: ClothingBeltBlueShieldWebbing
suffix: Filled
components:
- type: StorageFill
contents:
- id: Handcuffs
- id: Handcuffs
- id: Stunbaton
- id: GrenadeFlashBang
- id: TearGasGrenade
- id: MedkitCombatFilled


- type: entity
id: ClothingShoesBootsBlueShieldFilled
parent: ClothingShoesBootsBlueShield
suffix: Filled
components:
- type: ContainerFill
containers:
item:
- CombatKnife
Original file line number Diff line number Diff line change
Expand Up @@ -777,3 +777,28 @@
color: "#f4ffad"
radius: 5
energy: 2

# Blueshield Hardsuit

- type: entity
parent: ClothingHeadHardsuitWithLightBase
id: ClothingHeadHelmetHardsuitBlueshield
noSpawn: true
name: шлем скафандра офицера «синий щит»
description: Синий.
components:
- type: Sprite
sprite: _Sunrise/Clothing/Head/hardsuits/blueshield.rsi
- type: Clothing
sprite: _Sunrise/Clothing/Head/hardsuits/blueshield.rsi
- type: PointLight
color: "#adeeff"
- type: PressureProtection
highPressureMultiplier: 0.45
lowPressureMultiplier: 10000
- type: Armor
modifiers:
coefficients:
Blunt: 0.8
Slash: 0.8
Piercing: 0.8
11 changes: 11 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -235,3 +235,14 @@
sprite: Clothing/Shoes/Boots/cowboybootsfancy.rsi
- type: Clothing
sprite: Clothing/Shoes/Boots/cowboybootsfancy.rsi

- type: entity
parent: ClothingShoesMilitaryBase
id: ClothingShoesBootsBlueShield
name: ботинки офицера «синий щит»
description: Синий или голубой, вот в чём вопрос.
components:
- type: Sprite
sprite: _Sunrise/Clothing/Shoes/Boots/blueshield.rsi
- type: Clothing
sprite: _Sunrise/Clothing/Shoes/Boots/blueshield.rsi
1 change: 1 addition & 0 deletions Resources/Prototypes/Roles/Jobs/departments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
- HeadOfSecurity
- ResearchDirector
- Quartermaster
- BlueShield
primary: false
weight: 100

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,18 @@
contents:
- id: BoxSurvivalMedical
- id: RubberStampPsychologist

- type: entity
noSpawn: true
parent: ClothingBackpackBlueShield
id: ClothingBackpackBlueShieldFilled
components:
- type: StorageFill
contents:
- id: BoxSurvivalSecurity
- id: Flash
- id: TrackingImplanter
- id: TrackingImplanter
- id: TrackingImplanter
- id: TrackingImplanter
- id: ClothingOuterHardsuitBlueshield
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,18 @@
contents:
- id: BoxSurvivalMedical
- id: RubberStampPsychologist

- type: entity
noSpawn: true
parent: ClothingBackpackDuffelBlueShield
id: ClothingBackpackDuffelBlueShieldFilled
components:
- type: StorageFill
contents:
- id: BoxSurvivalSecurity
- id: Flash
- id: TrackingImplanter
- id: TrackingImplanter
- id: TrackingImplanter
- id: TrackingImplanter
- id: ClothingOuterHardsuitBlueshield
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,18 @@
contents:
- id: BoxSurvivalMedical
- id: RubberStampPsychologist

- type: entity
noSpawn: true
parent: ClothingBackpackSatchelBlueShield
id: ClothingBackpackSatchelBlueShieldFilled
components:
- type: StorageFill
contents:
- id: BoxSurvivalSecurity
- id: Flash
- id: TrackingImplanter
- id: TrackingImplanter
- id: TrackingImplanter
- id: TrackingImplanter
- id: ClothingOuterHardsuitBlueshield
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,12 @@
components:
- type: Sprite
sprite: _Sunrise/Back/Backpacks/ce.rsi

- type: entity
parent: ClothingBackpack
id: ClothingBackpackBlueShield
name: рюкзак офицера «синий щит»
description: На стиле.
components:
- type: Sprite
sprite: _Sunrise/Back/Backpacks/blueshield.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,12 @@
components:
- type: Sprite
sprite: _Sunrise/Back/Duffels/ce.rsi

- type: entity
parent: ClothingBackpackDuffel
id: ClothingBackpackDuffelBlueShield
name: вещмешок офицера «синий щит»
description: На стиле.
components:
- type: Sprite
sprite: _Sunrise/Back/Duffels/blueshield.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,12 @@
components:
- type: Sprite
sprite: _Sunrise/Back/Satchels/ce.rsi

- type: entity
parent: ClothingBackpackSatchel
id: ClothingBackpackSatchelBlueShield
name: сумка офицера «синий щит»
description: На стиле.
components:
- type: Sprite
sprite: _Sunrise/Back/Satchels/blueshield.rsi
10 changes: 10 additions & 0 deletions Resources/Prototypes/_Sunrise/Entities/Clothing/Belt/belts.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- type: entity
parent: ClothingBeltStorageBase
id: ClothingBeltBlueShieldWebbing
name: рпс офицера «синий щит»
description: Голубой?!
components:
- type: Sprite
sprite: _Sunrise/Clothing/Belt/blueshield_webbing.rsi
- type: Clothing
sprite: _Sunrise/Clothing/Belt/blueshield_webbing.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,29 @@
sprite: _Sunrise/Clothing/Eyes/Glasses/kim.rsi
- type: Clothing
sprite: _Sunrise/Clothing/Eyes/Glasses/kim.rsi

- type: entity
parent: ClothingEyesBase
id: ClothingEyesGlassesBlueShield
name: очки офицера «синий щит»
description: Инновационные синие линзы скрывают глаза от световых вспышек и имеют встроенный визор.
components:
- type: Sprite
sprite: _Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi
- type: Clothing
sprite: _Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi
- type: FlashImmunity
- type: ShowJobIcons
- type: ShowMindShieldIcons
- type: ShowCriminalRecordIcons
- type: ShowHealthBars
damageContainers:
- Biological
- type: ShowHealthIcons
damageContainers:
- Biological
- type: Tag
tags:
- HudMedical
- type: EyeProtection
protectionTime: 5
11 changes: 11 additions & 0 deletions Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,14 @@
sprite: _Sunrise/Clothing/Head/Hats/caphat.rsi
- type: Clothing
sprite: _Sunrise/Clothing/Head/Hats/caphat.rsi

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatBeretBlueShield
name: берет офицера «синий щит»
description: Синий.
components:
- type: Sprite
sprite: _Sunrise/Clothing/Head/Hats/blueshield.rsi
- type: Clothing
sprite: _Sunrise/Clothing/Head/Hats/blueshield.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,25 @@
Heat: 0.5
- type: ExplosionResistance
damageCoefficient: 0.65

- type: entity
parent: ClothingOuterArmorBasic
id: ClothingOuterArmorBlueShield
name: бронежилет офицера «синий щит»
description: Синий и прочный.
components:
- type: Sprite
sprite: _Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi
- type: Clothing
sprite: _Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi
- type: Armor
modifiers:
coefficients:
Blunt: 0.6
Slash: 0.6
Piercing: 0.6
Heat: 0.7
- type: ExplosionResistance
damageCoefficient: 0.80
- type: Item
size: Normal
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,35 @@
damageCoefficient: 0.7
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetCBURNLeader

- type: entity
parent: ClothingOuterHardsuitBase
id: ClothingOuterHardsuitBlueshield
name: скафандр офицера «синий щит»
description: Крепкий и надёжныый, как и его владелец.
components:
- type: Sprite
sprite: _Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi
- type: Clothing
sprite: _Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi
- type: PressureProtection
highPressureMultiplier: 0.525
lowPressureMultiplier: 10000
- type: ClothingSpeedModifier
walkModifier: 0.75
sprintModifier: 0.75
- type: Armor
modifiers:
coefficients:
Blunt: 0.6
Slash: 0.5
Piercing: 0.5
Heat: 0.8
Radiation: 0.25
Caustic: 0.6
- type: ExplosionResistance
damageCoefficient: 0.6
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitBlueshield
- type: Item
size: Normal
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,14 @@
sprite: _Sunrise/Clothing/Uniforms/Jumpskirt/schoolskirt.rsi
- type: Clothing
sprite: _Sunrise/Clothing/Uniforms/Jumpskirt/schoolskirt.rsi

- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtBlueShield
name: юбка-комбинезон офицера «синий щит»
description: Детка...
components:
- type: Sprite
sprite: _Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi
- type: Clothing
sprite: _Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,14 @@
sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi
- type: Clothing
sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitBlueShield
name: комбинезон офицера «синий щит»
description: На стиле.
components:
- type: Sprite
sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi
- type: Clothing
sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
- type: entity
parent: IDCardStandard
id: BlueShieldIDCard
name: ID карта офицера «синий щит»
description: Карта, необходимая для доступа в различные области станции.
components:
- type: Sprite
sprite: _Sunrise/Objects/Misc/id_cards.rsi
layers:
- state: silver
- state: idblueshield
- type: Item
heldPrefix: silver
- type: PresetIdCard
job: BlueShield
24 changes: 24 additions & 0 deletions Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,27 @@
borderColor: "#6f6192"
- type: Icon
state: pda-lawyer

- type: entity
parent: BasePDA
id: BlueShieldPDA
name: КПК офицера «синий щит»
description: Охуенный стиль.
components:
- type: Pda
id: BlueShieldIDCard
state: pda-blueshield
- type: Icon
state: pda-blueshield
- type: Sprite
sprite: _Sunrise/Objects/pda.rsi
layers:
- map: [ "enum.PdaVisualLayers.Base" ]
- state: "light_overlay"
map: [ "enum.PdaVisualLayers.Flashlight" ]
shader: "unshaded"
visible: false
- state: "id_overlay"
map: [ "enum.PdaVisualLayers.IdLight" ]
shader: "unshaded"
visible: false
Loading
Loading