diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl index 9a356a675e..87979653e3 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl @@ -2449,8 +2449,14 @@ ent-CP14StatueAngelLimestone = { ent-CP14StatueAngel } ent-CP14BaseTombstone = надгробие .desc = Кусок камня, установленный в память о павших. +ent-CP14IronDoorFrame = каркас железной двери + .desc = Незаконченная железная дверь. + +ent-CP14IronDoorFrameMirrored = { ent-CP14IronDoorFrame } + .desc = { ent-CP14IronDoorFrame.desc } + ent-CP14WoodenDoorFrame = каркас деревянной двери - .desc = Незаконченная деревянная дверь + .desc = Незаконченная деревянная дверь. ent-CP14WoodenDoorFrameMirrored = { ent-CP14WoodenDoorFrame } .desc = { ent-CP14WoodenDoorFrame.desc } @@ -2938,10 +2944,10 @@ ent-CP14CraneBarrelSmallAleBottomless = { ent-CP14CraneBarrelSmall } ent-CP14Bonfire = костёр .desc = Груда бревен, сложенных вместе, и готовых вспыхнуть от малейшей искры. -ent-C14IronCabinet = железный комод +ent-CP14IronCabinet = железный комод .desc = Железный шкаф. Прочный, запираемый. Вы можете хранить здесь свои ценности, не опасаясь, что какой-нибудь грабитель заберет все себе. -ent-C14IronCabinetCargo = торговый ящик +ent-CP14IronCabinetCargo = торговый ящик .desc = Бронированное хранилище для хранения денег, предназначенных для торговли с городом. Городские работники будут выгружать сюда свои доходы или забирать их отсюда, когда вы захотите что-то купить. ent-CP14ClosetBase = шкаф @@ -3229,6 +3235,9 @@ ent-CP14FenceIronGrilleStraight = { ent-CP14FenceIronGrilleBase } .desc = { ent-CP14FenceIronGrilleBase.desc } .suffix = Прямой +ent-CP14FenceIronGrilleGateFrame = рама железных решетчатых ворот + .desc = Незаконченные железные решетчатые ворота. + ent-CP14FenceIronGrilleGate = железные решетчатые ворота .desc = Тяжелые железные ворота в решетках. Выглядит серьезно. @@ -3304,7 +3313,7 @@ ent-CP14Mannequin = манекен .desc = Удобная подставка для одежды или доспехов. ent-CP14WoodenPallet = деревянный поддон - .desc = деревянная подставка для товаров + .desc = Деревянная подставка для товаров. ent-CP14Target = мишень .desc = Мишень для тренировки меткости. diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/dye.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/dye.yml index 5e5480681e..3ba7b248da 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/dye.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/dye.yml @@ -24,6 +24,9 @@ - state: base - state: powder color: "#bd2b26" + - type: Tag + tags: + - CP14DyeRed - type: entity id: CP14DyeYellow @@ -35,6 +38,9 @@ - state: base - state: powder color: "#ffe269" + - type: Tag + tags: + - CP14DyeYellow - type: entity id: CP14DyeBlue @@ -46,6 +52,9 @@ - state: base - state: powder color: "#5eabeb" + - type: Tag + tags: + - CP14DyeBlue - type: entity id: CP14DyeGreen @@ -57,6 +66,9 @@ - state: base - state: powder color: "#85903e" + - type: Tag + tags: + - CP14DyeGreen - type: entity id: CP14DyePurple @@ -68,6 +80,9 @@ - state: base - state: powder color: "#8241cc" + - type: Tag + tags: + - CP14DyePurple - type: entity id: CP14DyeBlack @@ -78,4 +93,7 @@ layers: - state: base - state: powder - color: "#242329" \ No newline at end of file + color: "#242329" + - type: Tag + tags: + - CP14DyeBlack \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Decorations/tombstones.yml b/Resources/Prototypes/_CP14/Entities/Structures/Decorations/tombstones.yml index d8dc8e94a9..f42173d6a3 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Decorations/tombstones.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Decorations/tombstones.yml @@ -46,5 +46,8 @@ spawn: CP14StoneBlock1: min: 1 - max: 2 - - type: Climbable \ No newline at end of file + max: 4 + - type: Climbable + - type: Construction + graph: CP14BaseTombstone + node: CP14BaseTombstone \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Doors/door_frames.yml b/Resources/Prototypes/_CP14/Entities/Structures/Doors/door_frames.yml index 13a4b42c61..8793577bba 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Doors/door_frames.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Doors/door_frames.yml @@ -22,7 +22,7 @@ parent: CP14BaseDoorFrame id: CP14WoodenDoorFrame name: wooden door frame - description: An unfinished wooden door + description: An unfinished wooden door. components: - type: Sprite sprite: _CP14/Structures/Doors/wooden_frame.rsi @@ -37,6 +37,11 @@ !type:DamageTrigger damage: 50 behaviors: + - !type:SpawnEntitiesBehavior + spawn: + CP14WoodenPlanks1: + min: 1 + max: 2 - !type:DoActsBehavior acts: ["Destruction"] - type: Construction @@ -51,4 +56,74 @@ state: closed_mirrored - type: Construction graph: CP14WoodenDoor - node: CP14WoodenDoorFrameMirrored \ No newline at end of file + node: CP14WoodenDoorFrameMirrored + +- type: entity + parent: CP14BaseDoorFrame + id: CP14IronDoorFrame + name: iron door frame + description: An unfinished iron door. + components: + - type: Sprite + sprite: _CP14/Structures/Doors/iron_frame.rsi + drawdepth: Mobs + state: closed + - type: Damageable + damageContainer: Inorganic + damageModifierSet: StructuralMetallic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:SpawnEntitiesBehavior + spawn: + CP14IronBar1: + min: 1 + max: 2 + - !type:DoActsBehavior + acts: ["Destruction"] + - type: Construction + graph: CP14IronDoor + node: CP14IronDoorFrame + +- type: entity + parent: CP14IronDoorFrame + id: CP14IronDoorFrameMirrored + components: + - type: Sprite + state: closed_mirrored + - type: Construction + graph: CP14IronDoor + node: CP14IronDoorFrameMirrored + +- type: entity + parent: CP14BaseDoorFrame + id: CP14FenceIronGrilleGateFrame + name: iron grille gate frame + description: An unfinished iron grille gate. + components: + - type: Sprite + sprite: _CP14/Structures/Fences/iron_grille.rsi + drawdepth: Mobs + state: door_closed_frame + - type: Damageable + damageContainer: Inorganic + damageModifierSet: StructuralMetallic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:SpawnEntitiesBehavior + spawn: + CP14IronBar1: + min: 1 + max: 2 + - !type:DoActsBehavior + acts: ["Destruction"] + - type: Construction + graph: CP14FenceIronGrilleGate + node: CP14FenceIronGrilleGateFrame diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Doors/iron_doors.yml b/Resources/Prototypes/_CP14/Entities/Structures/Doors/iron_doors.yml index b62ecc136b..c4e8cc7296 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Doors/iron_doors.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Doors/iron_doors.yml @@ -27,9 +27,9 @@ behaviors: - !type:DoActsBehavior acts: ["Destruction"] - #- type: Construction - # graph: CP14WoodenDoor - # node: CP14WoodenDoor + - type: Construction + graph: CP14IronDoor + node: CP14IronDoor - type: entity id: CP14IronDoorMirrored @@ -39,6 +39,6 @@ - type: Door openSpriteState: open_mirrored closedSpriteState: closed_mirrored - #- type: Construction - # graph: CP14WoodenDoor - # node: CP14WoodenDoorMirrored + - type: Construction + graph: CP14IronDoor + node: CP14IronDoorMirrored diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Doors/iron_doors_windowed.yml b/Resources/Prototypes/_CP14/Entities/Structures/Doors/iron_doors_windowed.yml index 2beca49e70..0ad836bda6 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Doors/iron_doors_windowed.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Doors/iron_doors_windowed.yml @@ -30,9 +30,9 @@ behaviors: - !type:DoActsBehavior acts: ["Destruction"] - #- type: Construction - # graph: CP14WoodenDoor - # node: CP14WoodenDoor + - type: Construction + graph: CP14IronDoor + node: CP14IronDoor - type: entity id: CP14IronDoorWindowedMirrored @@ -42,6 +42,6 @@ - type: Door openSpriteState: open_mirrored closedSpriteState: closed_mirrored - #- type: Construction - # graph: CP14WoodenDoor - # node: CP14WoodenDoorMirrored + - type: Construction + graph: CP14IronDoor + node: CP14IronDoorMirrored diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Fence/iron_grille.yml b/Resources/Prototypes/_CP14/Entities/Structures/Fence/iron_grille.yml index 9f11ef2b40..3b328f1e70 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Fence/iron_grille.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Fence/iron_grille.yml @@ -49,6 +49,9 @@ - MidImpassable - LowImpassable - WallLayer + - type: Construction + graph: CP14FenceIronGrilleStraight + node: CP14FenceIronGrilleStraight - type: entity parent: @@ -87,4 +90,7 @@ collection: CP14Doorknob params: variation: 0.03 - volume: -5 \ No newline at end of file + volume: -5 + - type: Construction + graph: CP14FenceIronGrilleGate + node: CP14FenceIronGrilleGate \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Fence/iron_grille_top.yml b/Resources/Prototypes/_CP14/Entities/Structures/Fence/iron_grille_top.yml index 29d1f759b1..fac375eff4 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Fence/iron_grille_top.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Fence/iron_grille_top.yml @@ -47,4 +47,7 @@ - Impassable layer: - MidImpassable - - HighImpassable \ No newline at end of file + - HighImpassable + - type: Construction + graph: CP14FenceIronGrilleWindowStraight + node: CP14FenceIronGrilleWindowStraight \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel_crane.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel_crane.yml index 6f9ce871a2..694b510894 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel_crane.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel_crane.yml @@ -56,6 +56,9 @@ solutions: barrel: maxVol: 500 + - type: Construction + graph: CP14CraneBarrel + node: CP14CraneBarrel - type: entity parent: CP14CraneBarrel @@ -264,6 +267,9 @@ solutions: barrel: maxVol: 50 + - type: Construction + graph: CP14CraneBarrelSmall + node: CP14CraneBarrelSmall - type: entity parent: CP14CraneBarrelSmall diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/beds.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/beds.yml index 5a7ffbeb9c..598d41451d 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/beds.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/beds.yml @@ -46,10 +46,13 @@ - !type:SpawnEntitiesBehavior spawn: CP14WoodenPlanks1: - min: 2 - max: 4 + min: 1 + max: 2 - type: Transform anchored: true noRot: true - type: Anchorable - - type: Pullable \ No newline at end of file + - type: Pullable + - type: Construction + graph: CP14WoodenBed + node: CP14WoodenBed \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bench.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bench.yml index ca782ac4b4..f6c3c63f5f 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bench.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bench.yml @@ -16,3 +16,6 @@ - state: wooden - type: Physics bodyType: Static + - type: Construction + graph: CP14BenchWood + node: CP14BenchWood diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/cabinets.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/cabinets.yml index 955ee0bf3a..0cb265c88f 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/cabinets.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/cabinets.yml @@ -70,14 +70,17 @@ - !type:SpawnEntitiesBehavior spawn: CP14WoodenPlanks1: - min: 3 - max: 6 + min: 1 + max: 3 - !type:DoActsBehavior acts: [ "Destruction" ] + - type: Construction + graph: CP14WoodenCabinet + node: CP14WoodenCabinet - type: entity parent: CP14CabinetBase - id: C14IronCabinet + id: CP14IronCabinet name: iron cabinet description: an iron cabinet. Sturdy, lockable. You can store your valuables here without fear of some burglar taking it all for himself. components: @@ -96,12 +99,20 @@ - !type:PlaySoundBehavior sound: collection: MetalBreak + - !type:SpawnEntitiesBehavior + spawn: + CP14IronBar1: + min: 1 + max: 3 - !type:DoActsBehavior acts: [ "Destruction" ] + - type: Construction + graph: CP14WoodenCabinet + node: CP14WoodenCabinet - type: entity - parent: C14IronCabinet - id: C14IronCabinetCargo + parent: CP14IronCabinet + id: CP14IronCabinetCargo name: trade box description: An armored vault for storing money for trade with the city. City workers will unload their earnings here, or take them from here when you want to buy something. components: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml index 00a9816416..1a43485f64 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml @@ -97,7 +97,12 @@ spawn: CP14WoodenPlanks1: min: 2 - max: 5 + max: 4 + - type: Construction + graph: CP14WoodenCloset + node: CP14WoodenCloset + containers: + - entity_storage - type: entity name: safe diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/curtains.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/curtains.yml index 1ee025c366..b1587880df 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/curtains.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/curtains.yml @@ -72,6 +72,9 @@ layers: - state: white_closed map: ["enum.DoorVisualLayers.Base"] + - type: Construction + graph: CP14Curtains + node: CP14CurtainsWhite - type: entity id: CP14CurtainsWhiteOpened @@ -101,6 +104,9 @@ layers: - state: blue_closed map: ["enum.DoorVisualLayers.Base"] + - type: Construction + graph: CP14Curtains + node: CP14CurtainsBlue - type: entity id: CP14CurtainsBlueOpened @@ -130,6 +136,9 @@ layers: - state: red_closed map: ["enum.DoorVisualLayers.Base"] + - type: Construction + graph: CP14Curtains + node: CP14CurtainsRed - type: entity id: CP14CurtainsRedOpened diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/pallets.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/pallets.yml index 4c2e28ce36..a0d0647c32 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/pallets.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/pallets.yml @@ -22,7 +22,7 @@ - CP14BasePallets - CP14BaseFlammable name: wooden pallet - description: wooden goods stand + description: Wooden goods stand. components: - type: Sprite state: wooden @@ -51,6 +51,9 @@ max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] + - type: Construction + graph: CP14WoodenPallet + node: CP14WoodenPallet - type: entity id: CP14WoodenPalletSell diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount.yml index 18cd2e13b2..0b10db8573 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount.yml @@ -130,6 +130,9 @@ - type: ContainerContainer containers: storagebase: !type:Container + - type: Construction + graph: CP14WallmountBarShelfA + node: CP14WallmountBarShelfA - type: entity id: CP14WallmountBarShelfB @@ -143,3 +146,6 @@ - map: ["enum.StorageFillLayers.Fill"] - type: StorageFillVisualizer fillBaseName: bottleB + - type: Construction + graph: CP14WallmountBarShelfB + node: CP14WallmountBarShelfB diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/coffin.yml b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/coffin.yml index 6643695c77..b154783ce8 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/coffin.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/coffin.yml @@ -36,3 +36,8 @@ max: 4 - !type:DoActsBehavior acts: [ "Destruction" ] + - type: Construction + graph: CP14CrateCoffin + node: CP14CrateCoffin + containers: + - entity_storage diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml index bae58dba33..d4587f4a1d 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml @@ -24,8 +24,8 @@ - !type:SpawnEntitiesBehavior spawn: CP14WoodenPlanks1: - min: 3 - max: 5 + min: 1 + max: 2 - !type:DoActsBehavior acts: [ "Destruction" ] - type: Climbable @@ -104,15 +104,15 @@ - !type:SpawnEntitiesBehavior spawn: CP14WoodenPlanks1: - min: 3 - max: 5 + min: 1 + max: 2 - !type:DoActsBehavior acts: [ "Destruction" ] - type: entity id: CP14LargeWoodenCrate name: large wooden crate - description: solid wooden crate + description: Solid wooden crate. parent: - CP14BaseCrate - CP14BaseFlammable @@ -134,15 +134,18 @@ - !type:SpawnEntitiesBehavior spawn: CP14WoodenPlanks1: - min: 1 + min: 2 max: 4 - !type:DoActsBehavior acts: [ "Destruction" ] + - type: Construction + graph: CP14LargeWoodenCrate + node: CP14LargeWoodenCrate - type: entity id: CP14SmallWoodenCrate name: small wooden crate - description: solid wooden crate + description: Solid wooden crate. parent: - CP14BaseSmallCrate - CP14BaseFlammable @@ -165,6 +168,9 @@ spawn: CP14WoodenPlanks1: min: 1 - max: 4 + max: 2 - !type:DoActsBehavior - acts: [ "Destruction" ] \ No newline at end of file + acts: [ "Destruction" ] + - type: Construction + graph: CP14SmallWoodenCrate + node: CP14SmallWoodenCrate \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/beds.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/beds.yml new file mode 100644 index 0000000000..aac866834a --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/beds.yml @@ -0,0 +1,15 @@ +- type: constructionGraph + id: CP14WoodenBed + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} + edges: + - to: CP14WoodenBed + steps: + - material: CP14WoodenPlanks + amount: 2 + doAfter: 2 + - node: CP14WoodenBed + entity: CP14WoodenBed diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/curtains.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/curtains.yml new file mode 100644 index 0000000000..82566765cb --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/curtains.yml @@ -0,0 +1,78 @@ +- type: constructionGraph + id: CP14Curtains + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} + edges: + - to: CP14CurtainsWhite + steps: + - material: CP14WoodenPlanks + amount: 1 + doAfter: 2 + - material: CP14Nail + amount: 4 + doAfter: 1 + - material: CP14Cloth + amount: 2 + doAfter: 1 + + - node: CP14CurtainsWhite + entity: CP14CurtainsWhite + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: CP14WoodenPlanks1 + amount: 1 + - !type:SpawnPrototype + prototype: CP14Nail1 + amount: 4 + - !type:SpawnPrototype + prototype: CP14Cloth1 + amount: 2 + - !type:DeleteEntity {} + steps: + - tool: Screwing #TODO - new tool + doAfter: 1 + - to: CP14CurtainsBlue + steps: + - tag: CP14DyeBlue + name: blue dye + icon: + sprite: _CP14/Objects/Materials/dye.rsi + state: powder + doAfter: 1 + - to: CP14CurtainsRed + steps: + - tag: CP14DyeRed + name: red dye + icon: + sprite: _CP14/Objects/Materials/dye.rsi + state: powder + doAfter: 1 + + - node: CP14CurtainsBlue + entity: CP14CurtainsBlue + edges: + - to: CP14CurtainsWhite + completed: + - !type:SpawnPrototype + prototype: CP14DyeBlue + amount: 1 + steps: + - tool: Screwing #TODO - new tool + doAfter: 1 + + - node: CP14CurtainsRed + entity: CP14CurtainsRed + edges: + - to: CP14CurtainsWhite + completed: + - !type:SpawnPrototype + prototype: CP14DyeRed + amount: 1 + steps: + - tool: Screwing #TODO - new tool + doAfter: 1 diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/Misc.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/lighting.yml similarity index 60% rename from Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/Misc.yml rename to Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/lighting.yml index 154e0b996d..47cb3f03cc 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/Misc.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/lighting.yml @@ -18,26 +18,6 @@ - node: CP14Bonfire entity: CP14Bonfire -- type: constructionGraph - id: CP14BaseBarrel - start: start - graph: - - node: start - actions: - - !type:DestroyEntity {} - edges: - - to: CP14BaseBarrel - steps: - - material: CP14WoodenPlanks - amount: 5 - doAfter: 3 - - material: CP14Nail - amount: 2 - doAfter: 2 - - - node: CP14BaseBarrel - entity: CP14BaseBarrel - - type: constructionGraph id: CP14WallmountTorch start: start @@ -74,20 +54,3 @@ - node: CP14WallmountLampEmpty entity: CP14WallmountLampEmpty - -- type: constructionGraph - id: CP14WallmountOrdersBorder - start: start - graph: - - node: start - actions: - - !type:DestroyEntity {} - edges: - - to: CP14WallmountOrdersBorder - steps: - - material: CP14WoodenPlanks - amount: 3 - doAfter: 3 - - - node: CP14WallmountOrdersBorder - entity: CP14WallmountOrdersBorder diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/orders_border.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/orders_border.yml new file mode 100644 index 0000000000..37e7467d20 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/orders_border.yml @@ -0,0 +1,16 @@ +- type: constructionGraph + id: CP14WallmountOrdersBorder + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} + edges: + - to: CP14WallmountOrdersBorder + steps: + - material: CP14WoodenPlanks + amount: 3 + doAfter: 3 + + - node: CP14WallmountOrdersBorder + entity: CP14WallmountOrdersBorder diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/seats.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/seats.yml index f833f40cbe..48ef6f0d55 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/seats.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/seats.yml @@ -11,6 +11,21 @@ - material: CP14WoodenPlanks amount: 4 doAfter: 2 - - node: CP14ChairWooden - entity: CP14ChairWooden \ No newline at end of file + entity: CP14ChairWooden + +- type: constructionGraph + id: CP14BenchWood + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} + edges: + - to: CP14BenchWood + steps: + - material: CP14WoodenPlanks + amount: 5 + doAfter: 2 + - node: CP14BenchWood + entity: CP14BenchWood \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Misc/pallets.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Misc/pallets.yml new file mode 100644 index 0000000000..782dd75b31 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Misc/pallets.yml @@ -0,0 +1,15 @@ +- type: constructionGraph + id: CP14WoodenPallet + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} + edges: + - to: CP14WoodenPallet + steps: + - material: CP14WoodenPlanks + amount: 2 + doAfter: 2 + - node: CP14WoodenPallet + entity: CP14WoodenPallet diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/target.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Misc/target.yml similarity index 100% rename from Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/target.yml rename to Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Misc/target.yml diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Misc/tombs.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Misc/tombs.yml new file mode 100644 index 0000000000..b847d86e87 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Misc/tombs.yml @@ -0,0 +1,15 @@ +- type: constructionGraph + id: CP14BaseTombstone + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} + edges: + - to: CP14BaseTombstone + steps: + - material: CP14Stone + amount: 5 + doAfter: 2 + - node: CP14BaseTombstone + entity: CP14BaseTombstone diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/barrels.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/barrels.yml new file mode 100644 index 0000000000..b1ded56d19 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/barrels.yml @@ -0,0 +1,56 @@ +- type: constructionGraph + id: CP14BaseBarrel + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} + edges: + - to: CP14BaseBarrel + steps: + - material: CP14WoodenPlanks + amount: 5 + doAfter: 3 + - material: CP14Nail + amount: 2 + doAfter: 2 + - node: CP14BaseBarrel + entity: CP14BaseBarrel + +- type: constructionGraph + id: CP14CraneBarrel + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} + edges: + - to: CP14CraneBarrel + steps: + - material: CP14WoodenPlanks + amount: 5 + doAfter: 3 + - material: CP14Nail + amount: 2 + doAfter: 2 + - node: CP14CraneBarrel + entity: CP14CraneBarrel + +- type: constructionGraph + id: CP14CraneBarrelSmall + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} + edges: + - to: CP14CraneBarrelSmall + steps: + - material: CP14WoodenPlanks + amount: 3 + doAfter: 3 + - material: CP14Nail + amount: 2 + doAfter: 2 + - node: CP14CraneBarrelSmall + entity: CP14CraneBarrelSmall \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/cabinets.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/cabinets.yml new file mode 100644 index 0000000000..2825b2eba2 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/cabinets.yml @@ -0,0 +1,35 @@ +- type: constructionGraph + id: CP14WoodenCabinet + start: start + graph: + - node: start + edges: + - to: CP14WoodenCabinet + completed: + - !type:SnapToGrid + steps: + - material: CP14WoodenPlanks + amount: 3 + - material: CP14Nail + amount: 2 + doAfter: 4 + - node: CP14WoodenCabinet + entity: CP14WoodenCabinet + +- type: constructionGraph + id: CP14IronCabinet + start: start + graph: + - node: start + edges: + - to: CP14IronCabinet + completed: + - !type:SnapToGrid + steps: + - material: CP14IronBar + amount: 3 + - material: CP14Nail + amount: 2 + doAfter: 4 + - node: CP14IronCabinet + entity: CP14IronCabinet diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/chests.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/chests.yml similarity index 100% rename from Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/chests.yml rename to Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/chests.yml diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/closets.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/closets.yml new file mode 100644 index 0000000000..e283c08b52 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/closets.yml @@ -0,0 +1,17 @@ +- type: constructionGraph + id: CP14WoodenCloset + start: start + graph: + - node: start + edges: + - to: CP14WoodenCloset + completed: + - !type:SnapToGrid + steps: + - material: CP14WoodenPlanks + amount: 4 + - material: CP14Nail + amount: 2 + doAfter: 4 + - node: CP14WoodenCloset + entity: CP14WoodenCloset \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/coffins.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/coffins.yml new file mode 100644 index 0000000000..c2bb950f5d --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/coffins.yml @@ -0,0 +1,19 @@ +- type: constructionGraph + id: CP14CrateCoffin + start: start + graph: + - node: start + edges: + - to: CP14CrateCoffin + completed: + - !type:SnapToGrid + steps: + - material: CP14WoodenPlanks + amount: 2 + - material: CP14Cloth + amount: 2 + - material: CP14Nail + amount: 1 + doAfter: 4 + - node: CP14CrateCoffin + entity: CP14CrateCoffin \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/crates.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/crates.yml new file mode 100644 index 0000000000..a721ca8bf8 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/crates.yml @@ -0,0 +1,35 @@ +- type: constructionGraph + id: CP14SmallWoodenCrate + start: start + graph: + - node: start + edges: + - to: CP14SmallWoodenCrate + completed: + - !type:SnapToGrid + steps: + - material: CP14WoodenPlanks + amount: 2 + - material: CP14Nail + amount: 1 + doAfter: 4 + - node: CP14SmallWoodenCrate + entity: CP14SmallWoodenCrate + +- type: constructionGraph + id: CP14LargeWoodenCrate + start: start + graph: + - node: start + edges: + - to: CP14LargeWoodenCrate + completed: + - !type:SnapToGrid + steps: + - material: CP14WoodenPlanks + amount: 4 + - material: CP14Nail + amount: 2 + doAfter: 4 + - node: CP14LargeWoodenCrate + entity: CP14LargeWoodenCrate diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/seats.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/pits.yml similarity index 100% rename from Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/seats.yml rename to Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/pits.yml diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/shelfs.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/shelfs.yml new file mode 100644 index 0000000000..6cd5f2c592 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/shelfs.yml @@ -0,0 +1,31 @@ +- type: constructionGraph + id: CP14WallmountBarShelfA + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} + edges: + - to: CP14WallmountBarShelfA + steps: + - material: CP14WoodenPlanks + amount: 2 + doAfter: 2 + - node: CP14WallmountBarShelfA + entity: CP14WallmountBarShelfA + +- type: constructionGraph + id: CP14WallmountBarShelfB + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} + edges: + - to: CP14WallmountBarShelfB + steps: + - material: CP14WoodenPlanks + amount: 2 + doAfter: 2 + - node: CP14WallmountBarShelfB + entity: CP14WallmountBarShelfB \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/grilles.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/grilles.yml new file mode 100644 index 0000000000..5188d155c2 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/grilles.yml @@ -0,0 +1,48 @@ +- type: constructionGraph + id: CP14FenceIronGrilleGate + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} + edges: + - to: CP14FenceIronGrilleGateFrame + steps: + - material: CP14IronBar + amount: 1 + - material: CP14Nail + amount: 2 + doAfter: 2 + + - node: CP14FenceIronGrilleGateFrame + entity: CP14FenceIronGrilleGateFrame + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: CP14IronBar1 + amount: 1 + - !type:DeleteEntity {} + steps: + - tool: Screwing #TODO - new tool + doAfter: 1 + - to: CP14FenceIronGrilleGate + steps: + - material: CP14IronBar + amount: 1 + - material: CP14Nail + amount: 2 + doAfter: 2 + + - node: CP14FenceIronGrilleGate + entity: CP14FenceIronGrilleGate + edges: + - to: CP14FenceIronGrilleGateFrame + completed: + - !type:SpawnPrototype + prototype: CP14IronBar1 + amount: 1 + steps: + - tool: Screwing #TODO - new tool + doAfter: 1 + \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/iron_doors.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/iron_doors.yml new file mode 100644 index 0000000000..3a8f6bcac8 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/iron_doors.yml @@ -0,0 +1,121 @@ +- type: constructionGraph + id: CP14IronDoor + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} + edges: + - to: CP14IronDoorFrame + steps: + - material: CP14IronBar + amount: 2 + doAfter: 2 + + - node: CP14IronDoorFrame + entity: CP14IronDoorFrame + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: CP14IronBar1 + amount: 2 + - !type:DeleteEntity {} + steps: + - tool: Screwing #TODO - new tool + doAfter: 1 + - to: CP14IronDoorFrameMirrored + steps: + - tool: CP14Hammering + doAfter: 1 + - to: CP14IronDoor + steps: + - material: CP14IronBar + amount: 2 + doAfter: 2 + - to: CP14IronDoorWindowed + steps: + - material: CP14Nail + amount: 1 + doAfter: 1 + - material: CP14IronBar + amount: 2 + doAfter: 2 + + - node: CP14IronDoorFrameMirrored + entity: CP14IronDoorFrameMirrored + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: CP14IronBar1 + amount: 2 + - !type:DeleteEntity {} + steps: + - tool: Screwing #TODO - new tool + doAfter: 1 + - to: CP14IronDoorFrame + steps: + - tool: CP14Hammering + doAfter: 1 + - to: CP14IronDoorMirrored + steps: + - material: CP14IronBar + amount: 2 + doAfter: 2 + - to: CP14IronDoorWindowedMirrored + steps: + - material: CP14Nail + amount: 1 + doAfter: 1 + - material: CP14IronBar + amount: 2 + doAfter: 2 + + - node: CP14IronDoor + entity: CP14IronDoor + edges: + - to: CP14IronDoorFrame + completed: + - !type:SpawnPrototype + prototype: CP14IronBar1 + amount: 2 + steps: + - tool: Screwing #TODO - new tool + doAfter: 1 + + - node: CP14IronDoorMirrored + entity: CP14IronDoorMirrored + edges: + - to: CP14IronDoorFrameMirrored + completed: + - !type:SpawnPrototype + prototype: CP14IronBar1 + amount: 2 + steps: + - tool: Screwing #TODO - new tool + doAfter: 1 + + - node: CP14IronDoorWindowed + entity: CP14IronDoorWindowed + edges: + - to: CP14IronDoorFrame + completed: + - !type:SpawnPrototype + prototype: CP14IronBar1 + amount: 2 + steps: + - tool: Screwing #TODO - new tool + doAfter: 1 + + - node: CP14IronDoorWindowedMirrored + entity: CP14IronDoorWindowedMirrored + edges: + - to: CP14IronDoorFrameMirrored + completed: + - !type:SpawnPrototype + prototype: CP14IronBar1 + amount: 2 + steps: + - tool: Screwing #TODO - new tool + doAfter: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/wooden_door.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/wooden_doors.yml similarity index 100% rename from Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/wooden_door.yml rename to Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/wooden_doors.yml diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Roofs/roofs.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Roofs/roofs.yml similarity index 100% rename from Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Roofs/roofs.yml rename to Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Roofs/roofs.yml diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Walls/Snowdrift.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/Snowdrift.yml similarity index 100% rename from Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Walls/Snowdrift.yml rename to Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/Snowdrift.yml diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Walls/WallDirt.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/WallDirt.yml similarity index 100% rename from Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Walls/WallDirt.yml rename to Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/WallDirt.yml diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Walls/WallStone.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/WallStone.yml similarity index 100% rename from Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Walls/WallStone.yml rename to Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/WallStone.yml diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Walls/WallWood.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/WallWood.yml similarity index 100% rename from Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Walls/WallWood.yml rename to Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/WallWood.yml diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/grilles.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/grilles.yml new file mode 100644 index 0000000000..203a64b1ad --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/grilles.yml @@ -0,0 +1,35 @@ +- type: constructionGraph + id: CP14FenceIronGrilleStraight + start: start + graph: + - node: start + edges: + - to: CP14FenceIronGrilleStraight + completed: + - !type:SnapToGrid + steps: + - material: CP14IronBar + amount: 2 + - material: CP14Nail + amount: 4 + doAfter: 4 + - node: CP14FenceIronGrilleStraight + entity: CP14FenceIronGrilleStraight + +- type: constructionGraph + id: CP14FenceIronGrilleWindowStraight + start: start + graph: + - node: start + edges: + - to: CP14FenceIronGrilleWindowStraight + completed: + - !type:SnapToGrid + steps: + - material: CP14IronBar + amount: 1 + - material: CP14Nail + amount: 2 + doAfter: 4 + - node: CP14FenceIronGrilleWindowStraight + entity: CP14FenceIronGrilleWindowStraight \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/doors.yml b/Resources/Prototypes/_CP14/Recipes/Construction/doors.yml new file mode 100644 index 0000000000..8d986d2aa5 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Construction/doors.yml @@ -0,0 +1,170 @@ +- type: construction + crystallPunkAllowed: true + id: CP14WoodenDoor + name: wooden door + description: Not the most solid construction, but it's better than nothing. + graph: CP14WoodenDoor + startNode: start + targetNode: CP14WoodenDoor + category: construction-category-structures + icon: + sprite: _CP14/Structures/Doors/wooden_door.rsi + state: closed + objectType: Structure + placementMode: SnapgridCenter + canRotate: true + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + id: CP14WoodenDoorMirrored + name: wooden door (mirrored) + description: Not the most solid construction, but it's better than nothing. + graph: CP14WoodenDoor + startNode: start + targetNode: CP14WoodenDoorMirrored + category: construction-category-structures + icon: + sprite: _CP14/Structures/Doors/wooden_door.rsi + state: closed_mirrored + objectType: Structure + placementMode: SnapgridCenter + canRotate: true + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + id: CP14WoodenDoorWindowed + name: wooden windowed door + description: Not the most solid construction, but it's better than nothing. + graph: CP14WoodenDoor + startNode: start + targetNode: CP14WoodenDoorWindowed + category: construction-category-structures + icon: + sprite: _CP14/Structures/Doors/wooden_windowed_door.rsi + state: closed + objectType: Structure + placementMode: SnapgridCenter + canRotate: true + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + id: CP14WoodenDoorWindowedMirrored + name: wooden windowed door + description: Not the most solid construction, but it's better than nothing. + graph: CP14WoodenDoor + startNode: start + targetNode: CP14WoodenDoorWindowedMirrored + category: construction-category-structures + icon: + sprite: _CP14/Structures/Doors/wooden_windowed_door.rsi + state: closed_mirrored + objectType: Structure + placementMode: SnapgridCenter + canRotate: true + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + id: CP14IronDoor + name: iron door + description: Solid iron door. + graph: CP14IronDoor + startNode: start + targetNode: CP14IronDoor + category: construction-category-structures + icon: + sprite: _CP14/Structures/Doors/iron_door.rsi + state: closed + objectType: Structure + placementMode: SnapgridCenter + canRotate: true + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + id: CP14IronDoorMirrored + name: iron door (mirrored) + description: Solid iron door. + graph: CP14IronDoor + startNode: start + targetNode: CP14IronDoorMirrored + category: construction-category-structures + icon: + sprite: _CP14/Structures/Doors/iron_door.rsi + state: closed_mirrored + objectType: Structure + placementMode: SnapgridCenter + canRotate: true + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + id: CP14IronDoorWindowed + name: iron windowed door + description: The same sturdy iron door, but with a small window. + graph: CP14IronDoor + startNode: start + targetNode: CP14IronDoorWindowed + category: construction-category-structures + icon: + sprite: _CP14/Structures/Doors/iron_windowed_door.rsi + state: closed + objectType: Structure + placementMode: SnapgridCenter + canRotate: true + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + id: CP14IronDoorWindowedMirrored + name: iron windowed door + description: The same sturdy iron door, but with a small window. + graph: CP14IronDoor + startNode: start + targetNode: CP14IronDoorWindowedMirrored + category: construction-category-structures + icon: + sprite: _CP14/Structures/Doors/iron_windowed_door.rsi + state: closed_mirrored + objectType: Structure + placementMode: SnapgridCenter + canRotate: true + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + id: CP14FenceIronGrilleGate + name: iron grille gate + description: Heavy iron gates in bars. Looks serious. + graph: CP14FenceIronGrilleGate + startNode: start + targetNode: CP14FenceIronGrilleGate + category: construction-category-structures + icon: + sprite: _CP14/Structures/Fences/iron_grille.rsi + state: door_closed + objectType: Structure + placementMode: SnapgridCenter + canRotate: true + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml b/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml index 6f5ecca5bb..5f19680b96 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml @@ -16,24 +16,6 @@ conditions: - !type:TileNotBlocked -- type: construction - crystallPunkAllowed: true - name: Wooden barrel - description: The simplest design for storing liquids. - id: CP14BaseBarrel - graph: CP14BaseBarrel - startNode: start - targetNode: CP14BaseBarrel - category: construction-category-furniture - icon: - sprite: _CP14/Structures/Furniture/Barrels/barrel.rsi - state: barrel - objectType: Structure - placementMode: PlaceFree - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked - - type: construction crystallPunkAllowed: true name: Wooden table @@ -88,24 +70,6 @@ conditions: - !type:TileNotBlocked -- type: construction - crystallPunkAllowed: true - name: Bonfire - description: A pile of logs stacked together, ready to burst into flames at the slightest spark. - id: CP14Bonfire - graph: CP14Bonfire - startNode: start - targetNode: CP14Bonfire - category: construction-category-furniture - icon: - sprite: _CP14/Structures/Furniture/bonfire.rsi - state: base - objectType: Structure - placementMode: SnapgridCenter - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked - - type: construction crystallPunkAllowed: true name: Wallmount torch @@ -166,78 +130,6 @@ - !type:TileNotBlocked - !type:CP14WallRequired -- type: construction - crystallPunkAllowed: true - name: Wooden chest - description: a simple wooden chest for easy storage of junk. - id: CP14WoodenChest - graph: CP14WoodenChest - startNode: start - targetNode: CP14WoodenChest - category: construction-category-furniture - icon: - sprite: _CP14/Structures/Storage/Crates/woodenchest.rsi - state: icon - objectType: Structure - placementMode: SnapgridCenter - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked - -- type: construction - crystallPunkAllowed: true - name: Workbench - description: Table for the production of various basic tools. - id: CP14Workbench - graph: CP14Workbench - startNode: start - targetNode: CP14Workbench - category: construction-category-furniture - icon: - sprite: _CP14/Structures/Furniture/workbench.rsi - state: workbench - objectType: Structure - placementMode: SnapgridCenter - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked - -- type: construction - crystallPunkAllowed: true - name: Cooking table - description: A table to work with food. Time to cook! - id: CP14WorkbenchCooking - graph: CP14WorkbenchCooking - startNode: start - targetNode: CP14WorkbenchCooking - category: construction-category-furniture - icon: - sprite: _CP14/Structures/Furniture/workbench.rsi - state: cooking_table - objectType: Structure - placementMode: SnapgridCenter - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked - -- type: construction - crystallPunkAllowed: true - name: Sewing table - description: A table with embroidery tools to create different clothing and materials. - id: CP14WorkbenchSewing - graph: CP14WorkbenchSewing - startNode: start - targetNode: CP14WorkbenchSewing - category: construction-category-furniture - icon: - sprite: _CP14/Structures/Furniture/workbench.rsi - state: sewing_table - objectType: Structure - placementMode: SnapgridCenter - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked - - type: construction crystallPunkAllowed: true id: CP14Mannequin @@ -314,16 +206,35 @@ - type: construction crystallPunkAllowed: true - id: CP14WoodenDoor - name: wooden door - description: Not the most solid construction, but it's better than nothing. - graph: CP14WoodenDoor + id: CP14WoodenBed + name: Wooden bed + description: Comfortable bed for sleeping. + graph: CP14WoodenBed startNode: start - targetNode: CP14WoodenDoor + targetNode: CP14WoodenBed category: construction-category-furniture icon: - sprite: _CP14/Structures/Doors/wooden_door.rsi - state: closed + sprite: _CP14/Structures/Furniture/wooden_bed.rsi + state: icon + objectType: Structure + placementMode: SnapgridCenter + canRotate: false + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + name: Wood bench + description: A bench carved from wood, a comfortable part of the interior designed for sitting and relaxing. + id: CP14BenchWood + graph: CP14BenchWood + startNode: start + targetNode: CP14BenchWood + category: construction-category-furniture + icon: + sprite: _CP14/Structures/Furniture/bench.rsi + state: wooden objectType: Structure placementMode: SnapgridCenter canRotate: true @@ -333,60 +244,60 @@ - type: construction crystallPunkAllowed: true - id: CP14WoodenDoorMirrored - name: wooden door (mirrored) - description: Not the most solid construction, but it's better than nothing. - graph: CP14WoodenDoor + name: Curtains white + description: Two hanging sheets made of white fabric. + id: CP14CurtainsWhite + graph: CP14Curtains startNode: start - targetNode: CP14WoodenDoorMirrored + targetNode: CP14CurtainsWhite category: construction-category-furniture icon: - sprite: _CP14/Structures/Doors/wooden_door.rsi - state: closed_mirrored + sprite: _CP14/Structures/Furniture/curtains.rsi + state: white_closed objectType: Structure placementMode: SnapgridCenter canRotate: true canBuildInImpassable: false conditions: - - !type:TileNotBlocked + - !type:EmptyOrWindowValidInTile - type: construction crystallPunkAllowed: true - id: CP14WoodenDoorWindowed - name: wooden windowed door - description: Not the most solid construction, but it's better than nothing. - graph: CP14WoodenDoor + name: Curtains blue + description: Two hanging sheets made of blue fabric. + id: CP14CurtainsBlue + graph: CP14Curtains startNode: start - targetNode: CP14WoodenDoorWindowed + targetNode: CP14CurtainsBlue category: construction-category-furniture icon: - sprite: _CP14/Structures/Doors/wooden_windowed_door.rsi - state: closed + sprite: _CP14/Structures/Furniture/curtains.rsi + state: blue_closed objectType: Structure placementMode: SnapgridCenter canRotate: true canBuildInImpassable: false conditions: - - !type:TileNotBlocked + - !type:EmptyOrWindowValidInTile - type: construction crystallPunkAllowed: true - id: CP14WoodenDoorWindowedMirrored - name: wooden windowed door - description: Not the most solid construction, but it's better than nothing. - graph: CP14WoodenDoor + name: Curtains red + description: Two hanging sheets made of red fabric. + id: CP14CurtainsRed + graph: CP14Curtains startNode: start - targetNode: CP14WoodenDoorWindowedMirrored + targetNode: CP14CurtainsRed category: construction-category-furniture icon: - sprite: _CP14/Structures/Doors/wooden_windowed_door.rsi - state: closed_mirrored + sprite: _CP14/Structures/Furniture/curtains.rsi + state: red_closed objectType: Structure placementMode: SnapgridCenter canRotate: true canBuildInImpassable: false conditions: - - !type:TileNotBlocked + - !type:EmptyOrWindowValidInTile # Small fence diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/misc.yml b/Resources/Prototypes/_CP14/Recipes/Construction/misc.yml new file mode 100644 index 0000000000..548ad709db --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Construction/misc.yml @@ -0,0 +1,53 @@ +- type: construction + crystallPunkAllowed: true + name: Bonfire + description: A pile of logs stacked together, ready to burst into flames at the slightest spark. + id: CP14Bonfire + graph: CP14Bonfire + startNode: start + targetNode: CP14Bonfire + category: construction-category-misc + icon: + sprite: _CP14/Structures/Furniture/bonfire.rsi + state: base + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + name: Tombstone + description: A piece of stone used to honor the dead. + id: CP14BaseTombstone + graph: CP14BaseTombstone + startNode: start + targetNode: CP14BaseTombstone + category: construction-category-misc + icon: + sprite: _CP14/Structures/Decoration/tombstone.rsi + state: cross + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + name: Wooden pallet + description: Wooden crates stand. + id: CP14WoodenPallet + graph: CP14WoodenPallet + startNode: start + targetNode: CP14WoodenPallet + category: construction-category-misc + icon: + sprite: _CP14/Structures/Furniture/pallets.rsi + state: wooden + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/storage.yml b/Resources/Prototypes/_CP14/Recipes/Construction/storage.yml index 86ac6945c6..59ea11380b 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/storage.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/storage.yml @@ -1,12 +1,12 @@ - type: construction crystallPunkAllowed: true name: Dirt pit - description: you're wasting dirt to create a hole. Makes sense, doesn't it? Can only be built on dirt tiles. + description: You're wasting dirt to create a hole. Makes sense, doesn't it? Can only be built on dirt tiles. id: CP14CrateDirtPitGrave graph: CP14CrateDirtPitGrave startNode: start targetNode: CP14CrateDirtPitGrave - category: construction-category-furniture + category: construction-category-storage icon: sprite: _CP14/Structures/Storage/dirt_pit.rsi state: open @@ -17,4 +17,226 @@ - !type:TileNotBlocked - !type:TileType targets: - - CP14FloorDirt \ No newline at end of file + - CP14FloorDirt + +- type: construction + crystallPunkAllowed: true + name: Wooden chest + description: A simple wooden chest for easy storage of junk. + id: CP14WoodenChest + graph: CP14WoodenChest + startNode: start + targetNode: CP14WoodenChest + category: construction-category-storage + icon: + sprite: _CP14/Structures/Storage/Crates/woodenchest.rsi + state: icon + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + name: Wooden closet + description: A simple wooden wardrobe for storing clothes and other things. + id: CP14WoodenCloset + graph: CP14WoodenCloset + startNode: start + targetNode: CP14WoodenCloset + category: construction-category-storage + icon: + sprite: _CP14/Structures/Storage/Dressers/wood_cupboard.rsi + state: icon + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + name: Wooden cabinet + description: An ordinary wooden cabinet for simple knickknacks. + id: CP14WoodenCabinet + graph: CP14WoodenCabinet + startNode: start + targetNode: CP14WoodenCabinet + category: construction-category-storage + icon: + sprite: _CP14/Structures/Storage/Dressers/wood_cabinet.rsi + state: icon + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + name: Iron cabinet + description: An ordinary iron cabinet for simple knickknacks. + id: CP14IronCabinet + graph: CP14IronCabinet + startNode: start + targetNode: CP14IronCabinet + category: construction-category-storage + icon: + sprite: _CP14/Structures/Storage/Dressers/iron_cabinet.rsi + state: icon + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + name: Small wooden crate + description: A small wooden crate for storing everything. + id: CP14SmallWoodenCrate + graph: CP14SmallWoodenCrate + startNode: start + targetNode: CP14SmallWoodenCrate + category: construction-category-storage + icon: + sprite: _CP14/Structures/Storage/Crates/small_wooden_crate.rsi + state: icon + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + name: Large wooden crate + description: A large wooden crate for storing a lot of things. + id: CP14LargeWoodenCrate + graph: CP14LargeWoodenCrate + startNode: start + targetNode: CP14LargeWoodenCrate + category: construction-category-storage + icon: + sprite: _CP14/Structures/Storage/Crates/large_wooden_crate.rsi + state: icon + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + name: Coffin + description: A comfortable and nice looking coffin to comfortably await your resurrection. + id: CP14CrateCoffin + graph: CP14CrateCoffin + startNode: start + targetNode: CP14CrateCoffin + category: construction-category-storage + icon: + sprite: _CP14/Structures/Storage/Crates/coffin.rsi + state: base + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + name: Wooden barrel + description: The simplest design for storing liquids. + id: CP14BaseBarrel + graph: CP14BaseBarrel + startNode: start + targetNode: CP14BaseBarrel + category: construction-category-storage + icon: + sprite: _CP14/Structures/Furniture/Barrels/barrel.rsi + state: icon + objectType: Structure + placementMode: PlaceFree + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + name: Wooden crane barrel + description: Large lying barrel with tap, for storing valuable liquids. + id: CP14CraneBarrel + graph: CP14CraneBarrel + startNode: start + targetNode: CP14CraneBarrel + category: construction-category-storage + icon: + sprite: _CP14/Structures/Furniture/Barrels/crane_barrel.rsi + state: barrel + objectType: Structure + placementMode: SnapgridCenter + canRotate: true + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + name: Wooden small crane barrel + description: A small lying barrel with a tap to quickly pour liquid into mugs. + id: CP14CraneBarrelSmall + graph: CP14CraneBarrelSmall + startNode: start + targetNode: CP14CraneBarrelSmall + category: construction-category-storage + icon: + sprite: _CP14/Structures/Furniture/Barrels/crane_barrel_small.rsi + state: barrel + objectType: Structure + placementMode: SnapgridCenter + canRotate: true + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + name: Bar shelf (1) + description: Wall shelves to store your wine collection. + id: CP14WallmountBarShelfA + graph: CP14WallmountBarShelfA + startNode: start + targetNode: CP14WallmountBarShelfA + category: construction-category-storage + icon: + sprite: _CP14/Structures/Wallmount/wallmount_bar_shelf.rsi + state: shelf + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + canRotate: true + conditions: + - !type:TileNotBlocked + - !type:CP14WallRequired + +- type: construction + crystallPunkAllowed: true + name: Bar shelf (2) + description: Wall shelves to store your wine collection. + id: CP14WallmountBarShelfB + graph: CP14WallmountBarShelfB + startNode: start + targetNode: CP14WallmountBarShelfB + category: construction-category-storage + icon: + sprite: _CP14/Structures/Wallmount/wallmount_bar_shelf.rsi + state: shelf + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + canRotate: true + conditions: + - !type:TileNotBlocked + - !type:CP14WallRequired \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/walls.yml b/Resources/Prototypes/_CP14/Recipes/Construction/walls.yml index 8cd2988889..48ebaeb97d 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/walls.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/walls.yml @@ -67,5 +67,43 @@ objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + name: Iron grille + description: Strong iron grille. + id: CP14FenceIronGrilleStraight + graph: CP14FenceIronGrilleStraight + startNode: start + targetNode: CP14FenceIronGrilleStraight + category: construction-category-structures + icon: + sprite: _CP14/Structures/Fences/iron_grille.rsi + state: straight + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + canRotate: true + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + name: Iron grille window + description: The upper half of the solid grid. + id: CP14FenceIronGrilleWindowStraight + graph: CP14FenceIronGrilleWindowStraight + startNode: start + targetNode: CP14FenceIronGrilleWindowStraight + category: construction-category-structures + icon: + sprite: _CP14/Structures/Fences/iron_grille_top.rsi + state: straight + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + canRotate: true conditions: - !type:TileNotBlocked \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/workstations.yml b/Resources/Prototypes/_CP14/Recipes/Construction/workstations.yml new file mode 100644 index 0000000000..ab3fc49e17 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Construction/workstations.yml @@ -0,0 +1,53 @@ +- type: construction + crystallPunkAllowed: true + name: Workbench + description: Table for the production of various basic tools. + id: CP14Workbench + graph: CP14Workbench + startNode: start + targetNode: CP14Workbench + category: construction-category-machines + icon: + sprite: _CP14/Structures/Furniture/workbench.rsi + state: workbench + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + name: Cooking table + description: A table to work with food. Time to cook! + id: CP14WorkbenchCooking + graph: CP14WorkbenchCooking + startNode: start + targetNode: CP14WorkbenchCooking + category: construction-category-machines + icon: + sprite: _CP14/Structures/Furniture/workbench.rsi + state: cooking_table + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + name: Sewing table + description: A table with embroidery tools to create different clothing and materials. + id: CP14WorkbenchSewing + graph: CP14WorkbenchSewing + startNode: start + targetNode: CP14WorkbenchSewing + category: construction-category-machines + icon: + sprite: _CP14/Structures/Furniture/workbench.rsi + state: sewing_table + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/tags.yml b/Resources/Prototypes/_CP14/tags.yml index 78f0e1a228..2197b30e1e 100644 --- a/Resources/Prototypes/_CP14/tags.yml +++ b/Resources/Prototypes/_CP14/tags.yml @@ -67,6 +67,24 @@ - type: Tag id: CP14Dye +- type: Tag + id: CP14DyeRed + +- type: Tag + id: CP14DyeYellow + +- type: Tag + id: CP14DyeBlue + +- type: Tag + id: CP14DyeGreen + +- type: Tag + id: CP14DyePurple + +- type: Tag + id: CP14DyeBlack + - type: Tag id: CP14Meat diff --git a/Resources/Textures/_CP14/Structures/Doors/iron_frame.rsi/closed.png b/Resources/Textures/_CP14/Structures/Doors/iron_frame.rsi/closed.png new file mode 100644 index 0000000000..a8c8c7ad6a Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Doors/iron_frame.rsi/closed.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/iron_frame.rsi/closed_mirrored.png b/Resources/Textures/_CP14/Structures/Doors/iron_frame.rsi/closed_mirrored.png new file mode 100644 index 0000000000..d58fc3b300 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Doors/iron_frame.rsi/closed_mirrored.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/iron_frame.rsi/meta.json b/Resources/Textures/_CP14/Structures/Doors/iron_frame.rsi/meta.json new file mode 100644 index 0000000000..089fee6a93 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Doors/iron_frame.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "By TheShuEd", + "size": { + "x": 64, + "y": 96 + }, + "states": [ + { + "name": "closed", + "directions": 4 + }, + { + "name": "closed_mirrored", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Fences/iron_grille.rsi/door_closed_frame.png b/Resources/Textures/_CP14/Structures/Fences/iron_grille.rsi/door_closed_frame.png new file mode 100644 index 0000000000..044b9721c0 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Fences/iron_grille.rsi/door_closed_frame.png differ diff --git a/Resources/Textures/_CP14/Structures/Fences/iron_grille.rsi/meta.json b/Resources/Textures/_CP14/Structures/Fences/iron_grille.rsi/meta.json index a083faf32a..204bef370b 100644 --- a/Resources/Textures/_CP14/Structures/Fences/iron_grille.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Fences/iron_grille.rsi/meta.json @@ -18,6 +18,10 @@ { "name": "door_opened", "directions": 4 + }, + { + "name": "door_closed_frame", + "directions": 4 } ] } diff --git a/Resources/Textures/_CP14/Structures/Furniture/Barrels/barrel.rsi/icon.png b/Resources/Textures/_CP14/Structures/Furniture/Barrels/barrel.rsi/icon.png new file mode 100644 index 0000000000..f2004e86b2 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Barrels/barrel.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Structures/Furniture/Barrels/barrel.rsi/meta.json b/Resources/Textures/_CP14/Structures/Furniture/Barrels/barrel.rsi/meta.json index a0ac5273b7..a1e28ad7d9 100644 --- a/Resources/Textures/_CP14/Structures/Furniture/Barrels/barrel.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Furniture/Barrels/barrel.rsi/meta.json @@ -7,6 +7,9 @@ "y": 32 }, "states": [ + { + "name": "icon" + }, { "name": "barrel" }, diff --git a/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_cupboard.rsi/icon.png b/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_cupboard.rsi/icon.png new file mode 100644 index 0000000000..b04871c11a Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_cupboard.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_cupboard.rsi/meta.json b/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_cupboard.rsi/meta.json index 2a5918ad71..04e8a57239 100644 --- a/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_cupboard.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Storage/Dressers/wood_cupboard.rsi/meta.json @@ -7,6 +7,10 @@ "y": 96 }, "states": [ + { + "name": "icon", + "directions": 4 + }, { "name": "base", "directions": 4 diff --git a/Resources/migration.yml b/Resources/migration.yml index 65a3b10613..45e0757762 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -799,3 +799,7 @@ DrinkIrishCarBomb: DrinkIrishSlammer #2025-01-06 ClothingMaskSexyClown: ClothingMaskBlushingClown ClothingMaskSexyMime: ClothingMaskBlushingMime + +#2025-02-09 +C14IronCabinet: CP14IronCabinet +C14IronCabinetCargo: CP14IronCabinetCargo \ No newline at end of file