From ad9052ad26d3ea848f88d8647927d5ab210e2f7b Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Sun, 3 Mar 2024 17:45:56 +0300 Subject: [PATCH 01/12] flatpacked everything --- .../Catalog/Fills/Crates/engines.yml | 6 +- .../_NF/Catalog/Cargo/cargo_engines.yml | 12 +- .../_NF/Catalog/Fills/Crates/engines.yml | 8 +- .../_NF/Catalog/Fills/Crates/science.yml | 33 +- .../Inventories/circuitvend.yml | 64 ++- .../Entities/Objects/Devices/flatpacks.yml | 418 ++++++++++++++++++ 6 files changed, 492 insertions(+), 49 deletions(-) create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml index 73bedacaf3b..0ee4d1198cf 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml @@ -24,7 +24,8 @@ components: - type: StorageFill contents: - - id: AmeControllerUnanchored +# - id: AmeControllerUnanchored + - id: amecontrollerflatpack # Frontier # Singularity @@ -42,7 +43,8 @@ components: - type: StorageFill contents: - - id: RadiationCollectorFullTank +# - id: RadiationCollectorFullTank + - id: radiationcollectorflatpack # Frontier - type: entity id: CrateEngineeringSingularityContainment diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_engines.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_engines.yml index 9f4f8809d5b..1d3a9bb4e81 100644 --- a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_engines.yml +++ b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_engines.yml @@ -3,8 +3,8 @@ icon: sprite: Structures/Power/Generation/portable_generator.rsi state: portgen3 - product: PortableGeneratorJrPacman - cost: 1500 + product: portablegeneratorjrpacmanflatpack + cost: 2000 category: Engineering group: market @@ -13,8 +13,8 @@ icon: sprite: Structures/Power/Generation/portable_generator.rsi state: portgen2 - product: PortableGeneratorPacman - cost: 2500 + product: portablegeneratorpacmanflatpack + cost: 300 category: Engineering group: market @@ -23,7 +23,7 @@ icon: sprite: Structures/Power/Generation/portable_generator.rsi state: portgen1 - product: PortableGeneratorSuperPacman - cost: 3500 + product: portablegeneratorsuperpacmanflatpack + cost: 4000 category: Engineering group: market diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/engines.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/engines.yml index 4fd05f4614b..1ffcb965047 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/engines.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/engines.yml @@ -4,7 +4,7 @@ components: - type: StorageFill contents: - - id: GyroscopeUnanchored + - id: gyroscopeflatpack - type: entity id: CrateThruster @@ -12,7 +12,7 @@ components: - type: StorageFill contents: - - id: ThrusterUnanchored + - id: thrusterflatpack - type: entity id: CrateSmallGyroscope @@ -20,7 +20,7 @@ components: - type: StorageFill contents: - - id: SmallGyroscopeUnanchored + - id: gyroscopesmallflatpack - type: entity id: CrateSmallThruster @@ -28,4 +28,4 @@ components: - type: StorageFill contents: - - id: SmallThrusterUnanchored + - id: thrustersmallflatpack diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/science.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/science.yml index 4e997babcd8..ccc5f8fa5b1 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/science.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/science.yml @@ -4,22 +4,21 @@ components: - type: StorageFill contents: - - id: ExosuitFabricatorMachineCircuitboard - - id: AnomalyVesselCircuitboard - - id: CircuitImprinterMachineCircuitboard - - id: ResearchAndDevelopmentServerMachineCircuitboard - - id: ArtifactAnalyzerMachineCircuitboard - - id: AutolatheMachineCircuitboard - - id: ProtolatheMachineCircuitboard - - id: AnalysisComputerCircuitboard - - id: ResearchComputerCircuitboard - - id: APECircuitboard + - id: exosuitfabricatorflatpack + - id: anomalyvesselflatpack + - id: circuitimprinterflatpack + - id: rndserverflatpack + - id: artifactanalyzerflatpack + - id: autolatheflatpack + - id: protolatheflatpack + - id: analysisconsoleflatpack + - id: rndcomputerflatpack + - id: apeflatpack - id: AnomalyScanner - id: NodeScanner - - id: CableApcStack - - id: SheetSteel - amount: 2 - - id: SheetGlass - - id: SheetPGlass - - id: SheetPlasma - - id: ClothingBackpackDuffelScienceBundle +# - id: CableApcStack +# - id: SheetSteel +# - id: SheetGlass +# - id: SheetPGlass +# - id: SheetPlasma +# - id: ClothingBackpackDuffelScienceBundle diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuitvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuitvend.yml index da80ecbad52..78f3fa7c3f6 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuitvend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuitvend.yml @@ -2,24 +2,48 @@ id: CircuitVendInventory startingInventory: ## SalvageExpeditionsComputerCircuitboard: 8 - TilePrinterNFMachineCircuitboard: 8 - ComputerIFFCircuitboard: 4 - CrewMonitoringComputerCircuitboard: 6 - ResearchComputerCircuitboard: 12 - ResearchAndDevelopmentServerMachineCircuitboard: 12 - ExosuitFabricatorMachineCircuitboard: 4 - CircuitImprinterMachineCircuitboard: 6 - ProtolatheMachineCircuitboard: 6 - AutolatheMachineCircuitboard: 6 - EngineeringTechFabCircuitboard: 4 - MedicalTechFabCircuitboard: 4 - ServiceTechFabCircuitboard: 4 - ScienceTechFabCircuitboard: 4 - OreProcessorMachineCircuitboard: 10 - MaterialReclaimerMachineCircuitboard: 4 - UniformPrinterMachineCircuitboard: 4 - HydroponicsTrayMachineCircuitboard: 16 - TelecomServerCircuitboard: 6 - BorgChargerCircuitboard: 8 - CellRechargerCircuitboard: 8 + oreprocessorflatpack: 10 + autolatheflatpack: 6 + hydroponicstrayflatpack: 16 + crewmonitoringcomputerflatpack: 6 + rndcomputerflatpack: 12 + rndserverflatpack: 12 + exosuitfabricatorflatpack: 4 + protolatheflatpack: 6 + circuitimprinterflatpack: 6 + sciencetechfabflatpack: 4 + engineeringtechfabflatpack: 4 + servicetechfabflatpack: 4 + medicaltechfabflatpack: 4 + materialreclaimerflatpack: 4 + uniformprinterflatpack: 6 + telecommunicationserverflatpack: 6 + tileprinternfflatpack: 8 + cellchargerflatpack: 8 + borgchargerflatpack: 8 + airlockflatpack: 20 + airlockglassflatpack: 20 + airlockdockingflatpack: 20 + airlockdockingglassflatpack: 20 DoorElectronics: 30 +# TilePrinterNFMachineCircuitboard: 8 +# CrewMonitoringComputerCircuitboard: 6 +# ResearchComputerCircuitboard: 12 +# ResearchAndDevelopmentServerMachineCircuitboard: 12 +# ExosuitFabricatorMachineCircuitboard: 4 +# CircuitImprinterMachineCircuitboard: 6 +# ProtolatheMachineCircuitboard: 6 +# AutolatheMachineCircuitboard: 6 +# EngineeringTechFabCircuitboard: 4 +# MedicalTechFabCircuitboard: 4 +# ServiceTechFabCircuitboard: 4 +# ScienceTechFabCircuitboard: 4 +# OreProcessorMachineCircuitboard: 10 +# MaterialReclaimerMachineCircuitboard: 4 +# UniformPrinterMachineCircuitboard: 4 +# HydroponicsTrayMachineCircuitboard: 16 +# TelecomServerCircuitboard: 6 +# BorgChargerCircuitboard: 8 +# CellRechargerCircuitboard: 8 +# emaggedInventory: + ComputerIFFCircuitboard: 4 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml new file mode 100644 index 00000000000..b611418f9a2 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml @@ -0,0 +1,418 @@ +# Base +- type: entity + parent: BaseItem + id: autolatheflatpack + name: autolathe flatpack + description: A flatpack used for constructing an autolathe. + components: + - type: Item + size: Normal + - type: Flatpack + entity: Autolathe + - type: Sprite + sprite: Objects/Devices/flatpack.rsi + layers: + - state: base + - state: overlay + color: "#EFB341" + map: ["enum.FlatpackVisualLayers.Overlay"] + - state: icon-default + - type: Tag + tags: + - DroneUsable + - type: StaticPrice + price: 150 + +# Machines +# Engineering +- type: entity + parent: autolatheflatpack + id: engineeringtechfabflatpack + name: engineering tech fab flatpack + description: A flatpack used for constructing an engineering tech fab. + components: + - type: Flatpack + entity: EngineeringTechFab + - type: StaticPrice + price: 250 + +- type: entity + parent: autolatheflatpack + id: cellchargerflatpack + name: cell charger flatpack + description: A flatpack used for constructing a cell charger. + components: + - type: Flatpack + entity: PowerCellRecharger + - type: StaticPrice + price: 55 + +- type: entity + parent: cellchargerflatpack + id: borgchargerflatpack + name: borg charger flatpack + description: A flatpack used for constructing a borg charger. + components: + - type: Flatpack + entity: BorgCharger + +- type: entity + parent: autolatheflatpack + id: portablegeneratorjrpacmanflatpack + name: J.R.P.A.C.M.A.N.-type portable generator flatpack + description: A flatpack used for constructing a J.R.P.A.C.M.A.N.-type portable generator. + components: + - type: Flatpack + entity: PortableGeneratorJrPacman + +- type: entity + parent: autolatheflatpack + id: portablegeneratorpacmanflatpack + name: P.A.C.M.A.N.-type portable generator flatpack + description: A flatpack used for constructing a P.A.C.M.A.N.-type portable generator. + components: + - type: Flatpack + entity: PortableGeneratorPacman + +- type: entity + parent: autolatheflatpack + id: portablegeneratorsuperpacmanflatpack + name: S.U.P.E.R.P.A.C.M.A.N.-type portable generator flatpack + description: A flatpack used for constructing a S.U.P.E.R.P.A.C.M.A.N.-type portable generator. + components: + - type: Flatpack + entity: PortableGeneratorSuperPacman + +- type: entity + parent: autolatheflatpack + id: amecontrollerflatpack + name: AME controller flatpack + description: A flatpack used for constructing an AME controller. + components: + - type: Flatpack + entity: AmeControllerUnanchored + +- type: entity + parent: autolatheflatpack + id: radiationcollectorflatpack + name: radiation collector flatpack + description: A flatpack used for constructing a radiation collector. + components: + - type: Flatpack + entity: RadiationCollectorFullTank + +- type: entity + parent: autolatheflatpack + id: gyroscopeflatpack + name: gyroscope flatpack + description: A flatpack used for constructing a gyroscope. + components: + - type: Flatpack + entity: GyroscopeUnanchored + +- type: entity + parent: autolatheflatpack + id: gyroscopesmallflatpack + name: small gyroscope flatpack + description: A flatpack used for constructing a small gyroscope. + components: + - type: Flatpack + entity: SmallGyroscopeUnanchored + +- type: entity + parent: autolatheflatpack + id: thrusterflatpack + name: thruster flatpack + description: A flatpack used for constructing a thruster. + components: + - type: Flatpack + entity: ThrusterUnanchored + +- type: entity + parent: autolatheflatpack + id: thrustersmallflatpack + name: small thruster flatpack + description: A flatpack used for constructing a small thruster. + components: + - type: Flatpack + entity: SmallThrusterUnanchored + +# Science +- type: entity + parent: autolatheflatpack + id: exosuitfabricatorflatpack + name: exosuit fabricator flatpack + description: A flatpack used for constructing an exosuit fabricator. + components: + - type: Flatpack + entity: ExosuitFabricator + - type: Sprite + sprite: Objects/Devices/flatpack.rsi + layers: + - state: base + - state: overlay + color: "#D381C9" + map: ["enum.FlatpackVisualLayers.Overlay"] + - state: icon-default + - type: StaticPrice + price: 250 + +- type: entity + parent: exosuitfabricatorflatpack + id: circuitimprinterflatpack + name: circuit imprinter flatpack + description: A flatpack used for constructing a circuit imprinter. + components: + - type: Flatpack + entity: CircuitImprinter + +- type: entity + parent: exosuitfabricatorflatpack + id: protolatheflatpack + name: protolathe flatpack + description: A flatpack used for constructing a protolathe. + components: + - type: Flatpack + entity: Protolathe + +- type: entity + parent: exosuitfabricatorflatpack + id: artifactanalyzerflatpack + name: artifact analyzer flatpack + description: A flatpack used for constructing an artifact analyzer. + components: + - type: Flatpack + entity: MachineArtifactAnalyzer + +- type: entity + parent: exosuitfabricatorflatpack + id: anomalyvesselflatpack + name: anomaly vessel flatpack + description: A flatpack used for constructing an anomaly vessel. + components: + - type: Flatpack + entity: MachineAnomalyVessel + +- type: entity + parent: exosuitfabricatorflatpack + id: apeflatpack + name: A.P.E. flatpack + description: A flatpack used for constructing an A.P.E.. + components: + - type: Flatpack + entity: MachineAPE + +- type: entity + parent: exosuitfabricatorflatpack + id: sciencetechfabflatpack + name: science techfab flatpack + description: A flatpack used for constructing a science techfab. + components: + - type: Flatpack + entity: ScienceTechFab + +# Service +- type: entity + parent: autolatheflatpack + id: uniformprinterflatpack + name: uniform printer flatpack + description: A flatpack used for constructing an uniform printer. + components: + - type: Flatpack + entity: UniformPrinter + - type: Sprite + sprite: Objects/Devices/flatpack.rsi + layers: + - state: base + - state: overlay + color: "#9FED58" + map: ["enum.FlatpackVisualLayers.Overlay"] + - state: icon-default + +- type: entity + parent: uniformprinterflatpack + id: servicetechfabflatpack + name: service tech fab flatpack + description: A flatpack used for constructing a service tech fab. + components: + - type: Flatpack + entity: ServiceTechFab + - type: StaticPrice + price: 250 + +- type: entity + parent: uniformprinterflatpack + id: materialreclaimerflatpack + name: material reclaimer flatpack + description: A flatpack used for constructing a material reclaimer. + components: + - type: Flatpack + entity: MaterialReclaimer + +- type: entity + parent: uniformprinterflatpack + id: hydroponicstrayflatpack + name: hydroponics tray flatpack + description: A flatpack used for constructing a hydroponics tray. + components: + - type: Flatpack + entity: HydroponicsTrayEmpty + +- type: entity + parent: uniformprinterflatpack + id: tileprinternfflatpack + name: tile-meister 5000 flatpack + description: A flatpack used for constructing a tile-meister 5000. + components: + - type: Flatpack + entity: TilePrinterNF + +# Medical +- type: entity + parent: autolatheflatpack + id: medicaltechfabflatpack + name: medical tech fab flatpack + description: A flatpack used for constructing a medical tech fab. + components: + - type: Flatpack + entity: MedicalTechFab + - type: Sprite + sprite: Objects/Devices/flatpack.rsi + layers: + - state: base + - state: overlay + color: "#52B4E9" + map: ["enum.FlatpackVisualLayers.Overlay"] + - state: icon-default + - type: StaticPrice + price: 250 + +# Supply +- type: entity + parent: autolatheflatpack + id: oreprocessorflatpack + name: ore processor flatpack + description: A flatpack used for constructing an ore processor. + components: + - type: Flatpack + entity: OreProcessor + - type: Sprite + sprite: Objects/Devices/flatpack.rsi + layers: + - state: base + - state: overlay + color: "#A46106" + map: ["enum.FlatpackVisualLayers.Overlay"] + - state: icon-default + +# Consoles +- type: entity + parent: exosuitfabricatorflatpack + id: rndcomputerflatpack + name: R&D computer flatpack + description: A flatpack used for constructing a research and development computer. + components: + - type: Flatpack + entity: ComputerResearchAndDevelopment + +- type: entity + parent: exosuitfabricatorflatpack + id: analysisconsoleflatpack + name: analysis console flatpack + description: A flatpack used for constructing an analysis console. + components: + - type: Flatpack + entity: ComputerAnalysisConsole + +- type: entity + parent: exosuitfabricatorflatpack + id: crewmonitoringcomputerflatpack + name: crew monitoring console flatpack + description: A flatpack used for constructing a crew monitoring console. + components: + - type: Flatpack + entity: ComputerCrewMonitoring + +# Servers +- type: entity + parent: exosuitfabricatorflatpack + id: rndserverflatpack + name: R&D server flatpack + description: A flatpack used for constructing a research and development server. + components: + - type: Flatpack + entity: ResearchAndDevelopmentServer + +- type: entity + parent: autolatheflatpack + id: telecommunicationserverflatpack + name: telecommunication server flatpack + description: A flatpack used for constructing a telecommunication server. + components: + - type: Flatpack + entity: TelecomServer + - type: Sprite + sprite: Objects/Devices/flatpack.rsi + layers: + - state: base + - state: overlay + color: "#334E6D" + map: ["enum.FlatpackVisualLayers.Overlay"] + - state: icon-default + +# Airlocks +- type: entity + parent: telecommunicationserverflatpack + id: airlockflatpack + name: airlock flatpack + description: A flatpack used for constructing an airlock. + components: + - type: Flatpack + entity: Airlock + - type: StaticPrice + price: 95 + +- type: entity + parent: airlockflatpack + id: airlockglassflatpack + name: glass airlock flatpack + description: A flatpack used for constructing an airlock. + components: + - type: Flatpack + entity: AirlockGlass + +- type: entity + parent: airlockflatpack + id: airlockdockingflatpack + name: docking airlock flatpack + description: A flatpack used for constructing a docking airlock. + components: + - type: Flatpack + entity: AirlockShuttle + +- type: entity + parent: airlockflatpack + id: airlockdockingglassflatpack + name: docking glass airlock flatpack + description: A flatpack used for constructing a glass docking airlock. + components: + - type: Flatpack + entity: AirlockGlassShuttle + +# Memes +- type: entity + parent: autolatheflatpack + id: xenoqueenflatpack + name: xeno queen flatpack + description: A flatpack containing xeno queen. + components: + - type: Flatpack + entity: MobXenoQueen + - type: Sprite + sprite: Objects/Devices/flatpack.rsi + layers: + - state: base + - state: overlay + color: "#D381C9" + map: ["enum.FlatpackVisualLayers.Overlay"] + - state: icon-default From 72fd4e14997f6676d7511c46517b6c2deeb179b3 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Sun, 3 Mar 2024 20:09:11 +0300 Subject: [PATCH 02/12] autotune --- .../Inventories/autotunevend.yml | 38 ++--- .../Entities/Objects/Devices/flatpacks.yml | 139 ++++++++++++++++-- 2 files changed, 144 insertions(+), 33 deletions(-) diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/autotunevend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/autotunevend.yml index 2bd491761ca..8b2a3265e42 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/autotunevend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/autotunevend.yml @@ -28,30 +28,30 @@ GlockenspielInstrument: 2 BikeHornInstrument: 1 # Not actully bad as you might think MusicBoxInstrument: 1 -# SeashellInstrument: 1 This is actully just static noises XylophoneInstrument: 1 -# GunpetInstrument: 1 Sounds bad MicrophoneInstrument: 1 -# HelicopterInstrument: 1 Sounds bad -# BirdToyInstrument: 1 Sounds bad MusicalLungInstrument: 1 # This actully sound ok somehow + tubaflatpack: 1 + harpflatpack: 1 + contrabassflatpack: 1 + vibraphoneflatpack: 1 + marimbaflatpack: 1 + tomdrumsflatpack: 1 + timpaniflatpack: 1 + taikoflatpack: 1 + minimoogflatpack: 1 + churchorganflatpack: 1 + pianoflatpack: 1 + uprightpianoflatpack: 1 + dawflatpack: 1 + rickenbacker4003flatpack: 1 + contrabandInventory: +# SeashellInstrument: 1 This is actully just static noises # ReverseCymbalsInstrument: 1 Sounds bad # CannedApplauseInstrument: 1 Sounds bad - contrabandInventory: - TubaInstrument: 1 - HarpInstrument: 1 - ContrabassInstrument: 1 - VibraphoneInstrument: 1 - MarimbaInstrument: 1 - TomDrumsInstrument: 1 - TimpaniInstrument: 1 - TaikoInstrument: 1 - MinimoogInstrument: 1 - ChurchOrganInstrument: 1 - PianoInstrument: 1 - UprightPianoInstrument: 1 - DawInstrument: 1 - Rickenbacker4003Instrument: 1 +# HelicopterInstrument: 1 Sounds bad +# BirdToyInstrument: 1 Sounds bad +# GunpetInstrument: 1 Sounds bad emaggedInventory: # SuperSynthesizerInstrument: 1 # Can crash the server with some MIDI Rickenbacker4001Instrument: 1 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml index b611418f9a2..9b14a10f913 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml @@ -399,20 +399,131 @@ - type: Flatpack entity: AirlockGlassShuttle -# Memes +# Musical instruments - type: entity - parent: autolatheflatpack - id: xenoqueenflatpack - name: xeno queen flatpack - description: A flatpack containing xeno queen. + parent: uniformprinterflatpack + id: tubaflatpack + name: tuba flatpack + description: A flatpack containing a tuba. components: - type: Flatpack - entity: MobXenoQueen - - type: Sprite - sprite: Objects/Devices/flatpack.rsi - layers: - - state: base - - state: overlay - color: "#D381C9" - map: ["enum.FlatpackVisualLayers.Overlay"] - - state: icon-default + entity: TubaInstrument + - type: StaticPrice + price: 200 + +- type: entity + parent: tubaflatpack + id: harpflatpack + name: harp flatpack + description: A flatpack containing a harp. + components: + - type: Flatpack + entity: HarpInstrument + +- type: entity + parent: tubaflatpack + id: contrabassflatpack + name: contrabass flatpack + description: A flatpack containing a contrabass. + components: + - type: Flatpack + entity: ContrabassInstrument + +- type: entity + parent: tubaflatpack + id: vibraphoneflatpack + name: vibraphone flatpack + description: A flatpack containing a vibraphone. + components: + - type: Flatpack + entity: VibraphoneInstrument + +- type: entity + parent: tubaflatpack + id: marimbaflatpack + name: marimba flatpack + description: A flatpack containing a marimba. + components: + - type: Flatpack + entity: MarimbaInstrument + +- type: entity + parent: tubaflatpack + id: tomdrumsflatpack + name: tom drums flatpack + description: A flatpack containing tom drums. + components: + - type: Flatpack + entity: TomDrumsInstrument + +- type: entity + parent: tubaflatpack + id: timpaniflatpack + name: timpani flatpack + description: A flatpack containing a timpani. + components: + - type: Flatpack + entity: TimpaniInstrument + +- type: entity + parent: tubaflatpack + id: taikoflatpack + name: taiko flatpack + description: A flatpack containing a taiko. + components: + - type: Flatpack + entity: TaikoInstrument + +- type: entity + parent: tubaflatpack + id: minimoogflatpack + name: minimoog flatpack + description: A flatpack containing a minimoog. + components: + - type: Flatpack + entity: MinimoogInstrument + +- type: entity + parent: tubaflatpack + id: churchorganflatpack + name: church organ flatpack + description: A flatpack containing a church organ. + components: + - type: Flatpack + entity: ChurchOrganInstrument + +- type: entity + parent: tubaflatpack + id: pianoflatpack + name: piano flatpack + description: A flatpack containing a piano. + components: + - type: Flatpack + entity: PianoInstrument + +- type: entity + parent: tubaflatpack + id: uprightpianoflatpack + name: upright piano flatpack + description: A flatpack containing a upright piano. + components: + - type: Flatpack + entity: UprightPianoInstrument + +- type: entity + parent: tubaflatpack + id: dawflatpack + name: daw flatpack + description: A flatpack containing a daw. + components: + - type: Flatpack + entity: DawInstrument + +- type: entity + parent: tubaflatpack + id: rickenbacker4003flatpack + name: rickenbacker 4003 flatpack + description: A flatpack containing a rickenbacker 4003. + components: + - type: Flatpack + entity: Rickenbacker4003Instrument From eedc5569d5de2966b775ce998d931cb91ea05b0a Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Tue, 5 Mar 2024 09:09:28 +0300 Subject: [PATCH 03/12] ptk800 flatpack --- .../Catalog/VendingMachines/Inventories/circuitvend.yml | 3 ++- .../_NF/Entities/Objects/Devices/flatpacks.yml | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuitvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuitvend.yml index 06c68ad475d..7f025717a02 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuitvend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuitvend.yml @@ -2,7 +2,7 @@ id: CircuitVendInventory startingInventory: ## SalvageExpeditionsComputerCircuitboard: 8 - ShuttleGunKineticCircuitboard: 10 + shuttlegunkineticflatpack: 12 oreprocessorflatpack: 10 autolatheflatpack: 6 hydroponicstrayflatpack: 16 @@ -27,6 +27,7 @@ airlockdockingflatpack: 20 airlockdockingglassflatpack: 20 DoorElectronics: 30 +# ShuttleGunKineticCircuitboard: 10 # TilePrinterNFMachineCircuitboard: 8 # CrewMonitoringComputerCircuitboard: 6 # ResearchComputerCircuitboard: 12 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml index 9b14a10f913..3627d809e06 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml @@ -305,6 +305,15 @@ map: ["enum.FlatpackVisualLayers.Overlay"] - state: icon-default +- type: entity + parent: oreprocessorflatpack + id: shuttlegunkineticflatpack + name: PTK-800 "Matter Dematerializer" flatpack + description: A flatpack used for constructing a PTK-800 "Matter Dematerializer". + components: + - type: Flatpack + entity: ShuttleGunKinetic + # Consoles - type: entity parent: exosuitfabricatorflatpack From 44ffbb90182b2d355ee10eb835bfcb5003577867 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Wed, 6 Mar 2024 11:26:08 +0300 Subject: [PATCH 04/12] flatpacker flatpacked, icons --- .../Inventories/autotunevend.yml | 2 +- .../Inventories/circuitvend.yml | 2 +- .../Entities/Objects/Devices/flatpacks.yml | 116 +++++++++--------- .../Devices/flatpacks.rsi/command_airlock.png | Bin 0 -> 6421 bytes .../Devices/flatpacks.rsi/command_server.png | Bin 0 -> 6294 bytes .../flatpacks.rsi/engineering_gyroscope.png | Bin 0 -> 6493 bytes .../flatpacks.rsi/engineering_lathe.png | Bin 0 -> 6458 bytes .../flatpacks.rsi/engineering_thruster.png | Bin 0 -> 6532 bytes .../Devices/flatpacks.rsi/medical_console.png | Bin 0 -> 6455 bytes .../Devices/flatpacks.rsi/medical_lathe.png | Bin 0 -> 6429 bytes .../Objects/Devices/flatpacks.rsi/meta.json | 74 +++++++++++ .../Devices/flatpacks.rsi/power_charger.png | Bin 0 -> 6323 bytes .../flatpacks.rsi/power_console_ame.png | Bin 0 -> 6382 bytes .../Devices/flatpacks.rsi/power_generator.png | Bin 0 -> 6409 bytes .../flatpacks.rsi/science_anomaly_vessel.png | Bin 0 -> 6346 bytes .../Devices/flatpacks.rsi/science_ape.png | Bin 0 -> 6366 bytes .../science_artifact_analyzer.png | Bin 0 -> 6402 bytes .../Devices/flatpacks.rsi/science_console.png | Bin 0 -> 6385 bytes .../Devices/flatpacks.rsi/science_lathe.png | Bin 0 -> 6395 bytes .../Devices/flatpacks.rsi/science_server.png | Bin 0 -> 6341 bytes .../Devices/flatpacks.rsi/service_lathe.png | Bin 0 -> 6410 bytes .../Devices/flatpacks.rsi/service_music.png | Bin 0 -> 6361 bytes .../Devices/flatpacks.rsi/service_tray.png | Bin 0 -> 6478 bytes .../Devices/flatpacks.rsi/supply_gun.png | Bin 0 -> 6471 bytes .../Devices/flatpacks.rsi/supply_lathe.png | Bin 0 -> 6472 bytes 25 files changed, 131 insertions(+), 63 deletions(-) create mode 100644 Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/command_airlock.png create mode 100644 Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/command_server.png create mode 100644 Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/engineering_gyroscope.png create mode 100644 Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/engineering_lathe.png create mode 100644 Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/engineering_thruster.png create mode 100644 Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/medical_console.png create mode 100644 Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/medical_lathe.png create mode 100644 Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/power_charger.png create mode 100644 Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/power_console_ame.png create mode 100644 Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/power_generator.png create mode 100644 Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_anomaly_vessel.png create mode 100644 Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_ape.png create mode 100644 Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_artifact_analyzer.png create mode 100644 Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_console.png create mode 100644 Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_lathe.png create mode 100644 Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_server.png create mode 100644 Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/service_lathe.png create mode 100644 Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/service_music.png create mode 100644 Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/service_tray.png create mode 100644 Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/supply_gun.png create mode 100644 Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/supply_lathe.png diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/autotunevend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/autotunevend.yml index 8b2a3265e42..1bafedd4c30 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/autotunevend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/autotunevend.yml @@ -44,7 +44,6 @@ pianoflatpack: 1 uprightpianoflatpack: 1 dawflatpack: 1 - rickenbacker4003flatpack: 1 contrabandInventory: # SeashellInstrument: 1 This is actully just static noises # ReverseCymbalsInstrument: 1 Sounds bad @@ -52,6 +51,7 @@ # HelicopterInstrument: 1 Sounds bad # BirdToyInstrument: 1 Sounds bad # GunpetInstrument: 1 Sounds bad + rickenbacker4003: 1 emaggedInventory: # SuperSynthesizerInstrument: 1 # Can crash the server with some MIDI Rickenbacker4001Instrument: 1 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuitvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuitvend.yml index 7f025717a02..4be5b55bb36 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuitvend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuitvend.yml @@ -22,10 +22,10 @@ tileprinternfflatpack: 8 cellchargerflatpack: 8 borgchargerflatpack: 8 + flatpackerflatpack: 8 airlockflatpack: 20 airlockglassflatpack: 20 airlockdockingflatpack: 20 - airlockdockingglassflatpack: 20 DoorElectronics: 30 # ShuttleGunKineticCircuitboard: 10 # TilePrinterNFMachineCircuitboard: 8 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml index 3627d809e06..4abda90f4fe 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml @@ -10,16 +10,8 @@ - type: Flatpack entity: Autolathe - type: Sprite - sprite: Objects/Devices/flatpack.rsi - layers: - - state: base - - state: overlay - color: "#EFB341" - map: ["enum.FlatpackVisualLayers.Overlay"] - - state: icon-default - - type: Tag - tags: - - DroneUsable + sprite: _NF/Objects/Devices/flatpacks.rsi + state: engineering_lathe - type: StaticPrice price: 150 @@ -36,12 +28,23 @@ - type: StaticPrice price: 250 +- type: entity + parent: engineeringtechfabflatpack + id: flatpackerflatpack + name: flatpacker 1001 flatpack + description: A flatpack used for constructing a flatpacker 1001. + components: + - type: Flatpack + entity: MachineFlatpacker + - type: entity parent: autolatheflatpack id: cellchargerflatpack name: cell charger flatpack description: A flatpack used for constructing a cell charger. components: + - type: Sprite + state: power_charger - type: Flatpack entity: PowerCellRecharger - type: StaticPrice @@ -62,11 +65,13 @@ name: J.R.P.A.C.M.A.N.-type portable generator flatpack description: A flatpack used for constructing a J.R.P.A.C.M.A.N.-type portable generator. components: + - type: Sprite + state: power_generator - type: Flatpack entity: PortableGeneratorJrPacman - type: entity - parent: autolatheflatpack + parent: portablegeneratorjrpacmanflatpack id: portablegeneratorpacmanflatpack name: P.A.C.M.A.N.-type portable generator flatpack description: A flatpack used for constructing a P.A.C.M.A.N.-type portable generator. @@ -75,7 +80,7 @@ entity: PortableGeneratorPacman - type: entity - parent: autolatheflatpack + parent: portablegeneratorjrpacmanflatpack id: portablegeneratorsuperpacmanflatpack name: S.U.P.E.R.P.A.C.M.A.N.-type portable generator flatpack description: A flatpack used for constructing a S.U.P.E.R.P.A.C.M.A.N.-type portable generator. @@ -89,11 +94,13 @@ name: AME controller flatpack description: A flatpack used for constructing an AME controller. components: + - type: Sprite + state: power_console_ame - type: Flatpack entity: AmeControllerUnanchored - type: entity - parent: autolatheflatpack + parent: amecontrollerflatpack id: radiationcollectorflatpack name: radiation collector flatpack description: A flatpack used for constructing a radiation collector. @@ -107,11 +114,13 @@ name: gyroscope flatpack description: A flatpack used for constructing a gyroscope. components: + - type: Sprite + state: engineering_gyroscope - type: Flatpack entity: GyroscopeUnanchored - type: entity - parent: autolatheflatpack + parent: gyroscopeflatpack id: gyroscopesmallflatpack name: small gyroscope flatpack description: A flatpack used for constructing a small gyroscope. @@ -125,11 +134,13 @@ name: thruster flatpack description: A flatpack used for constructing a thruster. components: + - type: Sprite + state: engineering_thruster - type: Flatpack entity: ThrusterUnanchored - type: entity - parent: autolatheflatpack + parent: thrusterflatpack id: thrustersmallflatpack name: small thruster flatpack description: A flatpack used for constructing a small thruster. @@ -147,13 +158,7 @@ - type: Flatpack entity: ExosuitFabricator - type: Sprite - sprite: Objects/Devices/flatpack.rsi - layers: - - state: base - - state: overlay - color: "#D381C9" - map: ["enum.FlatpackVisualLayers.Overlay"] - - state: icon-default + state: science_lathe - type: StaticPrice price: 250 @@ -181,6 +186,8 @@ name: artifact analyzer flatpack description: A flatpack used for constructing an artifact analyzer. components: + - type: Sprite + state: science_artifact_analyzer - type: Flatpack entity: MachineArtifactAnalyzer @@ -190,6 +197,8 @@ name: anomaly vessel flatpack description: A flatpack used for constructing an anomaly vessel. components: + - type: Sprite + state: science_anomaly_vessel - type: Flatpack entity: MachineAnomalyVessel @@ -199,6 +208,8 @@ name: A.P.E. flatpack description: A flatpack used for constructing an A.P.E.. components: + - type: Sprite + state: science_ape - type: Flatpack entity: MachineAPE @@ -221,13 +232,7 @@ - type: Flatpack entity: UniformPrinter - type: Sprite - sprite: Objects/Devices/flatpack.rsi - layers: - - state: base - - state: overlay - color: "#9FED58" - map: ["enum.FlatpackVisualLayers.Overlay"] - - state: icon-default + state: service_lathe - type: entity parent: uniformprinterflatpack @@ -255,6 +260,8 @@ name: hydroponics tray flatpack description: A flatpack used for constructing a hydroponics tray. components: + - type: Sprite + state: service_tray - type: Flatpack entity: HydroponicsTrayEmpty @@ -277,13 +284,7 @@ - type: Flatpack entity: MedicalTechFab - type: Sprite - sprite: Objects/Devices/flatpack.rsi - layers: - - state: base - - state: overlay - color: "#52B4E9" - map: ["enum.FlatpackVisualLayers.Overlay"] - - state: icon-default + state: medical_lathe - type: StaticPrice price: 250 @@ -297,13 +298,7 @@ - type: Flatpack entity: OreProcessor - type: Sprite - sprite: Objects/Devices/flatpack.rsi - layers: - - state: base - - state: overlay - color: "#A46106" - map: ["enum.FlatpackVisualLayers.Overlay"] - - state: icon-default + state: supply_lathe - type: entity parent: oreprocessorflatpack @@ -313,6 +308,10 @@ components: - type: Flatpack entity: ShuttleGunKinetic + - type: Sprite + state: supply_gun + - type: StaticPrice + price: 250 # Consoles - type: entity @@ -321,11 +320,13 @@ name: R&D computer flatpack description: A flatpack used for constructing a research and development computer. components: + - type: Sprite + state: science_console - type: Flatpack entity: ComputerResearchAndDevelopment - type: entity - parent: exosuitfabricatorflatpack + parent: rndcomputerflatpack id: analysisconsoleflatpack name: analysis console flatpack description: A flatpack used for constructing an analysis console. @@ -339,6 +340,8 @@ name: crew monitoring console flatpack description: A flatpack used for constructing a crew monitoring console. components: + - type: Sprite + state: medical_console - type: Flatpack entity: ComputerCrewMonitoring @@ -349,6 +352,8 @@ name: R&D server flatpack description: A flatpack used for constructing a research and development server. components: + - type: Sprite + state: science_server - type: Flatpack entity: ResearchAndDevelopmentServer @@ -361,23 +366,19 @@ - type: Flatpack entity: TelecomServer - type: Sprite - sprite: Objects/Devices/flatpack.rsi - layers: - - state: base - - state: overlay - color: "#334E6D" - map: ["enum.FlatpackVisualLayers.Overlay"] - - state: icon-default + state: command_server # Airlocks - type: entity - parent: telecommunicationserverflatpack + parent: autolatheflatpack id: airlockflatpack name: airlock flatpack description: A flatpack used for constructing an airlock. components: - type: Flatpack entity: Airlock + - type: Sprite + state: command_airlock - type: StaticPrice price: 95 @@ -415,6 +416,8 @@ name: tuba flatpack description: A flatpack containing a tuba. components: + - type: Sprite + state: service_music - type: Flatpack entity: TubaInstrument - type: StaticPrice @@ -527,12 +530,3 @@ components: - type: Flatpack entity: DawInstrument - -- type: entity - parent: tubaflatpack - id: rickenbacker4003flatpack - name: rickenbacker 4003 flatpack - description: A flatpack containing a rickenbacker 4003. - components: - - type: Flatpack - entity: Rickenbacker4003Instrument diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/command_airlock.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/command_airlock.png new file mode 100644 index 0000000000000000000000000000000000000000..2ec0a96ab1262548dc11eb62c50e238cda9a2b5b GIT binary patch literal 6421 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 a5&`dWWkJtqlQy&@0Nvf&?SyOC#(x2zSkxK- literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/command_server.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/command_server.png new file mode 100644 index 0000000000000000000000000000000000000000..3f7ad57e38ba41769041855c47cfbc745873f460 GIT binary patch literal 6294 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/meta.json b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/meta.json new file mode 100644 index 00000000000..c2aeba3533f --- /dev/null +++ b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/meta.json @@ -0,0 +1,74 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Resprited for Frontir by erhardsteinhauer, based on sprites created by EmoGarbage404 (github) for SS14, solar-assembly-part taken from tgstation and modified at https://tgstation13.org/wiki/Guide_to_construction#Solar_Panels_and_Trackers, ame-part taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1b7952787c06c21ef1623e494dcfe7cb1f46e041", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "command_airlock" + }, + { + "name": "command_server" + }, + { + "name": "engineering_gyroscope" + }, + { + "name": "engineering_lathe" + }, + { + "name": "engineering_thruster" + }, + { + "name": "medical_console" + }, + { + "name": "medical_lathe" + }, + { + "name": "power_charger" + }, + { + "name": "power_console_ame" + }, + { + "name": "power_generator" + }, + { + "name": "science_anomaly_vessel" + }, + { + "name": "science_ape" + }, + { + "name": "science_artifact_analyzer" + }, + { + "name": "science_console" + }, + { + "name": "science_lathe" + }, + { + "name": "science_server" + }, + { + "name": "service_lathe" + }, + { + "name": "service_music" + }, + { + "name": "service_tray" + }, + { + "name": "supply_gun" + }, + { + "name": "supply_lathe" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/power_charger.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/power_charger.png new file mode 100644 index 0000000000000000000000000000000000000000..f3570726f6de13e691d8e8479bfa6f4502fbb1fe GIT binary patch literal 6323 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/power_console_ame.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/power_console_ame.png new file mode 100644 index 0000000000000000000000000000000000000000..4ea4cd0ab065dd36f590d0e60336dc801a4df48b GIT binary patch literal 6382 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/power_generator.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/power_generator.png new file mode 100644 index 0000000000000000000000000000000000000000..5b3ce974e32338abb3096a5d1be134bc06c06ab8 GIT binary patch literal 6409 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 M_HK5iwm}L10Kg`u!T)Z)j=ghe#O8?$jpj0N z2R4+!t*cHi8*Z;GvUrvFw#xE;>%nE6A)}iJW(N%xx~WyIK6H2B&z-N{vV?Ozc1C0J zmW5I zdgg?H(Mxux6Za;W9v(fNR@A$zm1wiQv^XI3*XMbBHs-olLMGaO{*$8DeWd|Som+z2 z31*m~_I>>{CzF7;>~Z#j?2NVEs5h4H?#WgK3?>4s5B)s-;pn{ytBify`K4w*7MdB( z-gl{xr;G0K>U|@(i`E)?qIDhFLLO>q3sJYRyT_un`oFwWurxd3&5c?6->B+4E=?8v zQh61IIewYTQD=m!#`x7oVfG*5(7gCg-E4i$bK7=Pk|V*Dnop9N$1IEMI(`eud|fra zWp{_x`dMBrQ72}=xlZHh*~#XEkDAvbopZ7a)U;zwjIvyQA4ZN8gIiD$-iKG7SaR-w zim&R!ZH*-}R2e?0!9Ka7=eyQwiR?Y1mw&o#b5}xTMI_*Y$_0-QmX7_iN;@Lr|*=YOs|;&Td4Q_x=j+ z98|jq?Va5g^#WBV4bu!0hWCZr1e(fs1!?Rc%C7giEqlzlPpkAhsLwtW`!I7+K!h#v z48QhniuK9bnCfdj;cIK3#$N2J<(|JCmC*U#9hs_gUpn|8$Vad3waX2o*9L@mU{i(n zLI3O6nT!id;Vs!P6RI6MDEK6WEY6PXTNvcBuxznLbDo8|>dO@c35kpmJ@B+pr~04P zk6+Kc&~;~{2H0?9O!dM@&BiVJ-|=jjS{jS=+(@xDnoc$mMUidjYIN&RrST@)_iHiV zHCk^?MYxJ@FI{1hbs`RNGY4Ow-#`i}UHCw>COS9&$ep;-;6%Rmp@9_q>JJf7mYb5( zHmeuzG}5Z&E~qX&mUZ^s)w6!F9&*0t0?TK-Z6)`1%**|ra9x+UC;Q%QB7s;frD|#?o&fLKnuY z%PckEM9gyR2z;*spa!yDq;P_d{qez3 zeI?28#(4a5k1akA+uMbbj_9(ju_sNmI_9>yNoq>w4?p8glswRRbX;v5HSn@FO=@uY zSe&dp{&JBDU)~$TjXRH$aEou+5F?F`uD5j9&8^bV(8X1*`Tf@6%8V;fcTVje+ugEx7JXFKt+FV| zc*)b{?)5t^tpLlH?QL*hmOGNsXNrX9lWM5%m$~iC-{CM;zri8*%@gL~1y|PQgJ&;| z6)yvO%znYUn(3rSPZ6$%9=zD)VK;wQxc77JkQw0ip4auv%$P3C19O}sXtQuJA#nZmK*<@nRrm5Ro0QbM;W76bp51kdxtmi`L)Jc}rm@-Z_-s^5Ewx5FrAsfp za%+B3)~?Yt!7+1tOq(4pjntu~ohq(%w?ZqKGXe=Wy_<>{OD|ffM?dv4y6v)^cB`$Y z{2JcA`GG@H(&elno55NquhV(93%d+5UhLyXTs6LGdtgtC{1EwSW}a)3zdiqsT88-r z)Wz|p3tbiUwr-wON`MK%P={x89&7!b)hqn^h#c-6KfGnrGd;Kq!J^UlBQe{}vi#ov4j{?FKV>SVI2r_QdrfmZ_q!#_<# zwf1%DMFQXtxBh5(2ZQMqa-kzO!q1n=6!1`VmVg1EWIQ2s1jAtVPBI~#83%~r41mMs zJ0J!xUPi#VEC<9&f*;0D=mx}ay%RwoB+);VnHa~Uun%XUi0})9y9q!5jz{597^H`cn}9<&YQyb87MmLE?m0yPwHy#J zVzH2lMoXnql++d_06AzZg+f7NaA+J32_cXoIbTedA^9Q;1;r$XJ0N0$T%njN;KLQ1 zbcR48c0eGYarhKDG|KdlL7h_$6m2EFNX$ahpaveA4+KEtFc>ltgG1sd=;`**sGr{_ zYrbeoMMzJyj4niDQ5ZCj_l1Q>?2+)<-(OmYLZK%ebTA+iNI)jwkpS?;7So*y<0Yc$ zJ|!YR(WQ(#p2bE(K`A{?xACI+1%9$o$jIUHgh~qqdODKD{Dc!qz<4Ew#Y6+~01pa8 z1Tka3z>B%;&kOX$d=w-976|0-6aN?Jk9sL%QR+%{7ceCXr!;p5gd$!lOTgr^sLETm zEs2dKuqa3XgU2B8M1YQDPyodp3x{Wrpg|0A8WoK%64UuiKtTnOqqq0-73;5kTMQOMCVd8l1E2^>a|J6FgTmpIBP=G>6XK*p>Bi;JIRIM7 z=O_mh3qysb14&C)R0qVY?1yGUbprvqSOA6!1n~|CMQm^drLw5t_EY6T^%XFchDtEN zQdHbj&AHM!Xl2tL{deGhV+x58NcsOap3l%vEH0o}DgfgGzyL-pz!d*I&tHK*F$F`r zok$GIY5!qT{{v?~nXulFtpJoy^B)4NpKMKTN%35zRB*U*8=%selk$t`2>?sE1dxuC zL(CXDp94Vq?NqUS?C1VPBD2|SGLwQMAxRV*fW#A6OeC3v0gwy=mW_jQ5lbddX5S}v zk$^3h(m}w51LXj;&QNhF*BQQiD*r6Mj7Ay*D3S|gp83AMXW! z2mR&ZOLKP#jcDu-bMk3)Hrcq_|G|NN{oj*RxIyjc!|NnMt4--!RE~TYGDz1(yaMHfGZj5Hb2w|TD=z)|4^_(`VOGysiOOKusLcJy9bZ#lU}$ynQ{lGQlbPq= z*&j$AG!SNO4Ne*0Iqf6QT)w2s(5v)p+Tsk4@H@w)cQy_-UaHN0d_q#OGrDf(?fY+R zhe)rBhw1Ra@mreDIK(d7XPK){(-||*O>~bfe5BW0u6u&zpc2#z8VC#3@F8oX)!dKN z_q`b7zAcPHALe1i#Pxvr4Z2 ze%^Z>Kh5r9RQb}U9k(~C=tCEFNXynjD0wrwF%yy+M)UA@KjpeE%#BS_yKQ~P&d)st}y)7E8{oST`5%h$+R=umUR65 z?%dI{$)QMVe7VQ`-H+=wYhOyI&ULrmUKI!U8>OD%ox0D~%}8PGANDQnv)HuXyCm=Q zxOtm+&T*&oZu@ApX~2KMxqIeHCt+&hwW@|K)-S;q=Jw9BGf zsb}cqzoV&YRYd>Pm#=D!L`Hr0v@UXH{qoSfB?ovMu*J$u5S=|~1_M99)PXFDn<4`m zzV}|Eb(@vWJ)-@~7TelcD;$B1ma$zI1>Sde8k{LOykSD)#n{=(0lRxaW<5Qapl`cD zyRP%Ss~P9k515o9^n0eeZU9xAhu%FrW`(q=Z=9xAaT{wA+ck(D+9O*L7-_RJ;^6wG zZCd{0TeTq@t(B2B6Q-?cIOuU0)LEeGHErct^C|iILGhQUv!gfKo!~zUrtzYNXLvPf zPububvM?iGJKQYS=>4AKXR{~HF7(`+aA|8(jyy8Kj>Ps%=`PLjE5N;u`POJ z{^C@?ZAV}oejKxSLQd%%L^iwLKD=Q|hI?nx`3pG)K>YkkO>?~`>Ob+c-)8aby?d{b zaCT?O+3%O-8%}C3Ux=Z|N{~ZygqAxU-c_05Gc)qDcg-YQt+q5dn6Tsuwi0`zuiYr! z^qomw@=!zEuAHB$ybf5+2#vip{?=0NPx-Zu^DpOgN7dWe27H@558A~E9hObsd;d-S z9s7Pm(pyJWN{!E9bgFMuR&~z)po7QHvkB%g#$LKfGiOr=yw<1|7(U8s-TZ3tlxE`o z_Rg|uy?xik2K;Ph8-EY~cV+UL$L5@bt-5Ev9))kZd9%Ogif473X9PGxOpBIS=5&S?2Tb8OqUAg%}=zK^%-->7de8bLb z-&n^)XXG|45c|&RNW5~*TAKZ|*dfw5auC0Q8=XDF-sNFauGPAevOU9#0$q3J?Gvnj z7Pdc&9_nD(ePHjy!@uTl4tR8Z){}jie7+RD{pcOD$A!mq>dbh37QWAAr1*7*%@f+m zQQvj#=wWpjzA4RA9CIl5H$KH%dlh~M4I@=Fv(0OqR-H+%4Nlf>*~Lz7>0Wo*>Dto@ z6K-XyeO2`=nhtg6&t(<2ZiDV(x8;?|6S8X^n{U%&Q>&s+S-f=IlzGC^5n1QZ&`ZZ0 zkBcWo(RIk;&>oVtFt|0q_+IFp)^y*gD%~RE)4ln}Sb7I@{s`) zz+-ab=Bs)~3FWaN5oZZ^8$f^4;GTpCw@rPSq1k^>2irnR?h;(i=kLTtTc0aia)`Io zE>p%Fw8^{ZnVKg9T<4FKhgR&!5R=RLM6k?8+)Q?r7M8ZTrz-GPBi2bn{N1Q@PYxK2-4I%5P^C zq?{q9qV+G{>%_$WRAco3)o*j7-K4qvQIDdC(`Q#{G1nlgsnxi)UzO{crs(86we&h| zJ%`fH&*@Fq+Knu^u6p-s7XqP`$#r*U(B0iXba1$D7pJaw@j189G^^vs1W(&ZiHzkJ z8S-C{whwF;+po%O4v+us%%f)4_~!h*$0!D6I(q3QrIRpC)wE*Ev1-$DDY3;kfE> zEz#YJMh%*UGBFg`AI00vuUSwv1s^IM{@@Y|85I z&qJ(?-5GqO=Q-FWEJnQNsC;>^?c{NT1uvuh3@x=%+iK6t{R)OwTsDtW(Kk=LwEk_y z>J$s5>mE^q_Pe7CuWoHS`h*&2xq|d6;k7P>GTzH@zEt`Nwzos zqv#5VgTepG9(k?aD^_Y=O<31kX)7v zDuNt<3lO_Q@m!x|2^5+f7zQTuKq?F6y1>9$NrMRlkPJX71$?2DrgTARcxmu=^)wcR z)IelB7gS^b1L-c3Ku8jXgu$UbmE1%EYJmaLS;At|LOi@iDd3R{DqbcN)38{DLV-~b zF(L^Ei>FelSR4UMAfRCcTAC!30ZOz`I!8@0!r=i)K?zqZOei#&`V`3EFB(@;Qhb=ECGk3pm78=fr=e#53dFUe6$uyM^%LN#3}(X z7LUPU1%l5kq%zOMPyYVWLK+7DvcZNxQjuH&LY|3`P&Q|*Q!!sI9qUsrh164;xcMwL z77j||d8~~$J%I7iMlBOszV~Id6i>CQXabOWxL?#JMVv|5L z2~P&m0Evu4GXXrC!ld8 z;s^k2DgbDx)aO8RW6)ht1Pt!e41*8I*dmDlE-$W-B~nN~EroFfP^b)0%Z7KvQ5|s< zJRV0SQ}H8!8 z;6E{i#)}lf|BmMq^dpO#M5Yi)ctMgNW&#At{+{Qrz#o}H;BF_CNs{RQVN?Hta~?@p zAJ|qTNgCrn6k0wq8fi&(Qqu-#05~GQ6i9?vnj?U999aV60U-y1`|W74eVFI| zMIr+b0I)z1L^B2%wGC!&%*< zXmoWVhRVfaJ{OXFuG5FS`8T*R_Mg0>`{VLa2xxPq& zF9LtfuCH=^kpf=?{+eC?Gr0^tJ#s@r_;;TIexN=OeJ2)v7}sU`d3zvo5j@1?^*M}2 zcxHmwCrXMy7*18cv=Cd1P2ovB89l&LuWOvHuA>1mVon?UFBdW0!!0cGT+gN}e%fxP z7c9@;pvW56-cQPW>+{mmCw|}>y;}YctGVOTt}mNnJbuD!*VX$cvEzoO-24H}ZgPvW zlg%88&c@*cigt2M5`po_2($;>e@w~(;*Y+6`ldl$9Xjwnmb?r&> zg)Dqlfn3XJz~4&eo4u;MhgRuE0|AXseTsHpvtN{Ji?h~lFUwM*)(u_17_;K3rTBu| ze7AkEG4?51HuF?@bG~UkOPF?~eN{qrUW2#Ml{TlgA0AJh%m~;VtVEY#YIkoaDGW^8 zQI6@ZO166|40Pbks-Nkt%KPqAR@zZRzaWm?({W|m6*1~ngabN*|dXU43xe(&#n*KfV=yXLdaa|La- z+5$Bg3^tqY=IjOih0ESERiICCRMa0ZnDWyoAAgA#GXgFU@!1?M2$w_(KsYGnuwgLi zy6lNwgh_rScAA(=GrhOlGXJN=|W!ltp(35i}8c~A-}~;oHpOvcG&p7w{(m3!oxZVxf%yftSWx6du)uQM&m{P(kIVPzmIuOlhlY$eH^6{hH6UMUU~JjMi~zZ zGu!GN!ujE^t2m%o62L{ zk$_)sT*knfA9~zdWY1+Q2Pr;d?`RdH2HL|KJKfakaZFQFGxvpRbqCiy-+U~DulY7J zZ&`F=beigq6+M?DQ+#2IhG~Y+h0h*EPLNCVXTA`YJ&dK^E4)CuU;0>>sd-&rUH?T> z`J$J8Fugh=fHPN&^Y`xa@zzDqXT|t*x8=H}nXzKwn6?J1V=Pw6?(~jJ*6A&)gQ}D2 z0$^LkR~15bd!0WX+pcBjrHi>q7Bl;rE;Q}jbhX^4r2MDw7f;g*XS&bT-m`dZ**vh= z;<&@X*RIHT!>U`08G)fS^&!c9sV8ja{lR11-CpXe;~jci^+IrFUH%;X1+E6st<5^N zn5UV?%C6S7I+_)qlHM|PUlkZ_a&zMY@MTG0#Yn}tPPwj?znyIt4N3LPkIzJ9F4-{V z)0>MRA36!BGzge5p-@TddhdQ0Mxm#m->|HGW^7t$^>O422c+E;Z0~AX*M3af&*QyA1@qsHpON z?G}m8Qpg5?vu}2u8h$zOd(9B(salOj%9_gOe$Sqkmt%$bniPZM2Td{ksg_*Lk~6ng zmNi=%Z}M99MDf<&4)NUv1j4d`bk9s~iE#Vxx`%LRy{sBvJDd5^_zUc~W3yl1C`nlf z=EPb08MoIz92?jqHR|7a|1P$=`-i`4`-EyIp8^&2I0MB)u4UGb?nUl=e80i$bo<4= z+ueE9npuX89?9&Jbe7=I6%~|%yMf~VzHnCZ(cn(gquT(~U9;Nr1FD&&1;sX*7aH3i zGG4h?PS*gcQg75Unc<2{*VuQ<&_M4%q=r=MP>cNy!$OljSQY%o)COO!QOlhg?uNiNV7d_;%swGhZIv+upk*T=$;zPRTe8*oM zk0`Fg9IRffR$iMNh9V)0*VFvl_I#+=vLAKw#q2g=+6A8S zVsU+{@n}zY_tmq-4=a__79`lEGG6BWw#{Uneg4|SU%X?wv#%xXW7(JFb2au-kLztR zf6UhGsdGsl?topS1&?pPNqckhjM1fyNeY=OUT;0G(f6D@C%V6`@$SMI+ShCcZyUj}d&)W`g?T5EyJmBFD+elkVj7sqI6}J}Wwn>Q-+*KdI};1{aGt8$E@WJ;O`k z77xvQmu^jL^$WRG*V}3r(z?6g3`wm-S#`_2qB&MA)s!=8Te~%XE{o5|OUWEt>lLE? z$f%L}+nX9xMAr<*nr5FeK*5u6#qCmF(BiWeDu3&t>0Nc$L2thK=-5TPZQ~v4=FR6) zo-G}%wxgX$$LV+LY(fwRaR%;U#jXpc^>EF zN+Ej~BIc=wEv>{@F0gox7y7RxH0fcjEVC*}MUO2)A7q?E?{D+-T62`JWBy((ngW95 zv(iz29^!Op!G5>a$eZA(9bm^3O_c>YL^d1g0uKM-d}7+9>FZ~r7EY|9Q< z+}fO#Wy7OD2QLfuA-Mae(6^T1>tAR5vD#hTct&)``HSK18E;~*7_IN7@6-4_?fvP5 z%?qV=`TQn@iAwuxzjRdgkyjYU;$Llet3o0vxvFQ@j65G1d0jgZ*f!Lq832k7H4nDD zg~2qlIM6-p&sa_Y_+eH|7C#8Il7BF6QW0`q3iMqzjY7cX z5J@N%;m`1dJMl#z9B+lULL*(IoQ+t-GBvoZh{dLOIlE3#KqD$5L?RJTP^gHA2&)L3 z6<-vL!jQ>i6dH@dVv!I6DURexm{KH9Y$BtWdW6%7JVwrx#0DC^|I2L;HaMC@dOHLZY!qEEzT39$IBEK3ns|Qz}AwqNGd# z3S)&vg@t`(A(pso{NnFVEyO<1&moi-DCUQY0MKP4$di~%cPik9i>Lbx7lX1XdE8tU z8wCX=_dMN(MrU|_wvovg%n1|7EoA8FNEYxJCkPjDJ7uvvH_8KOb52xuG<4_P6} zK`a&$$HD?QOb`FO@fz|{J6S5@&NIVvcMl$g@3=$v_ zSVRmK!)D@`aw^$5P#iqzR0P%v{bk0J%apMBqA;kuI6M|VLi}aPhZ6>ROPDg*FxF_Y zHQJhNO(qd>c;YmBKTsrw(p<)hL0e(5a&s0yafLXUP`Yu#n86@Qzzdcy$PR`AZ3mK; zDXR{MSw0W#hT+-!EL9?g|eIv$PMLSkR_|QshV?S2BYLd zThw2H|Aomrgdf5C?|8mIKeIT9BoTa3sE5cSXafjH{+j2{z@M4Cpl&CYh$89#VN?Hv zvz<&>H^`PRik#-(8x&5CCR-AhBbN#em$v~56PT1=%-jgF{G8!tQ~789H9jH)lqDA$i$_AGf+qT)$rJ*XLLeh1PaAHFl6BZmyS0_|AO?dn zT@PDXkD}0JiRc|J5O6u5=xd!m<;}mrO|zfM(f?#V9X4t0#1}+DRU9Jmh~WLD`#%9r zGA!o+AWzKytI(%ICS{p+5kWCe&OsL(bYG%AUzk%_A}gf-<7+DW{*N9Y>hDgzN#E~s zeV6N-6!<3a_w4#E*EcEfP2lg@^*@tK?aL!K$b)|OML-YKO=?FvpoejlAa|NGY#S^T zrkVD$XEQW2OW+nDhQZWzWbYZUU$W*yld2Lr!$q}UQAGuBv${Zlfd1vOj_&N><6l3# zhw5H$Z+Izt@A5nKH>}cHX1S%b#>`MIiuV?ZwNy);mW*%Bwl|zT->{*MK_Q1IPberC zUQ9n2pXgsVobG$n|6bA}25`2MZzCN!{N%%%7ph7MaqH_AUHDlPT4c9!HibW0yU=U? zOG#AZhDUYX>dZd6Lto+rireJ<)Vq{Jk7WzuPls&I2kXZclOVOR5#*wC0Wr!^7Yr0CSp&XyAjkNSQotjF7ZK*7?? zuN$Nus1s~$(`G#FiS#iJhF!g0SM`WPobzN3-f7pznYz9X!eE`uAJ&Ood>7X~I-p1* zemwj9$wge(iS}EH_LXh3xz4%OJ-1)G7OWWiV=O(^9^L}qI2+9pb1hRMt51^ KT;jNX>puXXddS=W literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_console.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_console.png new file mode 100644 index 0000000000000000000000000000000000000000..cc56a8777255c82f07e1f7bfd2b03a6b7bbec5b9 GIT binary patch literal 6385 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_lathe.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_lathe.png new file mode 100644 index 0000000000000000000000000000000000000000..4c463ea1b186c352a0704e8d2d16fb840242bef5 GIT binary patch literal 6395 zcmeHLc|6o>+aF{(c1MM>%$W`?%s#`+oUx8=szE4ACA0j7!7R-TgAh3>8VXbB&_)|4 zkxFuqh%9YVPSi=!qE6CgDV?6*43*yJyytoQeBS53=JS~`_kDk_?{(eZ>$>iHe$sus zJajbYX+j_n9jd3RFZdTKe`~0LpQ8Bq*AR$mU%Y>y*q1JW3WR(%CklXy;{*T{h~=;$ zkl5a50jqN?7i+wi%&D5?rnFYK9>!L$nk43rv2PqJ&p0wXbUdp~I@^z?uM0J~>A3Ov zh!LXwRNDFAgXyko4(@bM^UCZ24$~?NN7ua0KmV>H_RK;JiV1Gr@s;LJ_YMrP1qPJu zchRK-=xgg12FHyYw=lN&lQ-HEZ6^S!fY&0IvSJb zz4&I|s^5)j3>ovY3abNEow}0V8d#_}KHr`1eUreL0wM zHZ8jfGHZc!_El&}@=9k$>WA>7BR>puZZ6oo)7s9q&G%phsh*e|Sz+q+b&{ABxm%Vhy;xwq2Fp8eMG5WZS+hufDKtZDSC4f*0Ylb!bSKsRnZla8-3LWo{eiw1w`xgTdK_kxi>V#5N-JB|^x&OO_26WNO?H0w40`IaR(0c6Jf^?U%ML!d;oOof9<&({AOxvD6p} zdO0i#xU=BFwSB4%tu3c-x!)R{c+Il@$t$R_{c$!R`D4z+o8I68!Zr0Goi;X2DsEN2 zm8#lGir5u*q4;3Chhs@^*(;q=HN$F$qVF?uE`5JErYQK4cBkrDyY+XnQ|x?yx6wb9 zomhI~!V%2XbF(|tMk@$OZ_OQa1DSTGb^S~?eV-k%;b-5(Hz}zn1FdVXoxB+&?FsyY zCUx0X6vflA%1P`WBqa6XDSKVb4vBh0-9m4*LJq~5MO3_&)(+zKk9K9=*CM`8#_T%1 z^R^&Ur89rk)1JPLZM#hydb@WduAd!ySgKimv9eh`>2QTkVE4esgL?XbG)w-`NSh2FyDy2Ea|Mt zvZZt4+nY5x`WCvB(vz!P`^6N;z|VHOINS>l%<45=upYJhYs;KlBs4D zFf~$>u+^KZl|pp%81qhs7B4JVer0j`itmo)`WlfBLB?d#MXHhL5? zQagNZYs-R*i-+61E`BiD5Nw~kPnK)F{{!P(d|_IW>HdA>bxqi452D+u_MJz)+hw|r zelqSj#jWV(idXwKU`}nB7k$e%_4MGrd)3@$JI5S8gzYJN*Vf^bVU$$#d)Tn$_NYYR zM#@2awW>@;c^JZ^yxn>1{neMU#0OoeKZibkoF#j2=={$5^+xxN8VklK9$Z<*VBJ-}Qrd!k?YA0K2`YX<1Defeqw<&C{7T2a4 zZ9Q+v3*7p^75H`|48ppwno#y&N#q~74XFI3b-{SpF+qOy=-McGa~^plmUcsc=oX8wGA*Rhh+~7z|&AP0R;%>c*Y9> zzj!ZyW_%=*$bvaKXp&<|AORN;)1k54D4vKEYY$WKlEClsX(SA)fQTdQVSzLsD1|Qs zpg05$fr7ima$+zr2Tdqh$YPUxUEQZCz>z&HTr3ulkVuI{f{Ic%EtFL8bY8 zvXRRe#^DMS7IO4VB#Ze8Cx{kCDKIQ15{Lr0U?3up8T|!b%wc~{&=>oWul!pepu11} zU!XtgrHDnLE6J75jFvm4y4u6!@se14CWl2*d+j3EU1SEnVInAhTi~+zp8$ z1n6SE(4WtbvWLl|g~}-vO$8-Sw+m@GpQ$iZfB}}gM1O*l&-t4|2J9Fp zA{`*Y0VaTgpf2M~U#)5p5`UvM+*r)%^-na_kxSyT9eIIxSu#oiL$Kf3=L;1t7h4in&s`2Q68 zOvschGcF=9=BYXGf&=eM%Dims?p`OEs^S4=v~{kZOe{&(UEuDcg z)@Gy~y#_)>4w5e zAgg!y`Ppk7O^JEfqaIqmT~#DI7Y3nPE2a?5Po`fM-QaoVXvJL4RUm zY;24OIpbLYgO%Ef$HZ1;R<~;skqep@DRk9Wf+P>EPuW6oS`MZGLUr?UEq4js^e?Wn Br9J=v literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_server.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_server.png new file mode 100644 index 0000000000000000000000000000000000000000..e4eb8a2dd345c5aee2f40e06dc282b92f5ecfc52 GIT binary patch literal 6341 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/service_lathe.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/service_lathe.png new file mode 100644 index 0000000000000000000000000000000000000000..111377cf341a8672e22d62d4256301b6f682d75c GIT binary patch literal 6410 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

