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

Port Frontier Clothes #1388

Merged
merged 6 commits into from
Jan 5, 2025
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockAutoDrobeFilled
cost: 1730
cost: 3500
category: cargoproduct-category-name-service
group: market

Expand Down
33 changes: 19 additions & 14 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,26 @@
- type: vendingMachineInventory
id: PietyVendInventory
startingInventory:
ClothingUniformJumpsuitChaplain: 2
ClothingUniformJumpskirtChaplain: 2
ClothingUniformJumpsuitMonasticRobeDark: 1
ClothingUniformJumpsuitMonasticRobeLight: 1
ClothingUniformJumpsuitChaplain: 3
ClothingUniformJumpskirtChaplain: 3
ClothingUniformJumpsuitMonasticRobeDark: 3
ClothingUniformJumpsuitMonasticRobeLight: 3
ClothingOuterHoodieChaplain: 3
ClothingOuterHoodieBlack: 3
ClothingHeadHatHoodNunHood: 3
ClothingOuterNunRobe: 3
ClothingHeadHatFez: 3
ClothingHeadHatPlaguedoctor: 3
ClothingHeadHatWitch: 3
ClothingHeadHatWitch1: 3
ClothingOuterPlagueSuit: 3
ClothingMaskPlague: 3
ClothingNeckScarfChaplainStole: 3
ClothingHeadsetService: 4
RubberStampChaplain: 3
Bible: 3
ClothingNeckCrucifix: 3
ClothingNeckStoleChaplain: 1
ClothingOuterHoodieChaplain: 1
ClothingOuterHoodieBlack: 1
ClothingHeadHatHoodNunHood: 1
ClothingOuterNunRobe: 1
ClothingHeadHatFez: 1
ClothingHeadHatPlaguedoctor: 1
ClothingHeadHatWitch: 1
ClothingHeadHatWitch1: 1
ClothingOuterPlagueSuit: 1
ClothingMaskPlague: 1
#ClothingHeadsetService: 2 # Delta-V - Chaplain is no longer service dept
BoxCandle: 2
BoxCandleSmall: 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,50 @@
ClothingShoesBootsCowboyBlack: 1
ClothingShoesBootsCowboyWhite: 1
ClothingMaskNeckGaiterRed: 2
ClothingUniformJumpskirtPerformer: 2
ClothingShoesBootsPerformer: 2
ClothingNeckCloakMoth: 2
ClothingUniformJumpskirtJanimaid: 2
ClothingNeckCloakVoid: 2
ClothingHeadBandRed: 1
ClothingHeadHatPirate: 1
ClothingOuterCoatPirate: 1
ClothingUniformJumpsuitPirate: 1
ClothingShoesBootsLaceup: 2
FoamCutlass: 2
ClothingHeadSafari: 2 # Frontier
ClothingUniformJumpsuitSafari: 2 # Frontier
ClothingUniformRandomArmlessNoSkirt: 6 # Frontier
ClothingUniformRandomArmless: 6 # Frontier
ClothingUniformRandomStandard: 6 # Frontier
ClothingUniformRandomBra: 6 # Frontier
ClothingUniformRandomShorts: 6 # Frontier
ClothingUniformRandomShirt: 6 # Frontier
ClothingHandsGlovesBoxingRed: 2
ClothingHandsGlovesBoxingBlue: 2
ClothingHandsGlovesBoxingYellow: 2
ClothingHandsGlovesBoxingGreen: 2
UniformShortsRed: 4
UniformShortsRedWithTop: 4
ClothingBackpackClownFilled: 2
ClothingBackpackSatchelClown: 2
ClothingBackpackDuffelClown: 2
ClothingMaskClown: 2
ClothingShoesClown: 2
ClothingUniformJumpsuitClown: 2
RubberStampClown: 1
ClothingBackpackMime: 2
ClothingBackpackSatchelMime: 2
ClothingBackpackDuffelMime: 2
ClothingHeadHatMimesoft: 2
ClothingMaskMime: 2
ClothingUniformJumpsuitMime: 2
ClothingUniformJumpskirtMime: 2
ClothingBeltSuspenders: 2
RubberStampMime: 1
contrabandInventory: # Frontier - Hidden inventory
ClothingHeadHatMimesoftFlipped: 1
BarberScissors: 1
ClothingNeckBellCollar: 2
ClothingOuterUnathiRobe: 1
emaggedInventory:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,31 @@
id: LoadoutOuterCoatInspector
- type: loadout
id: LoadoutOuterCoatOvercoat
- type: loadout
id: LoadoutOuterBomberAerostatic
- type: loadout
id: LoadoutOuterBomberPunkRed
- type: loadout
id: LoadingOuterCoatJacketLeather
- type: loadout
id: LoadoutOuterJacketBiker
- type: loadout
id: LoadoutOuterJacketJamrock
- type: loadout
id: LoadoutOuterJacketLettermanBlue
- type: loadout
id: LoadoutOuterJacketLettermanBrown
- type: loadout
id: LoadoutOuterJacketLettermanMagenta
- type: loadout
id: LoadoutOuterJacketLettermanRed
- type: loadout
id: LoadoutOuterCoatAcidRaincoat
- type: loadout
id: LoadoutOuterCoatAcidRaincoatBlue
- type: loadout
id: LoadoutOuterCoatAcidRaincoatGreen
- type: loadout
id: LoadoutOuterCoatAcidRaincoatMagenta
- type: loadout
id: LoadoutOuterCoatAcidRaincoatYellow
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@
- type: Tag
tags:
- Trash
- Ash # Frontier
- type: SolutionContainerManager
solutions:
food:
Expand Down
150 changes: 150 additions & 0 deletions Resources/Prototypes/Loadouts/Generic/outerClothing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -351,3 +351,153 @@
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutOuter

