From: RedBookcase Date: Sun, 20 Apr 2025 20:55:42 +0000 (-0700) Subject: Pirate Gear Tweaks. (#35986) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=aea474d4a9a26f71367fe399e0ff813f8a9266ee;p=space-station-14.git Pirate Gear Tweaks. (#35986) * Tweaked pirate gear to be in-line with similar items. * Added attribution for flashlight sprites, made hardsuits Major Contraband * Added empty versions of the pirate revolver and flintlock. * Test fail fix hopefully? * Test fail fix hopefully V2.0 * Test fail fix hopefully V3.0 * Test fail fix hopefully V4.0 --------- Co-authored-by: RedBookcase --- diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index acb1db120d..9aa0e76a54 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -580,7 +580,7 @@ #Pirate Captain Hardsuit - type: entity - parent: ClothingHeadHardsuitBase + parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ] id: ClothingHeadHelmetHardsuitPirateCap name: pirate captain's hardsuit helmet suffix: Pirate @@ -590,9 +590,20 @@ sprite: Clothing/Head/Hardsuits/piratecaptainhelm.rsi - type: Clothing sprite: Clothing/Head/Hardsuits/piratecaptainhelm.rsi + - type: PointLight # Color matches visor colors, radius/energy same as mining hardsuit for the big captain. + color: "#f3ea9c" + radius: 7 + energy: 3 - type: PressureProtection highPressureMultiplier: 0.3 lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 #CENTCOMM / ERT HARDSUITS #ERT Leader Hardsuit diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index f3edb201e4..ec9b5e7f06 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -751,7 +751,7 @@ #Pirate EVA Suit (Deep Space EVA Suit) #Despite visually appearing like a softsuit, it functions exactly like a hardsuit would (parents off of base hardsuit, has resistances and toggleable clothing, etc.) so it goes here. - type: entity - parent: ClothingOuterHardsuitBase + parent: [ ClothingOuterHardsuitBase, BaseMajorContraband ] id: ClothingOuterHardsuitPirateEVA name: deep space EVA suit suffix: Pirate @@ -759,6 +759,8 @@ components: - type: Sprite sprite: Clothing/OuterClothing/Hardsuits/pirateeva.rsi + - type: Item + size: Huge - type: Clothing sprite: Clothing/OuterClothing/Hardsuits/pirateeva.rsi - type: ExplosionResistance @@ -782,13 +784,15 @@ #Pirate Captain Hardsuit - type: entity - parent: ClothingOuterHardsuitBase + parent: [ ClothingOuterHardsuitBase, BaseMajorContraband ] id: ClothingOuterHardsuitPirateCap name: pirate captain's hardsuit description: An ancient armored hardsuit, perfect for defending against space scurvy and toolbox-wielding scallywags. components: - type: Sprite sprite: Clothing/OuterClothing/Hardsuits/piratecaptain.rsi + - type: Item + size: Huge - type: Clothing sprite: Clothing/OuterClothing/Hardsuits/piratecaptain.rsi - type: PressureProtection diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 18f0d1c109..fa65aa4649 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -151,7 +151,7 @@ - type: entity name: pirate revolver - parent: [BaseWeaponRevolver, BaseMinorContraband] + parent: [BaseWeaponRevolver, BaseMajorContraband] id: WeaponRevolverPirate description: A crude single-action revolver handmade by a space pirate. Old and covered in rust, it somehow still works. Loads 5 rounds of .45 magnum. components: @@ -168,3 +168,17 @@ capacity: 5 chambers: [ True, True, True, True, True ] ammoSlots: [ null, null, null, null, null ] + +- type: entity + name: pirate revolver + parent: WeaponRevolverPirate + id: WeaponRevolverPirateEmpty + description: An odd, old-looking revolver, favoured by pirate crews. Uses .45 magnum ammo. + suffix: Empty + components: + - type: RevolverAmmoProvider + proto: null + capacity: 5 + chambers: [ null, null, null, null, null ] + ammoSlots: [ null, null, null, null, null ] + diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index e8f26cac89..ff532c94bf 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -81,7 +81,7 @@ - type: entity name: musket - parent: [ BaseWeaponSniper, BaseGunWieldable, BaseMinorContraband ] + parent: [ BaseWeaponSniper, BaseGunWieldable, BaseMajorContraband ] id: Musket description: This should've been in a museum long before you were born. Uses .60 anti-materiel ammo. components: @@ -119,16 +119,19 @@ - type: entity name: flintlock pistol - parent: [BaseWeaponSniper, BaseMinorContraband] + parent: [BaseWeaponSniper, BaseMajorContraband] id: WeaponPistolFlintlock - description: A pirate's companion. Yarrr! Uses .60 anti-materiel ammo. + description: A pirate's companion. Yarrr! Uses .45 magnum ammo. components: - type: Gun minAngle: 0 maxAngle: 30 #miss him entirely because the barrel is smoothbore - type: Item size: Small - storedRotation: 90 + shape: + - 0,0,1,0 + - 0,1,0,1 + storedRotation: 0 - type: Sprite sprite: Objects/Weapons/Guns/Snipers/flintlock.rsi - type: Clothing @@ -139,9 +142,18 @@ - type: BallisticAmmoProvider whitelist: tags: - - CartridgeAntiMateriel + - CartridgeMagnum # changed from Anti-material rifle rounds because it's a flintlock pistol not a Hristov capacity: 1 - proto: CartridgeAntiMateriel + proto: CartridgeMagnum - type: StaticPrice price: 0 +- type: entity + name: flintlock pistol + parent: WeaponPistolFlintlock + id: WeaponPistolFlintlockEmpty + description: A pirate's companion. Yarrr! Uses .45 magnum ammo. + suffix: Empty + components: + - type: BallisticAmmoProvider + proto: null diff --git a/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/equipped-HELMET-vox.png deleted file mode 100644 index 8d0cd093f3..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/icon-flash.png new file mode 100644 index 0000000000..a99dc4586f Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/meta.json index 48f0cbb615..dd030ae1f8 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/meta.json @@ -1,22 +1,33 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github) for ss14. Vox states by Flareguy for Space Station 14", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by brainfood1183 (github) for ss14. Vox states by Flareguy for Space Station 14. Flashlight state sprites by RedBookcase on github.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-HELMET", - "directions": 4 - }, - { - "name": "equipped-HELMET-vox", - "directions": 4 - } - ] + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vox", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 0000000000..2cec554e8f Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/off-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/off-equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 0000000000..2e34340b43 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/on-equipped-HELMET.png new file mode 100644 index 0000000000..ea09bb593f Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/on-equipped-HELMET.png differ