Skip to content

Commit

Permalink
Merge pull request #448 from Fansana/frontier-clothes
Browse files Browse the repository at this point in the history
Frontier Clothes
  • Loading branch information
Fansana authored Jan 8, 2025
2 parents 81c0a15 + 464041d commit 33677a4
Show file tree
Hide file tree
Showing 414 changed files with 4,238 additions and 15 deletions.
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: 2000 #FloofStation due to "Arbitrage"
cost: 3500
category: cargoproduct-category-name-service
group: market

Expand Down
31 changes: 17 additions & 14 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
- 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
ClothingNeckCrucifix: 3
ClothingNeckStoleChaplain: 1
ClothingOuterHoodieChaplain: 1
ClothingOuterHoodieBlack: 1
ClothingHeadHatHoodNunHood: 1
ClothingOuterNunRobe: 1
ClothingHeadHatFez: 1
ClothingHeadHatPlaguedoctor: 1
ClothingHeadHatWitch: 1
ClothingHeadHatWitch1: 1
ClothingOuterPlagueSuit: 1
ClothingMaskPlague: 1
ClothingHandsChaplainWarmers: 1 # Floofstation
ClothingUnderSocksChaplain: 1 # Floofstation
ClothingUniformChaplainThong: 1 # Floofstation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,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
ClothingNeckCloakRedHood: 1 # Floofstation - Red Cloak
Expand Down
28 changes: 28 additions & 0 deletions Resources/Prototypes/CharacterItemGroups/outerwearGroup.yml
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
- Burnt # Floof
- type: SolutionContainerManager
solutions:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,29 @@
name: foam dart
parent: BaseItem
components:
# Floof
- type: EmbeddableProjectile
sound: /Audio/Weapons/star_hit.ogg
offset: 0.1,0.1
minimumSpeed: 1
removalTime: 0.1
- type: Fixtures
fixtures:
fix1:
shape: !type:PolygonShape
vertices:
- -0.10,0.20
- -0.10,-0.20
- 0.10,-0.20
- 0.10,0.20
density: 20
mask:
- ItemMask
restitution: 0.3
friction: 0.2
- type: ThrowingAngle
angle: 180
# Floof end
- type: Tag
tags:
- BulletFoam
Expand Down
149 changes: 149 additions & 0 deletions Resources/Prototypes/Loadouts/Generic/outerClothing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
- 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
34 changes: 34 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
- type: entity
parent: ClothingBeltStorageBase
id: ClothingBeltChaplainSash
name: chaplain sash
description: Who knew that scarves can be also tied around your waist?
components:
- type: Sprite
sprite: _NF/Clothing/Belt/chaplain_sash.rsi
- type: Clothing
sprite: _NF/Clothing/Belt/chaplain_sash.rsi
- type: ItemMapper
mapLayers:
book:
whitelist:
tags:
- Book
components:
- BibleComponent
- Paper
bottle:
whitelist:
tags:
- Bottle
- DrinkBottle
components:
- Drink
- Hypospray
crucifix:
whitelist:
tags:
- Crucifix
sprite: _NF/Clothing/Belt/chaplain_sash_overlay.rsi
- type: Appearance

39 changes: 39 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,39 @@

- 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" ]
- state: decor_base_belt_01
map: [ "belt_decor" ]
- state: mask_null
map: [ "belt_overlay" ]
- 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

0 comments on commit 33677a4

Please sign in to comment.