Skip to content

Commit

Permalink
Merge pull request Simple-Station#42 from TheDenSS14/clothing-max
Browse files Browse the repository at this point in the history
Frontier Clothes and Armor
  • Loading branch information
sleepyyapril authored and VMSolidus committed Dec 31, 2024
1 parent 98e8af5 commit e735b13
Show file tree
Hide file tree
Showing 418 changed files with 4,068 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: 1730
cost: 3500
category: cargoproduct-category-name-service
group: market

Expand Down
34 changes: 20 additions & 14 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@
- 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
ClothingOuterEpiChaplainMantle: 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 @@ -116,6 +116,7 @@
- type: Tag
tags:
- Trash
- Ash # Frontier
- type: SolutionContainerManager
solutions:
food:
Expand Down
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: ""
78 changes: 78 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Eyes/punk_glasses.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
# Glasses
- type: entity
parent: ClothingEyesGlassesMeson
id: ClothingEyesPunkGoggles
name: punk goggles
description: How can you see anything in this with all the lights?
components:
- type: VisionCorrection
- type: Sprite
sprite: _NF/Clothing/Eyes/Glasses/punk_glasses.rsi
layers:
- state: base_glasses_01
map: [ "glasses_main" ]
scale: 2.5, 2.5
offset: 0,-0.6
- state: decor_base_glasses_01
map: [ "glasses_decor" ]
scale: 2.5, 2.5
offset: 0,-0.6
shader: unshaded
- type: Clothing
sprite: _NF/Clothing/Eyes/Glasses/punk_glasses.rsi
clothingVisuals:
eyes:
- state: base_glasses_01
map: [ "glasses_main" ]
- state: decor_base_glasses_01
map: [ "glasses_decor" ]
shader: unshaded
- type: RandomSprite
available:
- glasses_main:
base_glasses_01: CyberpunkDark
glasses_decor:
decor_base_glasses_01: CyberpunkDark

# HUDs
- type: entity
parent: ClothingEyesHudMedical
id: ClothingEyesPunkInfoShades
name: punk infoshades
description: How can you see anything in this with all the lights?
components:
- type: Sprite
sprite: _NF/Clothing/Eyes/Glasses/punk_glasses.rsi
layers:
- state: base_glasses_02
map: [ "infoshades_main" ]
scale: 2.5, 2.5
offset: 0,-0.6
- state: decor_base_glasses_02
map: [ "infoshades_decor" ]
scale: 2.5, 2.5
offset: 0,-0.6
shader: unshaded
- type: Clothing
sprite: _NF/Clothing/Eyes/Glasses/punk_glasses.rsi
clothingVisuals:
eyes:
- state: base_glasses_02
map: [ "infoshades_main" ]
- state: decor_base_glasses_02
map: [ "infoshades_decor" ]
shader: unshaded
- type: RandomSprite
available:
- infoshades_main:
base_glasses_02: CyberpunkNeon
infoshades_decor:
decor_base_glasses_02: CyberpunkNeon
- type: ShowHealthBars
damageContainers:
- Inorganic
- Silicon
- Biological
- type: ShowHealthIcons
damageContainers:
- Biological
59 changes: 59 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Head/headwear_punks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# Acid raincoat hoods
- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatHoodAcidRaincoat
categories: [ HideSpawnMenu ]
name: acid raincoat hood
description: Mostly transparent raincoat hood made out of acid resistant polymers.
components:
- type: Sprite
sprite: _NF/Clothing/Head/Hoods/Coat/acid_raincoat.rsi
- type: Clothing
sprite: _NF/Clothing/Head/Hoods/Coat/acid_raincoat.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.9
- type: HideLayerClothing
slots:
- Hair

- type: entity
parent: ClothingHeadHatHoodAcidRaincoat
id: ClothingHeadHatHoodAcidRaincoatBlue
categories: [ HideSpawnMenu ]
components:
- type: Sprite
sprite: _NF/Clothing/Head/Hoods/Coat/acid_raincoat_blue.rsi
- type: Clothing
sprite: _NF/Clothing/Head/Hoods/Coat/acid_raincoat_blue.rsi

- type: entity
parent: ClothingHeadHatHoodAcidRaincoat
id: ClothingHeadHatHoodAcidRaincoatGreen
categories: [ HideSpawnMenu ]
components:
- type: Sprite
sprite: _NF/Clothing/Head/Hoods/Coat/acid_raincoat_green.rsi
- type: Clothing
sprite: _NF/Clothing/Head/Hoods/Coat/acid_raincoat_green.rsi

- type: entity
parent: ClothingHeadHatHoodAcidRaincoat
id: ClothingHeadHatHoodAcidRaincoatMagenta
categories: [ HideSpawnMenu ]
components:
- type: Sprite
sprite: _NF/Clothing/Head/Hoods/Coat/acid_raincoat_magenta.rsi
- type: Clothing
sprite: _NF/Clothing/Head/Hoods/Coat/acid_raincoat_magenta.rsi

- type: entity
parent: ClothingHeadHatHoodAcidRaincoat
id: ClothingHeadHatHoodAcidRaincoatYellow
categories: [ HideSpawnMenu ]
components:
- type: Sprite
sprite: _NF/Clothing/Head/Hoods/Coat/acid_raincoat_yellow.rsi
- type: Clothing
sprite: _NF/Clothing/Head/Hoods/Coat/acid_raincoat_yellow.rsi
36 changes: 36 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Masks/masks_punk.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@

- type: entity
parent: ClothingMaskPullableBase
id: ClothingMaskPunkHalf
name: punk halfmask
description: A close-fitting breathing mask with gamer lights!
suffix: Random visuals
components:
- type: BreathMask
- type: Sprite
sprite: _NF/Clothing/Mask/punkhalfmask.rsi
layers:
- state: base_halfmask_01
map: [ "mask_main" ]
scale: 2, 2
offset: 0,-0.6
- state: decor_base_halfmask_01
map: [ "mask_decor" ]
shader: unshaded
scale: 2, 2
offset: 0,-0.6
- type: Clothing
sprite: _NF/Clothing/Mask/punkhalfmask.rsi
clothingVisuals:
mask:
- state: base_halfmask_01
map: [ "mask_main" ]
- state: decor_base_halfmask_01
map: [ "mask_decor" ]
shader: unshaded
- type: RandomSprite
available:
- mask_main:
base_halfmask_01: CyberpunkDark
mask_decor:
decor_base_halfmask_01: CyberpunkNeon
17 changes: 17 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Neck/misc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
- type: entity
parent: ClothingNeckBase
id: ClothingNeckCrucifix
name: crucifix
description: Damn, it feels good to be so pious.
components:
- type: Item
size: Small
- type: Sprite
sprite: _NF/Clothing/Neck/Misc/crucifix.rsi
- type: Clothing
sprite: _NF/Clothing/Neck/Misc/crucifix.rsi
- type: ReactionMixer # I'm assuming that this is used to make holy water
mixMessage: "bible-mixing-success"
reactionTypes:
- Holy
- type: Tag
10 changes: 10 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Neck/scarfs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- type: entity
parent: ClothingNeckBase
id: ClothingNeckScarfChaplainStole
name: chaplain's stole
description: A necessary evil for ordained priests outfit. Gives at least +2 to your holiness.
components:
- type: Sprite
sprite: _NF/Clothing/Neck/Scarfs/chaplain_stole.rsi
- type: Clothing
sprite: _NF/Clothing/Neck/Scarfs/chaplain_stole.rsi
Loading

0 comments on commit e735b13

Please sign in to comment.