diff --git a/Content.Server/Doors/Components/AirlockComponent.cs b/Content.Server/Doors/Components/AirlockComponent.cs index ae59d4a65c..ff581f5363 100644 --- a/Content.Server/Doors/Components/AirlockComponent.cs +++ b/Content.Server/Doors/Components/AirlockComponent.cs @@ -169,7 +169,7 @@ namespace Content.Server.Doors.Components { if (IsBolted()) { - Owner.PopupMessage(eventArgs.User, Loc.GetString("airlock-component-cannot-pry-is-bolted-message ")); + Owner.PopupMessage(eventArgs.User, Loc.GetString("airlock-component-cannot-pry-is-bolted-message")); return false; } if (IsPowered()) diff --git a/Resources/Prototypes/Entities/Structures/Doors/windoor.yml b/Resources/Prototypes/Entities/Structures/Doors/windoor.yml new file mode 100644 index 0000000000..c35ced8081 --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/Doors/windoor.yml @@ -0,0 +1,44 @@ +- type: entity + id: Windoor + parent: BaseStructure + name: windoor + description: It's a window and a sliding door. Wow! + placement: + mode: SnapgridCenter + components: + - type: InteractionOutline + - type: Sprite + netsync: false + drawdepth: Mobs + sprite: Structures/Doors/windoor.rsi + state: left + - type: Physics + fixtures: + - shape: + !type:PhysShapeAabb + bounds: "-0.5, -0.5, -0.3, 0.5" # i don't understand why these bounds work but they do + mass: 100 + mask: + - MobImpassable + layer: + - Opaque + - Impassable + - MobImpassable + - VaultImpassable + - SmallImpassable + - type: ApcPowerReceiver + - type: Damageable + resistances: glassResistances + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 200 + behaviors: + - !type:SpawnEntitiesBehavior + spawn: + ShardGlass: + min: 1 + max: 2 + - !type:DoActsBehavior + acts: [ "Destruction" ] diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/left.png b/Resources/Textures/Structures/Doors/windoor.rsi/left.png new file mode 100644 index 0000000000..fe1f75ba13 Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/left.png differ diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/left_assembly1.png b/Resources/Textures/Structures/Doors/windoor.rsi/left_assembly1.png new file mode 100644 index 0000000000..4f17d55de4 Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/left_assembly1.png differ diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/left_assembly2.png b/Resources/Textures/Structures/Doors/windoor.rsi/left_assembly2.png new file mode 100644 index 0000000000..668997d837 Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/left_assembly2.png differ diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/left_closing.png b/Resources/Textures/Structures/Doors/windoor.rsi/left_closing.png new file mode 100644 index 0000000000..e7085665d7 Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/left_closing.png differ diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/left_deny.png b/Resources/Textures/Structures/Doors/windoor.rsi/left_deny.png new file mode 100644 index 0000000000..ec9fccfd59 Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/left_deny.png differ diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/left_open.png b/Resources/Textures/Structures/Doors/windoor.rsi/left_open.png new file mode 100644 index 0000000000..2089729a6a Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/left_open.png differ diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/left_opening.png b/Resources/Textures/Structures/Doors/windoor.rsi/left_opening.png new file mode 100644 index 0000000000..5b68943ff6 Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/left_opening.png differ diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/left_secure.png b/Resources/Textures/Structures/Doors/windoor.rsi/left_secure.png new file mode 100644 index 0000000000..f4e59a2af3 Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/left_secure.png differ diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/left_secure_assembly1.png b/Resources/Textures/Structures/Doors/windoor.rsi/left_secure_assembly1.png new file mode 100644 index 0000000000..7d9ec61ecc Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/left_secure_assembly1.png differ diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/left_secure_assembly2.png b/Resources/Textures/Structures/Doors/windoor.rsi/left_secure_assembly2.png new file mode 100644 index 0000000000..7199abb2c1 Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/left_secure_assembly2.png differ diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/left_secure_closing.png b/Resources/Textures/Structures/Doors/windoor.rsi/left_secure_closing.png new file mode 100644 index 0000000000..a08434c90c Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/left_secure_closing.png differ diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/left_secure_open.png b/Resources/Textures/Structures/Doors/windoor.rsi/left_secure_open.png new file mode 100644 index 0000000000..b583cf7fe0 Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/left_secure_open.png differ diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/left_secure_opening.png b/Resources/Textures/Structures/Doors/windoor.rsi/left_secure_opening.png new file mode 100644 index 0000000000..e162ef9d39 Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/left_secure_opening.png differ diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/left_secure_spark.png b/Resources/Textures/Structures/Doors/windoor.rsi/left_secure_spark.png new file mode 100644 index 0000000000..1642b04c41 Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/left_secure_spark.png differ diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/left_spark.png b/Resources/Textures/Structures/Doors/windoor.rsi/left_spark.png new file mode 100644 index 0000000000..d95187f082 Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/left_spark.png differ diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/leftsecure_deny.png b/Resources/Textures/Structures/Doors/windoor.rsi/leftsecure_deny.png new file mode 100644 index 0000000000..2c18f9a5b1 Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/leftsecure_deny.png differ diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/meta.json b/Resources/Textures/Structures/Doors/windoor.rsi/meta.json new file mode 100644 index 0000000000..5da1d96d43 --- /dev/null +++ b/Resources/Textures/Structures/Doors/windoor.rsi/meta.json @@ -0,0 +1 @@ +{"name":1,"size":{"x":32,"y":32},"states":[{"name":"left_assembly2","directions":4,"delays":[[3,3],[3,3],[3,3],[3,3]]},{"name":"left_assembly1","directions":4},{"name":"left","directions":4},{"name":"left_closing","directions":4,"delays":[[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2]]},{"name":"left_open","directions":4},{"name":"left_opening","directions":4,"delays":[[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2]]},{"name":"left_deny","directions":4,"delays":[[1,2,1],[1,2,1],[1,2,1],[1,2,1]]},{"name":"left_spark","directions":4,"delays":[[1,1,1,1,1,1],[1,1,1,1,1,1],[1,1,1,1,1,1],[1,1,1,1,1,1]]},{"name":"right_assembly2","directions":4,"delays":[[3,3],[3,3],[3,3],[3,3]]},{"name":"right_assembly1","directions":4},{"name":"right","directions":4},{"name":"right_closing","directions":4,"delays":[[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2]]},{"name":"right_open","directions":4},{"name":"right_opening","directions":4,"delays":[[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2]]},{"name":"right_deny","directions":4,"delays":[[1,2,1],[1,2,1],[1,2,1],[1,2,1]]},{"name":"right_spark","directions":4,"delays":[[1,1,1,1,1,1],[1,1,1,1,1,1],[1,1,1,1,1,1],[1,1,1,1,1,1]]},{"name":"left_secure_assembly2","directions":4,"delays":[[3,3,3],[3,3,3],[3,3,3],[3,3,3]]},{"name":"left_secure_assembly1","directions":4},{"name":"left_secure","directions":4},{"name":"left_secure_closing","directions":4,"delays":[[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2]]},{"name":"left_secure_open","directions":4},{"name":"left_secure_opening","directions":4,"delays":[[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2]]},{"name":"leftsecure_deny","directions":4,"delays":[[1,1,1],[1,1,1],[1,1,1],[1,1,1]]},{"name":"left_secure_spark","directions":4,"delays":[[1,1,1,1,1,1],[1,1,1,1,1,1],[1,1,1,1,1,1],[1,1,1,1,1,1]]},{"name":"right_secure_assembly2","directions":4,"delays":[[3,3,3],[3,3,3],[3,3,3],[3,3,3]]},{"name":"right_secure_assembly1","directions":4},{"name":"right_secure","directions":4},{"name":"right_secure_closing","directions":4,"delays":[[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2]]},{"name":"right_secure_open","directions":4},{"name":"right_secure_opening","directions":4,"delays":[[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2]]},{"name":"right_secure_deny","directions":4,"delays":[[1,1,1],[1,1,1],[1,1,1],[1,1,1]]},{"name":"right_secure_spark","directions":4,"delays":[[1,1,1,1,1,1],[1,1,1,1,1,1],[1,1,1,1,1,1],[1,1,1,1,1,1]]}],"license":"CC BY-SA-3.0","copyright":"https://github.com/tgstation/tgstation/blob/3681006d7102045e334e8eddb23a8685fcdb258a/icons/obj/doors/windoor.dmi"} \ No newline at end of file diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/right.png b/Resources/Textures/Structures/Doors/windoor.rsi/right.png new file mode 100644 index 0000000000..a20fec764b Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/right.png differ diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/right_assembly1.png b/Resources/Textures/Structures/Doors/windoor.rsi/right_assembly1.png new file mode 100644 index 0000000000..b0aff1bf92 Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/right_assembly1.png differ diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/right_assembly2.png b/Resources/Textures/Structures/Doors/windoor.rsi/right_assembly2.png new file mode 100644 index 0000000000..9804a7f26d Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/right_assembly2.png differ diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/right_closing.png b/Resources/Textures/Structures/Doors/windoor.rsi/right_closing.png new file mode 100644 index 0000000000..31ccb737b8 Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/right_closing.png differ diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/right_deny.png b/Resources/Textures/Structures/Doors/windoor.rsi/right_deny.png new file mode 100644 index 0000000000..902c5ba158 Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/right_deny.png differ diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/right_open.png b/Resources/Textures/Structures/Doors/windoor.rsi/right_open.png new file mode 100644 index 0000000000..fc66fc1d81 Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/right_open.png differ diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/right_opening.png b/Resources/Textures/Structures/Doors/windoor.rsi/right_opening.png new file mode 100644 index 0000000000..0cc29af83e Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/right_opening.png differ diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/right_secure.png b/Resources/Textures/Structures/Doors/windoor.rsi/right_secure.png new file mode 100644 index 0000000000..1d7d93e283 Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/right_secure.png differ diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/right_secure_assembly1.png b/Resources/Textures/Structures/Doors/windoor.rsi/right_secure_assembly1.png new file mode 100644 index 0000000000..0dc3aae8ab Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/right_secure_assembly1.png differ diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/right_secure_assembly2.png b/Resources/Textures/Structures/Doors/windoor.rsi/right_secure_assembly2.png new file mode 100644 index 0000000000..a598c6c980 Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/right_secure_assembly2.png differ diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/right_secure_closing.png b/Resources/Textures/Structures/Doors/windoor.rsi/right_secure_closing.png new file mode 100644 index 0000000000..6236f71e3c Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/right_secure_closing.png differ diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/right_secure_deny.png b/Resources/Textures/Structures/Doors/windoor.rsi/right_secure_deny.png new file mode 100644 index 0000000000..0d0c576d90 Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/right_secure_deny.png differ diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/right_secure_open.png b/Resources/Textures/Structures/Doors/windoor.rsi/right_secure_open.png new file mode 100644 index 0000000000..4a18cabf76 Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/right_secure_open.png differ diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/right_secure_opening.png b/Resources/Textures/Structures/Doors/windoor.rsi/right_secure_opening.png new file mode 100644 index 0000000000..d4f4038246 Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/right_secure_opening.png differ diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/right_secure_spark.png b/Resources/Textures/Structures/Doors/windoor.rsi/right_secure_spark.png new file mode 100644 index 0000000000..2523e4fcc8 Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/right_secure_spark.png differ diff --git a/Resources/Textures/Structures/Doors/windoor.rsi/right_spark.png b/Resources/Textures/Structures/Doors/windoor.rsi/right_spark.png new file mode 100644 index 0000000000..a66dcf51c8 Binary files /dev/null and b/Resources/Textures/Structures/Doors/windoor.rsi/right_spark.png differ