diff --git a/Resources/Locale/en-US/_DV/tools/Hos-Briefcase.ftl b/Resources/Locale/en-US/_DV/tools/Hos-Briefcase.ftl index f6ffebd1f2e..6849f304b89 100644 --- a/Resources/Locale/en-US/_DV/tools/Hos-Briefcase.ftl +++ b/Resources/Locale/en-US/_DV/tools/Hos-Briefcase.ftl @@ -3,3 +3,6 @@ energy-magnum-bundle-description = A heavy duty, slow recharging, energy revolve x01-bundle-name = X-01 x01-bundle-description = A fast firing, high capacity, compact, energy gun perfect for dishing out consistent quick damage. + +grav-gauntlet-bundle-name = Grav Gauntlet +grav-gauntlet-bundle-description = A strong, slow hitting, gauntlet that can pull targets hit in and has a taser just in case. diff --git a/Resources/Prototypes/_DV/Catalog/HoS_Briefcase_catalog.yml b/Resources/Prototypes/_DV/Catalog/HoS_Briefcase_catalog.yml index e17fc138e8e..e087b6f5ef1 100644 --- a/Resources/Prototypes/_DV/Catalog/HoS_Briefcase_catalog.yml +++ b/Resources/Prototypes/_DV/Catalog/HoS_Briefcase_catalog.yml @@ -21,3 +21,15 @@ - WeaponEnergyGunMultiphase - SyndicateWhistle - BookSpaceLaw + +- type: thiefBackpackSet + id: GravGauntletBundle + name: grav-gauntlet-bundle-name + description: grav-gauntlet-bundle-description + sprite: + sprite: _DV/Objects/Weapons/Melee/grav_gauntlet.rsi + state: icon + content: + - GravGauntlet + - BedsheetUSA + - RockGuitarInstrument diff --git a/Resources/Prototypes/_DV/Entities/Objects/Specific/HoS_Briefcase.yml b/Resources/Prototypes/_DV/Entities/Objects/Specific/HoS_Briefcase.yml index 3f025ca1c91..9927ac8c893 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Specific/HoS_Briefcase.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Specific/HoS_Briefcase.yml @@ -14,6 +14,7 @@ possibleSets: - X01bundle - EnergyMagnumBundle + - GravGauntletBundle - type: Tag # DeltaV - can't go in storage implants tags: - HighRiskItem diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Melee/grav_gauntlet.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Melee/grav_gauntlet.yml new file mode 100644 index 00000000000..340f8876b26 --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Melee/grav_gauntlet.yml @@ -0,0 +1,57 @@ +- type: entity + parent: [BaseItem, BaseWeaponBatterySmall, BaseGunWieldable] + id: GravGauntlet + name: Grav Gauntlet MK-00c + description: A developmental prototype of Nanotrasen's Melee Arms Department. When striking an enemy, a gravitational wave pulses and sweeps them in for a follow-up. + components: + - type: Sprite + sprite: _DV/Objects/Weapons/Melee/grav_gauntlet.rsi + state: icon + - type: MeleeWeapon + range: 1.2 # so you can actually use the pull + attackRate: 0.70 # heavy friggin fists bro + angle: 0 + animation: WeaponArcFist + wideAnimationRotation: 145 + damage: + types: + Blunt: 18 + Heat: 5 + Structural: 20 + - type: IncreaseDamageOnWield + damage: + types: + Heat: 7 + Structural: 5 + - type: Gun #apersos was here + resetOnHandSelected: false + projectileSpeed: 25 + soundGunshot: /Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg + - type: BatteryAmmoProvider + proto: BulletTaser # most balanced kinda, better than a stun shotgun + fireCost: 1000 + - type: BatterySelfRecharger + autoRechargeRate: 1000 + autoRechargePauseTime: 55 + - type: GunRequiresWield #gotta steady your arm to aim duhhh + - type: AmmoCounter + - type: MeleeThrowOnHit + speed: 5.75 + distance: -.75 + - type: AltFireMelee + attackType: Heavy + - type: UseDelayOnShoot + - type: UseDelay + delay: 2 + - type: Clothing + sprite: _DV/Objects/Weapons/grav_gauntlet.rsi + quickEquip: false + slots: + - belt + - suitStorage + - type: Tag + tags: + - HighRiskItem + - Sidearm + - type: StealTarget + stealGroup: HoSSidearm diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/grav_gauntlet.rsi/icon.png b/Resources/Textures/_DV/Objects/Weapons/Melee/grav_gauntlet.rsi/icon.png new file mode 100644 index 00000000000..1539485cb72 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Melee/grav_gauntlet.rsi/icon.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/grav_gauntlet.rsi/inhand-left.png b/Resources/Textures/_DV/Objects/Weapons/Melee/grav_gauntlet.rsi/inhand-left.png new file mode 100644 index 00000000000..66bfc2367e3 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Melee/grav_gauntlet.rsi/inhand-left.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/grav_gauntlet.rsi/inhand-right.png b/Resources/Textures/_DV/Objects/Weapons/Melee/grav_gauntlet.rsi/inhand-right.png new file mode 100644 index 00000000000..0ad6567a3bd Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Melee/grav_gauntlet.rsi/inhand-right.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/grav_gauntlet.rsi/meta.json b/Resources/Textures/_DV/Objects/Weapons/Melee/grav_gauntlet.rsi/meta.json new file mode 100644 index 00000000000..c34f17bc90f --- /dev/null +++ b/Resources/Textures/_DV/Objects/Weapons/Melee/grav_gauntlet.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "created by coll1079/Apersos, also say thanks to my friend Noah for the beta icon", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/grav_gauntlet.rsi/wielded-inhand-left.png b/Resources/Textures/_DV/Objects/Weapons/Melee/grav_gauntlet.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..73f97531b56 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Melee/grav_gauntlet.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/grav_gauntlet.rsi/wielded-inhand-right.png b/Resources/Textures/_DV/Objects/Weapons/Melee/grav_gauntlet.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..6a8b9d81903 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Melee/grav_gauntlet.rsi/wielded-inhand-right.png differ