GYb29R| z;l|BXn%^uwS&UYt+Za%k+Zh Q$Wfq}uAVOWPOIbo0eL3KmH+?% literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/service_music.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/service_music.png new file mode 100644 index 0000000000000000000000000000000000000000..db1a9a8aec83bd88ed68bcc03469925cd709d3cc GIT binary patch literal 6361 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 a-}>^=3~_W}g$Z;RFs6gM{aM?U8~zEhVYPDr literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/service_tray.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/service_tray.png new file mode 100644 index 0000000000000000000000000000000000000000..683019d5945dfbf6e5a7777330ac8281c167eb3f GIT binary patch literal 6478 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
D;H?LY?tTWe)T*t{%M7 z#SxYY3y00vl|pZZdNc*D>qIb^)-3t01lya3fI2nAZthMRFIChvl#Er$#`mGWT%z0@ z?R@-d7(ocNBSEv%6O`1`uPr9v+GU=_YWl4K*TXfm@Y!i;X}dTBO*tiql$&+-^+F<% zp^o9rPwu%}Ol*F5uj%whkw!Aj_YpjqIToz$j&@Jx2Ug?qXp(HZ$IB1?Sv&Y5%V|qh z!C+ie)VkztGmMD+{Q@1*>!uw3RNT9nnVD0u2W&&`Rc^*ExUYHb;jIs2y94zKIshd51a!8CS?0NgM&sCu+kY zgVA41cRzz=+IMx{#V$-;ZLNxcuJ+=EgyttL_Wib=N4T>q-mb-QfZxC%=%PqonQyJA zKx|#+VB-JT_)MGK+UkV--00~qPvq6~KWnm7hpyzo5Uh^5Mzq-rx-Fb^mSkXc!M|V6 zIq*^pqwRM4wZ$1rHeD_+2}D#>M9IA&OflT+8)h$9RG+4gnOT&QQaCMjNy}-a?c2M& faB$}jHCg@^CD+4@&qKsLALA literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/supply_gun.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/supply_gun.png new file mode 100644 index 0000000000000000000000000000000000000000..cf7b6899956795aa1c84ec24062f9eee4ac24246 GIT binary patch literal 6471 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 Z(z!#LRds#%6?i5PZ+CyUa+k=|e*^U+({=y= literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/supply_lathe.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/supply_lathe.png new file mode 100644 index 0000000000000000000000000000000000000000..8c1e503d3c6a77a0b3d1a387cf3d5369821962f1 GIT binary patch literal 6472 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 Date: Wed, 6 Mar 2024 11:42:38 +0300 Subject: [PATCH 05/12] upped price of PAKMAN in cargo from 300 to 3000 --- Resources/Prototypes/_NF/Catalog/Cargo/cargo_engines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_engines.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_engines.yml index 1d3a9bb4e81..4ef4f2b2fd9 100644 --- a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_engines.yml +++ b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_engines.yml @@ -14,7 +14,7 @@ sprite: Structures/Power/Generation/portable_generator.rsi state: portgen2 product: portablegeneratorpacmanflatpack - cost: 300 + cost: 3000 category: Engineering group: market From 84904a24e4a634bb2e7d7772250d57ef23c42dda Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Wed, 6 Mar 2024 11:55:24 +0300 Subject: [PATCH 06/12] Update autotunevend.yml --- .../_NF/Catalog/VendingMachines/Inventories/autotunevend.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/autotunevend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/autotunevend.yml index 1bafedd4c30..ac47e68c9ba 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/autotunevend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/autotunevend.yml @@ -51,7 +51,7 @@ # HelicopterInstrument: 1 Sounds bad # BirdToyInstrument: 1 Sounds bad # GunpetInstrument: 1 Sounds bad - rickenbacker4003: 1 + Rickenbacker4003Instrument: 1 emaggedInventory: # SuperSynthesizerInstrument: 1 # Can crash the server with some MIDI Rickenbacker4001Instrument: 1 From 347f20673921f1f385a817ebdf1adc2d88a7b74d Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 8 Mar 2024 14:42:18 +0200 Subject: [PATCH 07/12] Cleanup Part 1 --- .../catalog/cargo/cargo-vending.ftl | 4 +- .../catalog/fills/crates/vending-crates.ftl | 4 +- Resources/Maps/_NF/Outpost/frontier.yml | 2 +- Resources/Maps/_NF/POI/anomalouslab.yml | 2 +- Resources/Maps/_NF/POI/grifty.yml | 2 +- Resources/Maps/_NF/POI/lodge.yml | 2 +- .../Catalog/Fills/Crates/engines.yml | 6 +- .../Circuitboards/Machine/production.yml | 8 - .../Devices/Circuitboards/computer.yml | 2 - .../Devices/CircuitBoards/production.yml | 6 - .../_NF/Catalog/Cargo/cargo_engines.yml | 6 +- .../_NF/Catalog/Cargo/cargo_vending.yml | 4 +- .../_NF/Catalog/Fills/Backpacks/duffelbag.yml | 16 - .../_NF/Catalog/Fills/Crates/engines.yml | 8 +- .../_NF/Catalog/Fills/Crates/science.yml | 26 +- .../_NF/Catalog/Fills/Crates/vending.yml | 4 +- .../Inventories/autotunevend.yml | 26 +- .../Inventories/circuitvend.yml | 51 --- .../Inventories/flatpackvend.yml | 28 ++ .../Entities/Objects/Devices/flatpacks.yml | 298 +++++++++++------- .../Service/vending_machine_restock.yml | 8 +- .../Structures/Machines/vending_machines.yml | 10 +- .../_NF/Objects/Devices/flatpack.rsi/base.png | Bin 0 -> 331 bytes .../command_airlock.png | Bin .../command_server.png | Bin .../engineering_gyroscope.png | Bin .../engineering_lathe.png | Bin .../engineering_thruster.png | Bin .../Devices/flatpack.rsi/icon-default.png | Bin 0 -> 175 bytes .../medical_console.png | Bin .../medical_lathe.png | Bin .../{flatpacks.rsi => flatpack.rsi}/meta.json | 9 + .../Objects/Devices/flatpack.rsi/overlay.png | Bin 0 -> 144 bytes .../power_charger.png | Bin .../power_console_ame.png | Bin .../power_generator.png | Bin .../science_anomaly_vessel.png | Bin .../science_ape.png | Bin .../science_artifact_analyzer.png | Bin .../science_console.png | Bin .../science_lathe.png | Bin .../science_server.png | Bin .../service_lathe.png | Bin .../service_music.png | Bin .../service_tray.png | Bin .../supply_gun.png | Bin .../supply_lathe.png | Bin .../broken.png | Bin .../deny-unshaded.png | Bin .../eject-unshaded.png | Bin .../meta.json | 0 .../normal-unshaded.png | Bin .../off.png | Bin .../panel.png | Bin 54 files changed, 273 insertions(+), 259 deletions(-) delete mode 100644 Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuitvend.yml create mode 100644 Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml create mode 100644 Resources/Textures/_NF/Objects/Devices/flatpack.rsi/base.png rename Resources/Textures/_NF/Objects/Devices/{flatpacks.rsi => flatpack.rsi}/command_airlock.png (100%) rename Resources/Textures/_NF/Objects/Devices/{flatpacks.rsi => flatpack.rsi}/command_server.png (100%) rename Resources/Textures/_NF/Objects/Devices/{flatpacks.rsi => flatpack.rsi}/engineering_gyroscope.png (100%) rename Resources/Textures/_NF/Objects/Devices/{flatpacks.rsi => flatpack.rsi}/engineering_lathe.png (100%) rename Resources/Textures/_NF/Objects/Devices/{flatpacks.rsi => flatpack.rsi}/engineering_thruster.png (100%) create mode 100644 Resources/Textures/_NF/Objects/Devices/flatpack.rsi/icon-default.png rename Resources/Textures/_NF/Objects/Devices/{flatpacks.rsi => flatpack.rsi}/medical_console.png (100%) rename Resources/Textures/_NF/Objects/Devices/{flatpacks.rsi => flatpack.rsi}/medical_lathe.png (100%) rename Resources/Textures/_NF/Objects/Devices/{flatpacks.rsi => flatpack.rsi}/meta.json (91%) create mode 100644 Resources/Textures/_NF/Objects/Devices/flatpack.rsi/overlay.png rename Resources/Textures/_NF/Objects/Devices/{flatpacks.rsi => flatpack.rsi}/power_charger.png (100%) rename Resources/Textures/_NF/Objects/Devices/{flatpacks.rsi => flatpack.rsi}/power_console_ame.png (100%) rename Resources/Textures/_NF/Objects/Devices/{flatpacks.rsi => flatpack.rsi}/power_generator.png (100%) rename Resources/Textures/_NF/Objects/Devices/{flatpacks.rsi => flatpack.rsi}/science_anomaly_vessel.png (100%) rename Resources/Textures/_NF/Objects/Devices/{flatpacks.rsi => flatpack.rsi}/science_ape.png (100%) rename Resources/Textures/_NF/Objects/Devices/{flatpacks.rsi => flatpack.rsi}/science_artifact_analyzer.png (100%) rename Resources/Textures/_NF/Objects/Devices/{flatpacks.rsi => flatpack.rsi}/science_console.png (100%) rename Resources/Textures/_NF/Objects/Devices/{flatpacks.rsi => flatpack.rsi}/science_lathe.png (100%) rename Resources/Textures/_NF/Objects/Devices/{flatpacks.rsi => flatpack.rsi}/science_server.png (100%) rename Resources/Textures/_NF/Objects/Devices/{flatpacks.rsi => flatpack.rsi}/service_lathe.png (100%) rename Resources/Textures/_NF/Objects/Devices/{flatpacks.rsi => flatpack.rsi}/service_music.png (100%) rename Resources/Textures/_NF/Objects/Devices/{flatpacks.rsi => flatpack.rsi}/service_tray.png (100%) rename Resources/Textures/_NF/Objects/Devices/{flatpacks.rsi => flatpack.rsi}/supply_gun.png (100%) rename Resources/Textures/_NF/Objects/Devices/{flatpacks.rsi => flatpack.rsi}/supply_lathe.png (100%) rename Resources/Textures/_NF/Structures/Machines/VendingMachines/{circuitvend.rsi => flatpackvend.rsi}/broken.png (100%) rename Resources/Textures/_NF/Structures/Machines/VendingMachines/{circuitvend.rsi => flatpackvend.rsi}/deny-unshaded.png (100%) rename Resources/Textures/_NF/Structures/Machines/VendingMachines/{circuitvend.rsi => flatpackvend.rsi}/eject-unshaded.png (100%) rename Resources/Textures/_NF/Structures/Machines/VendingMachines/{circuitvend.rsi => flatpackvend.rsi}/meta.json (100%) rename Resources/Textures/_NF/Structures/Machines/VendingMachines/{circuitvend.rsi => flatpackvend.rsi}/normal-unshaded.png (100%) rename Resources/Textures/_NF/Structures/Machines/VendingMachines/{circuitvend.rsi => flatpackvend.rsi}/off.png (100%) rename Resources/Textures/_NF/Structures/Machines/VendingMachines/{circuitvend.rsi => flatpackvend.rsi}/panel.png (100%) diff --git a/Resources/Locale/en-US/_NF/prototypes/catalog/cargo/cargo-vending.ftl b/Resources/Locale/en-US/_NF/prototypes/catalog/cargo/cargo-vending.ftl index efca148a5bc..97bf18849dc 100644 --- a/Resources/Locale/en-US/_NF/prototypes/catalog/cargo/cargo-vending.ftl +++ b/Resources/Locale/en-US/_NF/prototypes/catalog/cargo/cargo-vending.ftl @@ -4,8 +4,8 @@ ent-CrateVendingMachineRestockAstroVend = { ent-CrateVendingMachineRestockAstroV ent-CrateVendingMachineRestockAmmo = { ent-CrateVendingMachineRestockAmmoFilled } .desc = { ent-CrateVendingMachineRestockAmmoFilled.desc } -ent-CrateVendingMachineRestockCircuitVend = { ent-CrateVendingMachineRestockCircuitVendFilled } - .desc = { ent-CrateVendingMachineRestockCircuitVendFilled.desc } +ent-CrateVendingMachineRestockFlatpackVend = { ent-CrateVendingMachineRestockFlatpackVendFilled } + .desc = { ent-CrateVendingMachineRestockFlatpackVendFilled.desc } ent-CrateVendingMachineRestockCuddlyCritterVend = { ent-CrateVendingMachineRestockCuddlyCritterVendFilled } .desc = { ent-CrateVendingMachineRestockCuddlyCritterVendFilled.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/vending-crates.ftl b/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/vending-crates.ftl index b0cebeca7df..cbdf5dd81e2 100644 --- a/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/vending-crates.ftl +++ b/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/vending-crates.ftl @@ -4,8 +4,8 @@ ent-CrateVendingMachineRestockAstroVendFilled = AstroVend restock crate ent-CrateVendingMachineRestockAmmoFilled = Liberation restock crate .desc = Contains two restock boxes for the Liberation vending machine. -ent-CrateVendingMachineRestockCircuitVendFilled = CircuitVend restock crate - .desc = Contains two restock boxes for a CircuitVend vending machine. +ent-CrateVendingMachineRestockFlatpackVendFilled = FlatpackVend restock crate + .desc = Contains two restock boxes for a FlatpackVend vending machine. ent-CrateVendingMachineRestockCuddlyCritterVendFilled = CuddlyCritterVend restock crate .desc = Contains two restock boxes for a CuddlyCritterVend vending machine. diff --git a/Resources/Maps/_NF/Outpost/frontier.yml b/Resources/Maps/_NF/Outpost/frontier.yml index baa4b9710f3..c6312f78989 100644 --- a/Resources/Maps/_NF/Outpost/frontier.yml +++ b/Resources/Maps/_NF/Outpost/frontier.yml @@ -36648,7 +36648,7 @@ entities: - type: Transform pos: 49.5,4.5 parent: 2173 -- proto: VendingMachineCircuitVend +- proto: VendingMachineFlatpackVend entities: - uid: 4469 components: diff --git a/Resources/Maps/_NF/POI/anomalouslab.yml b/Resources/Maps/_NF/POI/anomalouslab.yml index 57c279e13d2..bdfb9c67dd7 100644 --- a/Resources/Maps/_NF/POI/anomalouslab.yml +++ b/Resources/Maps/_NF/POI/anomalouslab.yml @@ -10471,7 +10471,7 @@ entities: parent: 1 - type: Anchorable delay: 999999 -- proto: VendingMachineCircuitVend +- proto: VendingMachineFlatpackVend entities: - uid: 318 components: diff --git a/Resources/Maps/_NF/POI/grifty.yml b/Resources/Maps/_NF/POI/grifty.yml index fcc17110319..f4837c63c88 100644 --- a/Resources/Maps/_NF/POI/grifty.yml +++ b/Resources/Maps/_NF/POI/grifty.yml @@ -5163,7 +5163,7 @@ entities: - type: Transform pos: 3.5447173,5.482584 parent: 1 -- proto: VendingMachineRestockCircuitVend +- proto: VendingMachineRestockFlatpackVend entities: - uid: 626 components: diff --git a/Resources/Maps/_NF/POI/lodge.yml b/Resources/Maps/_NF/POI/lodge.yml index dbde66c3c64..95e62eb9f85 100644 --- a/Resources/Maps/_NF/POI/lodge.yml +++ b/Resources/Maps/_NF/POI/lodge.yml @@ -10028,7 +10028,7 @@ entities: - type: Transform pos: 9.5,10.5 parent: 1 -- proto: VendingMachineCircuitVend +- proto: VendingMachineFlatpackVend entities: - uid: 512 components: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml index aefdcd8ab9f..14bb24086af 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml @@ -30,8 +30,7 @@ components: - type: StorageFill contents: -# - id: AmeControllerUnanchored - - id: amecontrollerflatpack # Frontier + - id: AmecontrollerFlatpack # Frontier - AmeControllerUnanchored to Amecontrollerflatpack # Singularity @@ -53,8 +52,7 @@ components: - type: StorageFill contents: -# - id: RadiationCollectorFullTank - - id: radiationcollectorflatpack # Frontier + - id: RadiationcollectorFlatpack # Frontier - RadiationCollectorFullTank to Radiationcollectorflatpack - type: entity id: CrateEngineeringSingularityContainment diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml index 8a811d59c1b..d18ca9aa799 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -46,8 +46,6 @@ Amount: 2 DefaultPrototype: Beaker ExamineName: Glass Beaker - - type: StaticPrice - price: 200 - type: entity parent: BaseMachineCircuitboard @@ -135,8 +133,6 @@ ExamineName: Glass Beaker - type: StealTarget stealGroup: MedicalTechFabCircuitboard - - type: StaticPrice - price: 200 - type: entity id: CircuitImprinterMachineCircuitboard @@ -155,8 +151,6 @@ Amount: 2 DefaultPrototype: Beaker ExamineName: Glass Beaker - - type: StaticPrice - price: 200 - type: entity id: ExosuitFabricatorMachineCircuitboard @@ -175,8 +169,6 @@ - type: GuideHelp guides: - Robotics - - type: StaticPrice - price: 200 # yes i know this prototype name is long i'm just following conventions - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml index 7480d333090..d3826667016 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml @@ -423,8 +423,6 @@ state: cpu_command - type: ComputerBoard prototype: ComputerIFF - - type: StaticPrice - price: 400 - type: ComputerTabletopBoard # Frontier prototype: ComputerTabletopIFF # Frontier diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml index 1f470d4e13e..119bb729652 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml @@ -16,8 +16,6 @@ Amount: 2 DefaultPrototype: Beaker ExamineName: Glass Beaker - - type: StaticPrice - price: 200 - type: entity id: ServiceTechFabCircuitboard @@ -37,8 +35,6 @@ Amount: 2 DefaultPrototype: Beaker ExamineName: Glass Beaker - - type: StaticPrice - price: 200 - type: entity id: ScienceTechFabCircuitboard @@ -58,8 +54,6 @@ Amount: 2 DefaultPrototype: Beaker ExamineName: Glass Beaker - - type: StaticPrice - price: 200 - type: entity id: DeepFryerMachineCircuitboard diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_engines.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_engines.yml index 4ef4f2b2fd9..e151ffb0a87 100644 --- a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_engines.yml +++ b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_engines.yml @@ -3,7 +3,7 @@ icon: sprite: Structures/Power/Generation/portable_generator.rsi state: portgen3 - product: portablegeneratorjrpacmanflatpack + product: PortableGeneratorJrPacmanFlatpack cost: 2000 category: Engineering group: market @@ -13,7 +13,7 @@ icon: sprite: Structures/Power/Generation/portable_generator.rsi state: portgen2 - product: portablegeneratorpacmanflatpack + product: PortableGeneratorPacmanFlatpack cost: 3000 category: Engineering group: market @@ -23,7 +23,7 @@ icon: sprite: Structures/Power/Generation/portable_generator.rsi state: portgen1 - product: portablegeneratorsuperpacmanflatpack + product: PortableGeneratorSuperPacmanFlatpack cost: 4000 category: Engineering group: market diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml index ad30eb99832..1c4cad5fc80 100644 --- a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml @@ -27,11 +27,11 @@ group: market - type: cargoProduct - id: CrateVendingMachineRestockCircuitVend + id: CrateVendingMachineRestockFlatpackVend icon: sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base - product: CrateVendingMachineRestockCircuitVendFilled + product: CrateVendingMachineRestockFlatpackVendFilled cost: 100 category: Science group: market diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag.yml index d29c3abf483..acd53d4e257 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag.yml @@ -9,19 +9,3 @@ - id: WeaponLauncherChinaLakeEmp - id: GrenadeEmp amount: 8 - -- type: entity - id: ClothingBackpackDuffelScienceBundle - parent: ClothingBackpackDuffelScience - suffix: Science Kit - components: - - type: StorageFill - contents: - - id: Beaker - amount: 4 - - id: MatterBinStockPart - amount: 10 - - id: CapacitorStockPart - amount: 8 - - id: MicroManipulatorStockPart - amount: 5 diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/engines.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/engines.yml index 1ffcb965047..b165f5894d5 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/engines.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/engines.yml @@ -4,7 +4,7 @@ components: - type: StorageFill contents: - - id: gyroscopeflatpack + - id: GyroscopeFlatpack - type: entity id: CrateThruster @@ -12,7 +12,7 @@ components: - type: StorageFill contents: - - id: thrusterflatpack + - id: ThrusterFlatpack - type: entity id: CrateSmallGyroscope @@ -20,7 +20,7 @@ components: - type: StorageFill contents: - - id: gyroscopesmallflatpack + - id: GyroscopeSmallFlatpack - type: entity id: CrateSmallThruster @@ -28,4 +28,4 @@ components: - type: StorageFill contents: - - id: thrustersmallflatpack + - id: ThrusterSmallFlatpack diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/science.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/science.yml index ccc5f8fa5b1..28a3533768d 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/science.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/science.yml @@ -4,21 +4,15 @@ components: - type: StorageFill contents: - - id: exosuitfabricatorflatpack - - id: anomalyvesselflatpack - - id: circuitimprinterflatpack - - id: rndserverflatpack - - id: artifactanalyzerflatpack - - id: autolatheflatpack - - id: protolatheflatpack - - id: analysisconsoleflatpack - - id: rndcomputerflatpack - - id: apeflatpack + - id: ExosuitFabricatorFlatpack + - id: MachineAnomalyVesselFlatpack + - id: CircuitImprinterFlatpack + - id: ResearchAndDevelopmentServerFlatpack + - id: ComputerResearchAndDevelopmentFlatpack + - id: MachineArtifactAnalyzerFlatpack + - id: AutolatheFlatpack + - id: ProtolatheFlatpack + - id: ComputerAnalysisConsoleFlatpack + - id: MachineAPEFlatpack - id: AnomalyScanner - id: NodeScanner -# - id: CableApcStack -# - id: SheetSteel -# - id: SheetGlass -# - id: SheetPGlass -# - id: SheetPlasma -# - id: ClothingBackpackDuffelScienceBundle diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml index 9f5d80de238..7509d3125df 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml @@ -17,12 +17,12 @@ amount: 2 - type: entity - id: CrateVendingMachineRestockCircuitVendFilled + id: CrateVendingMachineRestockFlatpackVendFilled parent: CratePlasticBiodegradable components: - type: StorageFill contents: - - id: VendingMachineRestockCircuitVend + - id: VendingMachineRestockFlatpackVend amount: 2 - type: entity diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/autotunevend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/autotunevend.yml index ac47e68c9ba..32670e5fc0b 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/autotunevend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/autotunevend.yml @@ -31,19 +31,19 @@ XylophoneInstrument: 1 MicrophoneInstrument: 1 MusicalLungInstrument: 1 # This actully sound ok somehow - tubaflatpack: 1 - harpflatpack: 1 - contrabassflatpack: 1 - vibraphoneflatpack: 1 - marimbaflatpack: 1 - tomdrumsflatpack: 1 - timpaniflatpack: 1 - taikoflatpack: 1 - minimoogflatpack: 1 - churchorganflatpack: 1 - pianoflatpack: 1 - uprightpianoflatpack: 1 - dawflatpack: 1 + TubaInstrumentFlatpack: 1 + HarpInstrumentFlatpack: 1 + ContrabassInstrumentFlatpack: 1 + VibraphoneInstrumentFlatpack: 1 + MarimbaInstrumentFlatpack: 1 + TomDrumsInstrumentFlatpack: 1 + TimpaniInstrumentFlatpack: 1 + TaikoInstrumentFlatpack: 1 + MinimoogInstrumentFlatpack: 1 + ChurchOrganInstrumentFlatpack: 1 + PianoInstrumentFlatpack: 1 + UprightPianoInstrumentFlatpack: 1 + DawInstrumentFlatpack: 1 contrabandInventory: # SeashellInstrument: 1 This is actully just static noises # ReverseCymbalsInstrument: 1 Sounds bad diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuitvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuitvend.yml deleted file mode 100644 index 4be5b55bb36..00000000000 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuitvend.yml +++ /dev/null @@ -1,51 +0,0 @@ -- type: vendingMachineInventory - id: CircuitVendInventory - startingInventory: -## SalvageExpeditionsComputerCircuitboard: 8 - shuttlegunkineticflatpack: 12 - oreprocessorflatpack: 10 - autolatheflatpack: 6 - hydroponicstrayflatpack: 16 - crewmonitoringcomputerflatpack: 6 - rndcomputerflatpack: 12 - rndserverflatpack: 12 - exosuitfabricatorflatpack: 4 - protolatheflatpack: 6 - circuitimprinterflatpack: 6 - sciencetechfabflatpack: 4 - engineeringtechfabflatpack: 4 - servicetechfabflatpack: 4 - medicaltechfabflatpack: 4 - materialreclaimerflatpack: 4 - uniformprinterflatpack: 6 - telecommunicationserverflatpack: 6 - tileprinternfflatpack: 8 - cellchargerflatpack: 8 - borgchargerflatpack: 8 - flatpackerflatpack: 8 - airlockflatpack: 20 - airlockglassflatpack: 20 - airlockdockingflatpack: 20 - DoorElectronics: 30 -# ShuttleGunKineticCircuitboard: 10 -# TilePrinterNFMachineCircuitboard: 8 -# CrewMonitoringComputerCircuitboard: 6 -# ResearchComputerCircuitboard: 12 -# ResearchAndDevelopmentServerMachineCircuitboard: 12 -# ExosuitFabricatorMachineCircuitboard: 4 -# CircuitImprinterMachineCircuitboard: 6 -# ProtolatheMachineCircuitboard: 6 -# AutolatheMachineCircuitboard: 6 -# EngineeringTechFabCircuitboard: 4 -# MedicalTechFabCircuitboard: 4 -# ServiceTechFabCircuitboard: 4 -# ScienceTechFabCircuitboard: 4 -# OreProcessorMachineCircuitboard: 10 -# MaterialReclaimerMachineCircuitboard: 4 -# UniformPrinterMachineCircuitboard: 4 -# HydroponicsTrayMachineCircuitboard: 16 -# TelecomServerCircuitboard: 6 -# BorgChargerCircuitboard: 8 -# CellRechargerCircuitboard: 8 -# emaggedInventory: - ComputerIFFCircuitboard: 4 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml new file mode 100644 index 00000000000..20a800d654d --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml @@ -0,0 +1,28 @@ +- type: vendingMachineInventory + id: FlatpackVendInventory + startingInventory: + ShuttleGunKineticFlatpack: 12 + OreProcessorFlatpack: 10 + AutolatheFlatpack: 6 + HydroponicsTrayEmptyFlatpack: 16 + ComputerCrewMonitoringFlatpack: 6 + ExosuitFabricatorFlatpack: 4 + ProtolatheFlatpack: 6 + CircuitImprinterFlatpack: 6 + ScienceTechFabFlatpack: 4 + EngineeringTechFabFlatpack: 4 + ServiceTechFabFlatpack: 4 + MedicalTechFabFlatpack: 4 + MaterialReclaimerFlatpack: 4 + UniformPrinterFlatpack: 6 + TelecomServerFlatpack: 6 + TilePrinterNFFlatpack: 8 + PowerCellRechargerFlatpack: 8 + BorgChargerFlatpack: 8 + MachineFlatpackerFlatpack: 8 + AirlockFlatpack: 20 + AirlockGlassFlatpack: 20 + AirlockShuttleFlatpack: 20 + AirlockGlassShuttleFlatpack: 20 + emaggedInventory: + ComputerIFFFlatpack: 1 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml index 4abda90f4fe..c83eed9a8c6 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml @@ -1,25 +1,30 @@ # Base - type: entity - parent: BaseItem - id: autolatheflatpack + parent: BaseFlatpack + id: BaseNFFlatpack + components: + - type: StaticPrice + price: 150 + - type: Sprite + sprite: _NF/Objects/Devices/flatpack.rsi + +# Machines +# Engineering +- type: entity + parent: BaseNFFlatpack + id: AutolatheFlatpack name: autolathe flatpack description: A flatpack used for constructing an autolathe. components: - - type: Item - size: Normal - type: Flatpack entity: Autolathe - type: Sprite - sprite: _NF/Objects/Devices/flatpacks.rsi - state: engineering_lathe - - type: StaticPrice - price: 150 + layers: + - state: engineering_lathe -# Machines -# Engineering - type: entity - parent: autolatheflatpack - id: engineeringtechfabflatpack + parent: BaseNFFlatpack + id: EngineeringTechFabFlatpack name: engineering tech fab flatpack description: A flatpack used for constructing an engineering tech fab. components: @@ -29,17 +34,19 @@ price: 250 - type: entity - parent: engineeringtechfabflatpack - id: flatpackerflatpack + parent: BaseNFFlatpack + id: MachineFlatpackerFlatpack name: flatpacker 1001 flatpack description: A flatpack used for constructing a flatpacker 1001. components: - type: Flatpack entity: MachineFlatpacker + - type: StaticPrice + price: 250 - type: entity - parent: autolatheflatpack - id: cellchargerflatpack + parent: BaseNFFlatpack + id: PowerCellRechargerFlatpack name: cell charger flatpack description: A flatpack used for constructing a cell charger. components: @@ -51,17 +58,19 @@ price: 55 - type: entity - parent: cellchargerflatpack - id: borgchargerflatpack + parent: BaseNFFlatpack + id: BorgChargerFlatpack name: borg charger flatpack description: A flatpack used for constructing a borg charger. components: - type: Flatpack entity: BorgCharger + - type: StaticPrice + price: 55 - type: entity - parent: autolatheflatpack - id: portablegeneratorjrpacmanflatpack + parent: BaseNFFlatpack + id: PortableGeneratorJrPacmanFlatpack name: J.R.P.A.C.M.A.N.-type portable generator flatpack description: A flatpack used for constructing a J.R.P.A.C.M.A.N.-type portable generator. components: @@ -71,8 +80,8 @@ entity: PortableGeneratorJrPacman - type: entity - parent: portablegeneratorjrpacmanflatpack - id: portablegeneratorpacmanflatpack + parent: BaseNFFlatpack + id: PortableGeneratorPacmanFlatpack name: P.A.C.M.A.N.-type portable generator flatpack description: A flatpack used for constructing a P.A.C.M.A.N.-type portable generator. components: @@ -80,8 +89,8 @@ entity: PortableGeneratorPacman - type: entity - parent: portablegeneratorjrpacmanflatpack - id: portablegeneratorsuperpacmanflatpack + parent: BaseNFFlatpack + id: PortableGeneratorSuperPacmanFlatpack name: S.U.P.E.R.P.A.C.M.A.N.-type portable generator flatpack description: A flatpack used for constructing a S.U.P.E.R.P.A.C.M.A.N.-type portable generator. components: @@ -89,8 +98,8 @@ entity: PortableGeneratorSuperPacman - type: entity - parent: autolatheflatpack - id: amecontrollerflatpack + parent: BaseNFFlatpack + id: AmeControllerUnanchoredFlatpack name: AME controller flatpack description: A flatpack used for constructing an AME controller. components: @@ -100,8 +109,8 @@ entity: AmeControllerUnanchored - type: entity - parent: amecontrollerflatpack - id: radiationcollectorflatpack + parent: BaseNFFlatpack + id: RadiationCollectorFullTankFlatpack name: radiation collector flatpack description: A flatpack used for constructing a radiation collector. components: @@ -109,8 +118,8 @@ entity: RadiationCollectorFullTank - type: entity - parent: autolatheflatpack - id: gyroscopeflatpack + parent: BaseNFFlatpack + id: GyroscopeUnanchoredFlatpack name: gyroscope flatpack description: A flatpack used for constructing a gyroscope. components: @@ -120,8 +129,8 @@ entity: GyroscopeUnanchored - type: entity - parent: gyroscopeflatpack - id: gyroscopesmallflatpack + parent: BaseNFFlatpack + id: SmallGyroscopeUnanchoredFlatpack name: small gyroscope flatpack description: A flatpack used for constructing a small gyroscope. components: @@ -129,8 +138,8 @@ entity: SmallGyroscopeUnanchored - type: entity - parent: autolatheflatpack - id: thrusterflatpack + parent: BaseNFFlatpack + id: ThrusterUnanchoredFlatpack name: thruster flatpack description: A flatpack used for constructing a thruster. components: @@ -140,8 +149,8 @@ entity: ThrusterUnanchored - type: entity - parent: thrusterflatpack - id: thrustersmallflatpack + parent: BaseNFFlatpack + id: SmallThrusterUnanchoredFlatpack name: small thruster flatpack description: A flatpack used for constructing a small thruster. components: @@ -150,8 +159,8 @@ # Science - type: entity - parent: autolatheflatpack - id: exosuitfabricatorflatpack + parent: BaseNFFlatpack + id: ExosuitFabricatorFlatpack name: exosuit fabricator flatpack description: A flatpack used for constructing an exosuit fabricator. components: @@ -163,26 +172,30 @@ price: 250 - type: entity - parent: exosuitfabricatorflatpack - id: circuitimprinterflatpack + parent: BaseNFFlatpack + id: CircuitImprinterFlatpack name: circuit imprinter flatpack description: A flatpack used for constructing a circuit imprinter. components: - type: Flatpack entity: CircuitImprinter + - type: StaticPrice + price: 250 - type: entity - parent: exosuitfabricatorflatpack - id: protolatheflatpack + parent: BaseNFFlatpack + id: ProtolatheFlatpack name: protolathe flatpack description: A flatpack used for constructing a protolathe. components: - type: Flatpack entity: Protolathe + - type: StaticPrice + price: 250 - type: entity - parent: exosuitfabricatorflatpack - id: artifactanalyzerflatpack + parent: BaseNFFlatpack + id: MachineArtifactAnalyzerFlatpack name: artifact analyzer flatpack description: A flatpack used for constructing an artifact analyzer. components: @@ -190,10 +203,12 @@ state: science_artifact_analyzer - type: Flatpack entity: MachineArtifactAnalyzer + - type: StaticPrice + price: 250 - type: entity - parent: exosuitfabricatorflatpack - id: anomalyvesselflatpack + parent: BaseNFFlatpack + id: MachineAnomalyVesselFlatpack name: anomaly vessel flatpack description: A flatpack used for constructing an anomaly vessel. components: @@ -201,10 +216,12 @@ state: science_anomaly_vessel - type: Flatpack entity: MachineAnomalyVessel + - type: StaticPrice + price: 250 - type: entity - parent: exosuitfabricatorflatpack - id: apeflatpack + parent: BaseNFFlatpack + id: MachineAPEFlatpack name: A.P.E. flatpack description: A flatpack used for constructing an A.P.E.. components: @@ -212,20 +229,24 @@ state: science_ape - type: Flatpack entity: MachineAPE + - type: StaticPrice + price: 250 - type: entity - parent: exosuitfabricatorflatpack - id: sciencetechfabflatpack + parent: BaseNFFlatpack + id: ScienceTechFabFlatpack name: science techfab flatpack description: A flatpack used for constructing a science techfab. components: - type: Flatpack entity: ScienceTechFab + - type: StaticPrice + price: 250 # Service - type: entity - parent: autolatheflatpack - id: uniformprinterflatpack + parent: BaseNFFlatpack + id: UniformPrinterFlatpack name: uniform printer flatpack description: A flatpack used for constructing an uniform printer. components: @@ -235,8 +256,8 @@ state: service_lathe - type: entity - parent: uniformprinterflatpack - id: servicetechfabflatpack + parent: BaseNFFlatpack + id: ServiceTechFabFlatpack name: service tech fab flatpack description: A flatpack used for constructing a service tech fab. components: @@ -246,8 +267,8 @@ price: 250 - type: entity - parent: uniformprinterflatpack - id: materialreclaimerflatpack + parent: BaseNFFlatpack + id: MaterialReclaimerFlatpack name: material reclaimer flatpack description: A flatpack used for constructing a material reclaimer. components: @@ -255,8 +276,8 @@ entity: MaterialReclaimer - type: entity - parent: uniformprinterflatpack - id: hydroponicstrayflatpack + parent: BaseNFFlatpack + id: HydroponicsTrayEmptyFlatpack name: hydroponics tray flatpack description: A flatpack used for constructing a hydroponics tray. components: @@ -266,8 +287,8 @@ entity: HydroponicsTrayEmpty - type: entity - parent: uniformprinterflatpack - id: tileprinternfflatpack + parent: BaseNFFlatpack + id: TilePrinterNFFlatpack name: tile-meister 5000 flatpack description: A flatpack used for constructing a tile-meister 5000. components: @@ -276,8 +297,8 @@ # Medical - type: entity - parent: autolatheflatpack - id: medicaltechfabflatpack + parent: BaseNFFlatpack + id: MedicalTechFabFlatpack name: medical tech fab flatpack description: A flatpack used for constructing a medical tech fab. components: @@ -290,8 +311,8 @@ # Supply - type: entity - parent: autolatheflatpack - id: oreprocessorflatpack + parent: BaseNFFlatpack + id: OreProcessorFlatpack name: ore processor flatpack description: A flatpack used for constructing an ore processor. components: @@ -301,8 +322,8 @@ state: supply_lathe - type: entity - parent: oreprocessorflatpack - id: shuttlegunkineticflatpack + parent: BaseNFFlatpack + id: ShuttleGunKineticFlatpack name: PTK-800 "Matter Dematerializer" flatpack description: A flatpack used for constructing a PTK-800 "Matter Dematerializer". components: @@ -315,28 +336,32 @@ # Consoles - type: entity - parent: exosuitfabricatorflatpack - id: rndcomputerflatpack - name: R&D computer flatpack + parent: BaseNFFlatpack + id: ComputerResearchAndDevelopmentFlatpack + name: research and development computer flatpack description: A flatpack used for constructing a research and development computer. components: - type: Sprite state: science_console - type: Flatpack entity: ComputerResearchAndDevelopment + - type: StaticPrice + price: 250 - type: entity - parent: rndcomputerflatpack - id: analysisconsoleflatpack + parent: BaseNFFlatpack + id: ComputerAnalysisConsoleFlatpack name: analysis console flatpack description: A flatpack used for constructing an analysis console. components: - type: Flatpack entity: ComputerAnalysisConsole + - type: StaticPrice + price: 250 - type: entity - parent: exosuitfabricatorflatpack - id: crewmonitoringcomputerflatpack + parent: BaseNFFlatpack + id: ComputerCrewMonitoringFlatpack name: crew monitoring console flatpack description: A flatpack used for constructing a crew monitoring console. components: @@ -344,22 +369,37 @@ state: medical_console - type: Flatpack entity: ComputerCrewMonitoring + - type: StaticPrice + price: 250 + +- type: entity + parent: BaseNFFlatpack + id: ComputerIFFFlatpack + name: IFF computer flatpack + description: A flatpack used for constructing a IFF computer. + components: + - type: Flatpack + entity: ComputerIFF + - type: StaticPrice + price: 400 # Servers - type: entity - parent: exosuitfabricatorflatpack - id: rndserverflatpack - name: R&D server flatpack + parent: BaseNFFlatpack + id: ResearchAndDevelopmentServerFlatpack + name: research and development server flatpack description: A flatpack used for constructing a research and development server. components: - type: Sprite state: science_server - type: Flatpack entity: ResearchAndDevelopmentServer + - type: StaticPrice + price: 250 - type: entity - parent: autolatheflatpack - id: telecommunicationserverflatpack + parent: BaseNFFlatpack + id: TelecomServerFlatpack name: telecommunication server flatpack description: A flatpack used for constructing a telecommunication server. components: @@ -370,8 +410,8 @@ # Airlocks - type: entity - parent: autolatheflatpack - id: airlockflatpack + parent: BaseNFFlatpack + id: AirlockFlatpack name: airlock flatpack description: A flatpack used for constructing an airlock. components: @@ -383,150 +423,178 @@ price: 95 - type: entity - parent: airlockflatpack - id: airlockglassflatpack + parent: BaseNFFlatpack + id: AirlockGlassFlatpack name: glass airlock flatpack description: A flatpack used for constructing an airlock. components: - type: Flatpack entity: AirlockGlass + - type: StaticPrice + price: 95 - type: entity - parent: airlockflatpack - id: airlockdockingflatpack + parent: BaseNFFlatpack + id: AirlockShuttleFlatpack name: docking airlock flatpack description: A flatpack used for constructing a docking airlock. components: - type: Flatpack entity: AirlockShuttle + - type: StaticPrice + price: 95 - type: entity - parent: airlockflatpack - id: airlockdockingglassflatpack + parent: BaseNFFlatpack + id: AirlockGlassShuttleFlatpack name: docking glass airlock flatpack description: A flatpack used for constructing a glass docking airlock. components: - type: Flatpack entity: AirlockGlassShuttle + - type: StaticPrice + price: 95 # Musical instruments - type: entity - parent: uniformprinterflatpack - id: tubaflatpack + parent: BaseNFFlatpack + id: TubaInstrumentFlatpack name: tuba flatpack description: A flatpack containing a tuba. components: - - type: Sprite - state: service_music - type: Flatpack entity: TubaInstrument - type: StaticPrice - price: 200 + price: 400 - type: entity - parent: tubaflatpack - id: harpflatpack + parent: BaseNFFlatpack + id: HarpInstrumentFlatpack name: harp flatpack description: A flatpack containing a harp. components: - type: Flatpack entity: HarpInstrument + - type: StaticPrice + price: 400 - type: entity - parent: tubaflatpack - id: contrabassflatpack + parent: BaseNFFlatpack + id: ContrabassInstrumentFlatpack name: contrabass flatpack description: A flatpack containing a contrabass. components: - type: Flatpack entity: ContrabassInstrument + - type: StaticPrice + price: 400 - type: entity - parent: tubaflatpack - id: vibraphoneflatpack + parent: BaseNFFlatpack + id: VibraphoneInstrumentFlatpack name: vibraphone flatpack description: A flatpack containing a vibraphone. components: - type: Flatpack entity: VibraphoneInstrument + - type: StaticPrice + price: 400 - type: entity - parent: tubaflatpack - id: marimbaflatpack + parent: BaseNFFlatpack + id: MarimbaInstrumentFlatpack name: marimba flatpack description: A flatpack containing a marimba. components: - type: Flatpack entity: MarimbaInstrument + - type: StaticPrice + price: 400 - type: entity - parent: tubaflatpack - id: tomdrumsflatpack + parent: BaseNFFlatpack + id: TomDrumsInstrumentFlatpack name: tom drums flatpack description: A flatpack containing tom drums. components: - type: Flatpack entity: TomDrumsInstrument + - type: StaticPrice + price: 400 - type: entity - parent: tubaflatpack - id: timpaniflatpack + parent: BaseNFFlatpack + id: TimpaniInstrumentFlatpack name: timpani flatpack description: A flatpack containing a timpani. components: - type: Flatpack entity: TimpaniInstrument + - type: StaticPrice + price: 400 - type: entity - parent: tubaflatpack - id: taikoflatpack + parent: BaseNFFlatpack + id: TaikoInstrumentFlatpack name: taiko flatpack description: A flatpack containing a taiko. components: - type: Flatpack entity: TaikoInstrument + - type: StaticPrice + price: 400 - type: entity - parent: tubaflatpack - id: minimoogflatpack + parent: BaseNFFlatpack + id: MinimoogInstrumentFlatpack name: minimoog flatpack description: A flatpack containing a minimoog. components: - type: Flatpack entity: MinimoogInstrument + - type: StaticPrice + price: 400 - type: entity - parent: tubaflatpack - id: churchorganflatpack + parent: BaseNFFlatpack + id: ChurchOrganInstrumentFlatpack name: church organ flatpack description: A flatpack containing a church organ. components: - type: Flatpack entity: ChurchOrganInstrument + - type: StaticPrice + price: 400 - type: entity - parent: tubaflatpack - id: pianoflatpack + parent: BaseNFFlatpack + id: PianoInstrumentFlatpack name: piano flatpack description: A flatpack containing a piano. components: - type: Flatpack entity: PianoInstrument + - type: StaticPrice + price: 400 - type: entity - parent: tubaflatpack - id: uprightpianoflatpack + parent: BaseNFFlatpack + id: UprightPianoInstrumentFlatpack name: upright piano flatpack description: A flatpack containing a upright piano. components: - type: Flatpack entity: UprightPianoInstrument + - type: StaticPrice + price: 400 - type: entity - parent: tubaflatpack - id: dawflatpack + parent: BaseNFFlatpack + id: DawInstrumentFlatpack name: daw flatpack description: A flatpack containing a daw. components: - type: Flatpack entity: DawInstrument + - type: StaticPrice + price: 2000 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml index a9c145ff50a..ea1594b4336 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml @@ -80,13 +80,13 @@ - type: entity parent: SecuredVendingMachineRestock - id: VendingMachineRestockCircuitVend - name: CircuitVend restock box - description: A box full of boards for various computers. Load it into a CircuitVend to begin. A label reads THE BOX IS TAMPER PROOF AND WILL DESTROY IT'S CONTENT ON HARM. + id: VendingMachineRestockFlatpackVend + name: FlatpackVend restock box + description: A box full of flatpacks for various computers. Load it into a FlatpackVend to begin. A label reads THE BOX IS TAMPER PROOF AND WILL DESTROY IT'S CONTENT ON HARM. components: - type: VendingMachineRestock canRestock: - - CircuitVendInventory + - FlatpackVendInventory - type: Sprite layers: - state: base diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml index 0719d5d0d73..7bba7de48c8 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml @@ -60,21 +60,21 @@ - type: entity parent: [BaseStructureUnanchorable, VendingMachine] - id: VendingMachineCircuitVend - name: CircuitVend + id: VendingMachineFlatpackVend + name: FlatpackVend description: Essential tech for the space-men on the go components: - type: VendingMachine - pack: CircuitVendInventory + pack: FlatpackVendInventory offState: off brokenState: broken normalState: normal-unshaded ejectState: eject-unshaded denyState: deny-unshaded # - type: Advertise -# pack: CircuitVendAds +# pack: FlatpackVendAds - type: Sprite - sprite: _NF/Structures/Machines/VendingMachines/circuitvend.rsi + sprite: _NF/Structures/Machines/VendingMachines/flatpackvend.rsi layers: - state: "off" map: ["enum.VendingMachineVisualLayers.Base"] diff --git a/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/base.png b/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..628808adc7cf33292e6b2e88b763ed92908f2f91 GIT binary patch literal 331 zcmV-R0kr;!P)Px$1xZ9fR9J=Wl|M@ZK@dluVs+U%S4je?_8{blkTwYl{wb`)4=GkQV&NB9I7tw0 ztAJg+)O*{;DuqS%<|3lSzH*tJ-TS@(169;dobff5}u~r*1=V^ zLGmvskdKGk$>fZrqp+o=sy2IT)3l4uG`@BiQ!vU$e6H6&6WC2)ON&woO7(-yY-#EB zPDPW81OSXF7!3M6K0GxxySu-|n4*=yvAFV=hyqdI{|n6KQ=IdnX3lwL^Jy!A#ytR_ zGtJe_1xh8saGmLIZ=ua87Vxzr=_mkJtB<{PyXE6+2f%W%Y&=9DxQ3V4=LcQFm*-c} drHw=)kuTU_NacRkzTE%-002ovPDHLkV1hJ`l+*wK literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/command_airlock.png b/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/command_airlock.png similarity index 100% rename from Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/command_airlock.png rename to Resources/Textures/_NF/Objects/Devices/flatpack.rsi/command_airlock.png diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/command_server.png b/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/command_server.png similarity index 100% rename from Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/command_server.png rename to Resources/Textures/_NF/Objects/Devices/flatpack.rsi/command_server.png diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/engineering_gyroscope.png b/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/engineering_gyroscope.png similarity index 100% rename from Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/engineering_gyroscope.png rename to Resources/Textures/_NF/Objects/Devices/flatpack.rsi/engineering_gyroscope.png diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/engineering_lathe.png b/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/engineering_lathe.png similarity index 100% rename from Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/engineering_lathe.png rename to Resources/Textures/_NF/Objects/Devices/flatpack.rsi/engineering_lathe.png diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/engineering_thruster.png b/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/engineering_thruster.png similarity index 100% rename from Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/engineering_thruster.png rename to Resources/Textures/_NF/Objects/Devices/flatpack.rsi/engineering_thruster.png diff --git a/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/icon-default.png b/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/icon-default.png new file mode 100644 index 0000000000000000000000000000000000000000..da9da035a06495de4b261a65c028eda03c43ae2a GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}nVv3=ArY;~ z2@qAJn~Q4YWEMZ1shqI`u=BW7X>XbWjNrgQt2|OygXX{Zr(4`9Czl+HRoTQ qac}(09TI9{a8~)#Gi|mH)$$%jUdj198%_dEW$<+Mb6Mw<&;$Uw#V{=Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/power_charger.png b/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/power_charger.png similarity index 100% rename from Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/power_charger.png rename to Resources/Textures/_NF/Objects/Devices/flatpack.rsi/power_charger.png diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/power_console_ame.png b/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/power_console_ame.png similarity index 100% rename from Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/power_console_ame.png rename to Resources/Textures/_NF/Objects/Devices/flatpack.rsi/power_console_ame.png diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/power_generator.png b/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/power_generator.png similarity index 100% rename from Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/power_generator.png rename to Resources/Textures/_NF/Objects/Devices/flatpack.rsi/power_generator.png diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_anomaly_vessel.png b/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/science_anomaly_vessel.png similarity index 100% rename from Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_anomaly_vessel.png rename to Resources/Textures/_NF/Objects/Devices/flatpack.rsi/science_anomaly_vessel.png diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_ape.png b/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/science_ape.png similarity index 100% rename from Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_ape.png rename to Resources/Textures/_NF/Objects/Devices/flatpack.rsi/science_ape.png diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_artifact_analyzer.png b/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/science_artifact_analyzer.png similarity index 100% rename from Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_artifact_analyzer.png rename to Resources/Textures/_NF/Objects/Devices/flatpack.rsi/science_artifact_analyzer.png diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_console.png b/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/science_console.png similarity index 100% rename from Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_console.png rename to Resources/Textures/_NF/Objects/Devices/flatpack.rsi/science_console.png diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_lathe.png b/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/science_lathe.png similarity index 100% rename from Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_lathe.png rename to Resources/Textures/_NF/Objects/Devices/flatpack.rsi/science_lathe.png diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_server.png b/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/science_server.png similarity index 100% rename from Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_server.png rename to Resources/Textures/_NF/Objects/Devices/flatpack.rsi/science_server.png diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/service_lathe.png b/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/service_lathe.png similarity index 100% rename from Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/service_lathe.png rename to Resources/Textures/_NF/Objects/Devices/flatpack.rsi/service_lathe.png diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/service_music.png b/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/service_music.png similarity index 100% rename from Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/service_music.png rename to Resources/Textures/_NF/Objects/Devices/flatpack.rsi/service_music.png diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/service_tray.png b/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/service_tray.png similarity index 100% rename from Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/service_tray.png rename to Resources/Textures/_NF/Objects/Devices/flatpack.rsi/service_tray.png diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/supply_gun.png b/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/supply_gun.png similarity index 100% rename from Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/supply_gun.png rename to Resources/Textures/_NF/Objects/Devices/flatpack.rsi/supply_gun.png diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/supply_lathe.png b/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/supply_lathe.png similarity index 100% rename from Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/supply_lathe.png rename to Resources/Textures/_NF/Objects/Devices/flatpack.rsi/supply_lathe.png diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/circuitvend.rsi/broken.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/flatpackvend.rsi/broken.png similarity index 100% rename from Resources/Textures/_NF/Structures/Machines/VendingMachines/circuitvend.rsi/broken.png rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/flatpackvend.rsi/broken.png diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/circuitvend.rsi/deny-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/flatpackvend.rsi/deny-unshaded.png similarity index 100% rename from Resources/Textures/_NF/Structures/Machines/VendingMachines/circuitvend.rsi/deny-unshaded.png rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/flatpackvend.rsi/deny-unshaded.png diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/circuitvend.rsi/eject-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/flatpackvend.rsi/eject-unshaded.png similarity index 100% rename from Resources/Textures/_NF/Structures/Machines/VendingMachines/circuitvend.rsi/eject-unshaded.png rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/flatpackvend.rsi/eject-unshaded.png diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/circuitvend.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/VendingMachines/flatpackvend.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Structures/Machines/VendingMachines/circuitvend.rsi/meta.json rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/flatpackvend.rsi/meta.json diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/circuitvend.rsi/normal-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/flatpackvend.rsi/normal-unshaded.png similarity index 100% rename from Resources/Textures/_NF/Structures/Machines/VendingMachines/circuitvend.rsi/normal-unshaded.png rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/flatpackvend.rsi/normal-unshaded.png diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/circuitvend.rsi/off.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/flatpackvend.rsi/off.png similarity index 100% rename from Resources/Textures/_NF/Structures/Machines/VendingMachines/circuitvend.rsi/off.png rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/flatpackvend.rsi/off.png diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/circuitvend.rsi/panel.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/flatpackvend.rsi/panel.png similarity index 100% rename from Resources/Textures/_NF/Structures/Machines/VendingMachines/circuitvend.rsi/panel.png rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/flatpackvend.rsi/panel.png From 2abf74b51425cb5c789bd4b52533cbe95660bea4 Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 8 Mar 2024 15:06:06 +0200 Subject: [PATCH 08/12] Update flatpacks.yml --- .../Entities/Objects/Devices/flatpacks.yml | 192 ++++++++---------- 1 file changed, 89 insertions(+), 103 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml index c83eed9a8c6..05944761196 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml @@ -7,6 +7,8 @@ price: 150 - type: Sprite sprite: _NF/Objects/Devices/flatpack.rsi + layers: + - state: engineering_lathe # Machines # Engineering @@ -18,9 +20,6 @@ components: - type: Flatpack entity: Autolathe - - type: Sprite - layers: - - state: engineering_lathe - type: entity parent: BaseNFFlatpack @@ -50,12 +49,13 @@ name: cell charger flatpack description: A flatpack used for constructing a cell charger. components: - - type: Sprite - state: power_charger - type: Flatpack entity: PowerCellRecharger - type: StaticPrice price: 55 + - type: Sprite + layers: + - state: power_charger - type: entity parent: BaseNFFlatpack @@ -67,6 +67,9 @@ entity: BorgCharger - type: StaticPrice price: 55 + - type: Sprite + layers: + - state: power_charger - type: entity parent: BaseNFFlatpack @@ -74,13 +77,14 @@ name: J.R.P.A.C.M.A.N.-type portable generator flatpack description: A flatpack used for constructing a J.R.P.A.C.M.A.N.-type portable generator. components: - - type: Sprite - state: power_generator - type: Flatpack entity: PortableGeneratorJrPacman + - type: Sprite + layers: + - state: power_generator - type: entity - parent: BaseNFFlatpack + parent: PortableGeneratorJrPacmanFlatpack id: PortableGeneratorPacmanFlatpack name: P.A.C.M.A.N.-type portable generator flatpack description: A flatpack used for constructing a P.A.C.M.A.N.-type portable generator. @@ -89,7 +93,7 @@ entity: PortableGeneratorPacman - type: entity - parent: BaseNFFlatpack + parent: PortableGeneratorJrPacmanFlatpack id: PortableGeneratorSuperPacmanFlatpack name: S.U.P.E.R.P.A.C.M.A.N.-type portable generator flatpack description: A flatpack used for constructing a S.U.P.E.R.P.A.C.M.A.N.-type portable generator. @@ -103,10 +107,11 @@ name: AME controller flatpack description: A flatpack used for constructing an AME controller. components: - - type: Sprite - state: power_console_ame - type: Flatpack entity: AmeControllerUnanchored + - type: Sprite + layers: + - state: power_console_ame - type: entity parent: BaseNFFlatpack @@ -123,10 +128,11 @@ name: gyroscope flatpack description: A flatpack used for constructing a gyroscope. components: - - type: Sprite - state: engineering_gyroscope - type: Flatpack entity: GyroscopeUnanchored + - type: Sprite + layers: + - state: engineering_gyroscope - type: entity parent: BaseNFFlatpack @@ -143,10 +149,11 @@ name: thruster flatpack description: A flatpack used for constructing a thruster. components: - - type: Sprite - state: engineering_thruster - type: Flatpack entity: ThrusterUnanchored + - type: Sprite + layers: + - state: engineering_thruster - type: entity parent: BaseNFFlatpack @@ -166,82 +173,74 @@ components: - type: Flatpack entity: ExosuitFabricator - - type: Sprite - state: science_lathe - type: StaticPrice price: 250 + - type: Sprite + layers: + - state: science_lathe - type: entity - parent: BaseNFFlatpack + parent: ExosuitFabricatorFlatpack id: CircuitImprinterFlatpack name: circuit imprinter flatpack description: A flatpack used for constructing a circuit imprinter. components: - type: Flatpack entity: CircuitImprinter - - type: StaticPrice - price: 250 - type: entity - parent: BaseNFFlatpack + parent: ExosuitFabricatorFlatpack id: ProtolatheFlatpack name: protolathe flatpack description: A flatpack used for constructing a protolathe. components: - type: Flatpack entity: Protolathe - - type: StaticPrice - price: 250 - type: entity - parent: BaseNFFlatpack + parent: ExosuitFabricatorFlatpack id: MachineArtifactAnalyzerFlatpack name: artifact analyzer flatpack description: A flatpack used for constructing an artifact analyzer. components: - - type: Sprite - state: science_artifact_analyzer - type: Flatpack entity: MachineArtifactAnalyzer - - type: StaticPrice - price: 250 + - type: Sprite + layers: + - state: science_artifact_analyzer - type: entity - parent: BaseNFFlatpack + parent: ExosuitFabricatorFlatpack id: MachineAnomalyVesselFlatpack name: anomaly vessel flatpack description: A flatpack used for constructing an anomaly vessel. components: - - type: Sprite - state: science_anomaly_vessel - type: Flatpack entity: MachineAnomalyVessel - - type: StaticPrice - price: 250 + - type: Sprite + layers: + - state: science_anomaly_vessel - type: entity - parent: BaseNFFlatpack + parent: ExosuitFabricatorFlatpack id: MachineAPEFlatpack name: A.P.E. flatpack description: A flatpack used for constructing an A.P.E.. components: - - type: Sprite - state: science_ape - type: Flatpack entity: MachineAPE - - type: StaticPrice - price: 250 + - type: Sprite + layers: + - state: science_ape - type: entity - parent: BaseNFFlatpack + parent: ExosuitFabricatorFlatpack id: ScienceTechFabFlatpack name: science techfab flatpack description: A flatpack used for constructing a science techfab. components: - type: Flatpack entity: ScienceTechFab - - type: StaticPrice - price: 250 # Service - type: entity @@ -253,10 +252,11 @@ - type: Flatpack entity: UniformPrinter - type: Sprite - state: service_lathe + layers: + - state: service_lathe - type: entity - parent: BaseNFFlatpack + parent: UniformPrinterFlatpack id: ServiceTechFabFlatpack name: service tech fab flatpack description: A flatpack used for constructing a service tech fab. @@ -267,7 +267,7 @@ price: 250 - type: entity - parent: BaseNFFlatpack + parent: UniformPrinterFlatpack id: MaterialReclaimerFlatpack name: material reclaimer flatpack description: A flatpack used for constructing a material reclaimer. @@ -276,18 +276,19 @@ entity: MaterialReclaimer - type: entity - parent: BaseNFFlatpack + parent: UniformPrinterFlatpack id: HydroponicsTrayEmptyFlatpack name: hydroponics tray flatpack description: A flatpack used for constructing a hydroponics tray. components: - - type: Sprite - state: service_tray - type: Flatpack entity: HydroponicsTrayEmpty + - type: Sprite + layers: + - state: service_tray - type: entity - parent: BaseNFFlatpack + parent: UniformPrinterFlatpack id: TilePrinterNFFlatpack name: tile-meister 5000 flatpack description: A flatpack used for constructing a tile-meister 5000. @@ -304,10 +305,11 @@ components: - type: Flatpack entity: MedicalTechFab - - type: Sprite - state: medical_lathe - type: StaticPrice price: 250 + - type: Sprite + layers: + - state: medical_lathe # Supply - type: entity @@ -319,7 +321,8 @@ - type: Flatpack entity: OreProcessor - type: Sprite - state: supply_lathe + layers: + - state: supply_lathe - type: entity parent: BaseNFFlatpack @@ -329,10 +332,11 @@ components: - type: Flatpack entity: ShuttleGunKinetic - - type: Sprite - state: supply_gun - type: StaticPrice price: 250 + - type: Sprite + layers: + - state: supply_gun # Consoles - type: entity @@ -341,12 +345,13 @@ name: research and development computer flatpack description: A flatpack used for constructing a research and development computer. components: - - type: Sprite - state: science_console - type: Flatpack entity: ComputerResearchAndDevelopment - type: StaticPrice price: 250 + - type: Sprite + layers: + - state: science_console - type: entity parent: BaseNFFlatpack @@ -365,12 +370,13 @@ name: crew monitoring console flatpack description: A flatpack used for constructing a crew monitoring console. components: - - type: Sprite - state: medical_console - type: Flatpack entity: ComputerCrewMonitoring - type: StaticPrice price: 250 + - type: Sprite + layers: + - state: medical_console - type: entity parent: BaseNFFlatpack @@ -390,12 +396,13 @@ name: research and development server flatpack description: A flatpack used for constructing a research and development server. components: - - type: Sprite - state: science_server - type: Flatpack entity: ResearchAndDevelopmentServer - type: StaticPrice price: 250 + - type: Sprite + layers: + - state: science_server - type: entity parent: BaseNFFlatpack @@ -406,7 +413,8 @@ - type: Flatpack entity: TelecomServer - type: Sprite - state: command_server + layers: + - state: command_server # Airlocks - type: entity @@ -417,43 +425,38 @@ components: - type: Flatpack entity: Airlock - - type: Sprite - state: command_airlock - type: StaticPrice price: 95 + - type: Sprite + layers: + - state: command_airlock - type: entity - parent: BaseNFFlatpack + parent: AirlockFlatpack id: AirlockGlassFlatpack name: glass airlock flatpack description: A flatpack used for constructing an airlock. components: - type: Flatpack entity: AirlockGlass - - type: StaticPrice - price: 95 - type: entity - parent: BaseNFFlatpack + parent: AirlockFlatpack id: AirlockShuttleFlatpack name: docking airlock flatpack description: A flatpack used for constructing a docking airlock. components: - type: Flatpack entity: AirlockShuttle - - type: StaticPrice - price: 95 - type: entity - parent: BaseNFFlatpack + parent: AirlockFlatpack id: AirlockGlassShuttleFlatpack name: docking glass airlock flatpack description: A flatpack used for constructing a glass docking airlock. components: - type: Flatpack entity: AirlockGlassShuttle - - type: StaticPrice - price: 95 # Musical instruments - type: entity @@ -466,31 +469,30 @@ entity: TubaInstrument - type: StaticPrice price: 400 + - type: Sprite + layers: + - state: service_music - type: entity - parent: BaseNFFlatpack + parent: TubaInstrumentFlatpack id: HarpInstrumentFlatpack name: harp flatpack description: A flatpack containing a harp. components: - type: Flatpack entity: HarpInstrument - - type: StaticPrice - price: 400 - type: entity - parent: BaseNFFlatpack + parent: TubaInstrumentFlatpack id: ContrabassInstrumentFlatpack name: contrabass flatpack description: A flatpack containing a contrabass. components: - type: Flatpack entity: ContrabassInstrument - - type: StaticPrice - price: 400 - type: entity - parent: BaseNFFlatpack + parent: TubaInstrumentFlatpack id: VibraphoneInstrumentFlatpack name: vibraphone flatpack description: A flatpack containing a vibraphone. @@ -501,95 +503,79 @@ price: 400 - type: entity - parent: BaseNFFlatpack + parent: TubaInstrumentFlatpack id: MarimbaInstrumentFlatpack name: marimba flatpack description: A flatpack containing a marimba. components: - type: Flatpack entity: MarimbaInstrument - - type: StaticPrice - price: 400 - type: entity - parent: BaseNFFlatpack + parent: TubaInstrumentFlatpack id: TomDrumsInstrumentFlatpack name: tom drums flatpack description: A flatpack containing tom drums. components: - type: Flatpack entity: TomDrumsInstrument - - type: StaticPrice - price: 400 - type: entity - parent: BaseNFFlatpack + parent: TubaInstrumentFlatpack id: TimpaniInstrumentFlatpack name: timpani flatpack description: A flatpack containing a timpani. components: - type: Flatpack entity: TimpaniInstrument - - type: StaticPrice - price: 400 - type: entity - parent: BaseNFFlatpack + parent: TubaInstrumentFlatpack id: TaikoInstrumentFlatpack name: taiko flatpack description: A flatpack containing a taiko. components: - type: Flatpack entity: TaikoInstrument - - type: StaticPrice - price: 400 - type: entity - parent: BaseNFFlatpack + parent: TubaInstrumentFlatpack id: MinimoogInstrumentFlatpack name: minimoog flatpack description: A flatpack containing a minimoog. components: - type: Flatpack entity: MinimoogInstrument - - type: StaticPrice - price: 400 - type: entity - parent: BaseNFFlatpack + parent: TubaInstrumentFlatpack id: ChurchOrganInstrumentFlatpack name: church organ flatpack description: A flatpack containing a church organ. components: - type: Flatpack entity: ChurchOrganInstrument - - type: StaticPrice - price: 400 - type: entity - parent: BaseNFFlatpack + parent: TubaInstrumentFlatpack id: PianoInstrumentFlatpack name: piano flatpack description: A flatpack containing a piano. components: - type: Flatpack entity: PianoInstrument - - type: StaticPrice - price: 400 - type: entity - parent: BaseNFFlatpack + parent: TubaInstrumentFlatpack id: UprightPianoInstrumentFlatpack name: upright piano flatpack description: A flatpack containing a upright piano. components: - type: Flatpack entity: UprightPianoInstrument - - type: StaticPrice - price: 400 - type: entity - parent: BaseNFFlatpack + parent: TubaInstrumentFlatpack id: DawInstrumentFlatpack name: daw flatpack description: A flatpack containing a daw. From c157fa185d9f9f336280fadb826c9b2fd1d28b49 Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 8 Mar 2024 15:24:03 +0200 Subject: [PATCH 09/12] Update flatpacks.yml --- .../Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml index 05944761196..6e2e7e84f58 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml @@ -388,6 +388,9 @@ entity: ComputerIFF - type: StaticPrice price: 400 + - type: Sprite + layers: + - state: supply_gun # Servers - type: entity From 7d644514f2ae740d16151f723df2783e5cd1f79c Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Fri, 8 Mar 2024 15:27:18 +0200 Subject: [PATCH 10/12] Update science.yml --- Resources/Prototypes/_NF/Catalog/Fills/Crates/science.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/science.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/science.yml index 28a3533768d..77f50c9261c 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/science.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/science.yml @@ -16,3 +16,4 @@ - id: MachineAPEFlatpack - id: AnomalyScanner - id: NodeScanner + - id: Multitool From d71c12965146662d52d8a63cb38cb9ecc29988c2 Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 8 Mar 2024 15:31:58 +0200 Subject: [PATCH 11/12] WeaponCapacitorRechargerFlatpack --- .../VendingMachines/Inventories/flatpackvend.yml | 1 + .../_NF/Entities/Objects/Devices/flatpacks.yml | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml index 20a800d654d..e4a145363ef 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml @@ -18,6 +18,7 @@ TelecomServerFlatpack: 6 TilePrinterNFFlatpack: 8 PowerCellRechargerFlatpack: 8 + WeaponCapacitorRechargerFlatpack: 8 BorgChargerFlatpack: 8 MachineFlatpackerFlatpack: 8 AirlockFlatpack: 20 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml index 6e2e7e84f58..9ee5905789c 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml @@ -57,6 +57,17 @@ layers: - state: power_charger +- type: entity + parent: PowerCellRechargerFlatpack + id: WeaponCapacitorRechargerFlatpack + name: recharger flatpack + description: A flatpack used for constructing a recharger. + components: + - type: Flatpack + entity: WeaponCapacitorRecharger + - type: StaticPrice + price: 15 + - type: entity parent: BaseNFFlatpack id: BorgChargerFlatpack From 46bec3901213fe7a588299dfe31273adde056273 Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 8 Mar 2024 15:59:31 +0200 Subject: [PATCH 12/12] Fixing YML --- Resources/Prototypes/Catalog/Fills/Crates/engines.yml | 4 ++-- Resources/Prototypes/_NF/Catalog/Fills/Crates/engines.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml index 14bb24086af..19a813a16ab 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml @@ -30,7 +30,7 @@ components: - type: StorageFill contents: - - id: AmecontrollerFlatpack # Frontier - AmeControllerUnanchored to Amecontrollerflatpack + - id: AmeControllerUnanchoredFlatpack # Frontier - AmeControllerUnanchored to AmeControllerUnanchoredFlatpack # Singularity @@ -52,7 +52,7 @@ components: - type: StorageFill contents: - - id: RadiationcollectorFlatpack # Frontier - RadiationCollectorFullTank to Radiationcollectorflatpack + - id: RadiationCollectorFullTankFlatpack # Frontier - RadiationCollectorFullTank to RadiationCollectorFullTankFlatpack - type: entity id: CrateEngineeringSingularityContainment diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/engines.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/engines.yml index b165f5894d5..ce859351b5e 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/engines.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/engines.yml @@ -4,7 +4,7 @@ components: - type: StorageFill contents: - - id: GyroscopeFlatpack + - id: GyroscopeUnanchoredFlatpack - type: entity id: CrateThruster @@ -12,7 +12,7 @@ components: - type: StorageFill contents: - - id: ThrusterFlatpack + - id: ThrusterUnanchoredFlatpack - type: entity id: CrateSmallGyroscope @@ -20,7 +20,7 @@ components: - type: StorageFill contents: - - id: GyroscopeSmallFlatpack + - id: SmallGyroscopeUnanchoredFlatpack - type: entity id: CrateSmallThruster @@ -28,4 +28,4 @@ components: - type: StorageFill contents: - - id: ThrusterSmallFlatpack + - id: SmallThrusterUnanchoredFlatpack