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

New BSO Armors/Outfits #1682

Merged
merged 18 commits into from
Jan 29, 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
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
items:
- type: loadout
id: LoadoutClothingBackpackBlueshield
- type: loadout
id: LoadoutClothingSatchelBlueshield
- type: loadout
id: LoadoutClothingDuffelBlueshield

- type: characterItemGroup
id: LoadoutBlueshieldOfficerVests
Expand All @@ -13,6 +17,16 @@
id: LoadoutClothingBlueshieldArmoredJacket
- type: loadout
id: LoadoutClothingBlueshieldArmoredCowboyJacket
- type: loadout
id: LoadoutClothingBlueshieldArmorVest
- type: loadout
id: LoadoutClothingBlueshieldArmoredMarine
- type: loadout
id: LoadoutClothingBlueshieldArmoredVest
- type: loadout
id: LoadoutClothingBlueshieldArmoredKimono
- type: loadout
id: LoadoutClothingBlueshieldArmoredCoat

- type: characterItemGroup
id: LoadoutBlueshieldOfficerUniforms
Expand All @@ -22,4 +36,14 @@
id: LoadoutClothingUniformJumpskirtBlueshieldOfficer
- type: loadout
id: LoadoutClothingUniformJumpsuitBlueshieldOfficer


- type: characterItemGroup
id: LoadoutBlueshieldOfficerHats
maxItems: 1
items:
- type: loadout
id: LoadoutClothingBlueshieldBeretNavy
- type: loadout
id: LoadoutClothingBlueshieldBeretOfficer
- type: loadout
id: LoadoutClothingBlueshieldCowboyHat
141 changes: 140 additions & 1 deletion Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,34 @@
items:
- ClothingBackpackBlueshield

- type: loadout
id: LoadoutClothingSatchelBlueshield
category: JobsCommandBlueshieldOfficer
cost: 0
exclusive: true
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutBlueshieldOfficerBackpacks
- !type:CharacterJobRequirement
jobs:
- BlueshieldOfficer
items:
- ClothingBackpackSatchelBlueshield

- type: loadout
id: LoadoutClothingDuffelBlueshield
category: JobsCommandBlueshieldOfficer
cost: 0
exclusive: true
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutBlueshieldOfficerBackpacks
- !type:CharacterJobRequirement
jobs:
- BlueshieldOfficer
items:
- ClothingBackpackDuffelBlueshield

# Belt

# Ears
Expand All @@ -25,6 +53,47 @@
# Gloves

# Head
- type: loadout
id: LoadoutClothingBlueshieldBeretNavy
category: JobsCommandBlueshieldOfficer
cost: 0
exclusive: true
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutBlueshieldOfficerHats
- !type:CharacterJobRequirement
jobs:
- BlueshieldOfficer
items:
- ClothingHeadHatBeretNavy

- type: loadout
id: LoadoutClothingBlueshieldBeretOfficer
category: JobsCommandBlueshieldOfficer
cost: 0
exclusive: true
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutBlueshieldOfficerHats
- !type:CharacterJobRequirement
jobs:
- BlueshieldOfficer
items:
- ClothingHeadHatBeretOfficer

- type: loadout
id: LoadoutClothingBlueshieldCowboyHat
category: JobsCommandBlueshieldOfficer
cost: 0
exclusive: true
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutBlueshieldOfficerHats
- !type:CharacterJobRequirement
jobs:
- BlueshieldOfficer
items:
- ClothingHeadHatCowboyBlueshield

# Id

Expand Down Expand Up @@ -61,6 +130,76 @@
items:
- ClothingBlueshieldArmoredCowboyJacket

- type: loadout
id: LoadoutClothingBlueshieldArmorVest
category: JobsCommandBlueshieldOfficer
cost: 0
exclusive: true
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutBlueshieldOfficerVests
- !type:CharacterJobRequirement
jobs:
- BlueshieldOfficer
items:
- ClothingBlueshieldArmourVest

- type: loadout
id: LoadoutClothingBlueshieldArmoredMarine
category: JobsCommandBlueshieldOfficer
cost: 0
exclusive: true
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutBlueshieldOfficerVests
- !type:CharacterJobRequirement
jobs:
- BlueshieldOfficer
items:
- ClothingBlueshieldArmoredMarine

- type: loadout
id: LoadoutClothingBlueshieldArmoredVest
category: JobsCommandBlueshieldOfficer
cost: 0
exclusive: true
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutBlueshieldOfficerVests
- !type:CharacterJobRequirement
jobs:
- BlueshieldOfficer
items:
- ClothingBlueshieldArmoredVest

- type: loadout
id: LoadoutClothingBlueshieldArmoredKimono
category: JobsCommandBlueshieldOfficer
cost: 0
exclusive: true
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutBlueshieldOfficerVests
- !type:CharacterJobRequirement
jobs:
- BlueshieldOfficer
items:
- ClothingBlueshieldArmoredKimono

- type: loadout
id: LoadoutClothingBlueshieldArmoredCoat
category: JobsCommandBlueshieldOfficer
cost: 0
exclusive: true
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutBlueshieldOfficerVests
- !type:CharacterJobRequirement
jobs:
- BlueshieldOfficer
items:
- ClothingBlueshieldArmoredCoat

# Shoes