- type: loadout
id: LoadoutOuterBomberAerostatic
category: Outer
cost: 0
items:
- ClothingOuterCoatBomberAerostatic
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutOuter

- type: loadout
id: LoadoutOuterBomberPunkRed
category: Outer
cost: 0
items:
- ClothingOuterCoatBomberPunkRed
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutOuter

- type: loadout
id: LoadoutOuterJacketLeather
category: Outer
cost: 0
items:
- ClothingOuterCoatJacketLeather
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutOuter

- type: loadout
id: LoadoutOuterJacketBiker
category: Outer
cost: 0
items:
- ClothingOuterCoatJacketBiker
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutOuter

- type: loadout
id: LoadoutOuterJacketJamrock
category: Outer
cost: 0
items:
- ClothingOuterCoatJacketJamrock
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutOuter

- type: loadout
id: LoadoutOuterJacketLettermanBlue
category: Outer
cost: 0
items:
- ClothingOuterCoatJacketLettermanBlue
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutOuter

- type: loadout
id: LoadoutOuterJacketLettermanBrown
category: Outer
cost: 0
items:
- ClothingOuterCoatJacketLettermanBrown
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutOuter

- type: loadout
id: LoadoutOuterJacketLettermanMagenta
category: Outer
cost: 0
items:
- ClothingOuterCoatJacketLettermanMagenta
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutOuter

- type: loadout
id: LoadoutOuterJacketLettermanRed
category: Outer
cost: 0
items:
- ClothingOuterCoatJacketLettermanRed
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutOuter

- type: loadout
id: LoadoutOuterBomberPinkSleeves
category: Outer
cost: 0
items:
- ClothingOuterCoatBomberPinkSleeves
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutOuter

- type: loadout
id: LoadoutOuterCoatAcidRaincoat
category: Outer
cost: 0
items:
- ClothingOuterCoatAcidRaincoat
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutOuter

- type: loadout
id: LoadoutOuterCoatAcidRaincoatBlue
category: Outer
cost: 0
items:
- ClothingOuterCoatAcidRaincoatBlue
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutOuter

- type: loadout
id: LoadoutOuterCoatAcidRaincoatGreen
category: Outer
cost: 0
items:
- ClothingOuterCoatAcidRaincoatGreen
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutOuter

- type: loadout
id: LoadoutOuterCoatAcidRaincoatMagenta
category: Outer
cost: 0
items:
- ClothingOuterCoatAcidRaincoatMagenta
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutOuter

- type: loadout
id: LoadoutOuterCoatAcidRaincoatYellow
category: Outer
cost: 0
items:
- ClothingOuterCoatAcidRaincoatYellow
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutOuter
45 changes: 45 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_punk.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@

- type: entity
parent: ClothingBeltStorageBase
id: ClothingBeltPunkRandomized
name: punk belt
description: A webbing with functional pockets.
suffix: Random visuals
components:
- type: Sprite
sprite: _NF/Clothing/Belt/punk.rsi
layers:
- state: base_belt_01
map: [ "belt_main" ]
scale: 1.8, 1.8
offset: 0,0.1
- state: decor_base_belt_01
map: [ "belt_decor" ]
scale: 1.8, 1.8
offset: 0,0.1
- state: mask_null
map: [ "belt_overlay" ]
scale: 1.8, 1.8
offset: 0,0.1
- type: Clothing
sprite: _NF/Clothing/Belt/punk.rsi
clothingVisuals:
belt:
- state: base_belt_01
map: [ "belt_main" ]
- state: decor_base_belt_01
map: [ "belt_decor" ]
- state: mask_null
map: [ "belt_overlay" ]
- type: RandomSprite
available:
- belt_main:
base_belt_01: CyberpunkDark
belt_decor:
decor_base_belt_01: CyberpunkDark
belt_overlay:
decor_base_belt_02: CyberpunkDark
decor_base_belt_03: CyberpunkDark
decor_base_belt_04: CyberpunkDark
decor_base_belt_05: CyberpunkDark
mask_null: ""
Loading
Loading