From f95d159bc441fbc479b56ec1cc938b89a9da698a Mon Sep 17 00:00:00 2001
From: SimpleStation14 <130339894+SimpleStation14@users.noreply.github.com>
Date: Sat, 4 May 2024 16:33:19 -0700
Subject: [PATCH] Mirror: Barber scissors in uplink and chameleon bundle.
 (#121)

## Mirror of PR #25920: [Barber scissors in uplink and chameleon
bundle.](https://github.com/space-wizards/space-station-14/pull/25920)
from <img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `7af183ec720833aaa49cb8db3c7b37d14dd50798`

PR opened by <img
src="https://avatars.githubusercontent.com/u/159550239?v=4"
width="16"/><a href="https://github.com/AlexUmAndXGabriel08X">
AlexUmAndXGabriel08X</a> at 2024-03-07 21:21:02 UTC
PR merged by <img
src="https://avatars.githubusercontent.com/u/19864447?v=4"
width="16"/><a href="https://github.com/web-flow"> web-flow</a> at
2024-03-07 23:55:25 UTC

---

PR changed 3 files with 14 additions and 0 deletions.

The PR had the following labels:
- No C#


---

<details open="true"><summary><h1>Original Body</h1></summary>

> <!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
> <!-- The text between the arrows are comments - they will not be
visible on your PR. -->
>
> ## About the PR
> <!-- What did you change in this PR? -->
> In this another uplink related PR we changed that now you will get
barber scissors when purchasing chameleon bundle, and you can just
purchase barber scissors on their own in pointless tab.
> ## Why / Balance
> <!-- Why was it changed? Link any discussions or issues here. Please
discuss how this would affect game balance. -->
> We want to see them being used more commonly.
> It is actually really fitting in the chameleon bundle, as it's made to
change your look to whatever you need.
> ## Media
> - [X] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
>
>
![image](https://github.com/space-wizards/space-station-14/assets/159550239/5e1ddbf3-1319-433f-a3b3-1cebe9e2ae6c)
>
![image](https://github.com/space-wizards/space-station-14/assets/159550239/e44355eb-805a-49a4-80b1-d2598911ac7a)
>
![image](https://github.com/space-wizards/space-station-14/assets/159550239/b2db93ee-dac9-43e5-bfb8-abe4d1a2e749)
>
![image](https://github.com/space-wizards/space-station-14/assets/159550239/dd12aaa4-ed25-4d24-a40b-1c84eac359b8)
>


</details>

Co-authored-by: AlexUm & XGabriel08X <159550239+AlexUmAndXGabriel08X@users.noreply.github.com>
---
 .../Locale/en-US/store/uplink-catalog.ftl     |  3 +++
 .../Catalog/Fills/Backpacks/duffelbag.yml     | 23 ++++++++++---------
 .../Prototypes/Catalog/uplink_catalog.yml     | 10 ++++++++
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index 500bb801c4a..64aa9f81ff5 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -406,3 +406,6 @@ uplink-bribe-desc = A heartfelt gift that can help you sway someone's opinion. R
 
 uplink-hypodart-name = Hypodart
 uplink-hypodart-desc = A seemingly unremarkable dart with an enlarged reservoir for chemicals. It can store up to 7u reagents in itself, and instantly inject when it hits the target. Starts empty.
+
+uplink-barber-scissors-name = Barber Scissors
+uplink-barber-scissors-desc = A good tool to give your fellow agent a nice haircut, unless you want to give it to yourself.
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
index 14bf5e77184..c07b0eccf19 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -236,17 +236,18 @@
   id: ClothingBackpackChameleonFill
   suffix: Fill, Chameleon
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingUniformJumpsuitChameleon
-      - id: ClothingOuterChameleon
-      - id: ClothingNeckChameleon
-      - id: ClothingMaskGasChameleon
-      - id: ClothingHeadHatChameleon
-      - id: ClothingHandsChameleon
-      - id: ClothingEyesChameleon
-      - id: ClothingHeadsetChameleon
-      - id: ClothingShoesChameleon
+    - type: StorageFill
+      contents:
+        - id: ClothingUniformJumpsuitChameleon
+        - id: ClothingOuterChameleon
+        - id: ClothingNeckChameleon
+        - id: ClothingMaskGasChameleon
+        - id: ClothingHeadHatChameleon
+        - id: ClothingHandsChameleon
+        - id: ClothingEyesChameleon
+        - id: ClothingHeadsetChameleon
+        - id: ClothingShoesChameleon
+        - id: BarberScissors
 
 - type: entity
   parent: ClothingBackpackDuffelSyndicateBundle
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index f18deb5c0dc..8e2c6fc9305 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -1504,6 +1504,16 @@
 
  # Pointless
 
+- type: listing
+  id: UplinkBarberScissors
+  name: uplink-barber-scissors-name
+  description: uplink-barber-scissors-desc
+  productEntity: BarberScissors
+  cost:
+    Telecrystal: 1
+  categories:
+  - UplinkPointless
+
 - type: listing
   id: UplinkRevolverCapGun
   name: uplink-revolver-cap-gun-name