diff --git a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml index 8cfd062ab0..007d8c4c3f 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml @@ -47,6 +47,25 @@ damageOverlay: sprite: Structures/Windows/cracks.rsi +- type: entity + parent: ReinforcedWindow + id: TintedWindow + name: tinted window + components: + - type: Sprite + drawdepth: WallTops + sprite: Structures/Windows/tinted_window.rsi + - type: Icon + sprite: Structures/Windows/tinted_window.rsi + - type: IconSmooth + base: twindow + - type: Construction + graph: window + node: tintedWindow + - type: Occluder + sizeX: 32 + sizeY: 32 + - type: entity id: WindowReinforcedDirectional parent: WindowDirectional diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml index 296e073edb..bb835ff440 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml @@ -16,6 +16,12 @@ amount: 2 doAfter: 2 + - to: tintedWindow + steps: + - material: ReinforcedGlass + amount: 2 + doAfter: 2 + - to: reinforcedPlasmaWindow steps: - material: ReinforcedPlasmaGlass @@ -62,6 +68,25 @@ - tool: Anchoring doAfter: 2 + - node: tintedWindow + entity: TintedWindow + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetRGlass1 + amount: 2 + - !type:DeleteEntity {} + steps: + - tool: Screwing + doAfter: 1 + - tool: Prying + doAfter: 2 + - tool: Screwing + doAfter: 1 + - tool: Anchoring + doAfter: 2 + - node: plasmaWindow entity: PlasmaWindow edges: diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml index 6692612953..329b7bf2a6 100644 --- a/Resources/Prototypes/Recipes/Construction/structures.yml +++ b/Resources/Prototypes/Recipes/Construction/structures.yml @@ -107,6 +107,25 @@ placementMode: SnapgridCenter canRotate: false +- type: construction + name: tinted window + id: TintedWindow + graph: window + startNode: start + targetNode: tintedWindow + category: Structures + description: Not clear but tough. + canBuildInImpassable: true + conditions: + - !type:EmptyOrWindowValidInTile + - !type:NoWindowsInTile + icon: + sprite: Structures/Windows/tinted_window.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canRotate: false + - type: construction name: plasma window id: PlasmaWindow diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/full.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/full.png new file mode 100644 index 0000000000..6baa538dad Binary files /dev/null and b/Resources/Textures/Structures/Windows/tinted_window.rsi/full.png differ diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json b/Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json new file mode 100644 index 0000000000..30517fd0ac --- /dev/null +++ b/Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/ f141c349e063f7318d8c8a2417d840f0b2d06600, modified", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "twindow0", + "directions": 4 + }, + { + "name": "twindow1", + "directions": 4 + }, + { + "name": "twindow2", + "directions": 4 + }, + { + "name": "twindow3", + "directions": 4 + }, + { + "name": "twindow4", + "directions": 4 + }, + { + "name": "twindow5", + "directions": 4 + }, + { + "name": "twindow6", + "directions": 4 + }, + { + "name": "twindow7", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png new file mode 100644 index 0000000000..414ffd9f3e Binary files /dev/null and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png differ diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png new file mode 100644 index 0000000000..90131a48bf Binary files /dev/null and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png differ diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png new file mode 100644 index 0000000000..ae12f39860 Binary files /dev/null and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png differ diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow3.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow3.png new file mode 100644 index 0000000000..bbfee9bce7 Binary files /dev/null and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow3.png differ diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow4.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow4.png new file mode 100644 index 0000000000..b79db5f789 Binary files /dev/null and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow4.png differ diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png new file mode 100644 index 0000000000..83797163f2 Binary files /dev/null and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png differ diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png new file mode 100644 index 0000000000..2cae7c43a4 Binary files /dev/null and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png differ diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png new file mode 100644 index 0000000000..17304ce104 Binary files /dev/null and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png differ