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

Additional prewar clothing options. #721

Merged
merged 1 commit into from
Nov 24, 2024
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
22 changes: 22 additions & 0 deletions Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -501,3 +501,25 @@
- type: Tag
tags:
- HidesHair

- type: entity
parent: N14ClothingHeadHatBaseHelmetMetal
id: N14ClothingHeadHatPressHelmet
name: prewar reporter helmet
description: An old piece of armor once used by the Free Press before the war. Should still offer some protection.
components:
- type: Sprite
sprite: _Nuclear14/Clothing/Head/FalloutHelmets/reporterhelmet.rsi
- type: Clothing
sprite: _Nuclear14/Clothing/Head/FalloutHelmets/reporterhelmet.rsi

- type: entity
parent: N14ClothingHeadHatBaseHelmetMetal
id: N14ClothingHeadHatPrewarMilitaryHelmet
name: prewar military helmet
description: An old piece of armor once used by the US Army before the end.
components:
- type: Sprite
sprite: _Nuclear14/Clothing/Head/FalloutHelmets/prewarmilitaryhelmet.rsi
- type: Clothing
sprite: _Nuclear14/Clothing/Head/FalloutHelmets/prewarmilitaryhelmet.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -1079,3 +1079,21 @@
Heat: 0.6
- type: ExplosionResistance
damageCoefficient: 0.7
# random other armor
- type: entity
parent: ClothingOuterBase
id: N14ClothingOuterPressArmor
name: prewar reporter armor
description: An old piece of armor once used by the Free Press before the war. Though the kevlar is worn, it will still offer some protection.
components:
- type: Sprite
sprite: _Nuclear14/Clothing/OuterClothing/Armor/reportersvest.rsi
- type: Clothing
sprite: _Nuclear14/Clothing/OuterClothing/Armor/reportersvest.rsi
- type: Armor
modifiers:
coefficients:
Blunt: 0.75
Slash: 0.75
Piercing: 0.75
Heat: 0.9
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,27 @@
- type: Clothing
sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/cowboygrey.rsi

- type: entity
parent: ClothingUniformBase
id: N14ClothingUniformJumpsuitFudd
name: fudd clothes
description: A worn and partially torn pair of jeans, paired with a faded M81 pattern BDU jacket. "If you can't kill it with 6 rounds, you ain't a good shot."
components:
- type: Sprite
sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/fudd.rsi
- type: Clothing
sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/fudd.rsi

- type: entity
parent: ClothingUniformBase
id: N14ClothingUniformJumpsuitMilUniform
name: prewar military uniform
description: A worn set of prewar M81 pattern BDUs.
components:
- type: Sprite
sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/prewaruniform.rsi
- type: Clothing
sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/prewaruniform.rsi
#NCR

- 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,18 @@
{
"version": 1,
"license": null,
"copyright": "Taken from Civ13 at https://github.com/Civ13/Civ13/blob/8babab427b85181961f3770f024e348ffc1d3e41/icons/obj/clothing/hats.dmi, https://github.com/Civ13/Civ13/blob/8babab427b85181961f3770f024e348ffc1d3e41/icons/mob/head.dmi",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": null,
"copyright": "Taken from Civ13 at https://github.com/Civ13/Civ13/blob/8babab427b85181961f3770f024e348ffc1d3e41/icons/obj/clothing/hats.dmi, https://github.com/Civ13/Civ13/blob/8babab427b85181961f3770f024e348ffc1d3e41/icons/mob/head.dmi",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": null,
"copyright": "Taken from Civ13 at https://github.com/Civ13/Civ13/blob/1bf1d0938cd99eeb3ca13762c0d9cbf82c27fc7e/icons/mob/suit.dmi, https://github.com/Civ13/Civ13/blob/d5cca4c4d7a649176c5f0b26d02dfccaaf5649f4/icons/obj/clothing/suits.dmi",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "icon"
}
]
}
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,18 @@
{
"version": 1,
"license": null,
Copy link
Collaborator

Choose a reason for hiding this comment

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

Very odd that there's no license information for the sprites on their repo, so this is correct.

"copyright": "Taken from Civ13 at https://github.com/Civ13/Civ13/blob/d5cca4c4d7a649176c5f0b26d02dfccaaf5649f4/icons/mob/uniform.dmi, https://github.com/Civ13/Civ13/blob/d5cca4c4d7a649176c5f0b26d02dfccaaf5649f4/icons/obj/clothing/uniforms.dmi",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "icon"
}
]
}
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,18 @@
{
"version": 1,
"license": null,
"copyright": "Taken from Civ13 at https://github.com/Civ13/Civ13/blob/d5cca4c4d7a649176c5f0b26d02dfccaaf5649f4/icons/mob/uniform.dmi, https://github.com/Civ13/Civ13/blob/d5cca4c4d7a649176c5f0b26d02dfccaaf5649f4/icons/obj/clothing/uniforms.dmi, https://github.com/Civ13/Civ13/blob/d5cca4c4d7a649176c5f0b26d02dfccaaf5649f4/icons/obj/clothing/uniforms.dmi",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "icon"
}
]
}
Loading