Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feat: Departament-Specific Lathes #342

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Feat: Departament-Specific Lathes #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e42299
The return of the techfabs
Mnemotechnician Nov 10, 2024
f9a0d25
Eugh
Mnemotechnician Nov 10, 2024
73d6090
Merge remote-tracking branch 'floofstation/master' into floof/feat/de…
Mnemotechnician Nov 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions Resources/Migrations/deltaMigrations.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ PosterLegitSMEpi: PosterLegitSafetyMothEpi
PosterLegitSMPills: PosterLegitSafetyMothPills
PosterLegitSMAnomalies: PosterLegitSafetyMothDelam
PosterLegitSMGlimmer: PosterLegitSafetyMothGlimmer
EngineeringTechFab: Autolathe
EngineeringTechFabCircuitboard: AutolatheMachineCircuitboard
# Floof - re-added those 2
# EngineeringTechFab: Autolathe
# EngineeringTechFabCircuitboard: AutolatheMachineCircuitboard
# ServiceTechFab: Autolathe
# ServiceTechFabCircuitboard: AutolatheMachineCircuitboard
ScienceTechFab: Protolathe
ScienceTechFabCircuitboard: ProtolatheMachineCircuitboard
ServiceTechFab: Autolathe
ServiceTechFabCircuitboard: AutolatheMachineCircuitboard

# 2023-10-05
FoodMothTomatoSauce: null
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
- id: ClothingLongcoatLO # Floofstation
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: CargoTechFabCircuitboard # Floof - port to EE if possible

- type: entity
id: LockerCaptainFilledHardsuit
Expand Down Expand Up @@ -148,6 +149,7 @@
- id: ClothingHandsGlovesInspection # DeltaV - Add inspection gloves for HoP.
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: ServiceTechFabCircuitboard # Floof - port to ee if possible

- type: entity
id: LockerChiefEngineerFilledHardsuit
Expand Down Expand Up @@ -177,6 +179,7 @@
- id: CEIDCard # Delta-V
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: EngineeringTechFabCircuitboard # Floofstation - port to ee if possible

- type: entity
id: LockerChiefEngineerFilled
Expand All @@ -202,6 +205,7 @@
- id: RCDAmmo
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: EngineeringTechFabCircuitboard # Floofstation - port to ee if possible

- type: entity
id: LockerChiefMedicalOfficerFilledHardsuit
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Entities/Markers/Spawners/Random/techboard.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
- PortableGeneratorSuperPacmanMachineCircuitboard # Delta V - Add additional boards
- PortableGeneratorJrPacmanMachineCircuitboard # Delta V - Add additional boards
- MedicalTechFabCircuitboard # Delta V - Add additional boards
- EngineeringTechFabCircuitboard # Floof - add techfab boards
- CargoTechFabCircuitboard # Floof - add techfab boards
- ServiceTechFabCircuitboard # Floof - add techfab boards
- UniformPrinterMachineCircuitboard # Delta V - Add additional boards
- ArtifactAnalyzerMachineCircuitboard # Delta V - Add additional boards
rareChance: 0.1
58 changes: 58 additions & 0 deletions Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,64 @@
- type: StealTarget
stealGroup: MedicalTechFabCircuitboard

# THIS ENTIRE SECTION BELONGS TO FLOOF - port to EE if possible
# ===

- type: entity
id: EngineeringTechFabCircuitboard
parent: BaseMachineCircuitboard
name: engineering techfab machine board
description: A machine printed circuit board for an engineering techfab
components:
- type: Sprite
state: engineering
- type: MachineBoard
prototype: EngineeringTechFab
requirements:
MatterBin: 1
Manipulator: 3
tagRequirements:
GlassBeaker:
Amount: 1
DefaultPrototype: Beaker
ExamineName: Glass Beaker

- type: entity
id: CargoTechFabCircuitboard
parent: BaseMachineCircuitboard
name: cargo techfab machine board
description: A machine printed circuit board for a cargo techfab
components:
- type: Sprite
state: supply
- type: MachineBoard
prototype: CargoTechFab
requirements:
MatterBin: 3
Manipulator: 1
tagRequirements:
GlassBeaker:
Amount: 1
DefaultPrototype: Beaker
ExamineName: Glass Beaker

- type: entity
id: ServiceTechFabCircuitboard
parent: BaseMachineCircuitboard
name: service techfab machine board
description: A machine printed circuit board for a service techfab
components:
- type: Sprite
state: service
- type: MachineBoard
prototype: ServiceTechFab
requirements:
MatterBin: 2
Manipulator: 2

# ===
# Floof section end

- type: entity
id: CircuitImprinterMachineCircuitboard
parent: BaseMachineCircuitboard
Expand Down
Loading
Loading