diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 8f26498105a..608ab51f77f 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -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 @@ -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 diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index c7269763154..432dbe534de 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -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 @@ -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 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/bountyvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/bountyvend.yml index e7e44ac497b..3e108ca43ee 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/bountyvend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/bountyvend.yml @@ -12,6 +12,9 @@ #Bounty hunter ClothingUniformJumpsuitBH: 3 ClothingUniformJumpskirtBH: 3 + ClothingUniformJumpsuitBHGrey: 2 + ClothingUniformJumpskirtBHGrey: 2 + ClothingNeckTieBH: 2 ClothingOuterCoatBHTrench: 3 ClothingHeadHatBH: 3 #Mercenary diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Neck/ties.yml b/Resources/Prototypes/_NF/Entities/Clothing/Neck/ties.yml new file mode 100644 index 00000000000..a828ea30e6c --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/Neck/ties.yml @@ -0,0 +1,5 @@ +- type: entity + parent: ClothingNeckTieDet + id: ClothingNeckTieBH + name: tie + description: A loosely tied necktie, a perfect accessory for the over-worked. diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml index 33eef9f62f4..03de3bc313b 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml @@ -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 diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml index 4cd882060e9..70495d2a4f3 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml @@ -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 diff --git a/Resources/Prototypes/_Nyano/Catalog/Fills/Vending/Inventories/repdrobe.yml b/Resources/Prototypes/_Nyano/Catalog/Fills/Vending/Inventories/repdrobe.yml index 7f60cf006cd..3aa4193e2ee 100644 --- a/Resources/Prototypes/_Nyano/Catalog/Fills/Vending/Inventories/repdrobe.yml +++ b/Resources/Prototypes/_Nyano/Catalog/Fills/Vending/Inventories/repdrobe.yml @@ -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