Skip to content

Commit

Permalink
lots of fixes, cuts
Browse files Browse the repository at this point in the history
  • Loading branch information
rosieposieeee committed Jan 17, 2025
1 parent 39faa45 commit db06fdc
Show file tree
Hide file tree
Showing 561 changed files with 320 additions and 7,235 deletions.
46 changes: 21 additions & 25 deletions Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/tiles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
- FloorMetalBlue
- type: Stack
stackType: FloorTileMetalBlue

- type: entity
name: metal floor blue solid
parent: FloorTileItemBase
Expand All @@ -30,7 +30,7 @@
- FloorMetalBlueSolid
- type: Stack
stackType: FloorTileMetalBlueSolid

- type: entity
name: metal floor green
parent: FloorTileItemBase
Expand All @@ -46,7 +46,7 @@
- FloorMetalGreen
- type: Stack
stackType: FloorTileMetalGreen

- type: entity
name: metal floor green solid
parent: FloorTileItemBase
Expand All @@ -62,7 +62,7 @@
- FloorMetalGreenSolid
- type: Stack
stackType: FloorTileMetalGreenSolid

- type: entity
name: metal floor grey
parent: FloorTileItemBase
Expand All @@ -78,7 +78,7 @@
- FloorMetalGrey
- type: Stack
stackType: FloorTileMetalGrey

- type: entity
name: metal floor grey solid
parent: FloorTileItemBase
Expand All @@ -94,7 +94,7 @@
- FloorMetalGreySolid
- type: Stack
stackType: FloorTileMetalGreySolid

- type: entity
name: metal floor grey dark
parent: FloorTileItemBase
Expand All @@ -110,7 +110,7 @@
- FloorMetalGreyDark
- type: Stack
stackType: FloorTileMetalGreyDark

- type: entity
name: metal floor grey dark solid
parent: FloorTileItemBase
Expand All @@ -126,7 +126,7 @@
- FloorMetalGreyDarkSolid
- type: Stack
stackType: FloorTileMetalGreyDarkSolid

- type: entity
name: metal floor purple
parent: FloorTileItemBase
Expand All @@ -142,7 +142,7 @@
- FloorMetalPurple
- type: Stack
stackType: FloorTileMetalPurple

- type: entity
name: metal floor purple solid
parent: FloorTileItemBase
Expand All @@ -158,7 +158,7 @@
- FloorMetalPurpleSolid
- type: Stack
stackType: FloorTileMetalPurpleSolid

- type: entity
name: metal floor red
parent: FloorTileItemBase
Expand All @@ -174,7 +174,7 @@
- FloorMetalRed
- type: Stack
stackType: FloorTileMetalRed

- type: entity
name: metal floor red solid
parent: FloorTileItemBase
Expand All @@ -190,7 +190,7 @@
- FloorMetalRedSolid
- type: Stack
stackType: FloorTileMetalRedSolid

- type: entity
name: metal floor teal
parent: FloorTileItemBase
Expand All @@ -206,7 +206,7 @@
- FloorMetalTeal
- type: Stack
stackType: FloorTileMetalTeal

- type: entity
name: metal floor teal solid
parent: FloorTileItemBase
Expand All @@ -222,7 +222,7 @@
- FloorMetalTealSolid
- type: Stack
stackType: FloorTileMetalTealSolid

- type: entity
name: metal floor white
parent: FloorTileItemBase
Expand All @@ -238,7 +238,7 @@
- FloorMetalWhite
- type: Stack
stackType: FloorTileMetalWhite

- type: entity
name: metal floor white solid
parent: FloorTileItemBase
Expand All @@ -254,7 +254,7 @@
- FloorMetalWhiteSolid
- type: Stack
stackType: FloorTileMetalWhiteSolid

- type: entity
name: metal floor yellow
parent: FloorTileItemBase
Expand All @@ -270,7 +270,7 @@
- FloorMetalYellow
- type: Stack
stackType: FloorTileMetalYellow

- type: entity
name: metal floor yellow solid
parent: FloorTileItemBase
Expand All @@ -286,7 +286,7 @@
- FloorMetalYellowSolid
- type: Stack
stackType: FloorTileMetalYellowSolid

- type: entity
name: metal floor freezer
parent: FloorTileItemBase
Expand All @@ -304,7 +304,6 @@
stackType: FloorTileMetalFreezer

# Wood Tiles

- type: entity
name: oak wood floor
parent: FloorTileItemBase
Expand Down Expand Up @@ -377,7 +376,7 @@
- FloorMS13MetalIndustrial
- type: Stack
stackType: FloorTileMetalIndustrial

- type: entity
name: metal floor
parent: FloorTileItemBase
Expand All @@ -393,7 +392,7 @@
- FloorMS13MetalTile
- type: Stack
stackType: FloorTileMetalMS13

- type: entity
name: metal grate floor
parent: FloorTileItemBase
Expand All @@ -409,7 +408,7 @@
- FloorMS13MetalGrate
- type: Stack
stackType: FloorTileMetalGrate

- type: entity
name: metal solid floor
parent: FloorTileItemBase
Expand All @@ -427,7 +426,6 @@
stackType: FloorTileMetalSolid

# Carpets

- type: entity
name: red carpet
parent: FloorTileItemBase
Expand All @@ -446,5 +444,3 @@
# - type: Construction
# graph: TileWood
# node: woodtilelight

# Paths and Roads
Original file line number Diff line number Diff line change
Expand Up @@ -251,86 +251,13 @@

- type: entity
parent: N14DecorFloorBase
id: N14DecorStalagmite1
name: stalagmite
description: Pointy rocks! Mites go up, tites come...
components:
- type: Sprite
state: stalagmite
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeCircle
radius: 0.20
density: 1000
mask:
- MachineMask
layer:
- MachineLayer

- type: entity
parent: N14DecorStalagmite1
id: N14DecorStalagmite2
components:
- type: Sprite
state: stalagmite1

- type: entity
parent: N14DecorStalagmite1
id: N14DecorStalagmite3
components:
- type: Sprite
state: stalagmite2

- type: entity
parent: N14DecorStalagmite1
id: N14DecorStalagmite4
components:
- type: Sprite
state: stalagmite3

- type: entity
parent: N14DecorStalagmite1
id: N14DecorStalagmite5
components:
- type: Sprite
state: stalagmite4

- type: entity
parent: N14DecorStalagmite1
id: N14DecorStalagmite6
components:
- type: Sprite
state: stalagmite5

- type: entity
parent: N14DecorStalagmite1
id: N14DecorMinecart
name: minecrart
description: It seems to have fallen over...
components:
- type: Sprite
state: minecart_fallen

- type: entity
parent: N14DecorFloorBase
id: N14DecorSignLeftMine
name: sign
description: A sign, for a mine, pointing li...left
components:
- type: Sprite
state: sign_left

- type: entity
parent: N14DecorFloorBase
id: N14DecorSignRightMine
name: sign
description: A sign, pointing right.
components:
- type: Sprite
state: sign_right

# World Decor
- type: entity
parent: N14DecorFloorBase
Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit db06fdc

Please sign in to comment.