cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Final (real) Fixes + Tweaks + Cleanup

This commit is contained in:
Stxcking 2026-04-17 02:08:38 -04:00
parent 63c649d92f
commit c863e32518
13 changed files with 63 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Resources/Locale/en-US/_DV/prototypes/entities/structures/furniture.ftl
View File

@ -1,4 +1,3 @@
structure-furniture-fancy-counter = fancy wood counter
structure-furniture-shoddy-counter = shoddy wood counter
structure-furniture-fancy-steel-counter = steel counter

1
Resources/Prototypes/Entities/Structures/Doors/bar_cells.yml
View File

@ -36,7 +36,6 @@
min: 5
max: 10
- type: entity
parent: DoorBarCell
id: DoorBarCellLocked

37
Resources/Prototypes/_DV/Entities/Structures/Decoration/rugs.yml
View File

@ -25,18 +25,6 @@
min: 3
max: 3
- type: entity
parent: N14CarpetSingleBase
id: N14RugMat
name: mat
components:
- type: Sprite
sprite: _Nuclear14/Structures/Furniture/rugs.rsi
state: mat_blank
- type: Construction
graph: N14RugMatRecipe
node: matBlank
# 64x64 rugs
- type: entity
id: N14RugBlue
@ -147,28 +135,3 @@
CarpetOrange:
min: 4
max: 4
- type: entity
id: N14RugMatRubberLarge
parent: N14RugBlue
name: rubber mat
description: A large laboratory-grade rubber mat. Feel safe as you spill acid on yourself!
placement:
mode: PlaceFree
components:
- type: Sprite
sprite: _Nuclear14/Structures/Furniture/rugs64x64.rsi
state: rug_rubber
- type: Construction
graph: N14RugRecipes
node: RubberMat
- type: Destructible
thresholds:
- trigger: !type:DamageTrigger
damage: 10
behaviors:
- !type:SpawnEntitiesBehavior
spawn:
SheetPlastic:
min: 4
max: 4

13
Resources/Prototypes/_DV/Entities/Structures/Furniture/table.yml
View File

@ -1,6 +1,7 @@
- type: entity
id: N14FreeTableBase # Base off this for wood tables
parent: BaseStructure
abstract: true
name: table
description: A square piece of wood standing on four wood legs.
components:
@ -421,10 +422,6 @@
map: ["enum.StorageVisualLayers.Base"]
- state: opened
map: ["enum.StorageVisualLayers.Door"]
- type: Appearance
- type: EntityStorageVisuals
stateDoorClosed: base
stateDoorOpen: opened
- type: Fixtures
fixtures:
fix1:
@ -438,8 +435,8 @@
- TableLayer
- type: Storage
grid:
- 0,0,3,2
- 5,0,5,7
- 0,0,2,2
- 5,0,7,2
maxItemSize: Normal
- type: UserInterface
interfaces:
@ -640,8 +637,8 @@
- TableLayer
- type: Storage
grid:
- 0,0,2,3
- 5,0,5,7
- 0,0,2,2
- 5,0,7,2
maxItemSize: Normal
- type: UserInterface
interfaces:

5
Resources/Prototypes/_DV/Entities/Structures/Storage/Shelves/shelves.yml
View File

@ -141,7 +141,7 @@
- MidImpassable
- type: Storage
grid:
- 0,0,3,6
- 0,0,4,5
maxItemSize: Large
- type: Construction
graph: StandingShelves
@ -169,7 +169,7 @@
- MidImpassable
- type: Storage
grid:
- 0,0,3,6
- 0,0,4,5
maxItemSize: Large
- type: Construction
graph: StandingShelves
@ -298,7 +298,6 @@
graph: StandingShelves
node: MetalStandingShelfMedical
- type: entity
parent: MetalStandingShelfMedical
id: MetalStandingShelfMedicalFilled

1
Resources/Prototypes/_DV/Recipes/Construction/Graphs/Structures/furniture/seats.yml
View File

@ -462,6 +462,7 @@
doAfter: 1
#region N14
- type: constructionGraph
id: N14Seat
start: start

34
Resources/Prototypes/_DV/Recipes/Construction/Graphs/Structures/shelves.yml
View File

