diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index 164d9d55539..ad266ff608b 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -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 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml index 437f2011e76..e1ea4c16db8 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml @@ -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 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index 07e08e63478..6bf690738c4 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -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 diff --git a/Resources/Prototypes/CharacterItemGroups/outerwearGroup.yml b/Resources/Prototypes/CharacterItemGroups/outerwearGroup.yml index 50eb4dc8bed..033a52c6bdb 100644 --- a/Resources/Prototypes/CharacterItemGroups/outerwearGroup.yml +++ b/Resources/Prototypes/CharacterItemGroups/outerwearGroup.yml @@ -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 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml index 24c88902179..6d8fd57b8b1 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml @@ -116,6 +116,7 @@ - type: Tag tags: - Trash + - Ash # Frontier - Burnt # Floof - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml index 34a39c1583e..ac878728366 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml @@ -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 diff --git a/Resources/Prototypes/Loadouts/Generic/outerClothing.yml b/Resources/Prototypes/Loadouts/Generic/outerClothing.yml new file mode 100644 index 00000000000..5c99e614f53 --- /dev/null +++ b/Resources/Prototypes/Loadouts/Generic/outerClothing.yml @@ -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 diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml new file mode 100644 index 00000000000..580975c8437 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml @@ -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 + diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_punk.yml b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_punk.yml new file mode 100644 index 00000000000..355a5c986d0 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_punk.yml @@ -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: "" diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Eyes/punk_glasses.yml b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/punk_glasses.yml new file mode 100644 index 00000000000..e8c9fbbb1b8 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/punk_glasses.yml @@ -0,0 +1,70 @@ +# 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" ] + - state: decor_base_glasses_01 + map: [ "glasses_decor" ] + 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" ] + - state: decor_base_glasses_02 + map: [ "infoshades_decor" ] + 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 diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/headwear_punks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/headwear_punks.yml new file mode 100644 index 00000000000..9bade6e0f17 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/headwear_punks.yml @@ -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 diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks_punk.yml b/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks_punk.yml new file mode 100644 index 00000000000..3b05bbd48c6 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks_punk.yml @@ -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 diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/_NF/Entities/Clothing/Neck/misc.yml new file mode 100644 index 00000000000..b01caf132cd --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/Neck/misc.yml @@ -0,0 +1,19 @@ +- 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 + tags: + - Crucifix diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Neck/scarfs.yml b/Resources/Prototypes/_NF/Entities/Clothing/Neck/scarfs.yml new file mode 100644 index 00000000000..bed54cc70d2 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/Neck/scarfs.yml @@ -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 diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/armor_punk.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/armor_punk.yml new file mode 100644 index 00000000000..94f06de3c85 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/armor_punk.yml @@ -0,0 +1,141 @@ +#Mercenary web vest +- type: entity + parent: [ClothingOuterStorageBase, AllowSuitStorageClothing] #web vest so it should have some pockets for ammo # Frontier: ClothingOuterVestWeb