Merge pull request #1426 from collinlunn/construction_yaml

Construction prototype camelCase
This commit is contained in:
ShadowCommander
2020-07-19 12:22:50 -07:00
committed by GitHub
6 changed files with 24 additions and 24 deletions

View File

@@ -85,10 +85,10 @@ namespace Content.Shared.Construction
ser.DataField(ref _id, "id", string.Empty);
ser.DataField(ref _description, "description", string.Empty);
ser.DataField(ref _icon, "icon", SpriteSpecifier.Invalid);
ser.DataField(ref _type, "objecttype", ConstructionType.Structure);
ser.DataField(ref _type, "objectType", ConstructionType.Structure);
ser.DataField(ref _result, "result", null);
ser.DataField(ref _placementMode, "placementmode", "PlaceFree");
ser.DataField(ref _canBuildInImpassable, "canbuildinimpassable", false);
ser.DataField(ref _placementMode, "placementMode", "PlaceFree");
ser.DataField(ref _canBuildInImpassable, "canBuildInImpassable", false);
_keywords = ser.ReadDataField<List<string>>("keywords", new List<string>());
{

View File

@@ -1,11 +1,11 @@
- type: construction
- type: construction
name: wall light
id: WallLight
keywords: [fixture, lamp]
category: Machines
description: A simple wall-mounted light fixture.
placementmode: SnapgridBorder
canbuildinimpassable: true
placementMode: SnapgridBorder
canBuildInImpassable: true
icon:
sprite: Constructible/Lighting/lighting.rsi
state: on

View File

@@ -1,4 +1,4 @@
- type: construction
- type: construction
name: skub
id: skub
category: Items/Misc
@@ -6,7 +6,7 @@
description: In the end, there is only Skub.
icon: Objects/Misc/skub.rsi/icon.png
result: Skub
objecttype: Item
objectType: Item
steps:
- material: Metal
amount: 1

View File

@@ -3,7 +3,7 @@
id: smes
category: Machines/Power
keywords: [battery, cell, storage]
placementmode: SnapgridCenter
placementMode: SnapgridCenter
description: A SMES is a large battery capable of connecting directly to a power grid.
icon:
sprite: Constructible/Power/smes.rsi
@@ -23,7 +23,7 @@
name: generator
id: generator
category: Machines/Power
placementmode: SnapgridCenter
placementMode: SnapgridCenter
description: A portable generator capable of producing power from thin air.
icon: Constructible/Power/generator.png
result: Generator
@@ -39,9 +39,9 @@
name: APC
id: APC
category: Machines/Power
placementmode: SnapgridCenter
placementMode: SnapgridCenter
description: Provides power from the grid wirelessly to other machines in the area.
canbuildinimpassable: true
canBuildInImpassable: true
icon:
sprite: Constructible/Power/apc.rsi
state: apc0

View File

@@ -1,4 +1,4 @@
- type: construction
- type: construction
name: wall
id: wall
category: Structures
@@ -6,9 +6,9 @@
icon:
sprite: Constructible/Structures/Walls/solid.rsi
state: full
objecttype: Structure
objectType: Structure
result: solid_wall
placementmode: SnapgridCenter
placementMode: SnapgridCenter
steps:
- material: Metal
amount: 2
@@ -29,7 +29,7 @@
sprite: Constructible/Structures/Tables/generic.rsi
state: plain_preview
result: Table
placementmode: SnapgridCenter
placementMode: SnapgridCenter
steps:
- material: Metal
amount: 2
@@ -42,9 +42,9 @@
icon:
sprite: Constructible/Structures/Windows/window.rsi
state: full
objecttype: Structure
objectType: Structure
result: Window
placementmode: SnapgridCenter
placementMode: SnapgridCenter
steps:
- material: Glass
amount: 2
@@ -59,9 +59,9 @@
icon:
sprite: Constructible/Structures/Walls/low_wall.rsi
state: metal
objecttype: Structure
objectType: Structure
result: LowWall
placementmode: SnapgridCenter
placementMode: SnapgridCenter
steps:
- material: Metal
amount: 2
@@ -82,9 +82,9 @@
icon:
sprite: Constructible/Structures/Windows/reinforced_window.rsi
state: full
objecttype: Structure
objectType: Structure
result: ReinforcedWindow
placementmode: SnapgridCenter
placementMode: SnapgridCenter
steps:
- material: Glass
amount: 2

View File

@@ -1,4 +1,4 @@
- type: construction
- type: construction
name: crude spear
id: spear
category: Items/Weapons
@@ -6,7 +6,7 @@
description: A crude spear for when you need to put holes in somebody.
icon: Objects/Weapons/Melee/spear.rsi/spear.png
result: Spear
objecttype: Item
objectType: Item
steps:
- material: Metal
amount: 1