diff --git a/Resources/Prototypes/Entities/Buildings/airlock_base.yml b/Resources/Prototypes/Entities/Buildings/airlock_base.yml index 13be0fa782..52eaaa7565 100644 --- a/Resources/Prototypes/Entities/Buildings/airlock_base.yml +++ b/Resources/Prototypes/Entities/Buildings/airlock_base.yml @@ -49,9 +49,16 @@ - type: entity id: AirlockGlass parent: Airlock + name: Glass Airlock components: - type: Airlock occludes: false - type: Occluder enabled: false + + - type: Sprite + sprite: Buildings/Doors/airlock_glass.rsi + + - type: Icon + sprite: Buildings/Doors/airlock_glass.rsi diff --git a/Resources/Prototypes/Entities/Buildings/airlock_types.yml b/Resources/Prototypes/Entities/Buildings/airlock_types.yml index f721cbaed4..c1c50f00b3 100644 --- a/Resources/Prototypes/Entities/Buildings/airlock_types.yml +++ b/Resources/Prototypes/Entities/Buildings/airlock_types.yml @@ -28,6 +28,19 @@ - type: Icon sprite: Buildings/Doors/airlock_engineering.rsi + +- type: entity + parent: AirlockGlass + id: AirlockEngineeringGlass + name: Glass Engineering Airlock + components: + - type: Sprite + sprite: Buildings/Doors/airlock_engineering_glass.rsi + + - type: Icon + sprite: Buildings/Doors/airlock_engineering_glass.rsi + + - type: entity parent: airlock_engineering id: airlock_engineering_locked diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/closed.png b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/closed.png new file mode 100644 index 0000000000..f3a3798482 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/closed.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/closed_unlit.png b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/closed_unlit.png new file mode 100644 index 0000000000..56d917dc07 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/closing.png b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/closing.png new file mode 100644 index 0000000000..0be5d1b25b Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/closing.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/closing_unlit.png b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/closing_unlit.png new file mode 100644 index 0000000000..11ec1b845b Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/deny.png b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/deny.png new file mode 100644 index 0000000000..25a492559c Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/deny.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/locked.png b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/locked.png new file mode 100644 index 0000000000..1b5b19d26a Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/locked.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/meta.json b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/meta.json new file mode 100644 index 0000000000..5d35cc5738 --- /dev/null +++ b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/meta.json @@ -0,0 +1,220 @@ +{ + "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": "closed_unlit", + "directions": 1 + }, + { + "name": "closing", + "directions": 1, + "delays": [ + [ + 0.2, + 0.2, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.3 + ] + ] + }, + { + "name": "closing_unlit", + "directions": 1, + "delays": [ + [ + 0.5, + 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": "panel_closing", + "directions": 1, + "delays": [ + [ + 0.2, + 0.2, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.3 + ] + ] + }, + { + "name": "panel_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": "opening_unlit", + "directions": 1, + "delays": [ + [ + 0.2, + 0.2, + 0.1, + 0.1, + 0.1, + 0.5 + ] + ] + }, + { + "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 + ] + ] + } + ] +} diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/open.png b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/open.png new file mode 100644 index 0000000000..e8242e7c8e Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/open.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/opening.png b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/opening.png new file mode 100644 index 0000000000..efafcca63a Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/opening.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/opening_unlit.png b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/opening_unlit.png new file mode 100644 index 0000000000..e430c39ad1 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/panel_closing.png b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/panel_closing.png new file mode 100644 index 0000000000..de46d71ce1 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/panel_closing.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/panel_open.png b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/panel_open.png new file mode 100644 index 0000000000..777c6dd693 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/panel_open.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/panel_opening.png b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/panel_opening.png new file mode 100644 index 0000000000..c45825e1fa Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/panel_opening.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/spark.png b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/spark.png new file mode 100644 index 0000000000..682a255e5b Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/spark.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/sparks_broken.png b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/sparks_broken.png new file mode 100644 index 0000000000..fb5d774588 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/sparks_damaged.png b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/sparks_damaged.png new file mode 100644 index 0000000000..f16a028dee Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/sparks_open.png b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/sparks_open.png new file mode 100644 index 0000000000..630eabb976 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/sparks_open.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/welded.png b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/welded.png new file mode 100644 index 0000000000..7bdc0c7c65 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/welded.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/closed.png b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/closed.png new file mode 100644 index 0000000000..cd47c4d2c5 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/closed.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/closed_unlit.png b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/closed_unlit.png new file mode 100644 index 0000000000..56d917dc07 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/closing.png b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/closing.png new file mode 100644 index 0000000000..fced19b746 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/closing.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/closing_unlit.png b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/closing_unlit.png new file mode 100644 index 0000000000..11ec1b845b Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/deny.png b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/deny.png new file mode 100644 index 0000000000..11281feab3 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/deny.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/locked.png b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/locked.png new file mode 100644 index 0000000000..095929aa72 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/locked.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/meta.json b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/meta.json new file mode 100644 index 0000000000..5d35cc5738 --- /dev/null +++ b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/meta.json @@ -0,0 +1,220 @@ +{ + "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": "closed_unlit", + "directions": 1 + }, + { + "name": "closing", + "directions": 1, + "delays": [ + [ + 0.2, + 0.2, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.3 + ] + ] + }, + { + "name": "closing_unlit", + "directions": 1, + "delays": [ + [ + 0.5, + 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": "panel_closing", + "directions": 1, + "delays": [ + [ + 0.2, + 0.2, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.3 + ] + ] + }, + { + "name": "panel_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": "opening_unlit", + "directions": 1, + "delays": [ + [ + 0.2, + 0.2, + 0.1, + 0.1, + 0.1, + 0.5 + ] + ] + }, + { + "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 + ] + ] + } + ] +} diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/open.png b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/open.png new file mode 100644 index 0000000000..e8242e7c8e Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/open.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/opening.png b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/opening.png new file mode 100644 index 0000000000..5193d7f722 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/opening.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/opening_unlit.png b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/opening_unlit.png new file mode 100644 index 0000000000..e430c39ad1 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/panel_closing.png b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/panel_closing.png new file mode 100644 index 0000000000..de46d71ce1 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/panel_closing.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/panel_open.png b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/panel_open.png new file mode 100644 index 0000000000..777c6dd693 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/panel_open.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/panel_opening.png b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/panel_opening.png new file mode 100644 index 0000000000..c45825e1fa Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/panel_opening.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/spark.png b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/spark.png new file mode 100644 index 0000000000..2bc0c7eb75 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/spark.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/sparks_broken.png b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/sparks_broken.png new file mode 100644 index 0000000000..fb5d774588 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/sparks_damaged.png b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/sparks_damaged.png new file mode 100644 index 0000000000..f16a028dee Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/sparks_open.png b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/sparks_open.png new file mode 100644 index 0000000000..630eabb976 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/sparks_open.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/welded.png b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/welded.png new file mode 100644 index 0000000000..7bdc0c7c65 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/welded.png differ