diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index 04aa5185a7..8f9396dcee 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -22,13 +22,48 @@ parent: ClothingHeadHelmetHelmet id: ClothingHeadHelmetHelmetOld name: helmet - description: An old usual helmet. + description: Standard Security gear. Protects the head from impacts. components: - type: Sprite sprite: Clothing/Head/Helmets/securityold.rsi - type: Clothing sprite: Clothing/Head/Helmets/securityold.rsi +#SWAT Helmet +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHelmetSwat + name: SWAT helmet + description: An extremely robust helmet, commonly used by paramilitary forces. This one has the Nanotrasen logo emblazoned on the top. + components: + - type: Sprite + sprite: Clothing/Head/Helmets/swat.rsi + - type: Clothing + sprite: Clothing/Head/Helmets/swat.rsi + - type: Armor #In SS13 this has 100% acid (caustic) protection, however it would be probably be silly to give this to a helmet without locational damage existing yet. + modifiers: + coefficients: + Blunt: 0.70 + Slash: 0.70 + Piercing: 0.80 + Heat: 0.80 + Radiation: 0.80 + - type: ExplosionResistance + damageCoefficient: 0.75 + +#Syndicate SWAT Helmet +- type: entity + parent: ClothingHeadHelmetSwat + id: ClothingHeadHelmetSwatSyndicate + name: SWAT helmet + suffix: Syndicate + description: An extremely robust helmet, commonly used by paramilitary forces. It is adorned in a nefarious red and black stripe pattern. + components: + - type: Sprite + sprite: Clothing/Head/Helmets/swat_syndicate.rsi + - type: Clothing + sprite: Clothing/Head/Helmets/swat_syndicate.rsi + #Light Riot Helmet - type: entity parent: ClothingHeadBase diff --git a/Resources/Prototypes/Procedural/salvage_rewards.yml b/Resources/Prototypes/Procedural/salvage_rewards.yml index 957a4b7690..f64ea80f83 100644 --- a/Resources/Prototypes/Procedural/salvage_rewards.yml +++ b/Resources/Prototypes/Procedural/salvage_rewards.yml @@ -39,6 +39,8 @@ CrateArmorySMG: 0.25 CrateArmoryLaser: 0.25 WeaponMakeshiftLaser: 0.25 + # rare armor + ClothingHeadHelmetSwat: 0.1 # rare weapons WeaponSubMachineGunC20r: 0.1 diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index 79fb317924..081733e27e 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -54,7 +54,6 @@ satchel: ClothingBackpackDuffelSyndicateAmmo duffelbag: ClothingBackpackDuffelSyndicateAmmo - # Syndicate Operative Outfit - Poverty - type: startingGear id: SyndicateOperativeGearExtremelyBasic @@ -66,7 +65,6 @@ satchel: ClothingBackpackDuffelSyndicateOperative duffelbag: ClothingBackpackDuffelSyndicateOperative - #Syndicate Operative Outfit - Basic - type: startingGear id: SyndicateOperativeGearBasic @@ -103,6 +101,7 @@ satchel: ClothingBackpackDuffelSyndicateOperative duffelbag: ClothingBackpackDuffelSyndicateOperative +#Nuclear Operative Commander Gear - type: startingGear id: SyndicateCommanderGearFull equipment: @@ -123,6 +122,7 @@ satchel: ClothingBackpackDuffelSyndicateOperative duffelbag: ClothingBackpackDuffelSyndicateOperative +#Nuclear Operative Medic Gear - type: startingGear id: SyndicateOperativeMedicFull equipment: @@ -142,6 +142,96 @@ satchel: ClothingBackpackDuffelSyndicateOperativeMedic duffelbag: ClothingBackpackDuffelSyndicateOperativeMedic +# Syndicate Footsoldier Gear - Unarmed +- type: startingGear + id: SyndicateFootsoldierGear + equipment: + jumpsuit: ClothingUniformJumpsuitOperative + head: ClothingHeadHelmetSwatSyndicate + mask: ClothingMaskGas + outerClothing: ClothingOuterVestKevlar + ears: ClothingHeadsetAltSyndicate + gloves: ClothingHandsGlovesCombat + back: ClothingBackpackFilled + shoes: ClothingShoesBootsCombat + id: SyndiPDA #a subtype of this for footsoldiers would probably be good to have + innerclothingskirt: ClothingUniformJumpsuitOperative + satchel: ClothingBackpackSatchelFilled + duffelbag: ClothingBackpackDuffelFilled + +# Syndicate Footsoldier Gear - Knife +- type: startingGear + id: SyndicateFootsoldierGearKnife + equipment: + jumpsuit: ClothingUniformJumpsuitOperative + head: ClothingHeadHelmetSwatSyndicate + mask: ClothingMaskGas + outerClothing: ClothingOuterVestKevlar + ears: ClothingHeadsetAltSyndicate + gloves: ClothingHandsGlovesCombat + back: ClothingBackpackFilled + shoes: ClothingShoesBootsCombat + pocket1: CombatKnife + id: SyndiPDA + innerclothingskirt: ClothingUniformJumpsuitOperative + satchel: ClothingBackpackSatchelFilled + duffelbag: ClothingBackpackDuffelFilled + +# Syndicate Footsoldier Gear - Energy Sword +#Add energy shield to this when that gets added. +- type: startingGear + id: SyndicateFootsoldierGearESword + equipment: + jumpsuit: ClothingUniformJumpsuitOperative + head: ClothingHeadHelmetSwatSyndicate + mask: ClothingMaskGas + outerClothing: ClothingOuterVestKevlar + ears: ClothingHeadsetAltSyndicate + gloves: ClothingHandsGlovesCombat + back: ClothingBackpackFilled + shoes: ClothingShoesBootsCombatFilled + pocket1: EnergySword + id: SyndiPDA + innerclothingskirt: ClothingUniformJumpsuitOperative + satchel: ClothingBackpackSatchelFilled + duffelbag: ClothingBackpackDuffelFilled + +# Syndicate Footsoldier Gear - Viper +- type: startingGear + id: SyndicateFootsoldierGearPistol + equipment: + jumpsuit: ClothingUniformJumpsuitOperative + head: ClothingHeadHelmetSwatSyndicate + mask: ClothingMaskGas + outerClothing: ClothingOuterVestKevlar + ears: ClothingHeadsetAltSyndicate + gloves: ClothingHandsGlovesCombat + back: ClothingBackpackFilled + shoes: ClothingShoesBootsCombat + pocket1: WeaponPistolViper + id: SyndiPDA + innerclothingskirt: ClothingUniformJumpsuitOperative + satchel: ClothingBackpackSatchelFilled + duffelbag: ClothingBackpackDuffelFilled + +# Nanotrasen Paramilitary Unit Gear - Unarmed +#I do not feel like doing more of these right now because this probably needs more stuff (like a different ID.) +- type: startingGear + id: NanotrasenParamilitaryGear + equipment: + jumpsuit: ClothingUniformJumpsuitSec + back: ClothingBackpackSecurityFilled + shoes: ClothingShoesBootsCombatFilled + eyes: ClothingEyesGlassesSecurity + head: ClothingHeadHelmetSwat + mask: ClothingMaskGasSwat + outerClothing: ClothingOuterVestKevlar + ears: ClothingHeadsetSecurity + gloves: ClothingHandsGlovesCombat + innerclothingskirt: ClothingUniformJumpskirtSec + satchel: ClothingBackpackSatchelSecurityFilled + duffelbag: ClothingBackpackDuffelSecurityFilled + #CBURN Unit Gear - Full Kit - type: startingGear id: CBURNGear diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..030107f05e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/icon.png new file mode 100644 index 0000000000..c7d017dcca Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-left.png new file mode 100644 index 0000000000..c334355ba8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-right.png new file mode 100644 index 0000000000..423f3fe52e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/meta.json new file mode 100644 index 0000000000..8836c0b646 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, inhand sprites by Flareguy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..25dff526bb Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/icon.png new file mode 100644 index 0000000000..2fb1679000 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-left.png new file mode 100644 index 0000000000..6c958708c8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-right.png new file mode 100644 index 0000000000..e0ab815b50 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/meta.json new file mode 100644 index 0000000000..8bedbfb78e --- /dev/null +++ b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, inhand sprites by Flareguy, icon edited by Flareguy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}