]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Add fake cap gun to mime & clown uplink (#13998)
authorSlava0135 <40753025+Slava0135@users.noreply.github.com>
Tue, 28 Feb 2023 20:06:55 +0000 (23:06 +0300)
committerGitHub <noreply@github.com>
Tue, 28 Feb 2023 20:06:55 +0000 (16:06 -0400)
Resources/Locale/en-US/store/uplink-catalog.ftl
Resources/Prototypes/Catalog/uplink_catalog.yml
Resources/Prototypes/Entities/Objects/Fun/toys.yml

index 28fa900bc8f92f520a1099f653c48ceb26c786ff..7d67e2b4a3c548c23424c495f036fe325875ae6c 100644 (file)
@@ -142,6 +142,9 @@ uplink-gatfruit-seeds-desc = And who says guns don't grow on trees?
 uplink-necronomicon-name = Necronomicon
 uplink-necronomicon-desc = An unholy book capable of summoning a demonic familiar.
 
+uplink-revolver-cap-gun-fake-name = Fake Cap Gun
+uplink-revolver-cap-gun-fake-desc = Fool your enemy! It can use both cap and magnum bullets. Comes loaded with magnum bullets.
+
 # Armor
 uplink-chameleon-name = Chameleon Kit
 uplink-chameleon-desc = A backpack full of items that contain chameleon technology allowing you to disguise as pretty much anything on the station, and more!
index 5aae9b79baa8ffdc9671d46c1edde33f1f2db1d2..261fa5d1d855e8d1af26e59e4ff94b6f06934ec4 100644 (file)
     blacklist:
       components:
       - SurplusBundle
+  
+- type: listing
+  id: uplinkRevolverCapGunFake
+  name: uplink-revolver-cap-gun-fake-name
+  description: uplink-revolver-cap-gun-fake-desc
+  productEntity: RevolverCapGunFake
+  cost:
+    Telecrystal: 10
+  categories:
+  - UplinkJob
+  conditions:
+  - !type:BuyerJobCondition
+    whitelist:
+    - Mime
+    - Clown
 
 # Armor
 
index ab5a8968c1b8f5a12a51d0f07f99d7f32db7d2b8..84b41d07eefdb2c2ffb902d8bb72e9a094a97af9 100644 (file)
     containers:
       revolver-ammo: !type:Container
 
+- type: entity
+  parent: RevolverCapGun 
+  id: RevolverCapGunFake
+  name: cap gun
+  description: Looks almost like the real thing! Ages 8 and up.
+  components:
+    - type: RevolverAmmoProvider
+      whitelist:
+        tags:
+          - CartridgeCap
+          - SpeedLoaderCap
+          - CartridgeMagnum
+          - SpeedLoaderMagnum
+      proto: CartridgeMagnum
+
 - type: entity
   parent: BaseItem
   id: FoamBlade