(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>
This commit is contained in:
Git-Nivrak
2020-11-20 16:58:06 +02:00
committed by GitHub
parent ab1ce4b541
commit 6d2882c7cf
39 changed files with 821 additions and 79 deletions

View File

@@ -1,9 +1,8 @@
- type: tile
- type: tile
name: floor_dark
display_name: Dark floor
texture: "dark"
base_turfs:
- space
- plating
is_subfloor: false
can_crowbar: true
@@ -16,7 +15,6 @@
display_name: Elevator shaft
texture: "elevator_shaft"
base_turfs:
- space
- plating
is_subfloor: false
can_crowbar: true
@@ -28,7 +26,6 @@
display_name: Freezer
texture: "freezer"
base_turfs:
- space
- plating
is_subfloor: false
can_crowbar: true
@@ -41,7 +38,6 @@
display_name: Hydro floor
texture: "hydro"
base_turfs:
- space
- plating
is_subfloor: false
can_crowbar: true
@@ -53,7 +49,6 @@
display_name: Green circuit floor
texture: "green_circuit"
base_turfs:
- space
- plating
is_subfloor: false
can_crowbar: true
@@ -66,7 +61,6 @@
display_name: Linoleum floor
texture: "lino"
base_turfs:
- space
- plating
is_subfloor: false
can_crowbar: true
@@ -79,7 +73,6 @@
display_name: Mono floor
texture: "mono"
base_turfs:
- space
- plating
is_subfloor: false
can_crowbar: true
@@ -92,7 +85,6 @@
display_name: Reinforced floor
texture: "reinforced"
base_turfs:
- space
- plating
is_subfloor: false
can_crowbar: true
@@ -105,7 +97,6 @@
display_name: rock floor
texture: "rock_vault"
base_turfs:
- space
- plating
is_subfloor: false
can_crowbar: true
@@ -118,7 +109,6 @@
display_name: Showroom floor
texture: "showroom"
base_turfs:
- space
- plating
is_subfloor: false
can_crowbar: true
@@ -131,7 +121,6 @@
display_name: Steel floor
texture: "steel"
base_turfs:
- space
- plating
is_subfloor: false
can_crowbar: true
@@ -144,7 +133,6 @@
display_name: Dirty steel floor
texture: "steel_dirty"
base_turfs:
- space
- plating
is_subfloor: false
can_crowbar: true
@@ -157,8 +145,7 @@
display_name: Techmaint Floor
texture: "tech_maint"
base_turfs:
- space
- underplating
- plating
is_subfloor: false
can_crowbar: true
footstep_sounds: footstep_floor
@@ -170,8 +157,7 @@
display_name: White Floor
texture: "white"
base_turfs:
- space
- underplating
- plating
is_subfloor: false
can_crowbar: true
footstep_sounds: footstep_floor
@@ -194,8 +180,7 @@
display_name: Asteroid Tile
texture: Asteroid/asteroid_tile
base_turfs:
- space
- underplating
- plating
is_subfloor: false
can_crowbar: true
footstep_sounds: footstep_asteroid
@@ -262,8 +247,7 @@
display_name: Gold Tile
texture: gold
base_turfs:
- space
- underplating
- plating
is_subfloor: false
can_crowbar: true
footstep_sounds: footstep_floor

View File

@@ -3,6 +3,16 @@
display_name: Plating
texture: plating
base_turfs:
- underplating
is_subfloor: true
footstep_sounds: footstep_plating
friction: 0.5
- type: tile
name: lattice
display_name: lattice
texture: lattice
base_turfs:
- space
is_subfloor: true
footstep_sounds: footstep_plating
@@ -13,7 +23,7 @@
display_name: Underplating
texture: underplating
base_turfs:
- space
- lattice
is_subfloor: true
footstep_sounds: footstep_plating
friction: 0.5