tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move circuit tiles and faux tiles to the cutter machine (#37982)

Browse Source 
* super cutter machine

* split the big tile pack

* re-add new faux

* consistent naming

* missing category

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
This commit is contained in:
āda
2025-09-23 19:12:45 -05:00
committed by GitHub
parent 7102da139b
commit fabef941c2
9 changed files with 184 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Resources/Locale/en-US/lathe/lathe-categories.ftl
View File

@@ -4,7 +4,6 @@ lathe-category-clothing = Clothing
lathe-category-lights = Lights
lathe-category-machines = Machines
lathe-category-parts = Parts
lathe-category-tiles = Tiles
lathe-category-tools = Tools
lathe-category-weapons = Weapons
@@ -24,13 +23,16 @@ lathe-category-service = Service
lathe-category-supply = Supply
# Cutter
lathe-category-concrete = Concrete
lathe-category-dark = Dark
lathe-category-maints = Maints
lathe-category-steel = Steel
lathe-category-white = White
lathe-category-wood = Wood
lathe-category-tiles = Tiles
lathe-category-circuit-tile = Circuit
lathe-category-concrete-tile = Concrete
lathe-category-dark-tile = Dark
lathe-category-faux-tile = Faux
lathe-category-maints-tile = Maints
lathe-category-marble = Marble
lathe-category-steel-tile = Steel
lathe-category-white-tile = White
lathe-category-wood-tile = Wood
# Science
lathe-category-mechs = Mechs

26
Resources/Prototypes/Entities/Objects/Misc/tiles.yml
View File

@@ -1321,32 +1321,6 @@
- type: Stack
stackType: FloorTileRCircuit
# Circuits stacks
- type: entity
parent: FloorTileItemGCircuit
id: FloorTileItemGCircuit4
suffix: 4
components:
- type: Stack
count: 4
- type: entity
parent: FloorTileItemBCircuit
id: FloorTileItemBCircuit4
suffix: 4
components:
- type: Stack
count: 4
- type: entity
parent: FloorTileItemRCircuit
id: FloorTileItemRCircuit4
suffix: 4
components:
- type: Stack
count: 4
# Terrain
- type: entity
name: grass tile

13
Resources/Prototypes/Entities/Structures/Machines/lathe.yml
View File

@@ -209,7 +209,6 @@
- Janitor
- Instruments
- Equipment
- FauxTiles
- type: EmagLatheRecipes
emagDynamicPacks:
- SecurityAmmo
@@ -257,7 +256,6 @@
- CargoBoardsStatic
- MedicalBoardsStatic
- EngineeringBoardsStatic
- CircuitFloorsStatic
dynamicPacks:
- EngineeringBoards
- CargoBoards
@@ -688,7 +686,16 @@
idleState: icon
runningState: building
staticPacks:
- FloorTilesStatic
- FloorDarkTilesStatic
- FloorSteelTilesStatic
- FloorWhiteTilesStatic
- FloorMaintsTilesStatic
- FloorWoodTilesStatic
- FloorConcreteTilesStatic
- CircuitFloorsStatic
- FloorMarbleTilesStatic
dynamicPacks:
- FauxTiles
- type: MaterialStorage
whitelist:
tags:

20
Resources/Prototypes/Recipes/Lathes/Packs/science.yml
View File

@@ -10,13 +10,6 @@
- CutterMachineCircuitboard
- BorgChargerCircuitboard
- type: latheRecipePack
id: CircuitFloorsStatic
recipes:
- FloorGreenCircuit
- FloorBlueCircuit
- FloorRedCircuit
## Dynamic
- type: latheRecipePack
@@ -62,19 +55,6 @@
- WeaponTetherGun
- WeaponGauntletGorilla
- type: latheRecipePack
id: FauxTiles
recipes:
- FauxTileAstroGrass
- FauxTileMowedAstroGrass
- FauxTileJungleAstroGrass
- FauxTileDarkAstroGrass
- FauxTileLightAstroGrass
- FauxTileAstroIce
- FauxTileAstroSnow
- FauxTileAstroAsteroidSand
- FauxTileDesertAstroSand
# Only contains parts for making basic modular grenades, no actual explosives
- type: latheRecipePack
id: ScienceExplosives

53
Resources/Prototypes/Recipes/Lathes/Packs/tiles.yml
View File

@@ -1,7 +1,7 @@
## Static
- type: latheRecipePack
id: FloorTilesStatic
id: FloorDarkTilesStatic
recipes:
- FloorTileItemDark
- FloorTileItemDarkDiagonalMini
@@ -12,8 +12,10 @@
- FloorTileItemDarkPavement
- FloorTileItemDarkPavementVertical
- FloorTileItemDarkOffset
- FloorTileItemDarkSquiggly
- FloorTileItemSteelCheckerDark
- type: latheRecipePack
id: FloorSteelTilesStatic
recipes:
- FloorTileItemSteel
- FloorTileItemSteelOffset
- FloorTileItemSteelDiagonalMini
@@ -23,6 +25,12 @@
- FloorTileItemSteelMono
- FloorTileItemSteelPavement
- FloorTileItemSteelPavementVertical
- FloorTileItemSteelCheckerDark
- FloorTileItemSteelCheckerLight
- type: latheRecipePack
id: FloorWhiteTilesStatic
recipes:
- FloorTileItemWhite
- FloorTileItemWhiteOffset
- FloorTileItemWhiteDiagonalMini
@@ -32,14 +40,25 @@
- FloorTileItemWhiteMono
- FloorTileItemWhitePavement
- FloorTileItemWhitePavementVertical
- FloorTileItemSteelCheckerLight
- type: latheRecipePack
id: FloorMaintsTilesStatic
recipes:
- FloorTileItemGratingMaint
- FloorTileItemTechmaint
- FloorTileItemSteelMaint
- FloorTileItemTechmaintDark
- type: latheRecipePack
id: FloorWoodTilesStatic
recipes:
- FloorTileItemWood
- FloorTileItemWoodLarge
- FloorTileItemWoodPattern
- type: latheRecipePack
id: FloorConcreteTilesStatic
recipes:
- FloorTileItemConcrete
- FloorTileItemConcreteMono
- FloorTileItemConcreteSmooth
@@ -49,5 +68,31 @@
- FloorTileItemOldConcrete
- FloorTileItemOldConcreteMono
- FloorTileItemOldConcreteSmooth
- type: latheRecipePack
id: CircuitFloorsStatic
recipes:
- FloorGreenCircuit
- FloorBlueCircuit
- FloorRedCircuit
- type: latheRecipePack
id: FloorMarbleTilesStatic
recipes:
- FloorTileItemWhiteMarble
- FloorTileItemDarkMarble
## Dynamic
- type: latheRecipePack
id: FauxTiles
recipes:
- FauxTileAstroGrass
- FauxTileMowedAstroGrass
- FauxTileJungleAstroGrass
- FauxTileDarkAstroGrass
- FauxTileLightAstroGrass
- FauxTileAstroIce
- FauxTileAstroSnow
- FauxTileAstroAsteroidSand
- FauxTileDesertAstroSand

28
Resources/Prototypes/Recipes/Lathes/categories.yml
View File

@@ -19,10 +19,6 @@
id: Parts
name: lathe-category-parts
- type: latheCategory
id: Tiles
name: lathe-category-tiles
- type: latheCategory
id: Tools
name: lathe-category-tools
@@ -78,29 +74,41 @@
name: lathe-category-supply
# Cutter machine
- type: latheCategory
id: Tiles
name: lathe-category-tiles
- type: latheCategory
id: Circuit
name: lathe-category-circuit-tile
- type: latheCategory
id: Concrete
name: lathe-category-concrete
name: lathe-category-concrete-tile
- type: latheCategory
id: Dark
name: lathe-category-dark
name: lathe-category-dark-tile
- type: latheCategory
id: Faux
name: lathe-category-faux-tile
- type: latheCategory
id: Maints
name: lathe-category-maints
name: lathe-category-maints-tile
- type: latheCategory
id: Steel
name: lathe-category-steel
name: lathe-category-steel-tile
- type: latheCategory
id: White
name: lathe-category-white
name: lathe-category-white-tile
- type: latheCategory
id: Wood
name: lathe-category-wood
name: lathe-category-wood-tile
- type: latheCategory
id: Marble

76
Resources/Prototypes/Recipes/Lathes/misc.yml
View File

@@ -10,13 +10,6 @@
Steel: 50
Glass: 50
- type: latheRecipe
abstract: true
id: BaseFauxTileRecipe
completetime: 1
materials:
Plastic: 100
# Recipes
## Lights
@@ -185,75 +178,6 @@
Steel: 750
Plastic: 100
- type: latheRecipe
parent: BaseFauxTileRecipe
id: FauxTileAstroGrass
result: FloorTileItemAstroGrass
- type: latheRecipe
parent: BaseFauxTileRecipe
id: FauxTileMowedAstroGrass
result: FloorTileItemMowedAstroGrass
- type: latheRecipe
parent: BaseFauxTileRecipe
id: FauxTileJungleAstroGrass
result: FloorTileItemJungleAstroGrass
- type: latheRecipe
parent: BaseFauxTileRecipe
id: FauxTileDarkAstroGrass
result: FloorTileItemDarkAstroGrass
- type: latheRecipe
parent: BaseFauxTileRecipe
id: FauxTileLightAstroGrass
result: FloorTileItemLightAstroGrass
- type: latheRecipe
parent: BaseFauxTileRecipe
id: FauxTileAstroIce
result: FloorTileItemAstroIce
- type: latheRecipe
parent: BaseFauxTileRecipe
id: FauxTileAstroSnow
result: FloorTileItemAstroSnow
- type: latheRecipe
parent: BaseFauxTileRecipe
id: FauxTileAstroAsteroidSand
result: FloorTileItemAstroAsteroidSand
- type: latheRecipe
parent: BaseFauxTileRecipe
id: FauxTileAstroAsteroidSandBorderless
result: FloorTileItemAstroAsteroidSandBorderless
- type: latheRecipe
parent: BaseFauxTileRecipe
id: FauxTileDesertAstroSand
result: FloorTileItemDesertAstroSand
- type: latheRecipe
id: FloorGreenCircuit
result: FloorTileItemGCircuit4
completetime: 2
materials:
Steel: 100
- type: latheRecipe
parent: FloorGreenCircuit
id: FloorBlueCircuit
result: FloorTileItemBCircuit4
- type: latheRecipe
id: FloorRedCircuit
result: FloorTileItemRCircuit4
completetime: 2
materials:
Steel: 100
- type: latheRecipe
id: HandheldStationMap
result: HandheldStationMapEmpty

94
Resources/Prototypes/Recipes/Lathes/tiles.yml
View File

@@ -13,6 +13,7 @@
parent: BaseTileRecipe
id: BaseSteelTileRecipe
categories:
- Tiles
- Steel
materials:
Steel: 25
@@ -22,6 +23,7 @@
parent: BaseSteelTileRecipe
id: BaseDarkTileRecipe
categories:
- Tiles
- Dark
- type: latheRecipe
@@ -29,6 +31,7 @@
parent: BaseSteelTileRecipe
id: BaseWhiteTileRecipe
categories:
- Tiles
- White
- type: latheRecipe
@@ -36,13 +39,23 @@
parent: BaseSteelTileRecipe
id: BaseMaintTileRecipe
categories:
- Tiles
- Maints
- type: latheRecipe
abstract: true
parent: BaseSteelTileRecipe
id: BaseCircuitTileRecipe
categories:
- Tiles
- Circuit
- type: latheRecipe
abstract: true
parent: BaseTileRecipe
id: BaseWoodTileRecipe
categories:
- Tiles
- Wood
materials:
Wood: 25
@@ -52,16 +65,28 @@
parent: BaseTileRecipe
id: BaseConcreteTileRecipe
categories:
- Tiles
- Concrete
materials:
Steel: 25
Plastic: 25
- type: latheRecipe
abstract: true
parent: BaseTileRecipe
id: BaseFauxTileRecipe
categories:
- Tiles
- Faux
materials:
Plastic: 100
- type: latheRecipe
abstract: true
parent: BaseTileRecipe
id: BaseMarbleTileRecipe
categories:
- Tiles
- Marble
materials:
Steel: 25
@@ -222,7 +247,7 @@
id: FloorTileItemWhitePavementVertical
result: FloorTileItemWhitePavementVertical
# Other steel
# Maints
- type: latheRecipe
parent: BaseMaintTileRecipe
id: FloorTileItemGratingMaint
@@ -243,6 +268,22 @@
id: FloorTileItemTechmaintDark
result: FloorTileItemTechmaintDark
# Circuit
- type: latheRecipe
parent: BaseCircuitTileRecipe
id: FloorGreenCircuit
result: FloorTileItemGCircuit
- type: latheRecipe
parent: BaseCircuitTileRecipe
id: FloorBlueCircuit
result: FloorTileItemBCircuit
- type: latheRecipe
parent: BaseCircuitTileRecipe
id: FloorRedCircuit
result: FloorTileItemRCircuit
# Wood
- type: latheRecipe
parent: BaseWoodTileRecipe
@@ -305,6 +346,57 @@
id: FloorTileItemOldConcreteSmooth
result: FloorTileItemOldConcreteSmooth
# Faux
- type: latheRecipe
parent: BaseFauxTileRecipe
id: FauxTileAstroGrass
result: FloorTileItemAstroGrass
- type: latheRecipe
parent: BaseFauxTileRecipe
id: FauxTileMowedAstroGrass
result: FloorTileItemMowedAstroGrass
- type: latheRecipe
parent: BaseFauxTileRecipe
id: FauxTileJungleAstroGrass
result: FloorTileItemJungleAstroGrass
- type: latheRecipe
parent: BaseFauxTileRecipe
id: FauxTileDarkAstroGrass
result: FloorTileItemDarkAstroGrass
- type: latheRecipe
parent: BaseFauxTileRecipe
id: FauxTileLightAstroGrass
result: FloorTileItemLightAstroGrass
- type: latheRecipe
parent: BaseFauxTileRecipe
id: FauxTileAstroIce
result: FloorTileItemAstroIce
- type: latheRecipe
parent: BaseFauxTileRecipe
id: FauxTileAstroSnow
result: FloorTileItemAstroSnow
- type: latheRecipe
parent: BaseFauxTileRecipe
id: FauxTileAstroAsteroidSand
result: FloorTileItemAstroAsteroidSand
- type: latheRecipe
parent: BaseFauxTileRecipe
id: FauxTileAstroAsteroidSandBorderless
result: FloorTileItemAstroAsteroidSandBorderless
- type: latheRecipe
parent: BaseFauxTileRecipe
id: FauxTileDesertAstroSand
result: FloorTileItemDesertAstroSand
# Marble
- type: latheRecipe
parent: BaseMarbleTileRecipe

5
Resources/migration.yml
View File

@@ -654,6 +654,11 @@ SpawnHonkBot: SpawnMobHonkBot
CrateFoodPizzaLarge: CrateFoodPizza
CrateFoodSoftdrinksLarge: CrateFoodSoftdrinks
# 2025-06-03
FloorTileItemGCircuit4: FloorTileItemGCircuit
FloorTileItemBCircuit4: FloorTileItemBCircuit
FloorTileItemRCircuit4: FloorTileItemRCircuit
# 2025-06-06
MagazineLightRifleMaxim: null
MagazineLightRiflePkBox: null