From 2d07a5973b304d1e5b74bb80eb30e768c5198edc Mon Sep 17 00:00:00 2001 From: Slava0135 <40753025+Slava0135@users.noreply.github.com> Date: Tue, 28 Feb 2023 23:06:55 +0300 Subject: [PATCH] Add fake cap gun to mime & clown uplink (#13998) --- Resources/Locale/en-US/store/uplink-catalog.ftl | 3 +++ Resources/Prototypes/Catalog/uplink_catalog.yml | 15 +++++++++++++++ .../Prototypes/Entities/Objects/Fun/toys.yml | 15 +++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 28fa900bc8..7d67e2b4a3 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -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! diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 5aae9b79ba..261fa5d1d8 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -557,6 +557,21 @@ 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 diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index ab5a8968c1..84b41d07ee 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -587,6 +587,21 @@ 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 -- 2.52.0