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 Security Hardsuit, "Patrol". #194

Merged
merged 3 commits into from
Aug 14, 2023
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
57 changes: 39 additions & 18 deletions Resources/Maps/Shuttles/Kestrel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,12 @@ entities:
type: Transform
- proto: Airlock
entities:
- uid: 143
components:
- rot: 3.141592653589793 rad
pos: 0.5,-1.5
parent: 3
type: Transform
- uid: 149
components:
- rot: 1.5707963267948966 rad
Expand Down Expand Up @@ -1793,18 +1799,18 @@ entities:
pos: 3.5,-0.5
parent: 3
type: Transform
- proto: ComputerCrewMonitoring
- proto: ComputerShuttle
entities:
- uid: 49
- uid: 138
components:
- pos: 1.5,1.5
- pos: 0.5,1.5
parent: 3
type: Transform
- proto: ComputerShuttle
- proto: ComputerStationRecords
entities:
- uid: 138
- uid: 49
components:
- pos: 0.5,1.5
- pos: 1.5,1.5
parent: 3
type: Transform
- proto: CrateGenericSteel
Expand Down Expand Up @@ -1906,6 +1912,13 @@ entities:
pos: 0.5,-2.5
parent: 3
type: Transform
- proto: FaxMachineShip
entities:
- uid: 410
components:
- pos: 1.5,-0.5
parent: 3
type: Transform
- proto: GasPipeStraight
entities:
- uid: 395
Expand Down Expand Up @@ -2270,13 +2283,6 @@ entities:
type: Transform
- enabled: False
type: AmbientSound
- uid: 274
components:
- pos: 2.5,-1.5
parent: 3
type: Transform
- enabled: False
type: AmbientSound
- uid: 288
components:
- rot: -1.5707963267948966 rad
Expand Down Expand Up @@ -2317,6 +2323,13 @@ entities:
type: Transform
- enabled: False
type: AmbientSound
- uid: 380
components:
- pos: 1.5,-2.5
parent: 3
type: Transform
- enabled: False
type: AmbientSound
- uid: 469
components:
- rot: -1.5707963267948966 rad
Expand Down Expand Up @@ -2790,6 +2803,13 @@ entities:
pos: 5.5,-6.5
parent: 3
type: Transform
- proto: TableReinforced
entities:
- uid: 94
components:
- pos: 1.5,-0.5
parent: 3
type: Transform
- proto: Thruster
entities:
- uid: 33
Expand Down Expand Up @@ -3290,11 +3310,6 @@ entities:
pos: 8.5,-7.5
parent: 3
type: Transform
- uid: 94
components:
- pos: 1.5,-0.5
parent: 3
type: Transform
- uid: 106
components:
- pos: -3.5,-8.5
Expand Down Expand Up @@ -3334,6 +3349,12 @@ entities:
pos: -4.5,-18.5
parent: 3
type: Transform
- uid: 274
components:
- rot: 3.141592653589793 rad
pos: 2.5,-1.5
parent: 3
type: Transform
- uid: 285
components:
- rot: -1.5707963267948966 rad
Expand Down
25 changes: 25 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,31 @@
Slash: 0.9
Piercing: 0.9
Heat: 0.9

#Security Patrol Hardsuit
- type: entity
parent: ClothingHeadHardsuitWithLightBase
id: ClothingHeadHelmetHardsuitSecuritypatrol
noSpawn: true
name: security patrol hardsuit helmet
description: Armored hardsuit helmet for security needs.
components:
- type: Sprite
sprite: Clothing/Head/Hardsuits/security-patrol.rsi
- type: Clothing
sprite: Clothing/Head/Hardsuits/security-patrol.rsi
- type: PointLight
color: red
- type: PressureProtection
highPressureMultiplier: 0.525
lowPressureMultiplier: 10000
- type: Armor
modifiers:
coefficients:
Blunt: 0.9
Slash: 0.9
Piercing: 0.9
Heat: 0.9

#Brigmedic Hardsuit
- type: entity
Expand Down
30 changes: 30 additions & 0 deletions Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,36 @@
damageCoefficient: 0.4
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitSecurity

#Security Patrol Hardsuit
- type: entity
parent: ClothingOuterHardsuitBase
id: ClothingOuterHardsuitSecuritypatrol
name: security patrol hardsuit
description: A special suit that protects from the danger of space, employed by security patrol officers.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/security-patrol.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Hardsuits/security-patrol.rsi
- type: PressureProtection
highPressureMultiplier: 0.525
lowPressureMultiplier: 10000
- type: ClothingSpeedModifier
walkModifier: 0.85
sprintModifier: 0.80
- type: Armor
modifiers:
coefficients:
Blunt: 0.6
Slash: 0.6
Piercing: 0.6
Heat: 0.8
Caustic: 0.75
- type: ExplosionResistance
damageCoefficient: 0.4
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitSecuritypatrol

#Brigmedic Hardsuit
- type: entity
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by DadNotTheBelt (https://github.com/No-Dad-Not-The-Belt) for SS14/Frontier Station 14.",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by DadNotTheBelt (https://github.com/No-Dad-Not-The-Belt) for SS14/Frontier Station 14.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading