(Smaller) Construction PR - (IC Construction) (#2575)

* Disable Pulling When Buckling an entity * Projectile Improvements If you shoot at a person that is critted now it will only hit if you aim at that person otherwise go "above" him and hit other targets. - Dead people are still unhitable * Update Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com> * Firelock In Progress * Revert "Projectile Improvements" This reverts commit 5821afc798e49e530d4086d7a9ddbe097805fdc4. * Firelock Graph * Revert "Merge branch 'master' into test2" This reverts commit c69661cc7d9dcdc6d8c0dd45770f9eb94b231463, reversing changes made to 5f1de8b8d24cd52190addb3df5617cb1012fd52c. * Bunch of stuff - Metal Rods - Reinforced Glass - SetStackCount Condition - Tables - Lattice * Output2 to FloorTileItemComponent * Plating, Underplating and Tiles (+FloorTile Improvements) * Turf Fixes + APC Electronics * Reinforced Glass In-hand textures * All the fixes * Final Changes * (Hopefully) Last commit * Update Resources/Prototypes/Entities/Constructible/Doors/firelock_frame.yml Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com> * Update Content.Server/GameObjects/Components/Atmos/FirelockComponent.cs Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * A Few more things * Edit FirelockComponent.cs Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com> Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com> Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2020-11-20 16:58:06 +02:00
parent ab1ce4b541
commit 6d2882c7cf
39 changed files with 821 additions and 79 deletions
--- a/Resources/Prototypes/Entities/Constructible/Doors/firelock.yml
+++ b/Resources/Prototypes/Entities/Constructible/Doors/firelock.yml
@@ -58,6 +58,10 @@
      enabled: false
    - type: SnapGrid
      offset: Center
+    - type: Construction
+      graph: Firelock
+      node: Firelock
+
  placement:
    mode: SnapgridCenter

--- a/Resources/Prototypes/Entities/Constructible/Doors/firelock_frame.yml
+++ b/Resources/Prototypes/Entities/Constructible/Doors/firelock_frame.yml
@@ -0,0 +1,25 @@
+- type: entity
+  id: FirelockFrame
+  name: Firelock Frame
+  description: That is a firelock frame.
+  components:
+    - type: Sprite
+      sprite: Constructible/Structures/Doors/firelock.rsi
+      state: frame1
+    - type: Construction
+      graph: Firelock
+      node: frame1
+    - type: Clickable
+    - type: InteractionOutline
+    - type: Physics
+      shapes:
+        - !type:PhysShapeAabb
+          bounds: "-0.49,-0.49,0.49,0.49"
+          mask:
+            - Impassable
+          layer:
+            - Opaque
+            - Impassable
+            - MobImpassable
+            - VaultImpassable
+            - SmallImpassable
--- a/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml
+++ b/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml
@@ -1,4 +1,4 @@
- type: entity
+- type: entity
  id: TableBase
  name: "table"
  description: A square piece of metal standing on four metal legs.
@@ -62,6 +62,9 @@
      SteelSheet1:
        Min: 1
        Max: 1
+  - type: Construction
+    graph: Tables
+    node: TableFrame

 - type: entity
  id: TableBar
@@ -100,6 +103,9 @@
      SteelSheet1:
        Min: 1
        Max: 1
+  - type: Construction
+    graph: Tables
+    node: MetalTable

 - type: entity
  id: TableR
@@ -119,6 +125,9 @@
      SteelSheet1:
        Min: 1
        Max: 1
+  - type: Construction
+    graph: Tables
+    node: ReinforcedTable

 - type: entity
  id: TableGlass
@@ -138,6 +147,9 @@
      ShardGlass:
        Min: 1
        Max: 1
+  - type: Construction
+    graph: Tables
+    node: GlassTable

 - type: entity
  id: TableGlassR
@@ -157,6 +169,9 @@
      ShardGlass:
        Min: 1
        Max: 1
+  - type: Construction
+    graph: Tables
+    node: RGlassTable

 - type: entity
  id: TableWood
@@ -176,6 +191,9 @@
      WoodPlank:
        Min: 1
        Max: 1
+  - type: Construction
+    graph: Tables
+    node: WoodTable

 - type: entity
  id: TableCarpet
@@ -195,6 +213,9 @@
      WoodPlank:
        Min: 1
        Max: 1
+  - type: Construction
+    graph: Tables
+    node: PokerTable

 - type: entity
  id: TableStone
--- a/Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml
@@ -23,3 +23,6 @@
    key: catwalk
    base: catwalk_
  - type: Catwalk
+  - type: Construction
+    graph: Catwalk
+    node: Catwalk
--- a/Resources/Prototypes/Entities/Constructible/Items/metal_rod.yml
+++ b/Resources/Prototypes/Entities/Constructible/Items/metal_rod.yml
@@ -0,0 +1,35 @@
+- type: entity
+  name: Metal Rod
+  parent: BaseItem
+  id: MetalRod
+  suffix: full
+  components:
+    - type: Sprite
+      sprite: Objects/Materials/materials.rsi
+      state: rods
+    - type: Item
+      size: 24
+      icon:
+        sprite: /Textures/Constructible/Structures/Walls/materials.rsi
+        state: rods
+      prefix: inhand
+    - type: Construction
+      graph: metalRod
+      node: MetalRod
+    - type: Stack
+      stacktype: enum.StackType.MetalRod
+      count: 50
+      max: 50
+    - type: FloorTile
+      outputs:
+        - lattice
+        - floor_reinforced
+
+- type: entity
+  parent: MetalRod
+  id: MetalRodStack1
+  components:
+    - type: Stack
+      stacktype: enum.StackType.MetalRod
+      count: 1
+      max: 50
--- a/Resources/Prototypes/Entities/Constructible/Power/power_base.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/power_base.yml
@@ -187,6 +187,9 @@
    interfaces:
    - key: enum.ApcUiKey.Key
      type: ApcBoundUserInterface
+  - type: Construction
+    graph: apc
+    node: apc

 - type: entity
  id: SolarPanel
--- a/Resources/Prototypes/Entities/Objects/Misc/apc_electronics.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/apc_electronics.yml
@@ -0,0 +1,9 @@
+- type: entity
+  id: APCElectronics
+  parent: BaseItem
+  name: APC Electronics
+  description: Circuit used in APC construction.
+  components:
+    - type: Sprite
+      sprite: Constructible/Misc/module.rsi
+      state: charger_APC
--- a/Resources/Prototypes/Entities/Objects/Misc/firelock_electronics.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/firelock_electronics.yml
@@ -0,0 +1,10 @@
+- type: entity
+  id: FirelockElectronics
+  parent: BaseItem
+  name: Firelock Electronics
+  description: Advanced circuit board used to detect differences in pressure, temperature and gas concentrations between the two sides of the door.
+  components:
+    - type: Sprite
+      sprite: Constructible/Misc/module.rsi
+      state: mainboard
+    - type: FirelockElectronics
--- a/Resources/Prototypes/Entities/Objects/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/materials.yml
@@ -26,6 +26,9 @@
  - type: Item
    sprite: Objects/Materials/sheets.rsi
    HeldPrefix: metal
+  - type: FloorTile
+    outputs:
+      - underplating

 - type: entity
  id: SteelSheet1
@@ -66,6 +69,36 @@
    stacktype: enum.StackType.Glass
    count: 1

+- type: entity
+  name: Reinforced Glass
+  parent: MaterialStack
+  id: rglass
+  suffix: Full
+  components:
+    - type: Material
+      materials:
+        - key: enum.MaterialKeys.Stack
+          mat: rglass
+    - type: Stack
+      stacktype: enum.StackType.ReinforcedGlass
+    - type: Sprite
+      sprite: Objects/Materials/sheets.rsi
+      state: rglass
+    - type: Item
+      sprite: Objects/Materials/sheets.rsi
+      HeldPrefix: rglass
+
+- type: entity
+  name: Reinforced Glass sheet
+  id: RGlassSheet1
+  parent: rglass
+  suffix: 1
+  components:
+  - type: Stack
+    StackType: enum.StackType.ReinforcedGlass
+    count: 1
+
+
 - type: entity
  name: plasteel sheet
  id: PlasteelStack
--- a/Resources/Prototypes/Entities/Objects/tiles.yml
+++ b/Resources/Prototypes/Entities/Objects/tiles.yml
@@ -1,4 +1,4 @@
- type: entity
+- type: entity
  parent: BaseItem
  id: FloorTileItemBase
  description: These could work as a pretty decent throwing weapon.
@@ -8,7 +8,9 @@
    sprite: Objects/Tiles/tile.rsi
    state: tile_steel
  - type: FloorTile
-    output: floor_steel
+    outputs:
+      - plating
+      - floor_steel
  - type: Stack
    stacktype: FloorTileSteel
    count: 1
@@ -35,7 +37,9 @@
    sprite: Objects/Tiles/tile.rsi
    HeldPrefix: tile_wood
  - type: FloorTile
-    output: floor_wood
+    outputs:
+      - plating
+      - floor_wood
  - type: Stack
    stacktype: FloorTileWood
    count: 1
@@ -53,7 +57,9 @@
    sprite: Objects/Tiles/tile.rsi
    HeldPrefix: tile_white
  - type: FloorTile
-    output: floor_white
+    outputs:
+      - plating
+      - floor_white
  - type: Stack
    stacktype: FloorTileWhite
    count: 1
@@ -71,7 +77,9 @@
    sprite: Objects/Tiles/tile.rsi
    HeldPrefix: tile_dark
  - type: FloorTile
-    output: floor_dark
+    outputs:
+      - plating
+      - floor_dark
  - type: Stack
    stacktype: FloorTileDark
    count: 1
@@ -89,7 +97,9 @@
    sprite: Objects/Tiles/tile.rsi
    HeldPrefix: tile_dark
  - type: FloorTile
-    output: floor_techmaint
+    outputs:
+      - plating
+      - floor_techmaint

 - type: entity
  name: floor tile freezer
@@ -103,7 +113,9 @@
    sprite: Objects/Tiles/tile.rsi
    HeldPrefix: tile_showroom
  - type: FloorTile
-    output: floor_freezer
+    outputs:
+      - plating
+      - floor_freezer

 - type: entity
  name: floor tile showroom
@@ -117,7 +129,9 @@
    sprite: Objects/Tiles/tile.rsi
    HeldPrefix: tile_showroom
  - type: FloorTile
-    output: floor_showroom
+    outputs:
+      - plating
+      - floor_showroom

 - type: entity
  name: floor tile snow
@@ -131,7 +145,9 @@
    sprite: Objects/Tiles/tile.rsi
    HeldPrefix: tile_silver
  - type: FloorTile
-    output: floor_snow
+    outputs:
+      - plating
+      - floor_snow

 - type: entity
  name: floor tile green circuit
@@ -145,7 +161,9 @@
    sprite: Objects/Tiles/tile.rsi
    HeldPrefix: tile_silver
  - type: FloorTile
-    output: floor_green_circuit
+    outputs:
+      - plating
+      - floor_green_circuit

 - type: entity
  name: floor tile gold
@@ -159,7 +177,9 @@
    sprite: Objects/Tiles/tile.rsi
    HeldPrefix: tile_gold
  - type: FloorTile
-    output: floor_gold
+    outputs:
+      - plating
+      - floor_gold

 - type: entity
  name: floor tile reinforced
@@ -173,7 +193,9 @@
    sprite: Objects/Tiles/tile.rsi
    HeldPrefix: tile_reinforced
  - type: FloorTile
-    output: floor_reinforced
+    outputs:
+      - plating
+      - floor_reinforced

 - type: entity
  name: floor tile rock
@@ -187,7 +209,9 @@
    sprite: Objects/Tiles/tile.rsi
    HeldPrefix: tile_steel
  - type: FloorTile
-    output: floor_rockvault
+    outputs:
+      - plating
+      - floor_rockvault

 - type: entity
  name: floor tile mono
@@ -201,7 +225,9 @@
    sprite: Objects/Tiles/tile.rsi
    HeldPrefix: tile_steel
  - type: FloorTile
-    output: floor_mono
+    outputs:
+      - plating
+      - floor_mono

 - type: entity
  name: floor tile linoleum
@@ -215,7 +241,9 @@
    sprite: Objects/Tiles/tile.rsi
    HeldPrefix: tile_steel
  - type: FloorTile
-    output: floor_lino
+    outputs:
+      - plating
+      - floor_lino

 - type: entity
  name: floor tile asteroid
@@ -229,7 +257,9 @@
    sprite: Objects/Tiles/tile.rsi
    HeldPrefix: tile_brown
  - type: FloorTile
-    output: floor_asteroid_tile
+    outputs:
+      - plating
+      - floor_asteroid_tile

 - type: entity
  name: floor tile hydro
@@ -243,7 +273,9 @@
    sprite: Objects/Tiles/tile.rsi
    HeldPrefix: tile_hydro
  - type: FloorTile
-    output: floor_hydro
+    outputs:
+      - plating
+      - floor_hydro

 - type: entity
  name: floor tile dirty
@@ -257,4 +289,6 @@
    sprite: Objects/Tiles/tile.rsi
    HeldPrefix: tile_brown
  - type: FloorTile
-    output: floor_steel_dirty
+    outputs:
+      - plating
+      - floor_steel_dirty