Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mirror: Barber scissors in uplink and chameleon bundle. #121

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading