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.

Sign up for GitHub

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

Jump to bottom

Rep Drobe #758

Merged
merged 4 commits into from
Jan 7, 2024
Merged

Rep Drobe #758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f79e8f
Fix
dvir001 Dec 13, 2023
2301bd3
Fix
dvir001 Dec 13, 2023
c82e254
Merge branch '2023-12-13-RepDrobe' of https://github.com/dvir001/fron…
dvir001 Dec 25, 2023
1c521fc
Merge branch 'new-frontiers-14:master' into 2023-12-13-RepDrobe
dvir001 Jan 7, 2024
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
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtDetective
name: hard-worn suit
name: detective hard-worn suit # Frontier - Added detective to name
description: Someone who wears this means business.
components:
- type: Sprite
Expand All @@ -133,7 +133,7 @@
- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtDetectiveGrey
name: noir suit
name: detective noir suit # Frontier - Added detective to name
description: A hard-boiled private investigator's grey suit, complete with tie clip.
components:
- type: Sprite
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitDetective
name: hard-worn suit
name: detective hard-worn suit # Frontier - Added detective to name
description: Someone who wears this means business.
components:
- type: Sprite
Expand All @@ -246,7 +246,7 @@
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitDetectiveGrey
name: noir suit
name: detective noir suit # Frontier - Added detective to name
description: A hard-boiled private investigator's grey suit, complete with tie clip.
components:
- type: Sprite
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/bountyvend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
#Bounty hunter
ClothingUniformJumpsuitBH: 3
ClothingUniformJumpskirtBH: 3
ClothingUniformJumpsuitBHGrey: 2
ClothingUniformJumpskirtBHGrey: 2
ClothingNeckTieBH: 2
ClothingOuterCoatBHTrench: 3
ClothingHeadHatBH: 3
#Mercenary
Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Neck/ties.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- type: entity
parent: ClothingNeckTieDet
id: ClothingNeckTieBH
name: tie
description: A loosely tied necktie, a perfect accessory for the over-worked.
8 changes: 7 additions & 1 deletion Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,15 @@
- type: entity
parent: ClothingUniformJumpskirtDetective
id: ClothingUniformJumpskirtBH
name: bounty hunter's hard-worn suit
name: hard-worn suit
description: Someone who wears this means business.

- type: entity
parent: ClothingUniformJumpskirtDetectiveGrey
id: ClothingUniformJumpskirtBHGrey
name: noir suit
description: A grey suit, complete with tie clip.

- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtMercenary
Expand Down
8 changes: 7 additions & 1 deletion Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,15 @@
- type: entity
parent: ClothingUniformJumpsuitDetective
id: ClothingUniformJumpsuitBH
name: bounty hunter's hard-worn suit
name: hard-worn suit
description: Someone who wears this means business.

- type: entity
parent: ClothingUniformJumpsuitDetectiveGrey
id: ClothingUniformJumpsuitBHGrey
name: noir suit
description: A grey suit, complete with tie clip.

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitChaplainPilgrimVest
Expand Down
10 changes: 5 additions & 5 deletions Resources/Prototypes/_Nyano/Catalog/Fills/Vending/Inventories/repdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
id: RepDrobeInventory
startingInventory:
ClothingUniformJumpsuitReporter: 2
# ClothingUniformJumpsuitDetective: 2 # Frontier - Detective gear, need to replace this.
# ClothingUniformJumpskirtDetective: 2 # Frontier - Detective gear, need to replace this.
ClothingUniformJumpsuitBH: 2 # Frontier
ClothingUniformJumpskirtBH: 2 # Frontier
ClothingShoesColorBrown: 2
ClothingShoesColorBlack: 2
ClothingShoesColorWhite: 2
# ClothingOuterVestDetective: 2 # Frontier - Detective gear, need to replace this.
ClothingHeadHatFedoraBrown: 2
# ClothingUniformJumpsuitDetectiveGrey: 2 # Frontier - Detective gear, need to replace this.
# ClothingUniformJumpskirtDetectiveGrey: 2 # Frontier - Detective gear, need to replace this.
# ClothingNeckTieDet: 2 # Frontier - Detective gear, need to replace this.
ClothingUniformJumpsuitBHGrey: 2 # Frontier
ClothingUniformJumpskirtBHGrey: 2 # Frontier
ClothingNeckTieBH: 2 # Frontier
ClothingHeadHatFedoraGrey: 2
ClothingHandsGlovesColorBlack: 2
RadioHandheld: 2
Expand Down
Loading