Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
Original file line number Diff line number Diff line change
@@ -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 }
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
Original file line number Diff line number Diff line change
@@ -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 }
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/_strings/_scp/tiles/anechoic.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
scp-tiles-anechoic = [SCP] покрытие безэховой камеры
Original file line number Diff line number Diff line change
Expand Up @@ -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] покрытие безэховой камеры
6 changes: 6 additions & 0 deletions Resources/Locale/ru-RU/_strings/_scp/tiles/wood.ftl
Original file line number Diff line number Diff line change
@@ -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 } сломанный
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
15 changes: 12 additions & 3 deletions Resources/Prototypes/Entities/Objects/Misc/tiles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -1405,6 +1410,7 @@
- type: Sprite
state: meat
- type: Item
sprite: _Scp/Objects/Tiles/wood.rsi # Fire added
heldPrefix: meat
- type: FloorTile
outputs:
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Objects/Shields/shields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -55,16 +55,16 @@
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
shape:
- 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 13 additions & 1 deletion Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -103,6 +103,7 @@
- type: entity
name: chair
id: Chair
categories: [ HideSpawnMenu ] # Fire edit
parent: ChairBase
components:
- type: Sprite
Expand All @@ -114,6 +115,7 @@
- type: entity
name: chair
id: ChairGreyscale
categories: [ HideSpawnMenu ] # Fire edit
parent: Chair
suffix: White
components:
Expand Down Expand Up @@ -163,6 +165,7 @@
- type: entity
name: white office chair
id: ChairOfficeLight
categories: [ HideSpawnMenu ] # Fire edit
parent: OfficeChairBase
components:
- type: Sprite
Expand All @@ -174,6 +177,7 @@
- type: entity
name: dark office chair
id: ChairOfficeDark
categories: [ HideSpawnMenu ] # Fire edit
parent: ChairOfficeLight
components:
- type: Sprite
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Structures/barricades.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading