diff --git a/Resources/Locale/en-US/_prototypes/_scp/entities/objects/misc/tiles.ftl b/Resources/Locale/en-US/_prototypes/_scp/entities/objects/misc/tiles.ftl
index 374902f32d1..fc6adbce93b 100644
--- a/Resources/Locale/en-US/_prototypes/_scp/entities/objects/misc/tiles.ftl
+++ b/Resources/Locale/en-US/_prototypes/_scp/entities/objects/misc/tiles.ftl
@@ -112,6 +112,12 @@ ent-ScpFloorTileItemConcrete = concrete tile
.desc = { ent-ScpFloorTileItemSteel.desc }
ent-ScpFloorTileItemConcreteMono = concrete mono tile
.desc = { ent-ScpFloorTileItemSteel.desc }
+ent-ScpFloorTileItemWood = { ent-FloorTileItemWood }
+ .desc = { ent-FloorTileItemWood.desc }
+ent-ScpFloorTileItemWoodPattern = { ent-FloorTileItemWoodPattern }
+ .desc = { ent-FloorTileItemWoodPattern.desc }
+ent-ScpFloorTileItemWoodLarge = { ent-FloorTileItemWoodLarge }
+ .desc = { ent-FloorTileItemWoodLarge.desc }
ent-ScpFloorTileItemAnechoic1 = anechoic chamber tile
.desc = { ent-ScpFloorTileItemSteel.desc }
ent-ScpFloorTileItemAnechoic2 = { ent-ScpFloorTileItemAnechoic1 }
diff --git a/Resources/Locale/en-US/_prototypes/_scp/entities/structures/furniture/chairs.ftl b/Resources/Locale/en-US/_prototypes/_scp/entities/structures/furniture/chairs.ftl
new file mode 100644
index 00000000000..1b88c1c43b6
--- /dev/null
+++ b/Resources/Locale/en-US/_prototypes/_scp/entities/structures/furniture/chairs.ftl
@@ -0,0 +1,19 @@
+ent-ScpChair = { ent-Chair }
+ .desc = { ent-Chair.desc }
+ent-ScpChairGreyscale = { ent-ChairGreyscale }
+ .suffix = { ent-ChairGreyscale.suffix }
+ .desc = { ent-ChairGreyscale.desc }
+ent-ScpChairOfficeLight = { ent-ChairOfficeLight }
+ .desc = { ent-ChairOfficeLight.desc }
+ent-ScpChairOfficeDark = { ent-ChairOfficeDark }
+ .desc = { ent-ChairOfficeDark.desc }
+ent-ScpChairOfficeGrey = { ent-ChairOfficeGrey }
+ .desc = { ent-ChairOfficeGrey.desc }
+ent-ScpChairWood = { ent-ChairWood }
+ .desc = { ent-ChairWood.desc }
+ent-ScpWoodenBench = { ent-WoodenBench }
+ .desc = { ent-WoodenBench.desc }
+ent-ScpChairRitual = { ent-ChairRitual }
+ .desc = { ent-ChairRitual.desc }
+ent-ScpChairCursed = { ent-ChairCursed }
+ .desc = { ent-ChairCursed.desc }
diff --git a/Resources/Locale/ru-RU/_prototypes/_scp/entities/objects/misc/tiles.ftl b/Resources/Locale/ru-RU/_prototypes/_scp/entities/objects/misc/tiles.ftl
index f9cde7964bf..f5119a82b11 100644
--- a/Resources/Locale/ru-RU/_prototypes/_scp/entities/objects/misc/tiles.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_scp/entities/objects/misc/tiles.ftl
@@ -112,6 +112,12 @@ ent-ScpFloorTileItemConcrete = бетонная плитка
.desc = { ent-FloorTileItemConcrete.desc }
ent-ScpFloorTileItemConcreteMono = бетонная плита
.desc = { ent-FloorTileItemConcrete.desc }
+ent-ScpFloorTileItemWood = { ent-FloorTileItemWood }
+ .desc = { ent-FloorTileItemWood.desc }
+ent-ScpFloorTileItemWoodPattern = { ent-FloorTileItemWoodPattern }
+ .desc = { ent-FloorTileItemWoodPattern.desc }
+ent-ScpFloorTileItemWoodLarge = { ent-FloorTileItemWoodLarge }
+ .desc = { ent-FloorTileItemWoodLarge.desc }
ent-ScpFloorTileItemAnechoic1 = покрытие безэховой камеры
.desc = { ent-ScpFloorTileItemSteel.desc }
ent-ScpFloorTileItemAnechoic2 = { ent-ScpFloorTileItemAnechoic1 }
diff --git a/Resources/Locale/ru-RU/_prototypes/_scp/entities/structures/furniture/chairs.ftl b/Resources/Locale/ru-RU/_prototypes/_scp/entities/structures/furniture/chairs.ftl
new file mode 100644
index 00000000000..1b88c1c43b6
--- /dev/null
+++ b/Resources/Locale/ru-RU/_prototypes/_scp/entities/structures/furniture/chairs.ftl
@@ -0,0 +1,19 @@
+ent-ScpChair = { ent-Chair }
+ .desc = { ent-Chair.desc }
+ent-ScpChairGreyscale = { ent-ChairGreyscale }
+ .suffix = { ent-ChairGreyscale.suffix }
+ .desc = { ent-ChairGreyscale.desc }
+ent-ScpChairOfficeLight = { ent-ChairOfficeLight }
+ .desc = { ent-ChairOfficeLight.desc }
+ent-ScpChairOfficeDark = { ent-ChairOfficeDark }
+ .desc = { ent-ChairOfficeDark.desc }
+ent-ScpChairOfficeGrey = { ent-ChairOfficeGrey }
+ .desc = { ent-ChairOfficeGrey.desc }
+ent-ScpChairWood = { ent-ChairWood }
+ .desc = { ent-ChairWood.desc }
+ent-ScpWoodenBench = { ent-WoodenBench }
+ .desc = { ent-WoodenBench.desc }
+ent-ScpChairRitual = { ent-ChairRitual }
+ .desc = { ent-ChairRitual.desc }
+ent-ScpChairCursed = { ent-ChairCursed }
+ .desc = { ent-ChairCursed.desc }
diff --git a/Resources/Locale/ru-RU/_Scp/construction/recipes/ScpAirlockLogotypeConstruction.ftl b/Resources/Locale/ru-RU/_strings/_scp/recipes/ScpAirlockLogotypeConstruction.ftl
similarity index 100%
rename from Resources/Locale/ru-RU/_Scp/construction/recipes/ScpAirlockLogotypeConstruction.ftl
rename to Resources/Locale/ru-RU/_strings/_scp/recipes/ScpAirlockLogotypeConstruction.ftl
diff --git a/Resources/Locale/ru-RU/_strings/_scp/tiles/anechoic.ftl b/Resources/Locale/ru-RU/_strings/_scp/tiles/anechoic.ftl
new file mode 100644
index 00000000000..f3b1ac896fd
--- /dev/null
+++ b/Resources/Locale/ru-RU/_strings/_scp/tiles/anechoic.ftl
@@ -0,0 +1 @@
+scp-tiles-anechoic = [SCP] покрытие безэховой камеры
diff --git a/Resources/Locale/ru-RU/_strings/_scp/tiles.ftl b/Resources/Locale/ru-RU/_strings/_scp/tiles/floor.ftl
similarity index 97%
rename from Resources/Locale/ru-RU/_strings/_scp/tiles.ftl
rename to Resources/Locale/ru-RU/_strings/_scp/tiles/floor.ftl
index 9d757b40f57..d845a3e3d91 100644
--- a/Resources/Locale/ru-RU/_strings/_scp/tiles.ftl
+++ b/Resources/Locale/ru-RU/_strings/_scp/tiles/floor.ftl
@@ -47,4 +47,3 @@ scp-tiles-steel-grille-offset-3 = [SCP] { ent-ScpFloorTileItemSteelGrilleOffset3
scp-tiles-steel-grille-offset-4 = [SCP] { ent-ScpFloorTileItemSteelGrilleOffset4 }
scp-tiles-concrete-tile = [SCP] { ent-ScpFloorTileItemConcrete }
scp-tiles-concrete-mono = [SCP] { ent-ScpFloorTileItemConcreteMono }
-scp-tiles-anechoic = [SCP] покрытие безэховой камеры
diff --git a/Resources/Locale/ru-RU/_strings/_scp/tiles/wood.ftl b/Resources/Locale/ru-RU/_strings/_scp/tiles/wood.ftl
new file mode 100644
index 00000000000..b6430cda510
--- /dev/null
+++ b/Resources/Locale/ru-RU/_strings/_scp/tiles/wood.ftl
@@ -0,0 +1,6 @@
+scp-tiles-wood = [SCP] деревянный пол
+scp-tiles-wood-large = [SCP] деревянный большой пол
+scp-tiles-wood-pattern = [SCP] деревянный узорчатый пол
+scp-tiles-wood-broken = { scp-tiles-wood } сломанный
+scp-tiles-wood-large-broken = { scp-tiles-wood-large } сломанный
+scp-tiles-wood-pattern-broken = { scp-tiles-wood-pattern } сломанный
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index a58ce535b53..c9077530e86 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -195,7 +195,7 @@
parent: ProduceBase
components:
- type: Sprite
- sprite: Objects/Specific/Hydroponics/towercap.rsi
+ sprite: _Scp/Objects/Specific/Hydroponics/towercap.rsi
- type: Item
heldPrefix: produce
- type: SolutionContainerManager
diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index 68b9b4b4914..6a183f963f7 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -280,12 +280,14 @@
- wood_2
- wood_3
- type: Sprite
+ sprite: _Scp/Objects/Materials/wood_plank.rsi # Fire added
state: wood
layers:
- state: wood
map: ["base"]
- type: Appearance
- type: Item
+ sprite: _Scp/Objects/Materials/wood_plank.rsi # Fire added
heldPrefix: wood
- type: Tag
tags:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
index 7433f5d3bee..50c057132ff 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
@@ -499,14 +499,17 @@
name: wood floor
parent: FloorTileItemBase
id: FloorTileItemWood
+ categories: [ HideSpawnMenu ] # Fire edit
components:
- type: Sprite
+ sprite: Objects/Tiles/wood.rsi
state: wood
- type: Item
+ sprite: Objects/Tiles/wood.rsi
heldPrefix: wood
- type: FloorTile
outputs:
- - ScpPlating # Fire Edit
+ - Plating
- FloorWood
- type: Stack
stackType: FloorTileWood
@@ -1385,14 +1388,16 @@
name: wood pattern floor
parent: FloorTileItemBase
id: FloorTileItemWoodPattern
+ categories: [ HideSpawnMenu ] # Fire edit
components:
- type: Sprite
+ sprite: Objects/Tiles/wood.rsi
state: woodpatternfloor
- type: Item
heldPrefix: wood
- type: FloorTile
outputs:
- - ScpPlating # Fire Edit
+ - Plating
- FloorWoodTile
- type: Stack
stackType: FloorTileWoodPattern
@@ -1405,6 +1410,7 @@
- type: Sprite
state: meat
- type: Item
+ sprite: _Scp/Objects/Tiles/wood.rsi # Fire added
heldPrefix: meat
- type: FloorTile
outputs:
@@ -1641,14 +1647,17 @@
name: large wood floor
parent: FloorTileItemBase
id: FloorTileItemWoodLarge
+ categories: [ HideSpawnMenu ] # Fire edit
components:
- type: Sprite
+ sprite: Objects/Tiles/wood.rsi
state: wood-large
- type: Item
+ sprite: Objects/Tiles/wood.rsi
heldPrefix: wood
- type: FloorTile
outputs:
- - ScpPlating # Fire Edit
+ - Plating
- FloorWoodLarge
- type: Stack
stackType: FloorTileWoodLarge
diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
index 1cfe88f6c8d..3a8fed6d9e6 100644
--- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml
+++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -6,10 +6,10 @@
abstract: true
components:
- type: Sprite
- sprite: Objects/Weapons/Melee/shields.rsi
+ sprite: _Scp/Objects/Weapons/Melee/shields.rsi # Fire edit
state: riot-icon
- type: Item
- sprite: Objects/Weapons/Melee/shields.rsi
+ sprite: _Scp/Objects/Weapons/Melee/shields.rsi # Fire edit
size: Ginormous
heldPrefix: riot
- type: Blocking
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
index d8b458a0b39..0a021a144dd 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -226,7 +226,7 @@
- type: Seed
seedId: towercap
- type: Sprite
- sprite: Objects/Specific/Hydroponics/towercap.rsi
+ sprite: _Scp/Objects/Specific/Hydroponics/towercap.rsi # Fire edit
- type: entity
parent: SeedBase
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
index 3aa5b041f83..0c3b5462cd0 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
@@ -5,7 +5,7 @@
description: A robust baseball bat.
components:
- type: Sprite
- sprite: Objects/Weapons/Melee/baseball_bat.rsi
+ sprite: _Scp/Objects/Weapons/Melee/baseball_bat.rsi # Fire edit
state: icon
- type: MeleeWeapon
wideAnimationRotation: -135
@@ -27,7 +27,7 @@
- 0,0,0,3
storedSprite:
state: storage
- sprite: Objects/Weapons/Melee/baseball_bat.rsi
+ sprite: _Scp/Objects/Weapons/Melee/baseball_bat.rsi # Fire edit
- type: Tool
qualities:
- Rolling
@@ -55,7 +55,7 @@
description: A few planks of wood stuck together.
components:
- type: Sprite
- sprite: Objects/Weapons/Melee/incomplete_bat.rsi
+ sprite: _Scp/Objects/Weapons/Melee/incomplete_bat.rsi # Fire edit
state: icon
- type: Item
size: Normal
@@ -63,8 +63,8 @@
- 0,0,0,3
storedSprite:
state: storage
- sprite: Objects/Weapons/Melee/incomplete_bat.rsi
- sprite: Objects/Weapons/Melee/incomplete_bat.rsi
+ sprite: _Scp/Objects/Weapons/Melee/incomplete_bat.rsi # Fire edit
+ sprite: _Scp/Objects/Weapons/Melee/incomplete_bat.rsi # Fire edit
- type: Construction
graph: WoodenBat
node: incompleteBat
diff --git a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
index 9735fbffb1d..06d1b213d17 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
@@ -228,7 +228,7 @@
- type: Pierceable
level: Wood
- type: Sprite
- sprite: Structures/Doors/MineralDoors/wood_door.rsi
+ sprite: _Scp/Structures/Doors/MineralDoors/wood_door.rsi # Fire edit
- type: Door
openSound:
path: /Audio/Effects/door_open.ogg
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
index b093a645b6e..34b04a453c6 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
@@ -938,9 +938,9 @@
description: Do not apply fire to this. Rumour says it burns easily.
components:
- type: Sprite
- sprite: Structures/Furniture/Tables/counterwood.rsi
+ sprite: _Scp/Structures/Furniture/Tables/counterwood.rsi # Fire edit
- type: Icon
- sprite: Structures/Furniture/Tables/counterwood.rsi
+ sprite: _Scp/SStructures/Furniture/Tables/counterwood.rsi # Fire edit
state: full
- type: Damageable
damageContainer: StructuralInorganic
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
index e98873cbc6b..609bce60d5e 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
@@ -21,7 +21,7 @@
mask:
- TableMask
- type: Sprite
- sprite: _Scp/Structures/Furniture/chairs.rsi # Fire edit
+ sprite: Structures/Furniture/chairs.rsi
noRot: true
- type: Strap
position: Stand
@@ -103,6 +103,7 @@
- type: entity
name: chair
id: Chair
+ categories: [ HideSpawnMenu ] # Fire edit
parent: ChairBase
components:
- type: Sprite
@@ -114,6 +115,7 @@
- type: entity
name: chair
id: ChairGreyscale
+ categories: [ HideSpawnMenu ] # Fire edit
parent: Chair
suffix: White
components:
@@ -163,6 +165,7 @@
- type: entity
name: white office chair
id: ChairOfficeLight
+ categories: [ HideSpawnMenu ] # Fire edit
parent: OfficeChairBase
components:
- type: Sprite
@@ -174,6 +177,7 @@
- type: entity
name: dark office chair
id: ChairOfficeDark
+ categories: [ HideSpawnMenu ] # Fire edit
parent: ChairOfficeLight
components:
- type: Sprite
@@ -212,9 +216,11 @@
- type: entity
name: wooden chair
id: ChairWood
+ categories: [ HideSpawnMenu ] # Fire edit
parent: UnanchoredChairBase
components:
- type: Sprite
+ sprite: Structures/Furniture/chairs.rsi
state: wooden
- type: Construction
graph: Seat
@@ -255,10 +261,12 @@
- type: entity
name: ritual chair
id: ChairRitual
+ categories: [ HideSpawnMenu ] # Fire edit
parent: ChairWood
description: Looks uncomfortable.
components:
- type: Sprite
+ sprite: Structures/Furniture/chairs.rsi
state: ritual
- type: Construction
graph: RitualSeat
@@ -279,10 +287,12 @@
- type: entity
name: cursed chair
id: ChairCursed
+ categories: [ HideSpawnMenu ] # Fire edit
parent: ChairWood
description: It's staring back.
components:
- type: Sprite
+ sprite: Structures/Furniture/chairs.rsi
state: cursed
- type: Strap
buckleSound:
@@ -457,10 +467,12 @@
- type: entity
name: wooden bench
id: WoodenBench
+ categories: [ HideSpawnMenu ] # Fire edit
parent: ChairBase
description: Did you get a splinter? Well, at least it’s eco friendly.
components:
- type: Sprite
+ sprite: Structures/Furniture/chairs.rsi
state: wooden-bench
- type: Construction
graph: Seat
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/shelfs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/shelfs.yml
index 1c922405477..0d0ff32b3ec 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/shelfs.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/shelfs.yml
@@ -8,7 +8,7 @@
components:
- type: Sprite
drawdepth: WallMountedItems
- sprite: Structures/Storage/Shelfs/wood.rsi
+ sprite: _Scp/Structures/Storage/Shelfs/wood.rsi # Fire edit
state: base
- type: Damageable
damageModifierSet: Wood
@@ -48,7 +48,7 @@
- type: LockedStorage
- type: LockVisuals
- type: Sprite
- sprite: Structures/Storage/Shelfs/wood.rsi
+ sprite: _Scp/Structures/Storage/Shelfs/wood.rsi # Fire edit
state: base
layers:
- state: rbase
@@ -197,7 +197,7 @@
description: A safe place to put your favorite bottle of whiskey.
components:
- type: Sprite
- sprite: Structures/Storage/Shelfs/wood.rsi
+ sprite: _Scp/Structures/Storage/Shelfs/wood.rsi # Fire edit
state: base
layers:
- state: rbase
@@ -330,7 +330,7 @@
description: Made out of the finest synthetic wood for all alcohol holding needs.
components:
- type: Sprite
- sprite: Structures/Storage/Shelfs/Departments/Service/bar.rsi
+ sprite: _Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi # Fire edit
state: base
layers:
- state: base
diff --git a/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml b/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml
index d4b9667ce7b..da2ddc8f176 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml
@@ -14,7 +14,7 @@
tags:
- Wooden
- type: Sprite
- sprite: Structures/Walls/wooden_fence.rsi
+ sprite: _Scp/Structures/Walls/wooden_fence.rsi # Fire edit
drawdepth: WallTops
- type: Physics
bodyType: Static
diff --git a/Resources/Prototypes/Entities/Structures/barricades.yml b/Resources/Prototypes/Entities/Structures/barricades.yml
index 5f6dc04b577..59db4a2868c 100644
--- a/Resources/Prototypes/Entities/Structures/barricades.yml
+++ b/Resources/Prototypes/Entities/Structures/barricades.yml
@@ -12,7 +12,7 @@
components:
- type: InteractionOutline
- type: Sprite
- sprite: Structures/barricades.rsi
+ sprite: _Scp/Structures/barricades.rsi # Fire edit
state: barricade_full
drawdepth: BlastDoors
noRot: true
diff --git a/Resources/Prototypes/Entities/Structures/stairs.yml b/Resources/Prototypes/Entities/Structures/stairs.yml
index a371f935672..68e7078c50d 100644
--- a/Resources/Prototypes/Entities/Structures/stairs.yml
+++ b/Resources/Prototypes/Entities/Structures/stairs.yml
@@ -96,7 +96,7 @@
suffix: Wood
components:
- type: Sprite
- sprite: Structures/stairs.rsi
+ sprite: _Scp/Structures/stairs.rsi # Fire edit
state: stairs_wood
drawdepth: FloorTiles
@@ -106,6 +106,6 @@
suffix: Wood, stage
components:
- type: Sprite
- sprite: Structures/stairs.rsi
+ sprite: _Scp/Structures/stairs.rsi # Fire edit
state: stairs_stage_wood
drawdepth: FloorTiles
diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml
index c86deeeca51..38a5c415ce6 100644
--- a/Resources/Prototypes/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Hydroponics/seeds.yml
@@ -475,7 +475,7 @@
name: seeds-towercap-name
noun: seeds-noun-spores
displayName: seeds-towercap-display-name
- plantRsi: Objects/Specific/Hydroponics/towercap.rsi
+ plantRsi: _Scp/Objects/Specific/Hydroponics/towercap.rsi # Fire edit
packetPrototype: TowercapSeeds
productPrototypes:
- Log
diff --git a/Resources/Prototypes/_Scp/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/_Scp/Entities/Objects/Misc/tiles.yml
index 9a44b233594..3a5d50f145c 100644
--- a/Resources/Prototypes/_Scp/Entities/Objects/Misc/tiles.yml
+++ b/Resources/Prototypes/_Scp/Entities/Objects/Misc/tiles.yml
@@ -793,3 +793,56 @@
outputs:
- ScpPlating
- ScpFloorAnechoic3
+
+# Wood
+
+- type: entity
+ id: ScpFloorTileItemWood
+ parent: FloorTileItemWood
+ components:
+ - type: Sprite
+ sprite: _Scp/Objects/Tiles/wood.rsi
+ - type: Item
+ sprite: _Scp/Objects/Tiles/wood.rsi
+ - type: FloorTile
+ outputs:
+ - ScpPlating # Fire Edit
+ - ScpFloorWood
+ - type: Stack
+ stackType: ScpFloorTileWood
+ - type: Construction
+ graph: ScpTileWood
+ node: scpwoodtile
+
+- type: entity
+ id: ScpFloorTileItemWoodLarge
+ parent: FloorTileItemWoodLarge
+ components:
+ - type: Sprite
+ sprite: _Scp/Objects/Tiles/wood.rsi
+ - type: Item
+ sprite: _Scp/Objects/Tiles/wood.rsi
+ - type: Stack
+ stackType: ScpFloorTileWoodLarge
+ - type: FloorTile
+ outputs:
+ - ScpPlating
+ - ScpFloorWoodLarge
+ - type: Construction
+ graph: ScpTileWoodLarge
+ node: scpwoodtilelarge
+
+- type: entity
+ id: ScpFloorTileItemWoodPattern
+ parent: FloorTileItemWoodPattern
+ components:
+ - type: Sprite
+ sprite: _Scp/Objects/Tiles/wood.rsi
+ - type: Item
+ sprite: _Scp/Objects/Tiles/wood.rsi
+ - type: Stack
+ stackType: ScpFloorTileWoodPattern
+ - type: FloorTile
+ outputs:
+ - ScpPlating
+ - ScpFloorWoodPattern
diff --git a/Resources/Prototypes/_Scp/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/_Scp/Entities/Structures/Furniture/chairs.yml
new file mode 100644
index 00000000000..f90a670cd1d
--- /dev/null
+++ b/Resources/Prototypes/_Scp/Entities/Structures/Furniture/chairs.yml
@@ -0,0 +1,110 @@
+- type: entity
+ id: ScpChair
+ parent: Chair
+ components:
+ - type: Sprite
+ sprite: _Scp/Structures/Furniture/chairs.rsi
+ state: chair
+ - type: Construction
+ graph: ScpSeat
+ node: chair
+
+- type: entity
+ id: ScpChairGreyscale
+ parent: ChairGreyscale
+ components:
+ - type: Sprite
+ sprite: _Scp/Structures/Furniture/chairs.rsi
+ state: chair-greyscale
+ - type: Construction
+ graph: ScpSeat
+ node: chair
+
+- type: entity
+ id: ScpChairOfficeLight
+ parent: ChairOfficeLight
+ components:
+ - type: Sprite
+ sprite: _Scp/Structures/Furniture/chairs.rsi
+ state: office-white
+ - type: Construction
+ graph: ScpSeat
+ node: chairOffice
+
+- type: entity
+ id: ScpChairOfficeDark
+ parent: ChairOfficeDark
+ components:
+ - type: Sprite
+ sprite: _Scp/Structures/Furniture/chairs.rsi
+ state: office-dark
+ - type: Construction
+ graph: ScpSeat
+ node: chairOfficeDark
+
+- type: entity
+ id: ScpChairOfficeGrey
+ parent: ChairOfficeGrey
+ components:
+ - type: Sprite
+ sprite: _Scp/Structures/Furniture/chairs.rsi
+ state: office-grey
+ - type: Construction
+ graph: ScpSeat
+ node: chairOfficeDark
+
+- type: entity
+ id: ScpChairWood
+ parent: ChairWood
+ components:
+ - type: Sprite
+ sprite: _Scp/Structures/Furniture/chairs.rsi
+ state: wooden
+ - type: Construction
+ graph: ScpSeat
+ node: chairWood
+
+- type: entity
+ id: ScpWoodenBench
+ parent: WoodenBench
+ components:
+ - type: Sprite
+ sprite: _Scp/Structures/Furniture/chairs.rsi
+ state: wooden-bench
+ - type: Construction
+ graph: ScpSeat
+ node: chairWoodBench
+
+- type: entity
+ id: ScpChairRitual
+ parent: ChairRitual
+ components:
+ - type: Sprite
+ sprite: _Scp/Structures/Furniture/chairs.rsi
+ state: ritual
+ - type: Construction
+ graph: ScpRitualSeat
+ node: chairRitual
+
+- type: entity
+ id: ScpChairCursed
+ parent: ChairCursed
+ components:
+ - type: Sprite
+ sprite: _Scp/Structures/Furniture/chairs.rsi
+ state: cursed
+ - type: Construction
+ graph: ScpRitualSeat
+ node: chairCursed
+
+- type: entity
+ id: ScpChairWoodWings
+ parent: ScpChairWood
+ name: wooden chair with wings
+ components:
+ - type: Sprite
+ sprite: _Scp/Structures/Furniture/chairs.rsi
+ state: wooden-wings
+ - type: Construction
+ graph: ScpSeat
+ node: chairWoodWings
diff --git a/Resources/Prototypes/_Scp/Recipes/Construction/Graphs/furniture/ritualseat.yml b/Resources/Prototypes/_Scp/Recipes/Construction/Graphs/furniture/ritualseat.yml
new file mode 100644
index 00000000000..4bed4e4dd2e
--- /dev/null
+++ b/Resources/Prototypes/_Scp/Recipes/Construction/Graphs/furniture/ritualseat.yml
@@ -0,0 +1,49 @@
+- type: constructionGraph
+ id: ScpRitualSeat
+ start: start
+ graph:
+ - node: start
+ actions:
+ - !type:DestroyEntity {}
+ edges:
+ - to: chairRitual
+ completed:
+ - !type:SnapToGrid
+ southRotation: true
+ steps:
+ - material: WoodPlank
+ amount: 2
+ doAfter: 1
+
+ - node: chairRitual
+ entity: ScpChairRitual
+ edges:
+ - to: start
+ completed:
+ - !type:SpawnPrototype
+ prototype: MaterialWoodPlank1
+ amount: 2
+ steps:
+ - tool: Screwing
+ doAfter: 1
+
+ - to: chairCursed
+ steps:
+ - tag: Head
+ icon:
+ sprite: Mobs/Species/Human/parts.rsi
+ state: "head_m"
+ name: construction-graph-tag-human-head
+ doAfter: 1
+
+ - node: chairCursed
+ entity: ScpChairCursed
+ edges:
+ - to: chairRitual
+ completed:
+ - !type:SpawnPrototype
+ prototype: HeadSkeleton
+ amount: 1
+ steps:
+ - tool: Prying
+ doAfter: 1
diff --git a/Resources/Prototypes/_Scp/Recipes/Construction/Graphs/furniture/seats.yml b/Resources/Prototypes/_Scp/Recipes/Construction/Graphs/furniture/seats.yml
new file mode 100644
index 00000000000..5df1b64d2fe
--- /dev/null
+++ b/Resources/Prototypes/_Scp/Recipes/Construction/Graphs/furniture/seats.yml
@@ -0,0 +1,109 @@
+- type: constructionGraph
+ id: ScpSeat
+ start: start
+ graph:
+ - node: start
+ actions:
+ - !type:DestroyEntity {}
+ edges:
+ - to: chair
+ steps:
+ - material: Steel
+ amount: 1
+ doAfter: 1
+ - to: chairOffice
+ steps:
+ - material: Steel
+ amount: 2
+ doAfter: 1
+ - to: chairOfficeDark
+ steps:
+ - material: Steel
+ amount: 2
+ doAfter: 1
+ - to: chairWood
+ steps:
+ - material: WoodPlank
+ amount: 3
+ doAfter: 1
+ - to: chairWoodBench
+ steps:
+ - material: WoodPlank
+ amount: 4
+ doAfter: 2
+ - to: chairWoodWings
+ steps:
+ - material: WoodPlank
+ amount: 3
+ doAfter: 1
+
+ - node: chair
+ entity: ScpChair
+ edges:
+ - to: start
+ completed:
+ - !type:SpawnPrototype
+ prototype: SheetSteel1
+ steps:
+ - tool: Screwing
+ doAfter: 1
+
+ - node: chairOffice
+ entity: ScpChairOfficeLight
+ edges:
+ - to: start
+ completed:
+ - !type:SpawnPrototype
+ prototype: SheetSteel1
+ amount: 2
+ steps:
+ - tool: Screwing
+ doAfter: 1
+
+ - node: chairOfficeDark
+ entity: ScpChairOfficeDark
+ edges:
+ - to: start
+ completed:
+ - !type:SpawnPrototype
+ prototype: SheetSteel1
+ amount: 2
+ steps:
+ - tool: Screwing
+ doAfter: 1
+
+ - node: chairWood
+ entity: ScpChairWood
+ edges:
+ - to: start
+ completed:
+ - !type:SpawnPrototype
+ prototype: MaterialWoodPlank1
+ amount: 3
+ steps:
+ - tool: Screwing
+ doAfter: 1
+
+ - node: chairWoodBench
+ entity: ScpWoodenBench
+ edges:
+ - to: start
+ completed:
+ - !type:SpawnPrototype
+ prototype: MaterialWoodPlank1
+ amount: 4
+ steps:
+ - tool: Screwing
+ doAfter: 2
+
+ - node: chairWoodWings
+ entity: ChairWoodWings
+ edges:
+ - to: start
+ completed:
+ - !type:SpawnPrototype
+ prototype: MaterialWoodPlank1
+ amount: 3
+ steps:
+ - tool: Screwing
+ doAfter: 1
diff --git a/Resources/Prototypes/_Scp/Recipes/Construction/furniture.yml b/Resources/Prototypes/_Scp/Recipes/Construction/furniture.yml
index e0072c20b64..4efbc10adde 100644
--- a/Resources/Prototypes/_Scp/Recipes/Construction/furniture.yml
+++ b/Resources/Prototypes/_Scp/Recipes/Construction/furniture.yml
@@ -59,3 +59,75 @@
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
+
+- type: construction
+ id: ScpChair
+ graph: ScpSeat
+ startNode: start
+ targetNode: chair
+ category: construction-category-furniture
+ objectType: Structure
+ placementMode: SnapgridCenter
+ canBuildInImpassable: false
+ conditions:
+ - !type:TileNotBlocked
+
+- type: construction
+ id: ScpChairOfficeLight
+ graph: ScpSeat
+ startNode: start
+ targetNode: chairOffice
+ category: construction-category-furniture
+ objectType: Structure
+ placementMode: SnapgridCenter
+ canBuildInImpassable: false
+ conditions:
+ - !type:TileNotBlocked
+
+- type: construction
+ id: ScpChairOfficeDark
+ graph: ScpSeat
+ startNode: start
+ targetNode: chairOfficeDark
+ category: construction-category-furniture
+ objectType: Structure
+ placementMode: SnapgridCenter
+ canBuildInImpassable: false
+ conditions:
+ - !type:TileNotBlocked
+
+- type: construction
+ id: ScpChairWood
+ graph: ScpSeat
+ startNode: start
+ targetNode: chairWood
+ category: construction-category-furniture
+ objectType: Structure
+ placementMode: SnapgridCenter
+ canBuildInImpassable: false
+ conditions:
+ - !type:TileNotBlocked
+
+- type: construction
+ id: ScpWoodenBench
+ graph: ScpSeat
+ startNode: start
+ targetNode: chairWoodBench
+ category: construction-category-furniture
+ objectType: Structure
+ placementMode: SnapgridCenter
+ canBuildInImpassable: false
+ conditions:
+ - !type:TileNotBlocked
+
+- type: construction
+ id: ScpChairRitual
+ graph: ScpRitualSeat
+ startNode: start
+ targetNode: chairRitual
+ category: construction-category-furniture
+ objectType: Structure
+ placementMode: SnapgridCenter
+ canBuildInImpassable: false
+ conditions:
+ - !type:TileNotBlocked
diff --git a/Resources/Prototypes/_Scp/Recipes/Crafting/Graphs/tiles.yml b/Resources/Prototypes/_Scp/Recipes/Crafting/Graphs/tiles.yml
index b7f5ed2194d..833d5872a0a 100644
--- a/Resources/Prototypes/_Scp/Recipes/Crafting/Graphs/tiles.yml
+++ b/Resources/Prototypes/_Scp/Recipes/Crafting/Graphs/tiles.yml
@@ -60,4 +60,36 @@
- material: Concrete
amount: 1
- node: scpconcretetile
- entity: ScpFloorTileItemConcreteMono
\ No newline at end of file
+ entity: ScpFloorTileItemConcreteMono
+
+- type: constructionGraph
+ id: ScpTileWood
+ start: start
+ graph:
+ - node: start
+ edges:
+ - to: scpwoodtile
+ completed:
+ - !type:SetStackCount
+ amount: 4
+ steps:
+ - material: WoodPlank
+ amount: 1
+ - node: scpwoodtile
+ entity: ScpFloorTileItemWood
+
+- type: constructionGraph
+ id: ScpTileWoodLarge
+ start: start
+ graph:
+ - node: start
+ edges:
+ - to: scpwoodtilelarge
+ completed:
+ - !type:SetStackCount
+ amount: 4
+ steps:
+ - material: WoodPlank
+ amount: 2
+ - node: scpwoodtilelarge
+ entity: ScpFloorTileItemWoodLarge
diff --git a/Resources/Prototypes/_Scp/Recipes/Crafting/tiles.yml b/Resources/Prototypes/_Scp/Recipes/Crafting/tiles.yml
index 01cb2dc3526..27c56258acc 100644
--- a/Resources/Prototypes/_Scp/Recipes/Crafting/tiles.yml
+++ b/Resources/Prototypes/_Scp/Recipes/Crafting/tiles.yml
@@ -28,4 +28,20 @@
startNode: start
targetNode: scpconcretetile
category: construction-category-tiles
- objectType: Item
\ No newline at end of file
+ objectType: Item
+
+- type: construction
+ id: ScpTileWoodCraft
+ graph: ScpTileWood
+ startNode: start
+ targetNode: scpwoodtile
+ category: construction-category-tiles
+ objectType: Item
+
+- type: construction
+ id: ScpTileWoodLargeCraft
+ graph: ScpTileWoodLarge
+ startNode: start
+ targetNode: scpwoodtilelarge
+ category: construction-category-tiles
+ objectType: Item
diff --git a/Resources/Prototypes/_Scp/Recipes/Lathes/Packs/tiles.yml b/Resources/Prototypes/_Scp/Recipes/Lathes/Packs/tiles.yml
index a60322f7694..0765eee0912 100644
--- a/Resources/Prototypes/_Scp/Recipes/Lathes/Packs/tiles.yml
+++ b/Resources/Prototypes/_Scp/Recipes/Lathes/Packs/tiles.yml
@@ -8,9 +8,6 @@
- FloorTileItemTechmaint
- FloorTileItemSteelMaint
- FloorTileItemTechmaintDark
- - FloorTileItemWood
- - FloorTileItemWoodLarge
- - FloorTileItemWoodPattern
- FloorTileItemConcrete
- FloorTileItemConcreteMono
- FloorTileItemConcreteSmooth
@@ -79,4 +76,7 @@
- ScpFloorTileItemSteelGrilleOffset3
- ScpFloorTileItemSteelGrilleOffset4
- ScpFloorTileItemConcrete
- - ScpFloorTileItemConcreteMono
\ No newline at end of file
+ - ScpFloorTileItemConcreteMono
+ - ScpFloorTileItemWood
+ - ScpFloorTileItemWoodLarge
+ - ScpFloorTileItemWoodPattern
diff --git a/Resources/Prototypes/_Scp/Recipes/Lathes/tiles.yml b/Resources/Prototypes/_Scp/Recipes/Lathes/tiles.yml
index 2aefa8f6f92..82491ca08ac 100644
--- a/Resources/Prototypes/_Scp/Recipes/Lathes/tiles.yml
+++ b/Resources/Prototypes/_Scp/Recipes/Lathes/tiles.yml
@@ -289,6 +289,22 @@
id: ScpFloorTileItemSteelGrilleOffset4
result: ScpFloorTileItemSteelGrilleOffset4
+# Wood
+- type: latheRecipe
+ parent: BaseWoodTileRecipe
+ id: ScpFloorTileItemWood
+ result: ScpFloorTileItemWood
+
+- type: latheRecipe
+ parent: BaseWoodTileRecipe
+ id: ScpFloorTileItemWoodLarge
+ result: ScpFloorTileItemWoodLarge
+
+- type: latheRecipe
+ parent: BaseWoodTileRecipe
+ id: ScpFloorTileItemWoodPattern
+ result: ScpFloorTileItemWoodPattern
+
# Concrete
- type: latheRecipe
parent: BaseConcreteTileRecipe
diff --git a/Resources/Prototypes/_Scp/Stacks/Tiles/wood.yml b/Resources/Prototypes/_Scp/Stacks/Tiles/wood.yml
new file mode 100644
index 00000000000..807027b0e82
--- /dev/null
+++ b/Resources/Prototypes/_Scp/Stacks/Tiles/wood.yml
@@ -0,0 +1,17 @@
+- type: stack
+ parent: BaseTileStack
+ id: ScpFloorTileWood
+ name: stack-wood-floor
+ spawn: ScpFloorTileItemWood
+
+- type: stack
+ parent: BaseTileStack
+ id: ScpFloorTileWoodPattern
+ name: stack-wood-patter-floor
+ spawn: ScpFloorTileItemWoodPattern
+
+- type: stack
+ parent: BaseTileStack
+ id: ScpFloorTileWoodLarge
+ name: stack-large-wood-floor
+ spawn: ScpFloorTileItemWoodLarge
diff --git a/Resources/Prototypes/_Scp/Tiles/anechoic.yml b/Resources/Prototypes/_Scp/Tiles/anechoic.yml
index 6bd03eb268e..75b945c1075 100644
--- a/Resources/Prototypes/_Scp/Tiles/anechoic.yml
+++ b/Resources/Prototypes/_Scp/Tiles/anechoic.yml
@@ -1,18 +1,15 @@
- type: tile
id: ScpFloorAnechoicBase
+ parent: ScpFloorBase
abstract: true
name: scp-tiles-anechoic
variants: 1
placementVariants:
- 1.0
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpCatwalk
params:
volume: -6
- heatCapacity: 10000
- type: tile
parent: ScpFloorAnechoicBase
diff --git a/Resources/Prototypes/_Scp/Tiles/floors.yml b/Resources/Prototypes/_Scp/Tiles/floors.yml
index 35b953a0a16..66fc1abd6a0 100644
--- a/Resources/Prototypes/_Scp/Tiles/floors.yml
+++ b/Resources/Prototypes/_Scp/Tiles/floors.yml
@@ -1,5 +1,14 @@
- type: tile
+ id: ScpFloorBase
+ abstract: true
+ baseTurf: ScpPlating
+ isSubfloor: false
+ deconstructTools: [ Prying ]
+ heatCapacity: 10000
+
+- type: tile
id: ScpFloorBlue
+ parent: ScpFloorBase
name: scp-tiles-blue-floor
sprite: /Textures/_Scp/Tiles/blue.png
variants: 14
@@ -18,18 +27,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpSteel
params:
volume: -7
itemDrop: ScpFloorTileItemBlue
- heatCapacity: 10000
- type: tile
id: ScpFloorGreen
+ parent: ScpFloorBase
name: scp-tiles-green-floor
sprite: /Textures/_Scp/Tiles/green.png
variants: 14
@@ -48,18 +54,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpSteel
params:
volume: -7
itemDrop: ScpFloorTileItemGreen
- heatCapacity: 10000
- type: tile
id: ScpFloorDepartmentCargo
+ parent: ScpFloorBase
name: scp-tiles-steel-floor
sprite: /Textures/_Scp/Tiles/department_cargo.png
variants: 14
@@ -78,18 +81,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpSteel
params:
volume: -7
itemDrop: ScpFloorTileItemDepartmentCargo
- heatCapacity: 10000
- type: tile
id: ScpFloorDepartmentCom
+ parent: ScpFloorBase
name: scp-tiles-steel-floor
sprite: /Textures/_Scp/Tiles/department_com.png
variants: 14
@@ -108,18 +108,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpSteel
params:
volume: -7
itemDrop: ScpFloorTileItemDepartmentCom
- heatCapacity: 10000
- type: tile
id: ScpFloorDepartmentEng
+ parent: ScpFloorBase
name: scp-tiles-steel-floor
sprite: /Textures/_Scp/Tiles/department_eng.png
variants: 14
@@ -138,18 +135,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpSteel
params:
volume: -7
itemDrop: ScpFloorTileItemDepartmentEng
- heatCapacity: 10000
- type: tile
id: ScpFloorDepartmentAtmos
+ parent: ScpFloorBase
name: scp-tiles-steel-floor
sprite: /Textures/_Scp/Tiles/department_atmos.png
variants: 14
@@ -168,18 +162,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpSteel
params:
volume: -7
itemDrop: ScpFloorTileItemDepartmentAtmos
- heatCapacity: 10000
- type: tile
id: ScpFloorDepartmentMed
+ parent: ScpFloorBase
name: scp-tiles-steel-floor
sprite: /Textures/_Scp/Tiles/department_med.png
variants: 14
@@ -198,18 +189,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpSteel
params:
volume: -7
itemDrop: ScpFloorTileItemDepartmentMed
- heatCapacity: 10000
- type: tile
id: ScpFloorDepartmentRnd
+ parent: ScpFloorBase
name: scp-tiles-steel-floor
sprite: /Textures/_Scp/Tiles/department_rnd.png
variants: 14
@@ -228,18 +216,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpSteel
params:
volume: -7
itemDrop: ScpFloorTileItemDepartmentRnd
- heatCapacity: 10000
- type: tile
id: ScpFloorDepartmentSec
+ parent: ScpFloorBase
name: scp-tiles-steel-floor
sprite: /Textures/_Scp/Tiles/department_sec.png
variants: 14
@@ -258,18 +243,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpSteel
params:
volume: -7
itemDrop: ScpFloorTileItemDepartmentSec
- heatCapacity: 10000
- type: tile
id: ScpFloorDepartmentSer
+ parent: ScpFloorBase
name: scp-tiles-steel-floor
sprite: /Textures/_Scp/Tiles/department_ser.png
variants: 14
@@ -288,18 +270,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpSteel
params:
volume: -7
itemDrop: ScpFloorTileItemDepartmentSer
- heatCapacity: 10000
- type: tile
id: ScpFloorCheckerDark
+ parent: ScpFloorBase
name: scp-tiles-dark-floor
sprite: /Textures/_Scp/Tiles/checker_dark.png
variants: 14
@@ -318,18 +297,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpTile
params:
volume: -7
itemDrop: ScpFloorTileItemCheckerDark
- heatCapacity: 10000
- type: tile
id: ScpFloorCheckerSteel
+ parent: ScpFloorBase
name: scp-tiles-steel-floor
sprite: /Textures/_Scp/Tiles/checker_steel.png
variants: 14
@@ -348,18 +324,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpSteel
params:
volume: -7
itemDrop: ScpFloorTileItemCheckerSteel
- heatCapacity: 10000
- type: tile
id: ScpFloorCheckerWhite
+ parent: ScpFloorBase
name: scp-tiles-white-floor
sprite: /Textures/_Scp/Tiles/checker_white.png
variants: 14
@@ -378,18 +351,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepTile
params:
volume: -7
itemDrop: ScpFloorTileItemCheckerWhite
- heatCapacity: 10000
- type: tile
id: ScpFloorDark
+ parent: ScpFloorBase
name: scp-tiles-dark-floor
sprite: /Textures/_Scp/Tiles/dark.png
variants: 14
@@ -408,18 +378,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpTile
params:
volume: -7
itemDrop: ScpFloorTileItemDark
- heatCapacity: 10000
- type: tile
id: ScpFloorDarkDiagonal
+ parent: ScpFloorBase
name: scp-tiles-dark-diagonal-floor
sprite: /Textures/_Scp/Tiles/dark_diagonal.png
variants: 14
@@ -438,18 +405,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpTile
params:
volume: -7
itemDrop: ScpFloorTileItemDarkDiagonal
- heatCapacity: 10000
- type: tile
id: ScpFloorDarkHalfMono
+ parent: ScpFloorBase
name: scp-tiles-dark-half-mono-floor
sprite: /Textures/_Scp/Tiles/dark_half_mono.png
variants: 12
@@ -466,18 +430,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpTile
params:
volume: -7
itemDrop: ScpFloorTileItemDarkHalfMono
- heatCapacity: 10000
- type: tile
id: ScpFloorDarkHalfMonoVertical
+ parent: ScpFloorBase
name: scp-tiles-dark-half-mono-vertical-floor
sprite: /Textures/_Scp/Tiles/dark_half_mono_vertical.png
variants: 12
@@ -494,18 +455,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpTile
params:
volume: -7
itemDrop: ScpFloorTileItemDarkHalfMonoVertical
- heatCapacity: 10000
- type: tile
id: ScpFloorDarkHerringbone
+ parent: ScpFloorBase
name: scp-tiles-dark-herringbone-floor
sprite: /Textures/_Scp/Tiles/dark_herringbone.png
variants: 14
@@ -524,18 +482,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpTile
params:
volume: -7
itemDrop: ScpFloorTileItemDarkHerringbone
- heatCapacity: 10000
- type: tile
id: ScpFloorDarkMini
+ parent: ScpFloorBase
name: scp-tiles-dark-mini-floor
sprite: /Textures/_Scp/Tiles/dark_mini.png
variants: 14
@@ -554,18 +509,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpTile
params:
volume: -7
itemDrop: ScpFloorTileItemDarkMini
- heatCapacity: 10000
- type: tile
id: ScpFloorDarkMono
+ parent: ScpFloorBase
name: scp-tiles-dark-mono-floor
sprite: /Textures/_Scp/Tiles/dark_mono.png
variants: 10
@@ -580,18 +532,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpTile
params:
volume: -7
itemDrop: ScpFloorTileItemDarkMono
- heatCapacity: 10000
- type: tile
id: ScpFloorDarkoffset
+ parent: ScpFloorBase
name: scp-tiles-dark-offset-floor
sprite: /Textures/_Scp/Tiles/dark_offset.png
variants: 4
@@ -600,18 +549,15 @@
- 1.0
- 1.0
- 1.0
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpTile
params:
volume: -7
itemDrop: ScpFloorTileItemDarkoffset
- heatCapacity: 10000
- type: tile
id: ScpFloorDarkPavement
+ parent: ScpFloorBase
name: scp-tiles-dark-pavement-floor
sprite: /Textures/_Scp/Tiles/dark_pavement.png
variants: 14
@@ -630,18 +576,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpTile
params:
volume: -7
itemDrop: ScpFloorTileItemDarkPavement
- heatCapacity: 10000
- type: tile
id: ScpFloorDarkPavementVertical
+ parent: ScpFloorBase
name: scp-tiles-dark-pavement-vertical-floor
sprite: /Textures/_Scp/Tiles/dark_pavement_vertical.png
variants: 14
@@ -660,18 +603,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpTile
params:
volume: -7
itemDrop: ScpFloorTileItemDarkPavementVertical
- heatCapacity: 10000
- type: tile
id: ScpFloorSteel
+ parent: ScpFloorBase
name: scp-tiles-steel-floor
sprite: /Textures/_Scp/Tiles/steel.png
variants: 14
@@ -690,18 +630,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpSteel
params:
volume: -7
itemDrop: ScpFloorTileItemSteel
- heatCapacity: 10000
- type: tile
id: ScpFloorSteelDiagonal
+ parent: ScpFloorBase
name: scp-tiles-steel-diagonal-floor
sprite: /Textures/_Scp/Tiles/steel_diagonal.png
variants: 14
@@ -720,18 +657,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpSteel
params:
volume: -7
itemDrop: ScpFloorTileItemSteelDiagonal
- heatCapacity: 10000
- type: tile
id: ScpFloorSteelHalfMono
+ parent: ScpFloorBase
name: scp-tiles-steel-half-mono-floor
sprite: /Textures/_Scp/Tiles/steel_half_mono.png
variants: 12
@@ -748,18 +682,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpSteel
params:
volume: -7
itemDrop: ScpFloorTileItemSteelHalfMono
- heatCapacity: 10000
- type: tile
id: ScpFloorSteelHalfMonoVertical
+ parent: ScpFloorBase
name: scp-tiles-steel-half-mono-vertical-floor
sprite: /Textures/_Scp/Tiles/steel_half_mono_vertical.png
variants: 12
@@ -776,18 +707,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpSteel
params:
volume: -7
itemDrop: ScpFloorTileItemSteelHalfMonoVertical
- heatCapacity: 10000
- type: tile
id: ScpFloorSteelHerringbone
+ parent: ScpFloorBase
name: scp-tiles-steel-herringbone-floor
sprite: /Textures/_Scp/Tiles/steel_herringbone.png
variants: 14
@@ -806,18 +734,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpSteel
params:
volume: -7
itemDrop: ScpFloorTileItemSteelHerringbone
- heatCapacity: 10000
- type: tile
id: ScpFloorSteelMini
+ parent: ScpFloorBase
name: scp-tiles-steel-mini-floor
sprite: /Textures/_Scp/Tiles/steel_mini.png
variants: 14
@@ -836,18 +761,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpSteel
params:
volume: -7
itemDrop: ScpFloorTileItemSteelMini
- heatCapacity: 10000
- type: tile
id: ScpFloorSteelMono
+ parent: ScpFloorBase
name: scp-tiles-steel-mono-floor
sprite: /Textures/_Scp/Tiles/steel_mono.png
variants: 10
@@ -862,18 +784,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpSteel
params:
volume: -7
itemDrop: ScpFloorTileItemSteelMono
- heatCapacity: 10000
- type: tile
id: ScpFloorSteeloffset
+ parent: ScpFloorBase
name: scp-tiles-steel-offset-floor
sprite: /Textures/_Scp/Tiles/steel_offset.png
variants: 4
@@ -882,18 +801,15 @@
- 1.0
- 1.0
- 1.0
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpSteel
params:
volume: -7
itemDrop: ScpFloorTileItemSteeloffset
- heatCapacity: 10000
- type: tile
id: ScpFloorSteelPavement
+ parent: ScpFloorBase
name: scp-tiles-steel-pavement-floor
sprite: /Textures/_Scp/Tiles/steel_pavement.png
variants: 14
@@ -912,18 +828,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpSteel
params:
volume: -7
itemDrop: ScpFloorTileItemSteelPavement
- heatCapacity: 10000
- type: tile
id: ScpFloorSteelPavementVertical
+ parent: ScpFloorBase
name: scp-tiles-steel-pavement-vertical-floor
sprite: /Textures/_Scp/Tiles/steel_pavement_vertical.png
variants: 14
@@ -942,18 +855,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpSteel
params:
volume: -7
itemDrop: ScpFloorTileItemSteelPavementVertical
- heatCapacity: 10000
- type: tile
id: ScpFloorWhite
+ parent: ScpFloorBase
name: scp-tiles-white-floor
sprite: /Textures/_Scp/Tiles/white.png
variants: 14
@@ -972,18 +882,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepTile
params:
volume: -7
itemDrop: ScpFloorTileItemWhite
- heatCapacity: 10000
- type: tile
id: ScpFloorWhiteDiagonal
+ parent: ScpFloorBase
name: scp-tiles-white-diagonal-floor
sprite: /Textures/_Scp/Tiles/white_diagonal.png
variants: 14
@@ -1002,18 +909,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepTile
params:
volume: -7
itemDrop: ScpFloorTileItemWhiteDiagonal
- heatCapacity: 10000
- type: tile
id: ScpFloorWhiteHalfMono
+ parent: ScpFloorBase
name: scp-tiles-white-half-mono-floor
sprite: /Textures/_Scp/Tiles/white_half_mono.png
variants: 12
@@ -1030,18 +934,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepTile
params:
volume: -7
itemDrop: ScpFloorTileItemWhiteHalfMono
- heatCapacity: 10000
- type: tile
id: ScpFloorWhiteHalfMonoVertical
+ parent: ScpFloorBase
name: scp-tiles-white-half-mono-vertical-floor
sprite: /Textures/_Scp/Tiles/white_half_mono_vertical.png
variants: 12
@@ -1058,18 +959,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepTile
params:
volume: -7
itemDrop: ScpFloorTileItemWhiteHalfMonoVertical
- heatCapacity: 10000
- type: tile
id: ScpFloorWhiteHerringbone
+ parent: ScpFloorBase
name: scp-tiles-white-herringbone-floor
sprite: /Textures/_Scp/Tiles/white_herringbone.png
variants: 14
@@ -1088,18 +986,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepTile
params:
volume: -7
itemDrop: ScpFloorTileItemWhiteHerringbone
- heatCapacity: 10000
- type: tile
id: ScpFloorWhiteMini
+ parent: ScpFloorBase
name: scp-tiles-white-mini-floor
sprite: /Textures/_Scp/Tiles/white_mini.png
variants: 14
@@ -1118,18 +1013,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepTile
params:
volume: -7
itemDrop: ScpFloorTileItemWhiteMini
- heatCapacity: 10000
- type: tile
id: ScpFloorWhiteMono
+ parent: ScpFloorBase
name: scp-tiles-white-mono-floor
sprite: /Textures/_Scp/Tiles/white_mono.png
variants: 10
@@ -1144,18 +1036,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepTile
params:
volume: -7
itemDrop: ScpFloorTileItemWhiteMono
- heatCapacity: 10000
- type: tile
id: ScpFloorWhiteoffset
+ parent: ScpFloorBase
name: scp-tiles-white-offset-floor
sprite: /Textures/_Scp/Tiles/white_offset.png
variants: 4
@@ -1164,18 +1053,15 @@
- 1.0
- 1.0
- 1.0
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepTile
params:
volume: -7
itemDrop: ScpFloorTileItemWhiteoffset
- heatCapacity: 10000
- type: tile
id: ScpFloorWhitePavement
+ parent: ScpFloorBase
name: scp-tiles-white-pavement-floor
sprite: /Textures/_Scp/Tiles/white_pavement.png
variants: 14
@@ -1194,18 +1080,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepTile
params:
volume: -7
itemDrop: ScpFloorTileItemWhitePavement
- heatCapacity: 10000
- type: tile
id: ScpFloorWhitePavementVertical
+ parent: ScpFloorBase
name: scp-tiles-white-pavement-vertical-floor
sprite: /Textures/_Scp/Tiles/white_pavement_vertical.png
variants: 14
@@ -1224,18 +1107,15 @@
- 0.05
- 0.05
- 0.05
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepTile
params:
volume: -7
itemDrop: ScpFloorTileItemWhitePavementVertical
- heatCapacity: 10000
- type: tile
id: ScpFloorFlesh106
+ parent: ScpFloorBase
name: scp-tiles-flesh-106
sprite: /Textures/_Scp/Tiles/flesh106.png
variants: 4
@@ -1244,188 +1124,151 @@
- 1.0
- 1.0
- 1.0
- isSubfloor: false
footstepSounds:
collection: FootstepScpFlesh106
params:
volume: -7
- heatCapacity: 10000
indestructible: true
- type: tile
id: ScpFloorSteelGrille1
+ parent: ScpFloorBase
name: scp-tiles-steel-grille-1
sprite: /Textures/_Scp/Tiles/Steel/steel_1.png
variants: 1
placementVariants:
- 1.0
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds: &SteelGrilleFootStepSounds
collection: FootstepScpCatwalk
params:
volume: -6
itemDrop: ScpFloorTileItemSteelGrille1
- heatCapacity: 10000
- type: tile
id: ScpFloorSteelGrille2
+ parent: ScpFloorBase
name: scp-tiles-steel-grille-2
sprite: /Textures/_Scp/Tiles/Steel/steel_2.png
variants: 1
placementVariants:
- 1.0
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds: *SteelGrilleFootStepSounds
itemDrop: ScpFloorTileItemSteelGrille2
- heatCapacity: 10000
- type: tile
id: ScpFloorSteelGrille3
+ parent: ScpFloorBase
name: scp-tiles-steel-grille-3
sprite: /Textures/_Scp/Tiles/Steel/steel_3.png
variants: 1
placementVariants:
- 1.0
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds: *SteelGrilleFootStepSounds
itemDrop: ScpFloorTileItemSteelGrille3
- heatCapacity: 10000
- type: tile
id: ScpFloorSteelGrille4
+ parent: ScpFloorBase
name: scp-tiles-steel-grille-4
sprite: /Textures/_Scp/Tiles/Steel/steel_4.png
variants: 1
placementVariants:
- 1.0
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds: *SteelGrilleFootStepSounds
itemDrop: ScpFloorTileItemSteelGrille4
- heatCapacity: 10000
- type: tile
id: ScpFloorSteelGrilleMono1
+ parent: ScpFloorBase
name: scp-tiles-steel-grille-mono-1
sprite: /Textures/_Scp/Tiles/Steel/steel_mono_1.png
variants: 1
placementVariants:
- 1.0
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds: *SteelGrilleFootStepSounds
itemDrop: ScpFloorTileItemSteelGrilleMono1
- heatCapacity: 10000
- type: tile
id: ScpFloorSteelGrilleMono2
+ parent: ScpFloorBase
name: scp-tiles-steel-grille-mono-2
sprite: /Textures/_Scp/Tiles/Steel/steel_mono_2.png
variants: 1
placementVariants:
- 1.0
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds: *SteelGrilleFootStepSounds
itemDrop: ScpFloorTileItemSteelGrilleMono2
- heatCapacity: 10000
- type: tile
id: ScpFloorSteelGrilleMono3
+ parent: ScpFloorBase
name: scp-tiles-steel-grille-mono-3
sprite: /Textures/_Scp/Tiles/Steel/steel_mono_3.png
variants: 1
placementVariants:
- 1.0
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds: *SteelGrilleFootStepSounds
itemDrop: ScpFloorTileItemSteelGrilleMono3
- heatCapacity: 10000
- type: tile
id: ScpFloorSteelGrilleMono4
+ parent: ScpFloorBase
name: scp-tiles-steel-grille-mono-4
sprite: /Textures/_Scp/Tiles/Steel/steel_mono_4.png
variants: 1
placementVariants:
- 1.0
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds: *SteelGrilleFootStepSounds
itemDrop: ScpFloorTileItemSteelGrilleMono4
- heatCapacity: 10000
- type: tile
id: ScpFloorSteelGrilleOffset1
+ parent: ScpFloorBase
name: scp-tiles-steel-grille-offset-1
sprite: /Textures/_Scp/Tiles/Steel/steel_offset_1.png
variants: 1
placementVariants:
- 1.0
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds: *SteelGrilleFootStepSounds
itemDrop: ScpFloorTileItemSteelGrilleOffset1
- heatCapacity: 10000
- type: tile
id: ScpFloorSteelGrilleOffset2
+ parent: ScpFloorBase
name: scp-tiles-steel-grille-offset-2
sprite: /Textures/_Scp/Tiles/Steel/steel_offset_2.png
variants: 1
placementVariants:
- 1.0
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds: *SteelGrilleFootStepSounds
itemDrop: ScpFloorTileItemSteelGrilleOffset2
- heatCapacity: 10000
- type: tile
id: ScpFloorSteelGrilleOffset3
+ parent: ScpFloorBase
name: scp-tiles-steel-grille-offset-3
sprite: /Textures/_Scp/Tiles/Steel/steel_offset_3.png
variants: 1
placementVariants:
- 1.0
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds: *SteelGrilleFootStepSounds
itemDrop: ScpFloorTileItemSteelGrilleOffset3
- heatCapacity: 10000
- type: tile
id: ScpFloorSteelGrilleOffset4
+ parent: ScpFloorBase
name: scp-tiles-steel-grille-offset-4
sprite: /Textures/_Scp/Tiles/Steel/steel_offset_4.png
variants: 1
placementVariants:
- 1.0
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds: *SteelGrilleFootStepSounds
itemDrop: ScpFloorTileItemSteelGrilleOffset4
- heatCapacity: 10000
# Concrete
- type: tile
id: ScpFloorConcrete
+ parent: ScpFloorBase
name: scp-tiles-concrete-tile
sprite: /Textures/_Scp/Tiles/Concrete/concrete.png
variants: 4
@@ -1434,18 +1277,15 @@
- 1.0
- 1.0
- 1.0
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpStone
params:
volume: -10
itemDrop: ScpFloorTileItemConcrete
- heatCapacity: 10000
- type: tile
id: ScpFloorConcreteMono
+ parent: ScpFloorBase
name: scp-tiles-concrete-mono
sprite: /Textures/_Scp/Tiles/Concrete/concrete_mono.png
variants: 4
@@ -1454,12 +1294,8 @@
- 1.0
- 1.0
- 1.0
- baseTurf: ScpPlating
- isSubfloor: false
- deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepScpStone
params:
volume: -10
itemDrop: ScpFloorTileItemConcreteMono
- heatCapacity: 10000
diff --git a/Resources/Prototypes/_Scp/Tiles/wood.yml b/Resources/Prototypes/_Scp/Tiles/wood.yml
new file mode 100644
index 00000000000..e348c0c3c4d
--- /dev/null
+++ b/Resources/Prototypes/_Scp/Tiles/wood.yml
@@ -0,0 +1,76 @@
+- type: tile
+ id: ScpFloorBaseWood
+ parent: ScpFloorBase
+ abstract: true
+ variants: 4
+ placementVariants:
+ - 1.0
+ - 1.0
+ - 1.0
+ - 1.0
+
+- type: tile
+ id: ScpFloorWood
+ parent: ScpFloorBaseWood
+ name: scp-tiles-wood
+ sprite: /Textures/_Scp/Tiles/Wood/wood.png
+ footstepSounds:
+ collection: FootstepWood
+ barestepSounds:
+ collection: BarestepWood
+ itemDrop: ScpFloorTileItemWood
+
+- type: tile
+ id: ScpFloorWoodLarge
+ parent: ScpFloorBaseWood
+ name: scp-tiles-wood-large
+ sprite: /Textures/_Scp/Tiles/Wood/wood_large.png
+ footstepSounds:
+ collection: FootstepWood
+ barestepSounds:
+ collection: BarestepWood
+ itemDrop: ScpFloorTileItemWoodLarge
+
+- type: tile
+ id: ScpFloorWoodPattern
+ parent: ScpFloorBaseWood
+ name: scp-tiles-wood-pattern
+ sprite: /Textures/_Scp/Tiles/Wood/wood_pattern.png
+ footstepSounds:
+ collection: FootstepWood
+ barestepSounds:
+ collection: BarestepWood
+ itemDrop: ScpFloorTileItemWoodPattern
+
+- type: tile
+ id: ScpFloorWoodBroken
+ parent: ScpFloorBaseWood
+ name: scp-tiles-wood-broken
+ sprite: /Textures/_Scp/Tiles/Wood/wood_broken.png
+ footstepSounds:
+ collection: FootstepWood
+ barestepSounds:
+ collection: BarestepWood
+ itemDrop: MaterialWoodPlank1
+
+- type: tile
+ id: ScpFloorWoodLargeBroken
+ parent: ScpFloorBaseWood
+ name: scp-tiles-wood-large-broken
+ sprite: /Textures/_Scp/Tiles/Wood/wood_large_broken.png
+ footstepSounds:
+ collection: FootstepWood
+ barestepSounds:
+ collection: BarestepWood
+ itemDrop: MaterialWoodPlank1
+
+- type: tile
+ id: ScpFloorWoodPatternBroken
+ parent: ScpFloorBaseWood
+ name: scp-tiles-wood-pattern-broken
+ sprite: /Textures/_Scp/Tiles/Wood/wood_pattern_broken.png
+ footstepSounds:
+ collection: FootstepWood
+ barestepSounds:
+ collection: BarestepWood
+ itemDrop: MaterialWoodPlank1
diff --git a/Resources/Prototypes/_Scp/tile_migrations.yml b/Resources/Prototypes/_Scp/tile_migrations.yml
index 92f4b4b99a8..a2c12b12e1f 100644
--- a/Resources/Prototypes/_Scp/tile_migrations.yml
+++ b/Resources/Prototypes/_Scp/tile_migrations.yml
@@ -105,3 +105,19 @@
- type: tileAlias
id: FloorBlue
target: ScpFloorBlue
+
+- type: tileAlias
+ id: FloorWood
+ target: ScpFloorWood
+
+- type: tileAlias
+ id: FloorWoodLarge
+ target: ScpFloorWoodLarge
+
+- type: tileAlias
+ id: FloorWoodTile
+ target: ScpFloorWoodPattern
+
+- type: tileAlias
+ id: FloorBrokenWood
+ target: ScpFloorWoodBroken
diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Misc/improvised_parts.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Misc/improvised_parts.yml
index 33dce55a6c4..4d3c398a718 100644
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Misc/improvised_parts.yml
+++ b/Resources/Prototypes/_Starlight/Entities/Objects/Misc/improvised_parts.yml
@@ -154,7 +154,7 @@
- type: Item
size: Small
- type: Sprite
- sprite: _Starlight/Objects/Misc/wooden_hilt.rsi
+ sprite: _Scp/Objects/Misc/wooden_hilt.rsi # Fire edit
state: icon
- type: Tag
tags:
diff --git a/Resources/Prototypes/_Starlight/Recipes/Crafting/Graphs/improvised/improvised_sword.yml b/Resources/Prototypes/_Starlight/Recipes/Crafting/Graphs/improvised/improvised_sword.yml
index 9693dd939ba..043981055c3 100644
--- a/Resources/Prototypes/_Starlight/Recipes/Crafting/Graphs/improvised/improvised_sword.yml
+++ b/Resources/Prototypes/_Starlight/Recipes/Crafting/Graphs/improvised/improvised_sword.yml
@@ -19,7 +19,7 @@
doAfter: 5
- tag: HiltWood
icon:
- sprite: _Starlight/Objects/Misc/wooden_hilt.rsi
+ sprite: _Scp/Objects/Misc/wooden_hilt.rsi # Fire edit
state: icon
name: crafting-menu-name-WH
- node: sword
diff --git a/Resources/Prototypes/_Starlight/Recipes/Crafting/Graphs/improvised/makeshift_sword.yml b/Resources/Prototypes/_Starlight/Recipes/Crafting/Graphs/improvised/makeshift_sword.yml
index 99e7792164d..33b00f35e12 100644
--- a/Resources/Prototypes/_Starlight/Recipes/Crafting/Graphs/improvised/makeshift_sword.yml
+++ b/Resources/Prototypes/_Starlight/Recipes/Crafting/Graphs/improvised/makeshift_sword.yml
@@ -16,7 +16,7 @@
doAfter: 5
- tag: HiltWood
icon:
- sprite: _Starlight/Objects/Misc/wooden_hilt.rsi
+ sprite: _Scp/Objects/Misc/wooden_hilt.rsi # Fire edit
state: icon
name: crafting-menu-name-WH
- node: sword
diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Furniture/chairs.yml
index 7efb4e4f674..9f93f0645c4 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Structures/Furniture/chairs.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Furniture/chairs.yml
@@ -30,10 +30,11 @@
- type: entity
name: grey office chair
id: ChairOfficeGrey
+ categories: [ HideSpawnMenu ] # Fire edit
parent: ChairOfficeLight
components:
- type: Sprite
- sprite: _Scp/Structures/Furniture/chairs.rsi # Fire edit
+ sprite: _Sunrise/Structures/Furniture/chairs.rsi
state: office-grey
- type: Construction
graph: Seat
diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Walls/railingwood.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Walls/railingwood.yml
index 6455bf087a4..8efbf22a979 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Structures/Walls/railingwood.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Walls/railingwood.yml
@@ -7,9 +7,9 @@
components:
- type: Sprite
drawdepth: SmallObjects
- sprite: _Sunrise/Structures/Walls/woodenrailing.rsi
+ sprite: _Scp/Structures/Walls/wooden_railing.rsi # Fire edit
- type: Icon
- sprite: _Sunrise/Structures/Walls/woodenrailing.rsi
+ sprite: _Scp/Structures/Walls/wooden_railing.rsi # Fire edit
- type: Physics
bodyType: Static
- type: InteractionOutline
diff --git a/Resources/Prototypes/_Sunrise/Tiles/floors.yml b/Resources/Prototypes/_Sunrise/Tiles/floors.yml
index ad43b27b727..015d06fe513 100644
--- a/Resources/Prototypes/_Sunrise/Tiles/floors.yml
+++ b/Resources/Prototypes/_Sunrise/Tiles/floors.yml
@@ -9,7 +9,7 @@
collection: FootstepWood
barestepSounds:
collection: BarestepWood
- itemDrop: FloorTileItemWood
+ itemDrop: ScpFloorTileItemWood # Fire edit
heatCapacity: 10000
- type: tile
diff --git a/Resources/ServerInfo/Guidebook/Engineering/Construction.xml b/Resources/ServerInfo/Guidebook/Engineering/Construction.xml
index 0457b8c4b85..ca60a18f2e9 100644
--- a/Resources/ServerInfo/Guidebook/Engineering/Construction.xml
+++ b/Resources/ServerInfo/Guidebook/Engineering/Construction.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/Resources/Textures/_Scp/Objects/Materials/wood_plank.rsi/meta.json b/Resources/Textures/_Scp/Objects/Materials/wood_plank.rsi/meta.json
new file mode 100644
index 00000000000..776a06579fd
--- /dev/null
+++ b/Resources/Textures/_Scp/Objects/Materials/wood_plank.rsi/meta.json
@@ -0,0 +1,28 @@
+{
+ "version": 1,
+ "license": "CLA",
+ "copyright": "Sprited by peperino0290_92944(discord) for Fire Station",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "wood"
+ },
+ {
+ "name": "wood_2"
+ },
+ {
+ "name": "wood_3"
+ },
+ {
+ "name": "wood-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "wood-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Scp/Objects/Materials/wood_plank.rsi/wood-inhand-left.png b/Resources/Textures/_Scp/Objects/Materials/wood_plank.rsi/wood-inhand-left.png
new file mode 100644
index 00000000000..d4d15d09cec
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Materials/wood_plank.rsi/wood-inhand-left.png differ
diff --git a/Resources/Textures/_Scp/Objects/Materials/wood_plank.rsi/wood-inhand-right.png b/Resources/Textures/_Scp/Objects/Materials/wood_plank.rsi/wood-inhand-right.png
new file mode 100644
index 00000000000..7d18c2d0a01
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Materials/wood_plank.rsi/wood-inhand-right.png differ
diff --git a/Resources/Textures/_Scp/Objects/Materials/wood_plank.rsi/wood.png b/Resources/Textures/_Scp/Objects/Materials/wood_plank.rsi/wood.png
new file mode 100644
index 00000000000..0389136f36a
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Materials/wood_plank.rsi/wood.png differ
diff --git a/Resources/Textures/_Scp/Objects/Materials/wood_plank.rsi/wood_2.png b/Resources/Textures/_Scp/Objects/Materials/wood_plank.rsi/wood_2.png
new file mode 100644
index 00000000000..6ff09b7ca7d
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Materials/wood_plank.rsi/wood_2.png differ
diff --git a/Resources/Textures/_Scp/Objects/Materials/wood_plank.rsi/wood_3.png b/Resources/Textures/_Scp/Objects/Materials/wood_plank.rsi/wood_3.png
new file mode 100644
index 00000000000..da9b6230371
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Materials/wood_plank.rsi/wood_3.png differ
diff --git a/Resources/Textures/_Scp/Objects/Misc/wooden_hilt.rsi/icon.png b/Resources/Textures/_Scp/Objects/Misc/wooden_hilt.rsi/icon.png
new file mode 100644
index 00000000000..d2fd1d2f2ff
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Misc/wooden_hilt.rsi/icon.png differ
diff --git a/Resources/Textures/_Scp/Objects/Misc/wooden_hilt.rsi/inhand-left.png b/Resources/Textures/_Scp/Objects/Misc/wooden_hilt.rsi/inhand-left.png
new file mode 100644
index 00000000000..3eb8910ef4d
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Misc/wooden_hilt.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Scp/Objects/Misc/wooden_hilt.rsi/inhand-right.png b/Resources/Textures/_Scp/Objects/Misc/wooden_hilt.rsi/inhand-right.png
new file mode 100644
index 00000000000..b6bd9dfb8f0
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Misc/wooden_hilt.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Scp/Objects/Misc/wooden_hilt.rsi/meta.json b/Resources/Textures/_Scp/Objects/Misc/wooden_hilt.rsi/meta.json
new file mode 100644
index 00000000000..3e39ff9f338
--- /dev/null
+++ b/Resources/Textures/_Scp/Objects/Misc/wooden_hilt.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+ "version":1,
+ "size":{
+ "x":32,
+ "y":32
+ },
+ "license":"CLA",
+ "copyright": "Made by peperino0290_92944 for SCP: Project Fire",
+ "states":[
+ {
+ "name":"icon"
+ },
+ {
+ "name": "inhand-left",
+ "directions":4
+ },
+ {
+ "name":"inhand-right",
+ "directions":4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Scp/Objects/Specific/Hydroponics/towercap.rsi/dead.png b/Resources/Textures/_Scp/Objects/Specific/Hydroponics/towercap.rsi/dead.png
new file mode 100644
index 00000000000..b261bce202e
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Specific/Hydroponics/towercap.rsi/dead.png differ
diff --git a/Resources/Textures/_Scp/Objects/Specific/Hydroponics/towercap.rsi/harvest.png b/Resources/Textures/_Scp/Objects/Specific/Hydroponics/towercap.rsi/harvest.png
new file mode 100644
index 00000000000..72d4a0ac274
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Specific/Hydroponics/towercap.rsi/harvest.png differ
diff --git a/Resources/Textures/_Scp/Objects/Specific/Hydroponics/towercap.rsi/meta.json b/Resources/Textures/_Scp/Objects/Specific/Hydroponics/towercap.rsi/meta.json
new file mode 100644
index 00000000000..34532aa5a7c
--- /dev/null
+++ b/Resources/Textures/_Scp/Objects/Specific/Hydroponics/towercap.rsi/meta.json
@@ -0,0 +1,40 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Original: Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github). Resprited by peperino0290_92944(discord) for Fire Station",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "dead"
+ },
+ {
+ "name": "harvest"
+ },
+ {
+ "name": "produce"
+ },
+ {
+ "name": "seed"
+ },
+ {
+ "name": "stage-1"
+ },
+ {
+ "name": "stage-2"
+ },
+ {
+ "name": "stage-3"
+ },
+ {
+ "name": "produce-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "produce-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Scp/Objects/Specific/Hydroponics/towercap.rsi/produce-inhand-left.png b/Resources/Textures/_Scp/Objects/Specific/Hydroponics/towercap.rsi/produce-inhand-left.png
new file mode 100644
index 00000000000..538dd5b73c4
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Specific/Hydroponics/towercap.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/_Scp/Objects/Specific/Hydroponics/towercap.rsi/produce-inhand-right.png b/Resources/Textures/_Scp/Objects/Specific/Hydroponics/towercap.rsi/produce-inhand-right.png
new file mode 100644
index 00000000000..cbf979beae0
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Specific/Hydroponics/towercap.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/_Scp/Objects/Specific/Hydroponics/towercap.rsi/produce.png b/Resources/Textures/_Scp/Objects/Specific/Hydroponics/towercap.rsi/produce.png
new file mode 100644
index 00000000000..ba57d59df78
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Specific/Hydroponics/towercap.rsi/produce.png differ
diff --git a/Resources/Textures/_Scp/Objects/Specific/Hydroponics/towercap.rsi/seed.png b/Resources/Textures/_Scp/Objects/Specific/Hydroponics/towercap.rsi/seed.png
new file mode 100644
index 00000000000..49245d46ff5
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Specific/Hydroponics/towercap.rsi/seed.png differ
diff --git a/Resources/Textures/_Scp/Objects/Specific/Hydroponics/towercap.rsi/stage-1.png b/Resources/Textures/_Scp/Objects/Specific/Hydroponics/towercap.rsi/stage-1.png
new file mode 100644
index 00000000000..c61f1091fd4
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Specific/Hydroponics/towercap.rsi/stage-1.png differ
diff --git a/Resources/Textures/_Scp/Objects/Specific/Hydroponics/towercap.rsi/stage-2.png b/Resources/Textures/_Scp/Objects/Specific/Hydroponics/towercap.rsi/stage-2.png
new file mode 100644
index 00000000000..3f13bd2f5ce
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Specific/Hydroponics/towercap.rsi/stage-2.png differ
diff --git a/Resources/Textures/_Scp/Objects/Specific/Hydroponics/towercap.rsi/stage-3.png b/Resources/Textures/_Scp/Objects/Specific/Hydroponics/towercap.rsi/stage-3.png
new file mode 100644
index 00000000000..5414e9c1be4
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Specific/Hydroponics/towercap.rsi/stage-3.png differ
diff --git a/Resources/Textures/_Scp/Objects/Tiles/wood.rsi/meta.json b/Resources/Textures/_Scp/Objects/Tiles/wood.rsi/meta.json
new file mode 100644
index 00000000000..29f15b10d95
--- /dev/null
+++ b/Resources/Textures/_Scp/Objects/Tiles/wood.rsi/meta.json
@@ -0,0 +1,28 @@
+{
+ "version": 1,
+ "license": "CLA",
+ "copyright": "Sprited by peperino0290_92944(discord) for Fire Station",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "wood"
+ },
+ {
+ "name": "wood-large"
+ },
+ {
+ "name": "woodpatternfloor"
+ },
+ {
+ "name": "wood-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "wood-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Scp/Objects/Tiles/wood.rsi/wood-inhand-left.png b/Resources/Textures/_Scp/Objects/Tiles/wood.rsi/wood-inhand-left.png
new file mode 100644
index 00000000000..023a38b8734
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Tiles/wood.rsi/wood-inhand-left.png differ
diff --git a/Resources/Textures/_Scp/Objects/Tiles/wood.rsi/wood-inhand-right.png b/Resources/Textures/_Scp/Objects/Tiles/wood.rsi/wood-inhand-right.png
new file mode 100644
index 00000000000..11a1f6342c4
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Tiles/wood.rsi/wood-inhand-right.png differ
diff --git a/Resources/Textures/_Scp/Objects/Tiles/wood.rsi/wood-large.png b/Resources/Textures/_Scp/Objects/Tiles/wood.rsi/wood-large.png
new file mode 100644
index 00000000000..a61205c229a
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Tiles/wood.rsi/wood-large.png differ
diff --git a/Resources/Textures/_Scp/Objects/Tiles/wood.rsi/wood.png b/Resources/Textures/_Scp/Objects/Tiles/wood.rsi/wood.png
new file mode 100644
index 00000000000..b61778f9303
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Tiles/wood.rsi/wood.png differ
diff --git a/Resources/Textures/_Scp/Objects/Tiles/wood.rsi/woodpatternfloor.png b/Resources/Textures/_Scp/Objects/Tiles/wood.rsi/woodpatternfloor.png
new file mode 100644
index 00000000000..2c27e806ef2
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Tiles/wood.rsi/woodpatternfloor.png differ
diff --git a/Resources/Textures/_Scp/Objects/Weapons/Melee/baseball_bat.rsi/equipped-BACKPACK.png b/Resources/Textures/_Scp/Objects/Weapons/Melee/baseball_bat.rsi/equipped-BACKPACK.png
new file mode 100644
index 00000000000..bb26f4dd6dc
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Weapons/Melee/baseball_bat.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/_Scp/Objects/Weapons/Melee/baseball_bat.rsi/icon.png b/Resources/Textures/_Scp/Objects/Weapons/Melee/baseball_bat.rsi/icon.png
new file mode 100644
index 00000000000..fcd5781bdd7
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Weapons/Melee/baseball_bat.rsi/icon.png differ
diff --git a/Resources/Textures/_Scp/Objects/Weapons/Melee/baseball_bat.rsi/inhand-left.png b/Resources/Textures/_Scp/Objects/Weapons/Melee/baseball_bat.rsi/inhand-left.png
new file mode 100644
index 00000000000..b9ad0e1cd13
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Weapons/Melee/baseball_bat.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Scp/Objects/Weapons/Melee/baseball_bat.rsi/inhand-right.png b/Resources/Textures/_Scp/Objects/Weapons/Melee/baseball_bat.rsi/inhand-right.png
new file mode 100644
index 00000000000..7204a4da56c
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Weapons/Melee/baseball_bat.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Scp/Objects/Weapons/Melee/baseball_bat.rsi/meta.json b/Resources/Textures/_Scp/Objects/Weapons/Melee/baseball_bat.rsi/meta.json
new file mode 100644
index 00000000000..3208b2b0288
--- /dev/null
+++ b/Resources/Textures/_Scp/Objects/Weapons/Melee/baseball_bat.rsi/meta.json
@@ -0,0 +1,37 @@
+{
+ "version": 1,
+ "license": "CLA",
+ "copyright": "Sprited by peperino0290_92944(discord) for Fire Station",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "storage"
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "wielded-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "wielded-inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Scp/Objects/Weapons/Melee/baseball_bat.rsi/storage.png b/Resources/Textures/_Scp/Objects/Weapons/Melee/baseball_bat.rsi/storage.png
new file mode 100644
index 00000000000..b6b5a3705bd
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Weapons/Melee/baseball_bat.rsi/storage.png differ
diff --git a/Resources/Textures/_Scp/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-left.png b/Resources/Textures/_Scp/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..7d8422482ec
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/_Scp/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-right.png b/Resources/Textures/_Scp/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..bb73874ee76
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/_Scp/Objects/Weapons/Melee/incomplete_bat.rsi/icon.png b/Resources/Textures/_Scp/Objects/Weapons/Melee/incomplete_bat.rsi/icon.png
new file mode 100644
index 00000000000..c4c3deb78f7
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Weapons/Melee/incomplete_bat.rsi/icon.png differ
diff --git a/Resources/Textures/_Scp/Objects/Weapons/Melee/incomplete_bat.rsi/inhand-left.png b/Resources/Textures/_Scp/Objects/Weapons/Melee/incomplete_bat.rsi/inhand-left.png
new file mode 100644
index 00000000000..4cd46fa0d94
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Weapons/Melee/incomplete_bat.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Scp/Objects/Weapons/Melee/incomplete_bat.rsi/inhand-right.png b/Resources/Textures/_Scp/Objects/Weapons/Melee/incomplete_bat.rsi/inhand-right.png
new file mode 100644
index 00000000000..588b39b5119
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Weapons/Melee/incomplete_bat.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Scp/Objects/Weapons/Melee/incomplete_bat.rsi/meta.json b/Resources/Textures/_Scp/Objects/Weapons/Melee/incomplete_bat.rsi/meta.json
new file mode 100644
index 00000000000..00ac2b1bef3
--- /dev/null
+++ b/Resources/Textures/_Scp/Objects/Weapons/Melee/incomplete_bat.rsi/meta.json
@@ -0,0 +1,25 @@
+{
+ "version": 1,
+ "license": "CLA",
+ "copyright": "Sprited by peperino0290_92944(discord) for Fire Station",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "storage"
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Scp/Objects/Weapons/Melee/incomplete_bat.rsi/storage.png b/Resources/Textures/_Scp/Objects/Weapons/Melee/incomplete_bat.rsi/storage.png
new file mode 100644
index 00000000000..839555e1853
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Weapons/Melee/incomplete_bat.rsi/storage.png differ
diff --git a/Resources/Textures/_Scp/Objects/Weapons/Melee/shields.rsi/buckler-icon.png b/Resources/Textures/_Scp/Objects/Weapons/Melee/shields.rsi/buckler-icon.png
new file mode 100644
index 00000000000..be64f7b4f97
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Weapons/Melee/shields.rsi/buckler-icon.png differ
diff --git a/Resources/Textures/_Scp/Objects/Weapons/Melee/shields.rsi/buckler-inhand-left.png b/Resources/Textures/_Scp/Objects/Weapons/Melee/shields.rsi/buckler-inhand-left.png
new file mode 100644
index 00000000000..51e92824029
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Weapons/Melee/shields.rsi/buckler-inhand-left.png differ
diff --git a/Resources/Textures/_Scp/Objects/Weapons/Melee/shields.rsi/buckler-inhand-right.png b/Resources/Textures/_Scp/Objects/Weapons/Melee/shields.rsi/buckler-inhand-right.png
new file mode 100644
index 00000000000..5537d115284
Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Weapons/Melee/shields.rsi/buckler-inhand-right.png differ
diff --git a/Resources/Textures/_Scp/Objects/Weapons/Melee/shields.rsi/meta.json b/Resources/Textures/_Scp/Objects/Weapons/Melee/shields.rsi/meta.json
new file mode 100644
index 00000000000..fd0ee70e50e
--- /dev/null
+++ b/Resources/Textures/_Scp/Objects/Weapons/Melee/shields.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+ "version": 1,
+ "license": "CLA",
+ "copyright": "Sprited by peperino0290_92944(discord) for Fire Station",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "buckler-icon"
+ },
+ {
+ "name": "buckler-inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "buckler-inhand-left",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Scp/Structures/Doors/MineralDoors/wood_door.rsi/closed.png b/Resources/Textures/_Scp/Structures/Doors/MineralDoors/wood_door.rsi/closed.png
new file mode 100644
index 00000000000..0162a0c8903
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Doors/MineralDoors/wood_door.rsi/closed.png differ
diff --git a/Resources/Textures/_Scp/Structures/Doors/MineralDoors/wood_door.rsi/closing.png b/Resources/Textures/_Scp/Structures/Doors/MineralDoors/wood_door.rsi/closing.png
new file mode 100644
index 00000000000..13a9f1b54a2
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Doors/MineralDoors/wood_door.rsi/closing.png differ
diff --git a/Resources/Textures/_Scp/Structures/Doors/MineralDoors/wood_door.rsi/meta.json b/Resources/Textures/_Scp/Structures/Doors/MineralDoors/wood_door.rsi/meta.json
new file mode 100644
index 00000000000..1ff192ee118
--- /dev/null
+++ b/Resources/Textures/_Scp/Structures/Doors/MineralDoors/wood_door.rsi/meta.json
@@ -0,0 +1,57 @@
+{
+ "version": 1,
+ "license": "CLA",
+ "copyright": "Sprited by peperino0290_92944(discord) for Fire Station",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "closed",
+ "directions": 1,
+ "delays": [
+ [
+ 1.0
+ ]
+ ]
+ },
+ {
+ "name": "closing",
+ "directions": 1,
+ "delays": [
+ [
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2
+ ]
+ ]
+ },
+ {
+ "name": "open",
+ "directions": 1,
+ "delays": [
+ [
+ 1.0
+ ]
+ ]
+ },
+ {
+ "name": "opening",
+ "directions": 1,
+ "delays": [
+ [
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/_Scp/Structures/Doors/MineralDoors/wood_door.rsi/open.png b/Resources/Textures/_Scp/Structures/Doors/MineralDoors/wood_door.rsi/open.png
new file mode 100644
index 00000000000..279c66eea78
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Doors/MineralDoors/wood_door.rsi/open.png differ
diff --git a/Resources/Textures/_Scp/Structures/Doors/MineralDoors/wood_door.rsi/opening.png b/Resources/Textures/_Scp/Structures/Doors/MineralDoors/wood_door.rsi/opening.png
new file mode 100644
index 00000000000..d9781768222
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Doors/MineralDoors/wood_door.rsi/opening.png differ
diff --git a/Resources/Textures/_Scp/Structures/Furniture/Tables/counterwood.rsi/full.png b/Resources/Textures/_Scp/Structures/Furniture/Tables/counterwood.rsi/full.png
new file mode 100644
index 00000000000..a826ebda1cc
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Furniture/Tables/counterwood.rsi/full.png differ
diff --git a/Resources/Textures/_Scp/Structures/Furniture/Tables/counterwood.rsi/meta.json b/Resources/Textures/_Scp/Structures/Furniture/Tables/counterwood.rsi/meta.json
new file mode 100644
index 00000000000..612d5724011
--- /dev/null
+++ b/Resources/Textures/_Scp/Structures/Furniture/Tables/counterwood.rsi/meta.json
@@ -0,0 +1,46 @@
+{
+ "version": 1,
+ "license": "CLA",
+ "copyright": "Sprited by peperino0290_92944(discord) for Fire Station",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "full"
+ },
+ {
+ "name": "state_0",
+ "directions": 4
+ },
+ {
+ "name": "state_1",
+ "directions": 4
+ },
+ {
+ "name": "state_2",
+ "directions": 4
+ },
+ {
+ "name": "state_3",
+ "directions": 4
+ },
+ {
+ "name": "state_4",
+ "directions": 4
+ },
+ {
+ "name": "state_5",
+ "directions": 4
+ },
+ {
+ "name": "state_6",
+ "directions": 4
+ },
+ {
+ "name": "state_7",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Scp/Structures/Furniture/Tables/counterwood.rsi/state_0.png b/Resources/Textures/_Scp/Structures/Furniture/Tables/counterwood.rsi/state_0.png
new file mode 100644
index 00000000000..aafca41ae80
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Furniture/Tables/counterwood.rsi/state_0.png differ
diff --git a/Resources/Textures/_Scp/Structures/Furniture/Tables/counterwood.rsi/state_1.png b/Resources/Textures/_Scp/Structures/Furniture/Tables/counterwood.rsi/state_1.png
new file mode 100644
index 00000000000..c63dbc1d5f3
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Furniture/Tables/counterwood.rsi/state_1.png differ
diff --git a/Resources/Textures/_Scp/Structures/Furniture/Tables/counterwood.rsi/state_2.png b/Resources/Textures/_Scp/Structures/Furniture/Tables/counterwood.rsi/state_2.png
new file mode 100644
index 00000000000..aafca41ae80
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Furniture/Tables/counterwood.rsi/state_2.png differ
diff --git a/Resources/Textures/_Scp/Structures/Furniture/Tables/counterwood.rsi/state_3.png b/Resources/Textures/_Scp/Structures/Furniture/Tables/counterwood.rsi/state_3.png
new file mode 100644
index 00000000000..c63dbc1d5f3
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Furniture/Tables/counterwood.rsi/state_3.png differ
diff --git a/Resources/Textures/_Scp/Structures/Furniture/Tables/counterwood.rsi/state_4.png b/Resources/Textures/_Scp/Structures/Furniture/Tables/counterwood.rsi/state_4.png
new file mode 100644
index 00000000000..25a4f0ea484
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Furniture/Tables/counterwood.rsi/state_4.png differ
diff --git a/Resources/Textures/_Scp/Structures/Furniture/Tables/counterwood.rsi/state_5.png b/Resources/Textures/_Scp/Structures/Furniture/Tables/counterwood.rsi/state_5.png
new file mode 100644
index 00000000000..2f3cdee20c7
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Furniture/Tables/counterwood.rsi/state_5.png differ
diff --git a/Resources/Textures/_Scp/Structures/Furniture/Tables/counterwood.rsi/state_6.png b/Resources/Textures/_Scp/Structures/Furniture/Tables/counterwood.rsi/state_6.png
new file mode 100644
index 00000000000..25a4f0ea484
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Furniture/Tables/counterwood.rsi/state_6.png differ
diff --git a/Resources/Textures/_Scp/Structures/Furniture/Tables/counterwood.rsi/state_7.png b/Resources/Textures/_Scp/Structures/Furniture/Tables/counterwood.rsi/state_7.png
new file mode 100644
index 00000000000..73664fd7289
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Furniture/Tables/counterwood.rsi/state_7.png differ
diff --git a/Resources/Textures/_Scp/Structures/Furniture/Tables/wood.rsi/full.png b/Resources/Textures/_Scp/Structures/Furniture/Tables/wood.rsi/full.png
index 9f1887f8055..8c79ac3be75 100644
Binary files a/Resources/Textures/_Scp/Structures/Furniture/Tables/wood.rsi/full.png and b/Resources/Textures/_Scp/Structures/Furniture/Tables/wood.rsi/full.png differ
diff --git a/Resources/Textures/_Scp/Structures/Furniture/Tables/wood.rsi/meta.json b/Resources/Textures/_Scp/Structures/Furniture/Tables/wood.rsi/meta.json
index 17fafbe7321..7621f5b7a26 100644
--- a/Resources/Textures/_Scp/Structures/Furniture/Tables/wood.rsi/meta.json
+++ b/Resources/Textures/_Scp/Structures/Furniture/Tables/wood.rsi/meta.json
@@ -5,7 +5,7 @@
"y": 32
},
"license": "CLA",
- "copyright": "Created by odlieerr(Discord) | Odleer(Space Station 14)",
+ "copyright": "Sprited by peperino0290_92944(discord) for Fire Station",
"states": [
{
"name": "full",
@@ -17,147 +17,35 @@
},
{
"name": "state_0",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
+ "directions": 4
},
{
"name": "state_1",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
+ "directions": 4
},
{
"name": "state_2",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
+ "directions": 4
},
{
"name": "state_3",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
+ "directions": 4
},
{
"name": "state_4",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
+ "directions": 4
},
{
"name": "state_5",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
+ "directions": 4
},
{
"name": "state_6",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
+ "directions": 4
},
{
"name": "state_7",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/bar-knocked.png b/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/bar-knocked.png
deleted file mode 100644
index b00aa4f6987..00000000000
Binary files a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/bar-knocked.png and /dev/null differ
diff --git a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/bar.png b/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/bar.png
deleted file mode 100644
index 19273f26d8b..00000000000
Binary files a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/bar.png and /dev/null differ
diff --git a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/brass_chair.png b/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/brass_chair.png
deleted file mode 100644
index a5be2fd7123..00000000000
Binary files a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/brass_chair.png and /dev/null differ
diff --git a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/card-stool.png b/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/card-stool.png
deleted file mode 100644
index 7e7ca14b747..00000000000
Binary files a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/card-stool.png and /dev/null differ
diff --git a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/comfy-overlay.png b/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/comfy-overlay.png
deleted file mode 100644
index 19965d71eed..00000000000
Binary files a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/comfy-overlay.png and /dev/null differ
diff --git a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/comfy.png b/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/comfy.png
deleted file mode 100644
index 6419debe077..00000000000
Binary files a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/comfy.png and /dev/null differ
diff --git a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/cursed.png b/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/cursed.png
index 9469e0b9c84..e4053aa1bb1 100644
Binary files a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/cursed.png and b/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/cursed.png differ
diff --git a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/meat.png b/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/meat.png
deleted file mode 100644
index 86330d1378c..00000000000
Binary files a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/meat.png and /dev/null differ
diff --git a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/meta.json b/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/meta.json
index 7e68101fc76..a3a329ecc29 100644
--- a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/meta.json
+++ b/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/meta.json
@@ -1,123 +1,86 @@
{
"version": 1,
"license": "CLA",
- "copyright": "Made by MIDUZKA (discord) for Fire Station",
+ "copyright": "Sprite for Fire Station. For additional info see copyright field on each state",
"size": {
"x": 32,
"y": 32
},
"states": [
- {
- "name": "bar",
- "directions": 4
- },
{
"name": "office-grey",
- "directions": 4
- },
- {
- "name": "bar-knocked",
- "directions": 4
+ "directions": 4,
+ "copyright": "Made by odlieerr(discord), continued by MIDUZKA (discord)"
},
{
"name": "chair",
- "directions": 4
+ "directions": 4,
+ "copyright": "Made by odlieerr(discord), continued by MIDUZKA (discord)"
},
{
"name": "chair-knocked",
- "directions": 4
+ "directions": 4,
+ "copyright": "Made by odlieerr(discord), continued by MIDUZKA (discord)"
},
{
"name": "chair_grayscale_legs",
- "directions": 4
+ "directions": 4,
+ "copyright": "Made by odlieerr(discord), continued and split into 2 parts by MIDUZKA (discord)"
},
{
"name": "chair_grayscale_legs-knocked",
- "directions": 4
+ "directions": 4,
+ "copyright": "Made by odlieerr(discord), continued and split into 2 parts by MIDUZKA (discord)"
},
{
"name": "chair_grayscale_seat",
- "directions": 4
+ "directions": 4,
+ "copyright": "Made by odlieerr(discord), continued and split into 2 parts by MIDUZKA (discord)"
},
{
"name": "chair_grayscale_seat-knocked",
- "directions": 4
- },
- {
- "name": "comfy",
- "directions": 4
- },
- {
- "name": "comfy-overlay",
- "directions": 4
- },
- {
- "name": "meat",
- "directions": 4
+ "directions": 4,
+ "copyright": "Made by odlieerr(discord), continued and split into 2 parts by MIDUZKA (discord)"
},
{
"name": "office-dark",
- "directions": 4
+ "directions": 4,
+ "copyright": "Made by odlieerr(discord), continued by MIDUZKA (discord)"
},
{
"name": "office-white",
- "directions": 4
- },
- {
- "name": "shuttle",
- "directions": 4
- },
- {
- "name": "shuttle-overlay",
- "directions": 4
- },
- {
- "name": "stool",
- "directions": 4
- },
- {
- "name": "stool-knocked",
- "directions": 4
+ "directions": 4,
+ "copyright": "Made by odlieerr(discord), continued by MIDUZKA (discord)"
},
{
"name": "wooden",
- "directions": 4
+ "directions": 4,
+ "copyright": "Made by peperino0290_92944(discord)"
},
{
"name": "wooden-bench",
- "directions": 4
+ "directions": 4,
+ "copyright": "Made by peperino0290_92944(discord)"
},
{
"name": "wooden-wings",
- "directions": 4
+ "directions": 4,
+ "copyright": "Made by peperino0290_92944(discord)"
},
{
"name": "wooden-wings-knocked",
- "directions": 4
+ "directions": 4,
+ "copyright": "Made by peperino0290_92944(discord)"
},
{
"name": "ritual",
- "directions": 4
+ "directions": 4,
+ "copyright": "Made by peperino0290_92944(discord)"
},
{
"name": "cursed",
- "directions": 4
- },
- {
- "name": "steel-bench",
- "directions": 4
- },
- {
- "name": "brass_chair",
- "directions": 4
- },
- {
- "name": "xeno-chair",
- "directions": 4
- },
- {
- "name": "card-stool",
- "directions": 4
+ "directions": 4,
+ "copyright": "Made by peperino0290_92944(discord)"
}
]
}
diff --git a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/ritual.png b/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/ritual.png
index 6985ead4e35..675dd94d5ee 100644
Binary files a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/ritual.png and b/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/ritual.png differ
diff --git a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/shuttle-overlay.png b/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/shuttle-overlay.png
deleted file mode 100644
index a97441a14a3..00000000000
Binary files a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/shuttle-overlay.png and /dev/null differ
diff --git a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/shuttle.png b/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/shuttle.png
deleted file mode 100644
index 7dcff12ea5c..00000000000
Binary files a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/shuttle.png and /dev/null differ
diff --git a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/steel-bench.png b/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/steel-bench.png
deleted file mode 100644
index c554b2c207a..00000000000
Binary files a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/steel-bench.png and /dev/null differ
diff --git a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/stool-knocked.png b/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/stool-knocked.png
deleted file mode 100644
index bb8d7111872..00000000000
Binary files a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/stool-knocked.png and /dev/null differ
diff --git a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/stool.png b/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/stool.png
deleted file mode 100644
index 5fab4416ae3..00000000000
Binary files a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/stool.png and /dev/null differ
diff --git a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/wooden-bench.png b/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/wooden-bench.png
index 00192a14479..8ae245ef7f3 100644
Binary files a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/wooden-bench.png and b/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/wooden-bench.png differ
diff --git a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/wooden-wings-knocked.png b/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/wooden-wings-knocked.png
index efb9b0b9154..16d9e6df0d4 100644
Binary files a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/wooden-wings-knocked.png and b/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/wooden-wings-knocked.png differ
diff --git a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/wooden-wings.png b/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/wooden-wings.png
index 13049f8fb56..4e5bedf7c26 100644
Binary files a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/wooden-wings.png and b/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/wooden-wings.png differ
diff --git a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/wooden.png b/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/wooden.png
index 863df2e99c8..8aa1c00d2bc 100644
Binary files a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/wooden.png and b/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/wooden.png differ
diff --git a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/xeno-chair.png b/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/xeno-chair.png
deleted file mode 100644
index 796d37d9b1f..00000000000
Binary files a/Resources/Textures/_Scp/Structures/Furniture/chairs.rsi/xeno-chair.png and /dev/null differ
diff --git a/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-0.png b/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-0.png
new file mode 100644
index 00000000000..c090326148d
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-0.png differ
diff --git a/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-1.png b/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-1.png
new file mode 100644
index 00000000000..7d698e0020f
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-1.png differ
diff --git a/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-10.png b/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-10.png
new file mode 100644
index 00000000000..5acb43b1799
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-10.png differ
diff --git a/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-11.png b/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-11.png
new file mode 100644
index 00000000000..328ca05ab73
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-11.png differ
diff --git a/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-12.png b/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-12.png
new file mode 100644
index 00000000000..77469720a63
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-12.png differ
diff --git a/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-2.png b/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-2.png
new file mode 100644
index 00000000000..5eab596dd46
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-2.png differ
diff --git a/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-3.png b/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-3.png
new file mode 100644
index 00000000000..116080939b6
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-3.png differ
diff --git a/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-4.png b/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-4.png
new file mode 100644
index 00000000000..15c03124e69
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-4.png differ
diff --git a/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-5.png b/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-5.png
new file mode 100644
index 00000000000..ece06f2d786
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-5.png differ
diff --git a/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-6.png b/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-6.png
new file mode 100644
index 00000000000..8ec7b1f6123
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-6.png differ
diff --git a/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-7.png b/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-7.png
new file mode 100644
index 00000000000..e9468e2cdfe
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-7.png differ
diff --git a/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-8.png b/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-8.png
new file mode 100644
index 00000000000..d01b2a6bc87
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-8.png differ
diff --git a/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-9.png b/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-9.png
new file mode 100644
index 00000000000..b5b86d3e4cd
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-9.png differ
diff --git a/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/base.png b/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/base.png
new file mode 100644
index 00000000000..5a7c7fd2ac2
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/base.png differ
diff --git a/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/meta.json b/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/meta.json
new file mode 100644
index 00000000000..a7cefa8d655
--- /dev/null
+++ b/Resources/Textures/_Scp/Structures/Storage/Shelfs/Departments/Service/bar.rsi/meta.json
@@ -0,0 +1,55 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Made by Kezu",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "base",
+ "license": "CLA",
+ "copyright": "Sprited by peperino0290_92944(discord) for Fire Station"
+ },
+ {
+ "name": "bar-0"
+ },
+ {
+ "name": "bar-1"
+ },
+ {
+ "name": "bar-2"
+ },
+ {
+ "name": "bar-3"
+ },
+ {
+ "name": "bar-4"
+ },
+ {
+ "name": "bar-5"
+ },
+ {
+ "name": "bar-6"
+ },
+ {
+ "name": "bar-7"
+ },
+ {
+ "name": "bar-8"
+ },
+ {
+ "name": "bar-9"
+ },
+ {
+ "name": "bar-10"
+ },
+ {
+ "name": "bar-11"
+ },
+ {
+ "name": "bar-12"
+ }
+ ]
+}
diff --git a/Resources/Textures/_Scp/Structures/Storage/Shelfs/wood.rsi/base.png b/Resources/Textures/_Scp/Structures/Storage/Shelfs/wood.rsi/base.png
new file mode 100644
index 00000000000..c21cf2ed298
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Storage/Shelfs/wood.rsi/base.png differ
diff --git a/Resources/Textures/_Scp/Structures/Storage/Shelfs/wood.rsi/closed.png b/Resources/Textures/_Scp/Structures/Storage/Shelfs/wood.rsi/closed.png
new file mode 100644
index 00000000000..d984c9e2324
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Storage/Shelfs/wood.rsi/closed.png differ
diff --git a/Resources/Textures/_Scp/Structures/Storage/Shelfs/wood.rsi/locked.png b/Resources/Textures/_Scp/Structures/Storage/Shelfs/wood.rsi/locked.png
new file mode 100644
index 00000000000..421688fcda8
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Storage/Shelfs/wood.rsi/locked.png differ
diff --git a/Resources/Textures/_Scp/Structures/Storage/Shelfs/wood.rsi/meta.json b/Resources/Textures/_Scp/Structures/Storage/Shelfs/wood.rsi/meta.json
new file mode 100644
index 00000000000..0a27dfb35af
--- /dev/null
+++ b/Resources/Textures/_Scp/Structures/Storage/Shelfs/wood.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+ "version": 1,
+ "license": "CLA",
+ "copyright": "Sprited by peperino0290_92944(discord) for Fire Station",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "base"
+ },
+ {
+ "name": "rbase"
+ },
+ {
+ "name": "locked"
+ },
+ {
+ "name": "unlocked"
+ },
+ {
+ "name": "closed"
+ },
+ {
+ "name": "open"
+ }
+ ]
+}
diff --git a/Resources/Textures/_Scp/Structures/Storage/Shelfs/wood.rsi/open.png b/Resources/Textures/_Scp/Structures/Storage/Shelfs/wood.rsi/open.png
new file mode 100644
index 00000000000..bb971c3adfc
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Storage/Shelfs/wood.rsi/open.png differ
diff --git a/Resources/Textures/_Scp/Structures/Storage/Shelfs/wood.rsi/rbase.png b/Resources/Textures/_Scp/Structures/Storage/Shelfs/wood.rsi/rbase.png
new file mode 100644
index 00000000000..c21cf2ed298
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Storage/Shelfs/wood.rsi/rbase.png differ
diff --git a/Resources/Textures/_Scp/Structures/Storage/Shelfs/wood.rsi/unlocked.png b/Resources/Textures/_Scp/Structures/Storage/Shelfs/wood.rsi/unlocked.png
new file mode 100644
index 00000000000..3a00217edae
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Storage/Shelfs/wood.rsi/unlocked.png differ
diff --git a/Resources/Textures/_Scp/Structures/Walls/wood.rsi/full.png b/Resources/Textures/_Scp/Structures/Walls/wood.rsi/full.png
new file mode 100644
index 00000000000..eea64d0fefc
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Walls/wood.rsi/full.png differ
diff --git a/Resources/Textures/_Scp/Structures/Walls/wood.rsi/meta.json b/Resources/Textures/_Scp/Structures/Walls/wood.rsi/meta.json
new file mode 100644
index 00000000000..93e1a6889bf
--- /dev/null
+++ b/Resources/Textures/_Scp/Structures/Walls/wood.rsi/meta.json
@@ -0,0 +1,44 @@
+{
+ "version": 1,
+ "license": "CLA",
+ "copyright": "Sprited by discord: odlieerr",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ { "name": "full" },
+ {
+ "name": "wood0",
+ "directions": 4
+ },
+ {
+ "name": "wood1",
+ "directions": 4
+ },
+ {
+ "name": "wood2",
+ "directions": 4
+ },
+ {
+ "name": "wood3",
+ "directions": 4
+ },
+ {
+ "name": "wood4",
+ "directions": 4
+ },
+ {
+ "name": "wood5",
+ "directions": 4
+ },
+ {
+ "name": "wood6",
+ "directions": 4
+ },
+ {
+ "name": "wood7",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Scp/Structures/Walls/wood.rsi/wood0.png b/Resources/Textures/_Scp/Structures/Walls/wood.rsi/wood0.png
new file mode 100644
index 00000000000..970b13b8733
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Walls/wood.rsi/wood0.png differ
diff --git a/Resources/Textures/_Scp/Structures/Walls/wood.rsi/wood1.png b/Resources/Textures/_Scp/Structures/Walls/wood.rsi/wood1.png
new file mode 100644
index 00000000000..6b9491cc898
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Walls/wood.rsi/wood1.png differ
diff --git a/Resources/Textures/_Scp/Structures/Walls/wood.rsi/wood2.png b/Resources/Textures/_Scp/Structures/Walls/wood.rsi/wood2.png
new file mode 100644
index 00000000000..970b13b8733
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Walls/wood.rsi/wood2.png differ
diff --git a/Resources/Textures/_Scp/Structures/Walls/wood.rsi/wood3.png b/Resources/Textures/_Scp/Structures/Walls/wood.rsi/wood3.png
new file mode 100644
index 00000000000..6b9491cc898
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Walls/wood.rsi/wood3.png differ
diff --git a/Resources/Textures/_Scp/Structures/Walls/wood.rsi/wood4.png b/Resources/Textures/_Scp/Structures/Walls/wood.rsi/wood4.png
new file mode 100644
index 00000000000..9dc17fa0b6b
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Walls/wood.rsi/wood4.png differ
diff --git a/Resources/Textures/_Scp/Structures/Walls/wood.rsi/wood5.png b/Resources/Textures/_Scp/Structures/Walls/wood.rsi/wood5.png
new file mode 100644
index 00000000000..2ea335b4f3c
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Walls/wood.rsi/wood5.png differ
diff --git a/Resources/Textures/_Scp/Structures/Walls/wood.rsi/wood6.png b/Resources/Textures/_Scp/Structures/Walls/wood.rsi/wood6.png
new file mode 100644
index 00000000000..9dc17fa0b6b
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Walls/wood.rsi/wood6.png differ
diff --git a/Resources/Textures/_Scp/Structures/Walls/wood.rsi/wood7.png b/Resources/Textures/_Scp/Structures/Walls/wood.rsi/wood7.png
new file mode 100644
index 00000000000..759e2a599d2
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Walls/wood.rsi/wood7.png differ
diff --git a/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/corner.png b/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/corner.png
new file mode 100644
index 00000000000..a7fe858c4bd
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/corner.png differ
diff --git a/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/corner_small.png b/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/corner_small.png
new file mode 100644
index 00000000000..642f2b59261
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/corner_small.png differ
diff --git a/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/door_closed.png b/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/door_closed.png
new file mode 100644
index 00000000000..2f02a6f743a
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/door_closed.png differ
diff --git a/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/door_closed_small.png b/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/door_closed_small.png
new file mode 100644
index 00000000000..2c7652ceaa8
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/door_closed_small.png differ
diff --git a/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/door_opened.png b/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/door_opened.png
new file mode 100644
index 00000000000..99dc852d35f
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/door_opened.png differ
diff --git a/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/door_opened_small.png b/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/door_opened_small.png
new file mode 100644
index 00000000000..04d5983660c
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/door_opened_small.png differ
diff --git a/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/end.png b/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/end.png
new file mode 100644
index 00000000000..8e4a035214a
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/end.png differ
diff --git a/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/end_small.png b/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/end_small.png
new file mode 100644
index 00000000000..fc2ac63aeb9
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/end_small.png differ
diff --git a/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/meta.json b/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/meta.json
new file mode 100644
index 00000000000..c0e2da16cfb
--- /dev/null
+++ b/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/meta.json
@@ -0,0 +1,59 @@
+{
+ "version": 1,
+ "license": "CLA",
+ "copyright": "Sprited by peperino0290_92944(discord) for Fire Station",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "straight",
+ "directions": 4
+ },
+ {
+ "name": "end",
+ "directions": 4
+ },
+ {
+ "name": "corner",
+ "directions": 4
+ },
+ {
+ "name": "door_closed",
+ "directions": 4
+ },
+ {
+ "name": "door_opened",
+ "directions": 4
+ },
+ {
+ "name": "tjunction",
+ "directions": 4
+ },
+ {
+ "name": "straight_small",
+ "directions": 4
+ },
+ {
+ "name": "end_small",
+ "directions": 4
+ },
+ {
+ "name": "corner_small",
+ "directions": 4
+ },
+ {
+ "name": "door_closed_small",
+ "directions": 4
+ },
+ {
+ "name": "door_opened_small",
+ "directions": 4
+ },
+ {
+ "name": "tjunction_small",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/straight.png b/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/straight.png
new file mode 100644
index 00000000000..4eb510ff696
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/straight.png differ
diff --git a/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/straight_small.png b/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/straight_small.png
new file mode 100644
index 00000000000..65760874552
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/straight_small.png differ
diff --git a/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/tjunction.png b/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/tjunction.png
new file mode 100644
index 00000000000..85cd3d431a6
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/tjunction.png differ
diff --git a/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/tjunction_small.png b/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/tjunction_small.png
new file mode 100644
index 00000000000..ecedee0dbbd
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Walls/wooden_fence.rsi/tjunction_small.png differ
diff --git a/Resources/Textures/_Scp/Structures/Walls/wooden_railing.rsi/corner.png b/Resources/Textures/_Scp/Structures/Walls/wooden_railing.rsi/corner.png
new file mode 100644
index 00000000000..ecaebbbb8af
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Walls/wooden_railing.rsi/corner.png differ
diff --git a/Resources/Textures/_Scp/Structures/Walls/wooden_railing.rsi/corner_small.png b/Resources/Textures/_Scp/Structures/Walls/wooden_railing.rsi/corner_small.png
new file mode 100644
index 00000000000..73bddfdae75
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Walls/wooden_railing.rsi/corner_small.png differ
diff --git a/Resources/Textures/_Scp/Structures/Walls/wooden_railing.rsi/meta.json b/Resources/Textures/_Scp/Structures/Walls/wooden_railing.rsi/meta.json
new file mode 100644
index 00000000000..7401369d436
--- /dev/null
+++ b/Resources/Textures/_Scp/Structures/Walls/wooden_railing.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CLA",
+ "copyright": "Made by peperino0290_92944 for SCP: Project Fire",
+ "size": {
+ "x": 48,
+ "y": 48
+ },
+ "states": [
+ {
+ "name": "side",
+ "directions": 4
+ },
+ {
+ "name": "corner",
+ "directions": 4
+ },
+ {
+ "name": "corner_small",
+ "directions": 4
+ },
+ {
+ "name": "round",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Scp/Structures/Walls/wooden_railing.rsi/round.png b/Resources/Textures/_Scp/Structures/Walls/wooden_railing.rsi/round.png
new file mode 100644
index 00000000000..ace77c17cde
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Walls/wooden_railing.rsi/round.png differ
diff --git a/Resources/Textures/_Scp/Structures/Walls/wooden_railing.rsi/side.png b/Resources/Textures/_Scp/Structures/Walls/wooden_railing.rsi/side.png
new file mode 100644
index 00000000000..8fea7d62365
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Walls/wooden_railing.rsi/side.png differ
diff --git a/Resources/Textures/_Scp/Structures/barricades.rsi/barricade.png b/Resources/Textures/_Scp/Structures/barricades.rsi/barricade.png
new file mode 100644
index 00000000000..3424b2bf6ae
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/barricades.rsi/barricade.png differ
diff --git a/Resources/Textures/_Scp/Structures/barricades.rsi/barricade_directional.png b/Resources/Textures/_Scp/Structures/barricades.rsi/barricade_directional.png
new file mode 100644
index 00000000000..f17a952f990
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/barricades.rsi/barricade_directional.png differ
diff --git a/Resources/Textures/_Scp/Structures/barricades.rsi/barricade_full.png b/Resources/Textures/_Scp/Structures/barricades.rsi/barricade_full.png
new file mode 100644
index 00000000000..272f474e9f7
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/barricades.rsi/barricade_full.png differ
diff --git a/Resources/Textures/_Scp/Structures/barricades.rsi/meta.json b/Resources/Textures/_Scp/Structures/barricades.rsi/meta.json
new file mode 100644
index 00000000000..dfd3a64aa39
--- /dev/null
+++ b/Resources/Textures/_Scp/Structures/barricades.rsi/meta.json
@@ -0,0 +1,21 @@
+{
+ "version": 1,
+ "license": "CLA",
+ "copyright": "Sprited by peperino0290_92944(discord) for Fire Station",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "barricade"
+ },
+ {
+ "name": "barricade_full"
+ },
+ {
+ "name": "barricade_directional",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Scp/Structures/stairs.rsi/meta.json b/Resources/Textures/_Scp/Structures/stairs.rsi/meta.json
index 8ddb4137df9..4ec7d41f882 100644
--- a/Resources/Textures/_Scp/Structures/stairs.rsi/meta.json
+++ b/Resources/Textures/_Scp/Structures/stairs.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CLA",
- "copyright": "Сreated by odlieerr(Discord) | Odleer(Space Station 14)",
+ "copyright": "Сreated by odlieerr(Discord) | Odleer(Space Station 14). Wooden sprited by peperino0290_92944(discord) for Fire Station",
"size": {
"x": 32,
"y": 32
@@ -18,6 +18,13 @@
},
{
"name": "stairs_stage_steel"
+ },
+ {
+ "name": "stairs_stage_wood"
+ },
+ {
+ "name": "stairs_wood",
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/_Scp/Structures/stairs.rsi/stairs_stage_wood.png b/Resources/Textures/_Scp/Structures/stairs.rsi/stairs_stage_wood.png
new file mode 100644
index 00000000000..f5b874e6395
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/stairs.rsi/stairs_stage_wood.png differ
diff --git a/Resources/Textures/_Scp/Structures/stairs.rsi/stairs_wood.png b/Resources/Textures/_Scp/Structures/stairs.rsi/stairs_wood.png
new file mode 100644
index 00000000000..62548d6c3f2
Binary files /dev/null and b/Resources/Textures/_Scp/Structures/stairs.rsi/stairs_wood.png differ
diff --git a/Resources/Textures/_Scp/Tiles/Wood/attributions.yml b/Resources/Textures/_Scp/Tiles/Wood/attributions.yml
new file mode 100644
index 00000000000..354ff954733
--- /dev/null
+++ b/Resources/Textures/_Scp/Tiles/Wood/attributions.yml
@@ -0,0 +1,4 @@
+- files: [ "wood", "wood_broken", "wood_large", "wood_large_broken", "wood_pattern", "wood_pattern_broken" ]
+ license: "CLA"
+ copyright: "Sprited by peperino0290_92944(discord) for Fire Station"
+ source: "https://github.com/space-sunrise/fire-station"
diff --git a/Resources/Textures/_Scp/Tiles/Wood/wood.png b/Resources/Textures/_Scp/Tiles/Wood/wood.png
new file mode 100644
index 00000000000..fe7b93a3d23
Binary files /dev/null and b/Resources/Textures/_Scp/Tiles/Wood/wood.png differ
diff --git a/Resources/Textures/_Scp/Tiles/Wood/wood_broken.png b/Resources/Textures/_Scp/Tiles/Wood/wood_broken.png
new file mode 100644
index 00000000000..5ee8beb9922
Binary files /dev/null and b/Resources/Textures/_Scp/Tiles/Wood/wood_broken.png differ
diff --git a/Resources/Textures/_Scp/Tiles/Wood/wood_large.png b/Resources/Textures/_Scp/Tiles/Wood/wood_large.png
new file mode 100644
index 00000000000..20e2fe71af1
Binary files /dev/null and b/Resources/Textures/_Scp/Tiles/Wood/wood_large.png differ
diff --git a/Resources/Textures/_Scp/Tiles/Wood/wood_large_broken.png b/Resources/Textures/_Scp/Tiles/Wood/wood_large_broken.png
new file mode 100644
index 00000000000..20656d41e8b
Binary files /dev/null and b/Resources/Textures/_Scp/Tiles/Wood/wood_large_broken.png differ
diff --git a/Resources/Textures/_Scp/Tiles/Wood/wood_pattern.png b/Resources/Textures/_Scp/Tiles/Wood/wood_pattern.png
new file mode 100644
index 00000000000..1229a3b9ca2
Binary files /dev/null and b/Resources/Textures/_Scp/Tiles/Wood/wood_pattern.png differ
diff --git a/Resources/Textures/_Scp/Tiles/Wood/wood_pattern_broken.png b/Resources/Textures/_Scp/Tiles/Wood/wood_pattern_broken.png
new file mode 100644
index 00000000000..582784c4e96
Binary files /dev/null and b/Resources/Textures/_Scp/Tiles/Wood/wood_pattern_broken.png differ
diff --git a/Resources/mapping_actions.yml b/Resources/mapping_actions.yml
index 8437d4915b3..426e839b1a3 100644
--- a/Resources/mapping_actions.yml
+++ b/Resources/mapping_actions.yml
@@ -82,13 +82,13 @@
- entity: Table
assignments:
- 3: 1
-- entity: ChairWood
+- entity: ScpChairWood # Fire edit
assignments:
- 3: 2
-- entity: Chair
+- entity: ScpChair # Fire edit
assignments:
- 3: 3
-- entity: ChairOfficeLight
+- entity: ScpChairOfficeLight # Fire edit
assignments:
- 3: 4
- entity: StoolBar
@@ -100,7 +100,7 @@
- entity: Rack
assignments:
- 3: 8
-- entity: ChairOfficeDark
+- entity: ScpChairOfficeDark # Fire edit
assignments:
- 3: 5
- entity: LampGold
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 1c87dfdd785..8fd6c3d7ef0 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -2637,7 +2637,20 @@ BaseComputer: ScpComputer
BaseComputerAiAccess: ScpComputer
# Keycards rename
-
KeyCardClassDCock: KeyCardClassDCook
+# Chair replacements
+Chair: ScpChair
+ChairGreyscale: ScpChairGreyscale
+ChairOfficeLight: ScpChairOfficeLight
+ChairOfficeDark: ScpChairOfficeDark
+ChairOfficeGrey: ScpChairOfficeGrey
+ChairWood: ScpChairWood
+WoodenBench: ScpWoodenBench
+ChairRitual: ScpChairRitual
+ChairCursed: ScpChairCursed
+FloorTileItemWood: ScpFloorTileItemWood
+FloorTileItemWoodLarge: ScpFloorTileItemWoodLarge
+FloorTileItemWoodPattern: ScpFloorTileItemWoodPattern
+
# Fire added end