diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml index 68bd4665d3d..1da6e5ae44b 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml @@ -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 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml index 158e80629e1..e917fe1fe4d 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml @@ -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 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Uniform/falloutjumpsuits.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Uniform/falloutjumpsuits.yml index 460d8a1a22a..f54184b3bde 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Uniform/falloutjumpsuits.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Uniform/falloutjumpsuits.yml @@ -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 diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/prewarmilitaryhelmet.rsi/equipped-HELMET.png b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/prewarmilitaryhelmet.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..8b1cc9199a1 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/prewarmilitaryhelmet.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/prewarmilitaryhelmet.rsi/icon.png b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/prewarmilitaryhelmet.rsi/icon.png new file mode 100644 index 00000000000..0490d4d2bd3 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/prewarmilitaryhelmet.rsi/icon.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/prewarmilitaryhelmet.rsi/meta.json b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/prewarmilitaryhelmet.rsi/meta.json new file mode 100644 index 00000000000..4ea30dbaade --- /dev/null +++ b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/prewarmilitaryhelmet.rsi/meta.json @@ -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 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/reporterhelmet.rsi/equipped-HELMET.png b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/reporterhelmet.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..3e84971f66b Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/reporterhelmet.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/reporterhelmet.rsi/icon.png b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/reporterhelmet.rsi/icon.png new file mode 100644 index 00000000000..dfd3cff8e57 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/reporterhelmet.rsi/icon.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/reporterhelmet.rsi/meta.json b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/reporterhelmet.rsi/meta.json new file mode 100644 index 00000000000..4ea30dbaade --- /dev/null +++ b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/reporterhelmet.rsi/meta.json @@ -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 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/reportersvest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/reportersvest.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..2785d1b9eb8 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/reportersvest.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/reportersvest.rsi/icon.png b/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/reportersvest.rsi/icon.png new file mode 100644 index 00000000000..8f85e11c24c Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/reportersvest.rsi/icon.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/reportersvest.rsi/meta.json b/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/reportersvest.rsi/meta.json new file mode 100644 index 00000000000..b4088494004 --- /dev/null +++ b/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/reportersvest.rsi/meta.json @@ -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" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/fudd.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/fudd.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..38a8d26bc97 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/fudd.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/fudd.rsi/icon.png b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/fudd.rsi/icon.png new file mode 100644 index 00000000000..1692b15326b Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/fudd.rsi/icon.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/fudd.rsi/meta.json b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/fudd.rsi/meta.json new file mode 100644 index 00000000000..995c7b6f68b --- /dev/null +++ b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/fudd.rsi/meta.json @@ -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", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/prewaruniform.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/prewaruniform.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..874ab9c9f5b Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/prewaruniform.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/prewaruniform.rsi/icon.png b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/prewaruniform.rsi/icon.png new file mode 100644 index 00000000000..651e3daf7d9 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/prewaruniform.rsi/icon.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/prewaruniform.rsi/meta.json b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/prewaruniform.rsi/meta.json new file mode 100644 index 00000000000..35a82e00d7c --- /dev/null +++ b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/prewaruniform.rsi/meta.json @@ -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" + } + ] +} \ No newline at end of file