diff --git a/Resources/Maps/stationstation.yml b/Resources/Maps/stationstation.yml index ff20b2afc0..4da9b13790 100644 --- a/Resources/Maps/stationstation.yml +++ b/Resources/Maps/stationstation.yml @@ -1160,32 +1160,64 @@ entities: - parent: 49 grid: 0 type: Transform -- type: airlock - components: - - grid: 0 - pos: -6,-6 - rot: -1.5707963267949 rad - type: Transform -- type: airlock +- type: airlock_engineering components: - grid: 0 pos: -5,-6 rot: -1.5707963267949 rad type: Transform -- type: airlock +- type: airlock_engineering components: - grid: 0 - pos: 4,-6 + pos: -6,-6 rot: -1.5707963267949 rad type: Transform - - hard: False - type: Collidable -- type: airlock +- type: airlock_engineering components: - grid: 0 pos: 5,-6 rot: -1.5707963267949 rad type: Transform - - hard: False - type: Collidable +- type: airlock_engineering + components: + - grid: 0 + pos: 4,-6 + rot: -1.5707963267949 rad + type: Transform +- type: airlock_external + components: + - grid: 0 + pos: -7,2 + rot: -1.5707963267949 rad + type: Transform +- type: airlock_external + components: + - grid: 0 + pos: -7,3 + rot: -1.5707963267949 rad + type: Transform +- type: airlock_external + components: + - grid: 0 + pos: -7,4 + rot: -1.5707963267949 rad + type: Transform +- type: airlock_external + components: + - grid: 0 + pos: 6,2 + rot: -1.5707963267949 rad + type: Transform +- type: airlock_external + components: + - grid: 0 + pos: 6,3 + rot: -1.5707963267949 rad + type: Transform +- type: airlock_external + components: + - grid: 0 + pos: 6,4 + rot: -1.5707963267949 rad + type: Transform ... diff --git a/Resources/Prototypes/Entities/Door.yml b/Resources/Prototypes/Entities/Door.yml index 00b939b776..e48ba7bfc2 100644 --- a/Resources/Prototypes/Entities/Door.yml +++ b/Resources/Prototypes/Entities/Door.yml @@ -17,8 +17,38 @@ state: closed - type: BoundingBox + # This AABB isn't the full tile because.. + # If it is, airlocks collide with walls and other airlocks causing them to never close. + # yeah... + # TODO: Fix that. + aabb: -0.45, -0.45, 0.45, 0.45 - type: Collidable - type: Door - type: Appearance visuals: - type: AirlockVisualizer2D + + placement: + mode: SnapgridBorder + +- type: entity + parent: airlock + id: airlock_external + name: External Airlock + components: + - type: Sprite + sprite: Buildings/airlock_external.rsi + + - type: Icon + sprite: Buildings/airlock_external.rsi + +- type: entity + parent: airlock + id: airlock_engineering + name: Engineering Airlock + components: + - type: Sprite + sprite: Buildings/airlock_engineering.rsi + + - type: Icon + sprite: Buildings/airlock_engineering.rsi diff --git a/Resources/Textures/Buildings/airlock_basic.rsi/meta.json b/Resources/Textures/Buildings/airlock_basic.rsi/meta.json index b4c323b79e..5b0fd232cb 100644 --- a/Resources/Textures/Buildings/airlock_basic.rsi/meta.json +++ b/Resources/Textures/Buildings/airlock_basic.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/doors/doorint.dmi", "states": [{"name": "closed", "directions": 1, "delays": [[1.0]]}, {"name": "closing", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "deny", "directions": 1, "delays": [[0.1, 0.1, 0.1]]}, {"name": "locked", "directions": 1, "delays": [[1.0]]}, {"name": "o_closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.4]]}, {"name": "o_opening", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "open", "directions": 1, "delays": [[1.0]]}, {"name": "opening", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "spark", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}]} \ No newline at end of file +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/doors/doorint.dmi", "states": [{"name": "closed", "directions": 1, "delays": [[1.0]]}, {"name": "closing", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "deny", "directions": 1, "delays": [[0.1, 0.1, 0.1]]}, {"name": "locked", "directions": 1, "delays": [[1.0]]}, {"name": "o_closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.4]]}, {"name": "o_opening", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "open", "directions": 1, "delays": [[1.0]]}, {"name": "opening", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "panel_open", "directions": 1, "delays": [[1.0]]}, {"name": "spark", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_broken", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_damaged", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 1.7]]}, {"name": "sparks_open", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "welded", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Buildings/airlock_basic.rsi/panel_open.png b/Resources/Textures/Buildings/airlock_basic.rsi/panel_open.png new file mode 100644 index 0000000000..5f3bfeae15 Binary files /dev/null and b/Resources/Textures/Buildings/airlock_basic.rsi/panel_open.png differ diff --git a/Resources/Textures/Buildings/airlock_basic.rsi/sparks_broken.png b/Resources/Textures/Buildings/airlock_basic.rsi/sparks_broken.png new file mode 100644 index 0000000000..98c9278337 Binary files /dev/null and b/Resources/Textures/Buildings/airlock_basic.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Buildings/airlock_basic.rsi/sparks_damaged.png b/Resources/Textures/Buildings/airlock_basic.rsi/sparks_damaged.png new file mode 100644 index 0000000000..415c8b1f5a Binary files /dev/null and b/Resources/Textures/Buildings/airlock_basic.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Buildings/airlock_basic.rsi/sparks_open.png b/Resources/Textures/Buildings/airlock_basic.rsi/sparks_open.png new file mode 100644 index 0000000000..9e48763e6c Binary files /dev/null and b/Resources/Textures/Buildings/airlock_basic.rsi/sparks_open.png differ diff --git a/Resources/Textures/Buildings/airlock_basic.rsi/welded.png b/Resources/Textures/Buildings/airlock_basic.rsi/welded.png new file mode 100644 index 0000000000..bd03f8b62e Binary files /dev/null and b/Resources/Textures/Buildings/airlock_basic.rsi/welded.png differ diff --git a/Resources/Textures/Buildings/airlock_engineering.rsi/closed.png b/Resources/Textures/Buildings/airlock_engineering.rsi/closed.png new file mode 100644 index 0000000000..3971e65c1f Binary files /dev/null and b/Resources/Textures/Buildings/airlock_engineering.rsi/closed.png differ diff --git a/Resources/Textures/Buildings/airlock_engineering.rsi/closing.png b/Resources/Textures/Buildings/airlock_engineering.rsi/closing.png new file mode 100644 index 0000000000..fd62047d90 Binary files /dev/null and b/Resources/Textures/Buildings/airlock_engineering.rsi/closing.png differ diff --git a/Resources/Textures/Buildings/airlock_engineering.rsi/deny.png b/Resources/Textures/Buildings/airlock_engineering.rsi/deny.png new file mode 100644 index 0000000000..9e56be88ea Binary files /dev/null and b/Resources/Textures/Buildings/airlock_engineering.rsi/deny.png differ diff --git a/Resources/Textures/Buildings/airlock_engineering.rsi/locked.png b/Resources/Textures/Buildings/airlock_engineering.rsi/locked.png new file mode 100644 index 0000000000..1bda1f14c7 Binary files /dev/null and b/Resources/Textures/Buildings/airlock_engineering.rsi/locked.png differ diff --git a/Resources/Textures/Buildings/airlock_engineering.rsi/meta.json b/Resources/Textures/Buildings/airlock_engineering.rsi/meta.json new file mode 100644 index 0000000000..2504313375 --- /dev/null +++ b/Resources/Textures/Buildings/airlock_engineering.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/doors/Dooreng.dmi", "states": [{"name": "closed", "directions": 1, "delays": [[1.0]]}, {"name": "closing", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "deny", "directions": 1, "delays": [[0.1, 0.1, 0.1]]}, {"name": "locked", "directions": 1, "delays": [[1.0]]}, {"name": "o_closing", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "o_opening", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "open", "directions": 1, "delays": [[1.0]]}, {"name": "opening", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "panel_open", "directions": 1, "delays": [[1.0]]}, {"name": "spark", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_broken", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_damaged", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 1.7]]}, {"name": "sparks_open", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "welded", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Buildings/airlock_engineering.rsi/o_closing.png b/Resources/Textures/Buildings/airlock_engineering.rsi/o_closing.png new file mode 100644 index 0000000000..b986d57b98 Binary files /dev/null and b/Resources/Textures/Buildings/airlock_engineering.rsi/o_closing.png differ diff --git a/Resources/Textures/Buildings/airlock_engineering.rsi/o_opening.png b/Resources/Textures/Buildings/airlock_engineering.rsi/o_opening.png new file mode 100644 index 0000000000..b8c8dd222b Binary files /dev/null and b/Resources/Textures/Buildings/airlock_engineering.rsi/o_opening.png differ diff --git a/Resources/Textures/Buildings/airlock_engineering.rsi/open.png b/Resources/Textures/Buildings/airlock_engineering.rsi/open.png new file mode 100644 index 0000000000..ac56b5978f Binary files /dev/null and b/Resources/Textures/Buildings/airlock_engineering.rsi/open.png differ diff --git a/Resources/Textures/Buildings/airlock_engineering.rsi/opening.png b/Resources/Textures/Buildings/airlock_engineering.rsi/opening.png new file mode 100644 index 0000000000..ddc1e2cf16 Binary files /dev/null and b/Resources/Textures/Buildings/airlock_engineering.rsi/opening.png differ diff --git a/Resources/Textures/Buildings/airlock_engineering.rsi/panel_open.png b/Resources/Textures/Buildings/airlock_engineering.rsi/panel_open.png new file mode 100644 index 0000000000..5f3bfeae15 Binary files /dev/null and b/Resources/Textures/Buildings/airlock_engineering.rsi/panel_open.png differ diff --git a/Resources/Textures/Buildings/airlock_engineering.rsi/spark.png b/Resources/Textures/Buildings/airlock_engineering.rsi/spark.png new file mode 100644 index 0000000000..d27b745d91 Binary files /dev/null and b/Resources/Textures/Buildings/airlock_engineering.rsi/spark.png differ diff --git a/Resources/Textures/Buildings/airlock_engineering.rsi/sparks_broken.png b/Resources/Textures/Buildings/airlock_engineering.rsi/sparks_broken.png new file mode 100644 index 0000000000..98c9278337 Binary files /dev/null and b/Resources/Textures/Buildings/airlock_engineering.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Buildings/airlock_engineering.rsi/sparks_damaged.png b/Resources/Textures/Buildings/airlock_engineering.rsi/sparks_damaged.png new file mode 100644 index 0000000000..415c8b1f5a Binary files /dev/null and b/Resources/Textures/Buildings/airlock_engineering.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Buildings/airlock_engineering.rsi/sparks_open.png b/Resources/Textures/Buildings/airlock_engineering.rsi/sparks_open.png new file mode 100644 index 0000000000..9e48763e6c Binary files /dev/null and b/Resources/Textures/Buildings/airlock_engineering.rsi/sparks_open.png differ diff --git a/Resources/Textures/Buildings/airlock_engineering.rsi/welded.png b/Resources/Textures/Buildings/airlock_engineering.rsi/welded.png new file mode 100644 index 0000000000..bd03f8b62e Binary files /dev/null and b/Resources/Textures/Buildings/airlock_engineering.rsi/welded.png differ diff --git a/Resources/Textures/Buildings/airlock_external.rsi/closed.png b/Resources/Textures/Buildings/airlock_external.rsi/closed.png new file mode 100644 index 0000000000..53c5c29f5a Binary files /dev/null and b/Resources/Textures/Buildings/airlock_external.rsi/closed.png differ diff --git a/Resources/Textures/Buildings/airlock_external.rsi/closing.png b/Resources/Textures/Buildings/airlock_external.rsi/closing.png new file mode 100644 index 0000000000..72d653d300 Binary files /dev/null and b/Resources/Textures/Buildings/airlock_external.rsi/closing.png differ diff --git a/Resources/Textures/Buildings/airlock_external.rsi/deny.png b/Resources/Textures/Buildings/airlock_external.rsi/deny.png new file mode 100644 index 0000000000..cdb5bc13cf Binary files /dev/null and b/Resources/Textures/Buildings/airlock_external.rsi/deny.png differ diff --git a/Resources/Textures/Buildings/airlock_external.rsi/locked.png b/Resources/Textures/Buildings/airlock_external.rsi/locked.png new file mode 100644 index 0000000000..4e65d38d3e Binary files /dev/null and b/Resources/Textures/Buildings/airlock_external.rsi/locked.png differ diff --git a/Resources/Textures/Buildings/airlock_external.rsi/meta.json b/Resources/Textures/Buildings/airlock_external.rsi/meta.json new file mode 100644 index 0000000000..edc8fbbf83 --- /dev/null +++ b/Resources/Textures/Buildings/airlock_external.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/doors/Doorext.dmi", "states": [{"name": "closed", "directions": 1, "delays": [[1.0]]}, {"name": "closing", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "deny", "directions": 1, "delays": [[0.1, 0.1, 0.1]]}, {"name": "locked", "directions": 1, "delays": [[1.0]]}, {"name": "o_closing", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "o_opening", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "open", "directions": 1, "delays": [[1.0]]}, {"name": "opening", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "panel_open", "directions": 1, "delays": [[1.0]]}, {"name": "spark", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_broken", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_damaged", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 1.7]]}, {"name": "sparks_open", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "welded", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Buildings/airlock_external.rsi/o_closing.png b/Resources/Textures/Buildings/airlock_external.rsi/o_closing.png new file mode 100644 index 0000000000..5000ac45ad Binary files /dev/null and b/Resources/Textures/Buildings/airlock_external.rsi/o_closing.png differ diff --git a/Resources/Textures/Buildings/airlock_external.rsi/o_opening.png b/Resources/Textures/Buildings/airlock_external.rsi/o_opening.png new file mode 100644 index 0000000000..dcd395be25 Binary files /dev/null and b/Resources/Textures/Buildings/airlock_external.rsi/o_opening.png differ diff --git a/Resources/Textures/Buildings/airlock_external.rsi/open.png b/Resources/Textures/Buildings/airlock_external.rsi/open.png new file mode 100644 index 0000000000..3a954a5d1c Binary files /dev/null and b/Resources/Textures/Buildings/airlock_external.rsi/open.png differ diff --git a/Resources/Textures/Buildings/airlock_external.rsi/opening.png b/Resources/Textures/Buildings/airlock_external.rsi/opening.png new file mode 100644 index 0000000000..7b8c0ecea6 Binary files /dev/null and b/Resources/Textures/Buildings/airlock_external.rsi/opening.png differ diff --git a/Resources/Textures/Buildings/airlock_external.rsi/panel_open.png b/Resources/Textures/Buildings/airlock_external.rsi/panel_open.png new file mode 100644 index 0000000000..0e9c588a32 Binary files /dev/null and b/Resources/Textures/Buildings/airlock_external.rsi/panel_open.png differ diff --git a/Resources/Textures/Buildings/airlock_external.rsi/spark.png b/Resources/Textures/Buildings/airlock_external.rsi/spark.png new file mode 100644 index 0000000000..b075f3bb77 Binary files /dev/null and b/Resources/Textures/Buildings/airlock_external.rsi/spark.png differ diff --git a/Resources/Textures/Buildings/airlock_external.rsi/sparks_broken.png b/Resources/Textures/Buildings/airlock_external.rsi/sparks_broken.png new file mode 100644 index 0000000000..f65599fca3 Binary files /dev/null and b/Resources/Textures/Buildings/airlock_external.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Buildings/airlock_external.rsi/sparks_damaged.png b/Resources/Textures/Buildings/airlock_external.rsi/sparks_damaged.png new file mode 100644 index 0000000000..f65599fca3 Binary files /dev/null and b/Resources/Textures/Buildings/airlock_external.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Buildings/airlock_external.rsi/sparks_open.png b/Resources/Textures/Buildings/airlock_external.rsi/sparks_open.png new file mode 100644 index 0000000000..30effd18f3 Binary files /dev/null and b/Resources/Textures/Buildings/airlock_external.rsi/sparks_open.png differ diff --git a/Resources/Textures/Buildings/airlock_external.rsi/welded.png b/Resources/Textures/Buildings/airlock_external.rsi/welded.png new file mode 100644 index 0000000000..09d28df40e Binary files /dev/null and b/Resources/Textures/Buildings/airlock_external.rsi/welded.png differ