Skip to content

Commit

Permalink
Mirror: Barber scissors in uplink and chameleon bundle. (#121)
Browse files Browse the repository at this point in the history
## Mirror of PR #25920: [Barber scissors in uplink and chameleon
bundle.](space-wizards/space-station-14#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 <[email protected]>
  • Loading branch information
SimpleStation14 and AlexUm418 authored May 4, 2024
1 parent deb4a22 commit f95d159
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 11 deletions.
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/store/uplink-catalog.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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.
23 changes: 12 additions & 11 deletions Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions Resources/Prototypes/Catalog/uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f95d159

Please sign in to comment.