@ -4,7 +4,7 @@
graph:
- node: start
actions:
- !type:DestroyEntity {}
- !type:DestroyEntity
edges:
- to: SmallWoodStandingShelf
completed:
@ -12,21 +12,21 @@
steps:
- material: WoodPlank
amount: 3
doAfter: 1
doAfter: 2
- to: SmallMetalStandingShelf
completed:
- !type:SnapToGrid
steps:
- material: Steel
amount: 3
doAfter: 1
doAfter: 2
- to: LargeWoodStandingShelf
completed:
- !type:SnapToGrid
steps:
- material: WoodPlank
amount: 4
doAfter: 1
doAfter: 3
- to: LargeMetalStandingShelf
completed:
- !type:SnapToGrid
@ -59,14 +59,14 @@
doAfter: 2
- material: Steel
amount: 4
doAfter: 4
doAfter: 3
- to: MetalStandingShelf
completed:
- !type:SnapToGrid
steps:
- material: Steel
amount: 6
doAfter: 1
amount: 5
doAfter: 2
- to: FruitStand
completed:
- !type:SnapToGrid
@ -86,7 +86,7 @@
doAfter: 1
- material: Steel
amount: 5
doAfter: 2
doAfter: 3
## Deconstruction
# Small Shelves
@ -99,7 +99,7 @@
- !type:GivePrototype
prototype: MaterialWoodPlank1
amount: 6
- !type:DeleteEntity {}
- !type:DeleteEntity
steps:
- tool: Screwing
doAfter: 2
@ -113,7 +113,7 @@
- !type:GivePrototype
prototype: SheetSteel1
amount: 5
- !type:DeleteEntity {}
- !type:DeleteEntity
steps:
- tool: Screwing
doAfter: 2
@ -128,7 +128,7 @@
- !type:GivePrototype
prototype: MaterialWoodPlank1
amount: 12
- !type:DeleteEntity {}
- !type:DeleteEntity
steps:
- tool: Prying
doAfter: 2
@ -142,7 +142,7 @@
- !type:GivePrototype
prototype: SheetSteel1
amount: 10
- !type:DeleteEntity {}
- !type:DeleteEntity
steps:
- tool: Screwing
doAfter: 2
@ -156,7 +156,7 @@
- !type:GivePrototype
prototype: MaterialWoodPlank1
amount: 5
- !type:DeleteEntity {}
- !type:DeleteEntity
steps:
- tool: Prying
doAfter: 2
@ -173,7 +173,7 @@
- !type:GivePrototype
prototype: SheetGlass1
amount: 2
- !type:DeleteEntity {}
- !type:DeleteEntity
steps:
- tool: Screwing
doAfter: 2
@ -187,7 +187,7 @@
- !type:GivePrototype
prototype: SheetSteel1
amount: 6
- !type:DeleteEntity {}
- !type:DeleteEntity
steps:
- tool: Screwing
doAfter: 2
@ -205,7 +205,7 @@
- !type:GivePrototype
prototype: SheetSteel1
amount: 1
- !type:DeleteEntity {}
- !type:DeleteEntity
steps:
- tool: Prying
doAfter: 2
@ -219,7 +219,7 @@
- !type:GivePrototype
prototype: SheetSteel1
amount: 6
- !type:DeleteEntity {}
- !type:DeleteEntity
steps:
- tool: Screwing
doAfter: 2

110
Resources/Prototypes/_DV/Recipes/Construction/Graphs/Structures/tables.yml
View File