# Uniforms
Expand Down Expand Up @@ -90,4 +229,4 @@
jobs:
- BlueshieldOfficer
items:
- ClothingUniformJumpsuitBlueshieldOfficer
- ClothingUniformJumpsuitBlueshieldOfficer
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
- id: WeaponLeverChester
- id: WeaponEnergyRevolver
- id: BlueshieldAmmunitionBoxFilled
- id: ClothingOuterHardsuitBlueshield
- id: ClothingBlueshieldArmoredCoat

- type: entity
id: LockerMagistrateFilled
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
- type: entity
parent: ClothingHeadHardsuitWithLightBase
id: ClothingHeadHelmetHardsuitBlueshield
name: blueshield's hardsuit helmet
description: Blueshield hardsuit with a top of the line gunlink. Belongs to the Blueshield.
components:
- type: BreathMask
- type: Sprite
sprite: _Goobstation/Clothing/Head/Hardsuits/blueshield.rsi
- type: Clothing
sprite: _Goobstation/Clothing/Head/Hardsuits/blueshield.rsi
- type: PointLight
color: "#57b9ff"
- type: PressureProtection
highPressureMultiplier: 0.45
lowPressureMultiplier: 1000
- type: Armor
modifiers:
coefficients:
Blunt: 0.9
Slash: 0.9
Piercing: 0.9
Heat: 0.9
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,70 @@
sprite: _Goobstation/Clothing/OuterClothing/Armor/blueshield_cowboy_jacket.rsi
- type: Item
size: Normal

- type: entity
parent: [ClothingOuterBaseMedium, AllowSuitStorageClothing, ClothingOuterStorageFoldableBase]
id: ClothingBlueshieldArmoredCoat
name: blueshield's armored coat
description: A coat for cold winter seasons with sewn in plates.
components:
- type: Sprite
sprite: _Goobstation/Clothing/OuterClothing/Armor/blueshield_coat.rsi
- type: Clothing
sprite: _Goobstation/Clothing/OuterClothing/Armor/blueshield_coat.rsi
- type: Item
size: Normal
- type: Armor
modifiers:
coefficients:
Blunt: 0.60
Slash: 0.60
Piercing: 0.65
Heat: 0.70
- type: TemperatureProtection
coefficient: 0.1

- type: entity
parent: [ClothingOuterStorageFoldableBaseOpened, ClothingBlueshieldArmoredCoat]
id: ClothingBlueshieldArmoredCoatOpen
name: blueshield's armored coat
suffix: Opened

- type: entity
parent: ClothingBlueshieldArmourVest
id: ClothingBlueshieldArmoredMarine
name: blueshield's armored marine vest
description: A vest from the blueshield's time in the marines.
components:
- type: Sprite
sprite: _Goobstation/Clothing/OuterClothing/Armor/blueshield_marine.rsi
- type: Clothing
sprite: _Goobstation/Clothing/OuterClothing/Armor/blueshield_marine.rsi
- type: Item
size: Normal

- type: entity
parent: ClothingBlueshieldArmourVest
id: ClothingBlueshieldArmoredVest
name: blueshield's armored vest
description: A vest with sewn-in reinforcement layers.
components:
- type: Sprite
sprite: _Goobstation/Clothing/OuterClothing/Armor/blueshield_vest.rsi
- type: Clothing
sprite: _Goobstation/Clothing/OuterClothing/Armor/blueshield_vest.rsi
- type: Item
size: Normal

- type: entity
parent: ClothingBlueshieldArmourVest
id: ClothingBlueshieldArmoredKimono
name: blueshield's armored kimono
description: As times evolve, so must the Blueshield.
components:
- type: Sprite
sprite: _Goobstation/Clothing/OuterClothing/Armor/blueshield_kimono.rsi
- type: Clothing
sprite: _Goobstation/Clothing/OuterClothing/Armor/blueshield_kimono.rsi
- type: Item
size: Normal
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
- type: entity
parent: ClothingOuterHardsuitSecurity
id: ClothingOuterHardsuitBlueshield
name: blueshield's hardsuit
description: A special hardsuit made for the Blueshield, contains extra armor.
components:
- type: Sprite
sprite: _Goobstation/Clothing/OuterClothing/Hardsuits/Combat/blueshield.rsi
- type: Clothing
sprite: _Goobstation/Clothing/OuterClothing/Hardsuits/Combat/blueshield.rsi
- type: PressureProtection
highPressureMultiplier: 0.45
lowPressureMultiplier: 1000
- type: ExplosionResistance
damageCoefficient: 0.6
- type: Armor
modifiers:
coefficients:
Blunt: 0.6
Slash: 0.5
Piercing: 0.5
Radiation: 0.5
Caustic: 0.6
- type: ClothingSpeedModifier
walkModifier: 0.85
sprintModifier: 0.85
- type: HeldSpeedModifier
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitBlueshield
- type: StaminaDamageResistance
coefficient: 0.5 # 50%
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,41 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from Bubberstation",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "icon-flash"
},
{
"name": "off-equipped-HELMET",
"directions": 4
},
{
"name": "off-inhand-left",
"directions": 4
},
{
"name": "off-inhand-right",
"directions": 4
},
{
"name": "on-equipped-HELMET",
"directions": 4
},
{
"name": "on-inhand-left",
"directions": 4
},
{
"name": "on-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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading