]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Rigged boxing gloves (#13847)
authorGoodWheatley <109803540+GoodWheatley@users.noreply.github.com>
Sat, 22 Apr 2023 23:08:33 +0000 (19:08 -0400)
committerGitHub <noreply@github.com>
Sat, 22 Apr 2023 23:08:33 +0000 (19:08 -0400)
* rigged boxing gloves

* change item parent

* fix indentation

Resources/Locale/en-US/store/uplink-catalog.ftl
Resources/Prototypes/Catalog/uplink_catalog.yml
Resources/Prototypes/Entities/Clothing/Hands/gloves.yml

index 0341c9a3871357bcd81336777cb128e963577888..eebfc55cab68330b15ad578d8998bc7d8c610a3e 100644 (file)
@@ -148,6 +148,9 @@ uplink-carp-dehydrated-desc = Looks like a plush toy carp, but just add water an
 uplink-gatfruit-seeds-name = Packet Of Gatfruit Seeds
 uplink-gatfruit-seeds-desc = And who says guns don't grow on trees?
 
+uplink-rigged-boxing-gloves-name = Rigged Boxing Gloves
+uplink-rigged-boxing-gloves-desc = Float like a butterfly, sting like a bee.
+
 uplink-necronomicon-name = Necronomicon
 uplink-necronomicon-desc = An unholy book capable of summoning a demonic familiar.
 
index b73174416c137ac0f10f72f491e79491256da329..6609dab0133d9e015ff159d0408d417d0313f82a 100644 (file)
     whitelist:
     - Botanist
 
+- type: listing
+  id: uplinkRiggedBoxingGloves
+  name: uplink-rigged-boxing-gloves-name
+  description: uplink-rigged-boxing-gloves-desc
+  productEntity: ClothingHandsGlovesBoxingRigged
+  cost:
+    Telecrystal: 5
+  categories:
+    - UplinkJob
+  conditions:
+    - !type:BuyerJobCondition
+      whitelist:
+        - Passenger
+        - Boxer
+
 - type: listing
   id: uplinkNecronomicon
   name: uplink-necronomicon-name
index 0dd5cb5d291ebf05cb960a1eb646dcbd21a5d61c..a9f9a8e2931e34355dbfb4320275170f41504eee 100644 (file)
     fiberColor: fibers-yellow
   - type: FingerprintMask
 
+- type: entity
+  parent: ClothingHandsGlovesBoxingBlue
+  id: ClothingHandsGlovesBoxingRigged
+  name: blue boxing gloves
+  description: Blue gloves for competitive boxing. Feels like they're heavier than usual...
+  components:
+  - type: StaminaDamageOnHit
+    damage: 30
+  - type: MeleeWeapon
+    attackRate: 1.5
+    damage:
+      types:
+        Blunt: 8
+
 - type: entity
   parent: ClothingHandsBase
   id: ClothingHandsGlovesCaptain