diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 4e8740ecfb7..70f061c1bc1 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4585,3 +4585,15 @@ Entries: backpack in duffel, a toolbox fits in a backpack. id: 5406 time: '2024-10-15T21:01:40.0000000+00:00' +- author: dvir001 + changes: + - type: Remove + message: >- + The old EVA suit, emergency EVA suit, and ancient EVA suit are no longer + printable. + - type: Tweak + message: >- + Material costs for small electronics like small gyroscope circuitboards + were increased. + id: 5407 + time: '2024-10-15T23:58:44.0000000+00:00' diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml index b16acb1fa70..3ee38eef27f 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml @@ -174,10 +174,10 @@ flatReductions: Heat: 10 # the average lightbulb only does around four damage! slots: OUTERCLOTHING - - type: PhysicalComposition # Frontier - materialComposition: # Frontier - Durathread: 100 # Frontier - Cloth: 100 # Frontier +# - type: PhysicalComposition # Frontier +# materialComposition: # Frontier +# Durathread: 100 # Frontier +# Cloth: 50 # Frontier - type: entity parent: ClothingOuterBase diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml index dd2b9525b13..f41fb27bd15 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml @@ -14,8 +14,6 @@ - SuitEVA - MonkeyWearable - WhitelistChameleon - - type: StaticPrice - price: 65 #Syndicate EVA - type: entity @@ -121,8 +119,6 @@ Radiation: 0.75 Caustic: 0.5 - type: GroupExamine - - type: StaticPrice # Frontier - price: 50 - type: StealTarget stealGroup: ClothingOuterHardsuitVoidParamed - type: ToggleableClothing @@ -130,4 +126,4 @@ slot: head - type: ContainerContainer containers: - toggleable-clothing: !type:ContainerSlot {} + toggleable-clothing: !type:ContainerSlot {} \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml index 042e0aacf36..1b2dbbb7a04 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml @@ -69,8 +69,6 @@ - type: Tag tags: - Packet - - type: StaticPrice - price: 4.5 - type: entity parent: BaseFoodCondimentPacket @@ -99,6 +97,8 @@ - type: SolutionContainerVisuals maxFillLevels: 2 fillBaseName: packet-trans- + - type: StaticPrice # Frontier + price: 5 # Frontier - type: entity parent: BaseFoodCondimentPacket @@ -366,8 +366,8 @@ - type: PhysicalComposition materialComposition: Glass: 50 - - type: StaticPrice - price: 13.5 + - type: StaticPrice # Frontier + price: 13.5 # Frontier - type: entity parent: BaseFoodCondimentBottle @@ -564,10 +564,10 @@ acts: [ "Destruction" ] - type: Sprite state: shaker-empty - - type: StaticPrice - price: 9 - type: RefillableSolution solution: food + - type: StaticPrice # Frontier + price: 9 # Frontier - type: entity parent: BaseFoodShaker @@ -607,4 +607,4 @@ state: shaker-pepper - type: Tag tags: - - PepperShaker + - PepperShaker \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml index 776dab0e2e7..02e51302227 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml @@ -54,8 +54,8 @@ materialComposition: Glass: 60 - type: SpaceGarbage - - type: StaticPrice - price: 3 + - type: StaticPrice # Frontier + price: 4.5 # Frontier - type: entity name: broken plate @@ -74,8 +74,8 @@ tags: - Trash - type: SpaceGarbage - - type: StaticPrice - price: 1 + - type: StaticPrice # Frontier + price: 1 # Frontier # Small Plate @@ -109,11 +109,11 @@ max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] - - type: StaticPrice - price: 2 - type: PhysicalComposition materialComposition: Glass: 30 + - type: StaticPrice # Frontier + price: 2 # Frontier - type: entity parent: FoodPlateTrash @@ -143,8 +143,8 @@ - type: Tag tags: - Trash - - type: StaticPrice - price: 1 + - type: StaticPrice # Frontier + price: 1 # Frontier - type: entity name: plastic plate @@ -162,8 +162,8 @@ - type: Tag tags: - Trash - - type: StaticPrice - price: 1 + - type: StaticPrice # Frontier + price: 1 # Frontier # Pie Tin @@ -188,5 +188,5 @@ materialComposition: Steel: 60 - type: SpaceGarbage - - type: StaticPrice - price: 1 + - type: StaticPrice # Frontier + price: 1 # Frontier \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml index c4e9f51f92c..ad5f53999d7 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml @@ -48,11 +48,8 @@ Blunt: 3 - type: Damageable damageContainer: Inorganic - - type: PhysicalComposition - materialComposition: - Steel: 100 - type: StaticPrice - price: 10 + price: 50 - type: entity abstract: true @@ -72,9 +69,10 @@ Steel: 100 - type: Tag tags: - - Trash - - type: StaticPrice - price: 1 + - Trash + - type: StaticPrice # Frontier + price: 6 # Frontier + # Tins # Need something that you can open these tins with. I suggest a prying or cutting tool. @@ -195,4 +193,4 @@ name: tinned meat components: - type: Sprite - sprite: Objects/Consumable/Food/Tins/meat.rsi + sprite: Objects/Consumable/Food/Tins/meat.rsi \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml index dc49fa5f66e..b42599a528a 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml @@ -32,4 +32,4 @@ refineResult: - id: SheetGlass1 - type: StaticPrice # Frontier - price: 1 # Frontier + price: 4 # Frontier diff --git a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml index 4022cbb67c5..c3ef660adc7 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml @@ -25,7 +25,7 @@ - type: StaticPrice price: 0 - type: StackPrice - price: 0.334 # Frontier: 2.25<0.334 + price: 0.6 # Frontier: 2.25<0.6 - type: PhysicalComposition materialComposition: Steel: 10 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml index 83fad39744c..9fe85403f35 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml @@ -330,7 +330,7 @@ Primed: { state: primed } # Unprimed: - type: StaticPrice - price: 25 # Frontier: 75<25 - TODO: material value rework + price: 30 # Frontier: 75<30 - type: entity name: EMP grenade diff --git a/Resources/Prototypes/Entities/Structures/Furniture/bench.yml b/Resources/Prototypes/Entities/Structures/Furniture/bench.yml index 659224220eb..0b1a99e4627 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/bench.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/bench.yml @@ -16,7 +16,7 @@ - type: Physics bodyType: Static - type: StaticPrice - price: 15 # Frontier: 35<15 - TODO: material value rework + price: 20 # Frontier: 35<20 - type: entity id: BenchColorfulComfy diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml index d992d79809f..6fd822ad1f6 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml @@ -47,7 +47,7 @@ sound: collection: MetalBreak - type: StaticPrice - price: 10 # Frontier: 50<10 + price: 15 # Frontier: 50<15 #Starts unanchored, cannot be rotated while anchored - type: entity diff --git a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml index 75ad85ef514..6e85de59ab8 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml @@ -74,7 +74,7 @@ - type: Drain autoDrain: false - type: StaticPrice - price: 25 # Frontier: 100<25 - TODO: material value rework + price: 30 # Frontier: 100<30 - type: UserInterface interfaces: enum.DisposalUnitUiKey.Key: diff --git a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml index ba50274ad50..fa0aa6daf3c 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml @@ -63,7 +63,7 @@ sound: collection: MetalGlassBreak - type: StaticPrice - price: 25 # Frontier: 75<25 - TODO: material value rework + price: 30 # Frontier: 75<30 - type: entity id: PoweredLightPostSmallEmpty diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml index 4450a154f41..6e151d49040 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml @@ -103,4 +103,4 @@ - !type:DoActsBehavior acts: [ "Destruction" ] - type: StaticPrice - price: 25 + price: 30 # Frontier 25<30 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 5cff8250734..6456143e7c2 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -203,10 +203,10 @@ - ClothingHeadHatCone - Flare - Durathread # Frontier - - ClothingOuterSuitEmergency # Frontier +# - ClothingOuterSuitEmergency # Frontier - ClothingHeadHelmetEVA # Frontier - ClothingHeadHelmetEVALarge # Frontier - - ClothingOuterHardsuitEVA # Frontier +# - ClothingOuterHardsuitEVA # Frontier - ClothingOuterEVASuitContractor # Frontier - ClothingOuterEVASuitPilot # Frontier - type: EmagLatheRecipes @@ -400,8 +400,8 @@ - ClothingOuterHardsuitScaf # Frontier - ClothingOuterHardsuitPilot # Frontier - ClothingOuterHardsuitMaximPrototype # Frontier - - ClothingHeadHelmetAncient # Frontier - - ClothingOuterHardsuitAncientEVA # Frontier +# - ClothingHeadHelmetAncient # Frontier +# - ClothingOuterHardsuitAncientEVA # Frontier - ConstructionBagOfHolding # Frontier - ServiceSelectiveDropper # Frontier - PlantAnalyzer # Frontier @@ -852,7 +852,7 @@ - WeaponLaserCarbinePractice - Zipties - ThrusterSecurityMachineCircuitboard # Frontier - - ClothingOuterSuitEmergency # Frontier +# - ClothingOuterSuitEmergency # Frontier - ClothingOuterEVASuitNfsd # Frontier - ClothingHeadHelmetEVA # Frontier - ClothingHeadHelmetEVALarge # Frontier @@ -1038,7 +1038,7 @@ - ClothingEyesGlassesChemical - WhiteCane - ClothingOuterEVASuitMedic # Frontier - - ClothingOuterSuitEmergency # Frontier +# - ClothingOuterSuitEmergency # Frontier - ClothingOuterHardsuitVoidParamed # Frontier - BaseChemistryEmptyVial # Frontier - PowerCellSmall # Frontier diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml index cd51be4b791..b7b91bc96fc 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml @@ -61,7 +61,7 @@ canCollide: false bodyType: static - type: StaticPrice - price: 11 # Frontier: 30<11 - TODO: material value rework + price: 12 # Frontier: 30<12 #Note: The PipeDirection of the PipeNode should be the south-facing version, because the entity starts at an angle of 0 (south) diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml index d853ab6d36d..16c07a4f962 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml @@ -87,7 +87,7 @@ graph: DisposalPipe node: broken - type: StaticPrice - price: 1 + price: 6 # Frontier 1<6 - type: entity id: DisposalPipe diff --git a/Resources/Prototypes/Entities/Structures/Power/chargers.yml b/Resources/Prototypes/Entities/Structures/Power/chargers.yml index bb823e53315..5068cbb5995 100644 --- a/Resources/Prototypes/Entities/Structures/Power/chargers.yml +++ b/Resources/Prototypes/Entities/Structures/Power/chargers.yml @@ -34,7 +34,7 @@ sound: collection: MetalBreak - type: StaticPrice - price: 25 # Frontier: 75<25 - TODO: material value rework + price: 30 # Frontier: 75<30 - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Structures/Walls/girders.yml b/Resources/Prototypes/Entities/Structures/Walls/girders.yml index f9fba12e170..c6a0807bdb0 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/girders.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/girders.yml @@ -53,7 +53,7 @@ sound: collection: MetalBreak - type: StaticPrice - price: 10 # Frontier: 30<10 + price: 15 # Frontier: 30<15 - type: Climbable # Frontier - Stop AI Abuse - type: RCDDeconstructable # Frontier cost: 4 # Frontier @@ -101,7 +101,7 @@ sound: collection: MetalBreak - type: StaticPrice - price: 35 # Frontier: 130<25, 25<35 + price: 70 # Frontier: 130<70 - type: entity id: ClockworkGirder diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index 1b10b9ec24c..de39d64771e 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -641,7 +641,7 @@ 5: { state: reinf_construct-5, visible: true} - type: ReinforcedWallReplacementMarker - type: StaticPrice - price: 50 # Frontier 250<50 + price: 115 # Frontier 250<115 - type: RadiationBlocker resistance: 5 - type: RCDDeconstructable #Frontier @@ -726,7 +726,7 @@ key: walls base: riveted - type: StaticPrice - price: 50 # Frontier: 150<50 FRONTIER MERGE: may need review + price: 115 # Frontier: 150<115 - type: RCDDeconstructable #Frontier cost: 6 #Frontier delay: 8 #Frontier diff --git a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml index 592220f2e44..20446605c77 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml @@ -49,7 +49,7 @@ damageOverlay: sprite: Structures/Windows/cracks.rsi - type: StaticPrice - price: 30 # Frontier: 100<30 + price: 50 # Frontier: 100<50 - type: RadiationBlocker resistance: 2 @@ -105,7 +105,7 @@ - !type:DoActsBehavior acts: [ "Destruction" ] - type: StaticPrice - price: 15 # Frontier:50<15 + price: 25 # Frontier:50<25 - type: RadiationBlocker resistance: 1 diff --git a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml index d5d5d87bb2a..d750b6060ad 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml @@ -52,7 +52,7 @@ damageOverlay: sprite: Structures/Windows/cracks.rsi - type: StaticPrice - price: 25 # Frontier: 150<25 + price: 70 # Frontier: 150<70 - type: entity parent: ShuttleWindow diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml index aa924743276..b81f54a7a6c 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml @@ -378,10 +378,10 @@ - UtilityBelt - ConstructionBag # Frontier ## EVA - - ClothingOuterSuitEmergency # Frontier +# - ClothingOuterSuitEmergency # Frontier - ClothingHeadHelmetEVA # Frontier - ClothingHeadHelmetEVALarge # Frontier - - ClothingOuterHardsuitEVA # Frontier +# - ClothingOuterHardsuitEVA # Frontier - ClothingOuterEVASuitEngineer # Frontier - ClothingOuterEVASuitAtmosTech # Frontier ## Materials @@ -430,8 +430,8 @@ - ClothingOuterHardsuitAtmos # Frontier - ClothingOuterHardsuitEngineering # Frontier - ClothingOuterHardsuitEngineeringWhite # Frontier - - ClothingHeadHelmetAncient # Frontier - - ClothingOuterHardsuitAncientEVA # Frontier +# - ClothingHeadHelmetAncient # Frontier +# - ClothingOuterHardsuitAncientEVA # Frontier - ConstructionBagOfHolding # Frontier - type: MaterialStorage whitelist: diff --git a/Resources/Prototypes/SimpleStation14/benches.yml b/Resources/Prototypes/SimpleStation14/benches.yml index cbc3d0ceeed..9952e0e0170 100644 --- a/Resources/Prototypes/SimpleStation14/benches.yml +++ b/Resources/Prototypes/SimpleStation14/benches.yml @@ -14,6 +14,8 @@ - type: Rotatable - type: Sprite state: middle + - type: StaticPrice # Frontier + price: 20 # Frontier: 20 # Park benches - type: entity @@ -26,6 +28,8 @@ - type: Construction # Frontier graph: BenchesGraph # Frontier node: BenchParkMiddleNode # Frontier + - type: StaticPrice # Frontier + price: 30 # Frontier: 30 - type: entity id: BenchParkLeft @@ -60,6 +64,8 @@ - type: Construction # Frontier graph: BenchesGraph # Frontier node: BenchParkBambooMiddleNode # Frontier + - type: StaticPrice # Frontier + price: 30 # Frontier: 30 - type: entity id: BenchParkBambooLeft @@ -94,6 +100,8 @@ - type: Construction # Frontier graph: BenchesGraph # Frontier node: BenchPewMiddleNode # Frontier + - type: StaticPrice # Frontier + price: 30 # Frontier: 30 - type: entity id: BenchPewLeft @@ -196,6 +204,8 @@ - type: Construction # Frontier graph: SofasGraph # Frontier node: BenchSofaMiddleNode # Frontier + - type: StaticPrice # Frontier + price: 25 # Frontier: 25 - type: entity id: BenchSofaLeft @@ -265,6 +275,8 @@ - type: Construction # Frontier graph: SofasGraph # Frontier node: BenchSofaCorpMiddleNode # Frontier + - type: StaticPrice # Frontier + price: 25 # Frontier: 25 - type: entity id: BenchSofaCorpLeft diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/softsuits.yml index 37f8635a0cb..a08496ecff7 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/softsuits.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/softsuits.yml @@ -26,12 +26,16 @@ - WhitelistChameleon - HidesHarpyWings - type: StaticPrice - price: 95 + price: 100 - type: ContainerContainer containers: toggleable-clothing: !type:ContainerSlot {} storagebase: !type:Container ents: [] + - type: PhysicalComposition + materialComposition: + Durathread: 100 + Cloth: 50 # DEPARTMENTAL - type: entity diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml index e184d3191b7..3e5f4e645b3 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml @@ -191,7 +191,7 @@ stackRequirements: Glass: 2 - type: StaticPrice - price: 12.5 + price: 17.5 - type: entity parent: BaseMachineCircuitboard diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/crossbow_bolts.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/crossbow_bolts.yml index 71460a371e9..73e746aa529 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/crossbow_bolts.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/crossbow_bolts.yml @@ -69,7 +69,7 @@ - BulletImpassable - type: PhysicalComposition materialComposition: - Steel: 25 + Steel: 10 - type: Damageable damageContainer: Inorganic - type: Destructible diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml index 138e2157609..fa2bcb7566b 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml @@ -268,8 +268,8 @@ - ClothingOuterHardsuitSalvage - ClothingOuterHardsuitLuxury - ClothingOuterHardsuitMaximPrototype - - ClothingHeadHelmetAncient - - ClothingOuterHardsuitAncientEVA +# - ClothingHeadHelmetAncient +# - ClothingOuterHardsuitAncientEVA - type: EmagLatheRecipes emagStaticRecipes: - ShellTranquilizer diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 2bc1adbdb39..45a58ea473f 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -118,6 +118,8 @@ graph: StorageFurnitureGraph node: LockerWoodenGenericNode - type: AccessReader + - type: StaticPrice + price: 75 # Frontier: 75 # NFSD - Evidence - type: entity diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/clothes.yml b/Resources/Prototypes/_NF/Recipes/Lathes/clothes.yml index 38762b9f548..9c697d9dec6 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/clothes.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/clothes.yml @@ -98,7 +98,7 @@ completetime: 3 category: ClothesNF materials: - Cloth: 100 + Cloth: 200 Durathread: 100 - type: latheRecipe @@ -107,7 +107,7 @@ completetime: 3 category: ClothesNF materials: - Cloth: 100 + Cloth: 200 Durathread: 100 # Boots @@ -117,7 +117,7 @@ completetime: 3 category: ClothesNF materials: - Cloth: 100 + Cloth: 200 Durathread: 100 - type: latheRecipe @@ -126,7 +126,7 @@ completetime: 3 category: ClothesNF materials: - Cloth: 100 + Cloth: 200 Durathread: 100 - type: latheRecipe @@ -135,7 +135,7 @@ completetime: 3 category: ClothesNF materials: - Cloth: 100 + Cloth: 200 Durathread: 100 - type: latheRecipe @@ -144,7 +144,7 @@ completetime: 3 category: ClothesNF materials: - Cloth: 100 + Cloth: 200 Durathread: 100 # Glasses diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml index f45fd6b39ba..180f4ca8a25 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml @@ -73,49 +73,30 @@ # Gyroscope - type: latheRecipe + parent: BaseCircuitboardRecipe id: GyroscopeSecurityMachineCircuitboard result: GyroscopeSecurityMachineCircuitboard category: Circuitry - completetime: 4 - materials: - Steel: 400 - Glass: 900 - type: latheRecipe + parent: BaseCircuitboardRecipe id: SmallGyroscopeSecurityMachineCircuitboard result: SmallGyroscopeSecurityMachineCircuitboard - category: Circuitry - completetime: 4 - materials: - Steel: 50 - Glass: 120 - type: latheRecipe + parent: BaseCircuitboardRecipe id: GyroscopeNfsdMachineCircuitboard result: GyroscopeNfsdMachineCircuitboard - category: Circuitry - completetime: 4 - materials: - Steel: 400 - Glass: 900 - type: latheRecipe + parent: BaseCircuitboardRecipe id: SmallGyroscopeNfsdMachineCircuitboard result: SmallGyroscopeNfsdMachineCircuitboard - category: Circuitry - completetime: 4 - materials: - Steel: 50 - Glass: 120 - type: latheRecipe + parent: BaseCircuitboardRecipe id: SmallGyroscopeMachineCircuitboard result: SmallGyroscopeMachineCircuitboard - category: Circuitry - completetime: 4 - materials: - Steel: 50 - Glass: 120 # Generators - type: latheRecipe diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/eva.yml b/Resources/Prototypes/_NF/Recipes/Lathes/eva.yml index f348492e083..f78b3d45619 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/eva.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/eva.yml @@ -1,13 +1,13 @@ # Softsuits -- type: latheRecipe - id: ClothingOuterSuitEmergency - result: ClothingOuterSuitEmergency - category: EVASuits - completetime: 4 - materials: - Steel: 150 - Cloth: 100 - Durathread: 300 +# - type: latheRecipe + # id: ClothingOuterSuitEmergency + # result: ClothingOuterSuitEmergency + # category: EVASuits + # completetime: 4 + # materials: + # Steel: 150 + # Cloth: 100 + # Durathread: 300 - type: latheRecipe id: ClothingOuterEVASuitHydro @@ -51,15 +51,15 @@ Cloth: 50 Durathread: 50 -- type: latheRecipe - id: ClothingOuterHardsuitEVA - result: ClothingOuterHardsuitEVA - category: EVASuits - completetime: 4 - materials: - Steel: 150 - Cloth: 100 - Durathread: 300 +# - type: latheRecipe + # id: ClothingOuterHardsuitEVA + # result: ClothingOuterHardsuitEVA + # category: EVASuits + # completetime: 4 + # materials: + # Steel: 150 + # Cloth: 100 + # Durathread: 300 - type: latheRecipe id: ClothingOuterHardsuitVoidParamed @@ -83,15 +83,15 @@ Cloth: 100 Durathread: 300 -- type: latheRecipe # Probably should be available via T2-T3 - id: ClothingHeadHelmetAncient - result: ClothingHeadHelmetAncient - category: EVASuits - completetime: 4 - materials: - Glass: 500 - Plasteel: 500 - Durathread: 100 +# - type: latheRecipe # Probably should be available via T2-T3 + # id: ClothingHeadHelmetAncient + # result: ClothingHeadHelmetAncient + # category: EVASuits + # completetime: 4 + # materials: + # Glass: 500 + # Plasteel: 500 + # Durathread: 100 - type: latheRecipe # Probably should be available via T2-T3 id: ClothingOuterHardsuitAncientEVA diff --git a/Resources/Prototypes/_NF/Research/industrial.yml b/Resources/Prototypes/_NF/Research/industrial.yml index ad7b57bb82e..86e029687b6 100644 --- a/Resources/Prototypes/_NF/Research/industrial.yml +++ b/Resources/Prototypes/_NF/Research/industrial.yml @@ -77,8 +77,8 @@ cost: 15000 recipeUnlocks: - ClothingOuterHardsuitMaximPrototype - - ClothingHeadHelmetAncient - - ClothingOuterHardsuitAncientEVA +# - ClothingHeadHelmetAncient +# - ClothingOuterHardsuitAncientEVA - NFBlueprintClothingOuterHardsuitMaximPrototype technologyPrerequisites: - HardsuitsAdvanced