diff --git a/Resources/Prototypes/_Triad/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/_Triad/Entities/Clothing/Hands/gloves.yml new file mode 100644 index 00000000000..f364c02a853 --- /dev/null +++ b/Resources/Prototypes/_Triad/Entities/Clothing/Hands/gloves.yml @@ -0,0 +1,15 @@ +- type: entity + parent: ClothingHandsGlovesSyntheticBase + id: ClothingHandsGlovesClockwork + name: clockwork gauntlets + description: Heavy, shock-resistant gauntlets with brass reinforcement. + components: + - type: Sprite + sprite: _Triad/Clothing/Hands/Gloves/clockwork_gauntlets.rsi + - type: Clothing + sprite: _Triad/Clothing/Hands/Gloves/clockwork_gauntlets.rsi + - type: Insulated + - type: Fiber + fiberMaterial: fibers-durathread + fiberColor: fibers-orange + - type: FingerprintMask diff --git a/Resources/Prototypes/_Triad/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_Triad/Entities/Clothing/Head/helmets.yml new file mode 100644 index 00000000000..630c3b7e9c1 --- /dev/null +++ b/Resources/Prototypes/_Triad/Entities/Clothing/Head/helmets.yml @@ -0,0 +1,21 @@ +- type: entity + parent: ClothingHeadHelmetBase + id: ClothingHeadHelmetClockwork + name: clockwork helmet + description: A heavy helmet made of brass. + components: + - type: Sprite + sprite: _Triad/Clothing/Head/Helmets/clockwork.rsi + - type: IngestionBlocker + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.8 + Piercing: 0.9 + Heat: 0.9 + - type: HideLayerClothing + slots: + - HeadTop + - HeadSide + - Hair diff --git a/Resources/Prototypes/_Triad/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/_Triad/Entities/Clothing/OuterClothing/armor.yml new file mode 100644 index 00000000000..f471d8230c1 --- /dev/null +++ b/Resources/Prototypes/_Triad/Entities/Clothing/OuterClothing/armor.yml @@ -0,0 +1,20 @@ +- type: entity + parent: ClothingOuterBaseLarge + id: ClothingOuterArmorClockwork + name: clockwork cuirass + description: A bulky cuirass made of brass. + components: + - type: Sprite + sprite: _Triad/Clothing/OuterClothing/Armor/clockwork_cuirass.rsi + - type: Clothing + sprite: _Triad/Clothing/OuterClothing/Armor/clockwork_cuirass.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.5 + Slash: 0.5 + Piercing: 0.5 + Heat: 0.5 + - type: ExplosionResistance + damageCoefficient: 0.75 + - type: GroupExamine diff --git a/Resources/Prototypes/_Triad/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/_Triad/Entities/Clothing/Shoes/specific.yml new file mode 100644 index 00000000000..30bd31b39e3 --- /dev/null +++ b/Resources/Prototypes/_Triad/Entities/Clothing/Shoes/specific.yml @@ -0,0 +1,10 @@ +- type: entity + parent: ClothingShoesBase + id: ClothingShoesClockwork + name: clockwork treads + description: Industrial boots made of brass. They're very heavy. + components: + - type: Sprite + sprite: _Triad/Clothing/Shoes/Specific/clockwork_treads.rsi + - type: Clothing + sprite: _Triad/Clothing/Shoes/Specific/clockwork_treads.rsi diff --git a/Resources/Prototypes/_Triad/Entities/Objects/Weapons/Melee/clockcult.yml b/Resources/Prototypes/_Triad/Entities/Objects/Weapons/Melee/clockcult.yml new file mode 100644 index 00000000000..4d07002071a --- /dev/null +++ b/Resources/Prototypes/_Triad/Entities/Objects/Weapons/Melee/clockcult.yml @@ -0,0 +1,70 @@ +- type: entity + parent: BaseItem + id: RatvarianSpear + name: ratvarian spear + description: A heavy, razor-sharp spear made of brass. It thrums with barely-contained energy. + categories: [ DoNotMap ] + components: + - type: Sprite + sprite: _Triad/Objects/Weapons/Melee/ratvarian_spear.rsi + state: icon + - type: Tag + tags: + - Spear + - type: Clothing + sprite: _Triad/Objects/Weapons/Melee/ratvarian_spear.rsi + quickEquip: false + slots: + - suitStorage + - belt + - back + - type: MeleeWeapon + wideAnimationRotation: -135 + angle: 0 + animation: WeaponArcThrust + damage: + types: + Piercing: 10 + Slash: 20 + Asphyxiation: 2 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: DamageOtherOnHit + damage: + types: + Piercing: 30 + Asphyxiation: 5 + - type: DamageOnLand + damage: + types: + Blunt: 5 + - type: SavingContraband + - type: UseDelay + - type: Wieldable + - type: IncreaseDamageOnWield + damage: + types: + Piercing: 6 + Slash: 6 + - type: Fixtures + fixtures: + fix1: + shape: !type:PolygonShape + vertices: + - -0.40,-0.30 + - -0.30,-0.40 + - 0.40,0.30 + - 0.30,0.40 + density: 20 + mask: + - ItemMask + restitution: 0.3 + friction: 0.2 + - type: EmbeddableProjectile + offset: -0.15,0.0 + - type: ThrowingAngle + angle: 225 + - type: LandAtCursor + - type: Item + size: Ginormous + - type: Sharp diff --git a/Resources/Textures/_Triad/Clothing/Hands/Gloves/clockwork_gauntlets.rsi/equipped-HAND.png b/Resources/Textures/_Triad/Clothing/Hands/Gloves/clockwork_gauntlets.rsi/equipped-HAND.png new file mode 100644 index 00000000000..032a5694c5f Binary files /dev/null and b/Resources/Textures/_Triad/Clothing/Hands/Gloves/clockwork_gauntlets.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/_Triad/Clothing/Hands/Gloves/clockwork_gauntlets.rsi/icon.png b/Resources/Textures/_Triad/Clothing/Hands/Gloves/clockwork_gauntlets.rsi/icon.png new file mode 100644 index 00000000000..c12c341a779 Binary files /dev/null and b/Resources/Textures/_Triad/Clothing/Hands/Gloves/clockwork_gauntlets.rsi/icon.png differ diff --git a/Resources/Textures/_Triad/Clothing/Hands/Gloves/clockwork_gauntlets.rsi/meta.json b/Resources/Textures/_Triad/Clothing/Hands/Gloves/clockwork_gauntlets.rsi/meta.json new file mode 100644 index 00000000000..585222004cb --- /dev/null +++ b/Resources/Textures/_Triad/Clothing/Hands/Gloves/clockwork_gauntlets.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/8d6b5d8366586fc4cb73690030b30007e965cbdf/icons/obj/clothing/gloves.dmi and https://github.com/tgstation/tgstation/blob/8d6b5d8366586fc4cb73690030b30007e965cbdf/icons/mob/clothing/hands.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Triad/Clothing/Head/Helmets/clockwork.rsi/equipped-HELMET.png b/Resources/Textures/_Triad/Clothing/Head/Helmets/clockwork.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..42e18e85761 Binary files /dev/null and b/Resources/Textures/_Triad/Clothing/Head/Helmets/clockwork.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_Triad/Clothing/Head/Helmets/clockwork.rsi/icon.png b/Resources/Textures/_Triad/Clothing/Head/Helmets/clockwork.rsi/icon.png new file mode 100644 index 00000000000..0a3f3d5bcf9 Binary files /dev/null and b/Resources/Textures/_Triad/Clothing/Head/Helmets/clockwork.rsi/icon.png differ diff --git a/Resources/Textures/_Triad/Clothing/Head/Helmets/clockwork.rsi/inhand-left.png b/Resources/Textures/_Triad/Clothing/Head/Helmets/clockwork.rsi/inhand-left.png new file mode 100644 index 00000000000..8ba94905d9d Binary files /dev/null and b/Resources/Textures/_Triad/Clothing/Head/Helmets/clockwork.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Triad/Clothing/Head/Helmets/clockwork.rsi/inhand-right.png b/Resources/Textures/_Triad/Clothing/Head/Helmets/clockwork.rsi/inhand-right.png new file mode 100644 index 00000000000..53f0bb0d9e2 Binary files /dev/null and b/Resources/Textures/_Triad/Clothing/Head/Helmets/clockwork.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Triad/Clothing/Head/Helmets/clockwork.rsi/meta.json b/Resources/Textures/_Triad/Clothing/Head/Helmets/clockwork.rsi/meta.json new file mode 100644 index 00000000000..0baa1d30734 --- /dev/null +++ b/Resources/Textures/_Triad/Clothing/Head/Helmets/clockwork.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/39e1851f59f5d4c29123533282d1dd9b934125fb/icons/mob/head.dmi and https://github.com/tgstation/tgstation/blob/38d1749ff5dda94575bf9ffed98fe8b0e72cef0e/icons/obj/clothing/clockwork_garb.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Triad/Clothing/OuterClothing/Armor/clockwork_cuirass.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Triad/Clothing/OuterClothing/Armor/clockwork_cuirass.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..53ec541e117 Binary files /dev/null and b/Resources/Textures/_Triad/Clothing/OuterClothing/Armor/clockwork_cuirass.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Triad/Clothing/OuterClothing/Armor/clockwork_cuirass.rsi/icon.png b/Resources/Textures/_Triad/Clothing/OuterClothing/Armor/clockwork_cuirass.rsi/icon.png new file mode 100644 index 00000000000..6cc3bbeb2fb Binary files /dev/null and b/Resources/Textures/_Triad/Clothing/OuterClothing/Armor/clockwork_cuirass.rsi/icon.png differ diff --git a/Resources/Textures/_Triad/Clothing/OuterClothing/Armor/clockwork_cuirass.rsi/inhand-left.png b/Resources/Textures/_Triad/Clothing/OuterClothing/Armor/clockwork_cuirass.rsi/inhand-left.png new file mode 100644 index 00000000000..e1ab3b1900a Binary files /dev/null and b/Resources/Textures/_Triad/Clothing/OuterClothing/Armor/clockwork_cuirass.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Triad/Clothing/OuterClothing/Armor/clockwork_cuirass.rsi/inhand-right.png b/Resources/Textures/_Triad/Clothing/OuterClothing/Armor/clockwork_cuirass.rsi/inhand-right.png new file mode 100644 index 00000000000..f71f66a2ebb Binary files /dev/null and b/Resources/Textures/_Triad/Clothing/OuterClothing/Armor/clockwork_cuirass.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Triad/Clothing/OuterClothing/Armor/clockwork_cuirass.rsi/meta.json b/Resources/Textures/_Triad/Clothing/OuterClothing/Armor/clockwork_cuirass.rsi/meta.json new file mode 100644 index 00000000000..3c19fcdc71c --- /dev/null +++ b/Resources/Textures/_Triad/Clothing/OuterClothing/Armor/clockwork_cuirass.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/2f82eae1ab64d0b93d40492b72945f6756baa676/icons/mob/suit.dmi and https://github.com/tgstation/tgstation/blob/38d1749ff5dda94575bf9ffed98fe8b0e72cef0e/icons/obj/clothing/clockwork_garb.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Triad/Clothing/Shoes/Specific/clockwork_treads.rsi/equipped-FEET.png b/Resources/Textures/_Triad/Clothing/Shoes/Specific/clockwork_treads.rsi/equipped-FEET.png new file mode 100644 index 00000000000..7f2078f0b3d Binary files /dev/null and b/Resources/Textures/_Triad/Clothing/Shoes/Specific/clockwork_treads.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/_Triad/Clothing/Shoes/Specific/clockwork_treads.rsi/icon.png b/Resources/Textures/_Triad/Clothing/Shoes/Specific/clockwork_treads.rsi/icon.png new file mode 100644 index 00000000000..900c54db63a Binary files /dev/null and b/Resources/Textures/_Triad/Clothing/Shoes/Specific/clockwork_treads.rsi/icon.png differ diff --git a/Resources/Textures/_Triad/Clothing/Shoes/Specific/clockwork_treads.rsi/meta.json b/Resources/Textures/_Triad/Clothing/Shoes/Specific/clockwork_treads.rsi/meta.json new file mode 100644 index 00000000000..d7be217959b --- /dev/null +++ b/Resources/Textures/_Triad/Clothing/Shoes/Specific/clockwork_treads.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/2563528d892f513f53f28a444658313f34484a76/icons/obj/clothing/shoes.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Triad/Objects/Weapons/Melee/ratvarian_spear.rsi/equipped-BACKPACK.png b/Resources/Textures/_Triad/Objects/Weapons/Melee/ratvarian_spear.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..039d50596f4 Binary files /dev/null and b/Resources/Textures/_Triad/Objects/Weapons/Melee/ratvarian_spear.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_Triad/Objects/Weapons/Melee/ratvarian_spear.rsi/equipped-BELT.png b/Resources/Textures/_Triad/Objects/Weapons/Melee/ratvarian_spear.rsi/equipped-BELT.png new file mode 100644 index 00000000000..e199e0afa1d Binary files /dev/null and b/Resources/Textures/_Triad/Objects/Weapons/Melee/ratvarian_spear.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_Triad/Objects/Weapons/Melee/ratvarian_spear.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Triad/Objects/Weapons/Melee/ratvarian_spear.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..039d50596f4 Binary files /dev/null and b/Resources/Textures/_Triad/Objects/Weapons/Melee/ratvarian_spear.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_Triad/Objects/Weapons/Melee/ratvarian_spear.rsi/icon.png b/Resources/Textures/_Triad/Objects/Weapons/Melee/ratvarian_spear.rsi/icon.png new file mode 100644 index 00000000000..05d387806c0 Binary files /dev/null and b/Resources/Textures/_Triad/Objects/Weapons/Melee/ratvarian_spear.rsi/icon.png differ diff --git a/Resources/Textures/_Triad/Objects/Weapons/Melee/ratvarian_spear.rsi/inhand-left.png b/Resources/Textures/_Triad/Objects/Weapons/Melee/ratvarian_spear.rsi/inhand-left.png new file mode 100644 index 00000000000..4ab77211342 Binary files /dev/null and b/Resources/Textures/_Triad/Objects/Weapons/Melee/ratvarian_spear.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Triad/Objects/Weapons/Melee/ratvarian_spear.rsi/inhand-right.png b/Resources/Textures/_Triad/Objects/Weapons/Melee/ratvarian_spear.rsi/inhand-right.png new file mode 100644 index 00000000000..4658005c226 Binary files /dev/null and b/Resources/Textures/_Triad/Objects/Weapons/Melee/ratvarian_spear.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Triad/Objects/Weapons/Melee/ratvarian_spear.rsi/meta.json b/Resources/Textures/_Triad/Objects/Weapons/Melee/ratvarian_spear.rsi/meta.json new file mode 100644 index 00000000000..429b33e21f1 --- /dev/null +++ b/Resources/Textures/_Triad/Objects/Weapons/Melee/ratvarian_spear.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/d50960f4c06073e2a95ef67f6a45492eb3882d18/icons/mob/inhands/antag/clockwork_lefthand.dmi and https://github.com/tgstation/tgstation/blob/d50960f4c06073e2a95ef67f6a45492eb3882d18/icons/mob/inhands/antag/clockwork_righthand.dmi and https://github.com/tgstation/tgstation/blob/d50960f4c06073e2a95ef67f6a45492eb3882d18/icons/obj/clockwork_objects.dmi and https://github.com/tgstation/tgstation/blob/f88da4bcb9d488c5195877ff616a96abba3977b9/icons/mob/clothing/belt.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Triad/Objects/Weapons/Melee/ratvarian_spear.rsi/wielded-inhand-left.png b/Resources/Textures/_Triad/Objects/Weapons/Melee/ratvarian_spear.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..d8fb3f3e526 Binary files /dev/null and b/Resources/Textures/_Triad/Objects/Weapons/Melee/ratvarian_spear.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_Triad/Objects/Weapons/Melee/ratvarian_spear.rsi/wielded-inhand-right.png b/Resources/Textures/_Triad/Objects/Weapons/Melee/ratvarian_spear.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..4ae1a3a77db Binary files /dev/null and b/Resources/Textures/_Triad/Objects/Weapons/Melee/ratvarian_spear.rsi/wielded-inhand-right.png differ