@ -4,7 +4,7 @@
graph:
- node: start
actions:
- !type:DestroyEntity {}
- !type:DestroyEntity
edges:
- to: N14WoodFrame
completed:
@ -60,7 +60,7 @@
- material: Steel
amount: 3
doAfter: 2
- to: N14MetalCounterFrame
- to: N14WoodCounterFrame
completed:
- !type:SnapToGrid
southRotation: true
@ -80,9 +80,15 @@
# Wooden Tables with Frame
- node: N14WoodFrame
entity: N14WoodTableFrame
actions:
- !type:DestroyEntity {}
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: MaterialWoodPlank1
amount: 2
steps:
- tool: Prying
doAfter: 1
- to: N14DeskWood
completed:
- !type:SnapToGrid
@ -95,7 +101,6 @@
- material: WoodPlank
amount: 3
doAfter: 3
- to: N14DeskWoodMetal
completed:
- !type:SnapToGrid
@ -111,7 +116,6 @@
doAfter: 3
- tool: Screwing
doAfter: 2
- to: N14DeskWoodSmall
completed:
- !type:SnapToGrid
@ -124,7 +128,6 @@
- material: WoodPlank
amount: 3
doAfter: 3
- to: N14WoodWideOval
completed:
- !type:SnapToGrid
@ -133,7 +136,6 @@
- material: WoodPlank
amount: 3
doAfter: 3
- to: N14WoodSquareWide
completed:
- !type:SnapToGrid
@ -147,7 +149,6 @@
- material: WoodPlank
amount: 1
doAfter: 1
- to: N14PoolTable
completed:
- !type:SnapToGrid
@ -166,7 +167,6 @@
- material: Cloth
amount: 4
doAfter: 1
- to: N14CardsTable
completed:
- !type:SnapToGrid
@ -186,9 +186,15 @@
# Metal Tables with Frame
- node: N14MetalFrame
entity: N14MetalTableFrame
actions:
- !type:DestroyEntity {}
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetSteel1
amount: 2
steps:
- tool: Prying
doAfter: 1
- to: N14DeskMetal
completed:
- !type:SnapToGrid
@ -201,7 +207,6 @@
- material: Steel
amount: 6
doAfter: 4
- to: N14DeskMetalLegs
completed:
- !type:SnapToGrid
@ -214,7 +219,6 @@
- material: Steel
amount: 4
doAfter: 4
- to: N14DeskMetalSmall
completed:
- !type:SnapToGrid
@ -227,7 +231,6 @@
- material: Steel
amount: 4
doAfter: 4
- to: N14MetalRound
completed:
- !type:SnapToGrid
@ -236,7 +239,6 @@
- material: Steel
amount: 2
doAfter: 1
- to: N14MetalRolling
completed:
- !type:SnapToGrid
@ -249,9 +251,15 @@
# Counters
- node: N14WoodCounterFrame
entity: N14WoodCounterFrame
actions:
- !type:DestroyEntity {}
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: MaterialWoodPlank1
amount: 2
steps:
- tool: Prying
doAfter: 1
- to: N14WoodCounter
steps:
- material: WoodPlank
@ -259,7 +267,6 @@
doAfter: 1
- tool: Screwing
doAfter: 1
- to: N14WoodCraftCounter
steps:
- material: WoodPlank
@ -271,16 +278,23 @@
- node: N14MetalCounterFrame
entity: N14MetalCounterFrame
actions:
- !type:DestroyEntity {}
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetSteel1
amount: 2
steps:
- tool: Prying
doAfter: 1
- tool: Screwing
doAfter: 1
- to: N14MetalCounter
steps:
- material: Steel
amount: 1
- tool: Screwing
doAfter: 1
- to: TableMetalGrate
steps:
- material: MetalRod
@ -289,31 +303,6 @@
#region Deconstruction
# Small Tables
- node: N14WoodFrame
entity: N14WoodTableFrame
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: MaterialWoodPlank1
amount: 2
- !type:DeleteEntity
steps:
- tool: Prying
doAfter: 1
- node: N14MetalFrame
entity: N14MetalTableFrame
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetSteel1
amount: 2
- !type:DeleteEntity
steps:
- tool: Prying
doAfter: 1
- node: N14WoodSquare
entity: N14TableWoodSquare
@ -388,6 +377,7 @@
doAfter: 1
# Tables/Desk
- node: N14WoodWideOval
entity: N14TableWoodenOvalWide
edges:
@ -554,18 +544,6 @@
doAfter: 4
# Counters
- node: N14WoodCounterFrame
entity: N14WoodCounterFrame
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: MaterialWoodPlank1
amount: 2
- !type:DeleteEntity {}
steps:
- tool: Prying
doAfter: 1
- node: N14WoodCounter
entity: N14TableCounter
@ -594,20 +572,6 @@
- tool: Prying
doAfter: 2
- node: N14MetalCounterFrame
entity: N14MetalCounterFrame
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetSteel1
amount: 2
steps:
- tool: Prying
doAfter: 1
- tool: Screwing
doAfter: 1
- node: N14MetalCounter
entity: N14TableCounterMetal
edges:

32
Resources/Prototypes/_DV/Recipes/Construction/Graphs/rugs.yml
View File

@ -12,51 +12,33 @@
amount: 3
doAfter: 1
- node: matBlank
entity: N14RugMat
- type: constructionGraph
id: N14RugRecipes
start: start
graph:
- node: start
actions:
- !type:DestroyEntity {}
- !type:DestroyEntity
edges:
- to: blueRug
completed:
- !type:SnapToGrid
steps:
- material: FloorCarpetBlue
amount: 4
doAfter: 2
- to: purpleRug
completed:
- !type:SnapToGrid
steps:
- material: FloorCarpetPurple
amount: 4
- to: redRug
completed:
- !type:SnapToGrid
steps:
- material: FloorCarpetRed
amount: 4
doAfter: 2
- to: orangeRug
completed:
- !type:SnapToGrid
steps:
- material: FloorCarpetOrange
amount: 4
doAfter: 2
- to: RubberMat
completed:
- !type:SnapToGrid
steps:
- material: Plastic
amount: 4
doAfter: 2
- node: blueRug
entity: N14RugBlue
@ -105,15 +87,3 @@
steps:
- tool: Screwing
doAfter: 1
- node: RubberMat
entity: N14RugMatRubberLarge
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetPlastic1
amount: 4
steps:
- tool: Screwing
doAfter: 1

16
Resources/Prototypes/_DV/Recipes/Construction/rugs.yml
View File

@ -1,11 +1,3 @@
- type: construction
id: N14RugMat
graph: N14RugMatRecipe
startNode: start
targetNode: matBlank
category: construction-category-furniture
objectType: Structure
- type: construction
id: N14RugBlue
graph: N14RugRecipes
@ -37,11 +29,3 @@
targetNode: orangeRug
category: construction-category-furniture
objectType: Structure
- type: construction
id: N14RugMatRubberLarge
graph: N14RugRecipes
startNode: start
targetNode: RubberMat
category: construction-category-furniture
objectType: Structure

0
Resources/Prototypes/_Nuclear14/Recipes/Construction/furniture.yml Normal file
View File

4
Resources/Textures/_DV/Structures/Decoration/rugs.rsi/meta.json
View File

@ -22,10 +22,6 @@
{
"name": "blue",
"directions": 4
},
{
"name": "rubber",
"directions": 4
}
]
}

BIN
Resources/Textures/_DV/Structures/Decoration/rugs.rsi/rubber.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.5 KiB