From: Sphiral <145869023+SphiraI@users.noreply.github.com> Date: Mon, 26 Feb 2024 23:25:44 +0000 (-0600) Subject: More windoors (starring directional window) (#25501) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=88ae71715b89b4ada2dfa42331c12962f73485fe;p=space-station-14.git More windoors (starring directional window) (#25501) * Added Plasma and Uranium Windoors, plus uranium directional windows * I forgor the locked proto's too ;-; * Skill issue, forgot to remove something that was a test * Please dear git tests, let me sleep (ShardGlassRUranium indeed does not exist) * No more static prices for windows/windoors * I wish I knew how to run the tests locally ;-; --- diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml index a86c7a44b9..64a6a0c9e8 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: WindoorAssembly name: windoor assembly description: It opens, it closes, and you can see through it! @@ -73,3 +73,127 @@ graph: Windoor node: assemblySecure +#plasma windoor assemblies +- type: entity + id: WindoorAssemblyPlasma + name: Plasma windoor assembly + description: It opens, it closes, and you can see through it! This one looks purp-, no, pink. Wait... + parent: WindoorAssembly + components: + - type: Sprite + sprite: Structures/Doors/Windoors/plasma.rsi + layers: + - state: assembly + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 360 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:SpawnEntitiesBehavior + spawn: + SheetSteel1: + min: 1 + max: 2 + SheetPGlass1: + min: 1 + max: 3 + - type: Construction + graph: Windoor + node: pglass + +- type: entity + id: WindoorAssemblySecurePlasma + name: Secure Plasma windoor assembly + description: It opens, it closes, and you can see through it! This one looks strong and pin-, no, purple. Hold on... + parent: WindoorAssembly + components: + - type: Sprite + sprite: Structures/Doors/Windoors/plasma.rsi + layers: + - state: secure_underlay + - state: assembly + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 1200 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:SpawnEntitiesBehavior + spawn: + SheetPlasteel1: + min: 1 + max: 2 + SheetRPGlass1: + min: 1 + max: 3 + - type: Construction + graph: Windoor + node: pglassSecure + +#uranium windoor assemblies +- type: entity + id: WindoorAssemblyUranium + name: Uranium windoor assembly + description: It opens, it closes, and you can see through it! This one looks sickly green... + parent: WindoorAssembly + components: + - type: Sprite + sprite: Structures/Doors/Windoors/uranium.rsi + layers: + - state: assembly + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 300 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:SpawnEntitiesBehavior + spawn: + SheetSteel1: + min: 1 + max: 2 + SheetUGlass1: + min: 1 + max: 3 + - type: Construction + graph: Windoor + node: uglass + +- type: entity + id: WindoorAssemblySecureUranium + name: Secure Uranium windoor assembly + description: It opens, it closes, and you can see through it! This one looks strong and radioactive-lime-green! + parent: WindoorAssembly + components: + - type: Sprite + sprite: Structures/Doors/Windoors/uranium.rsi + layers: + - state: secure_underlay + - state: assembly + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 1200 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:SpawnEntitiesBehavior + spawn: + SheetPlasteel1: + min: 1 + max: 2 + SheetRUGlass1: + min: 1 + max: 3 + - type: Construction + graph: Windoor + node: uglassSecure + diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml index e5eebab861..56167c178e 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml @@ -1,4 +1,5 @@ -- type: entity +#Normal windoors +- type: entity id: BaseWindoor parent: BaseStructure abstract: true @@ -194,3 +195,223 @@ node: windoorSecure - type: StaticPrice price: 200 + +#Plasma Windoors +- type: entity + id: BasePlasmaWindoor + parent: BaseWindoor + abstract: true + components: + - type: Sprite + sprite: Structures/Doors/Windoors/plasma.rsi + layers: + - state: closed + map: [ "enum.DoorVisualLayers.Base" ] + - state: closed_unlit + shader: unshaded + map: [ "enum.DoorVisualLayers.BaseUnlit" ] + - state: welded + map: [ "enum.WeldableLayers.BaseWelded" ] + - state: bolted_unlit + shader: unshaded + map: [ "enum.DoorVisualLayers.BaseBolted" ] + - state: emergency_unlit + shader: unshaded + map: [ "enum.DoorVisualLayers.BaseEmergencyAccess" ] + - state: panel_open + map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + visible: false + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 480 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 240 + behaviors: + - !type:SpawnEntitiesBehavior + spawn: + ShardGlassPlasma: + min: 1 + max: 2 + SheetSteel1: + min: 1 + max: 2 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Construction + graph: Windoor + node: pwindoor + - type: StaticPrice + price: 170 + - type: RadiationBlocker + resistance: 2 + +- type: entity + id: BaseSecurePlasmaWindoor + parent: BaseWindoor + abstract: true + components: + - type: Sprite + sprite: Structures/Doors/Windoors/plasma.rsi + layers: + - state: secure_underlay + - state: closed + map: [ "enum.DoorVisualLayers.Base" ] + - state: closed_unlit + shader: unshaded + map: [ "enum.DoorVisualLayers.BaseUnlit" ] + - state: welded + map: [ "enum.WeldableLayers.BaseWelded" ] + - state: bolted_unlit + shader: unshaded + map: [ "enum.DoorVisualLayers.BaseBolted" ] + - state: emergency_unlit + shader: unshaded + map: [ "enum.DoorVisualLayers.BaseEmergencyAccess" ] + - state: panel_open + map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + visible: false + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 800 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 530 + behaviors: + - !type:SpawnEntitiesBehavior + spawn: + ShardGlassPlasma: + min: 1 + max: 2 + SheetPlasteel1: + min: 1 + max: 2 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Construction + graph: Windoor + node: pwindoorSecure + - type: StaticPrice + price: 312 + - type: RadiationBlocker + resistance: 4 + +#Uranium Windoors +- type: entity + id: BaseUraniumWindoor + parent: BaseWindoor + abstract: true + components: + - type: Sprite + sprite: Structures/Doors/Windoors/uranium.rsi + layers: + - state: closed + map: [ "enum.DoorVisualLayers.Base" ] + - state: closed_unlit + shader: unshaded + map: [ "enum.DoorVisualLayers.BaseUnlit" ] + - state: welded + map: [ "enum.WeldableLayers.BaseWelded" ] + - state: bolted_unlit + shader: unshaded + map: [ "enum.DoorVisualLayers.BaseBolted" ] + - state: emergency_unlit + shader: unshaded + map: [ "enum.DoorVisualLayers.BaseEmergencyAccess" ] + - state: panel_open + map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + visible: false + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 400 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 240 + behaviors: + - !type:SpawnEntitiesBehavior + spawn: + ShardGlassUranium: + min: 1 + max: 2 + SheetSteel1: + min: 1 + max: 2 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Construction + graph: Windoor + node: uwindoor + - type: StaticPrice + price: 180 + - type: RadiationBlocker + resistance: 3 + +- type: entity + id: BaseSecureUraniumWindoor + parent: BaseWindoor + abstract: true + components: + - type: Sprite + sprite: Structures/Doors/Windoors/uranium.rsi + layers: + - state: secure_underlay + - state: closed + map: [ "enum.DoorVisualLayers.Base" ] + - state: closed_unlit + shader: unshaded + map: [ "enum.DoorVisualLayers.BaseUnlit" ] + - state: welded + map: [ "enum.WeldableLayers.BaseWelded" ] + - state: bolted_unlit + shader: unshaded + map: [ "enum.DoorVisualLayers.BaseBolted" ] + - state: emergency_unlit + shader: unshaded + map: [ "enum.DoorVisualLayers.BaseEmergencyAccess" ] + - state: panel_open + map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + visible: false + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 1200 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 400 + behaviors: + - !type:SpawnEntitiesBehavior + spawn: + ShardGlassUranium: + min: 1 + max: 2 + SheetPlasteel1: + min: 1 + max: 2 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Construction + graph: Windoor + node: uwindoorSecure + - type: StaticPrice + price: 462 + - type: RadiationBlocker + resistance: 5 diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml index 60e6f47dcc..86a788f7b5 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml @@ -1,15 +1,39 @@ -- type: entity +- type: entity id: Windoor parent: BaseWindoor - name: windoor + name: Windoor description: It's a window and a sliding door. Wow! - type: entity id: WindoorSecure parent: BaseSecureWindoor - name: secure windoor + name: Secure Windoor description: It's a sturdy window and a sliding door. Wow! +- type: entity + id: WindoorPlasma + parent: BasePlasmaWindoor + name: Plasma Windoor + description: It's a pink window *and* a sliding door. Amazing! + +- type: entity + id: WindoorSecurePlasma + parent: BaseSecurePlasmaWindoor + name: Secure Plasma Windoor + description: It's a sturdy purple window *and* a sliding door. Spectacular! + +- type: entity + id: WindoorUranium + parent: BaseUraniumWindoor + name: Uranium Windoor + description: It's a window and a sliding door. Huh? Oh, and it's green! + +- type: entity + id: WindoorSecureUranium + parent: BaseSecureUraniumWindoor + name: Secure Uranium Windoor + description: It's a sturdy window and a sliding door. It's so neon green, it might even taste like limes! + # TODO remove these with parameterized prototypes/whatever we end up doing # Windoors (alphabetical) @@ -61,6 +85,14 @@ - type: AccessReader access: [["Janitor"]] +- type: entity + parent: WindoorPlasma + id: PlasmaWindoorJanitorLocked + suffix: Janitor, Locked, Plasma + components: + - type: AccessReader + access: [["Janitor"]] + - type: entity parent: Windoor id: WindoorKitchenLocked @@ -151,6 +183,14 @@ - type: AccessReader access: [["Chemistry"]] +- type: entity + parent: WindoorSecurePlasma + id: PlasmaWindoorSecureChemistryLocked + suffix: Chemistry, Locked, Plasma + components: + - type: AccessReader + access: [["Chemistry"]] + - type: entity parent: WindoorSecure id: WindoorSecureCentralCommandLocked @@ -159,6 +199,22 @@ - type: AccessReader access: [["CentralCommand"]] +- type: entity + parent: WindoorSecurePlasma + id: PlasmaWindoorSecureCentralCommandLocked + suffix: Central Command, Locked, Plasma + components: + - type: AccessReader + access: [["CentralCommand"]] + +- type: entity + parent: WindoorSecureUranium + id: UraniumWindoorSecureCentralCommandLocked + suffix: Central Command, Locked, Uranium + components: + - type: AccessReader + access: [["CentralCommand"]] + - type: entity parent: WindoorSecure id: WindoorSecureCommandLocked @@ -183,6 +239,22 @@ - type: AccessReader access: [["Engineering"]] +- type: entity + parent: WindoorSecurePlasma + id: PlasmaWindoorSecureEngineeringLocked + suffix: Engineering, Locked, Plasma + components: + - type: AccessReader + access: [["Engineering"]] + +- type: entity + parent: WindoorSecureUranium + id: UraniumWindoorSecureEngineeringLocked + suffix: Engineering, Locked, Uranium + components: + - type: AccessReader + access: [["Engineering"]] + - type: entity parent: WindoorSecure id: WindoorSecureExternalLocked @@ -199,6 +271,14 @@ - type: AccessReader access: [["Janitor"]] +- type: entity + parent: WindoorSecurePlasma + id: PlasmaWindoorSecureJanitorLocked + suffix: Janitor, Locked, Plasma + components: + - type: AccessReader + access: [["Janitor"]] + - type: entity parent: WindoorSecure id: WindoorSecureKitchenLocked @@ -247,6 +327,14 @@ - type: AccessReader access: [["Research"]] +- type: entity + parent: WindoorSecurePlasma + id: PlasmaWindoorSecureScienceLocked + suffix: Science, Locked, Plasma + components: + - type: AccessReader + access: [["Research"]] + - type: entity parent: WindoorSecure id: WindoorSecureServiceLocked diff --git a/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml b/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml index baf50e17d2..7b486dd3aa 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml @@ -53,6 +53,54 @@ - type: RadiationBlocker resistance: 5 +- type: entity + id: UraniumReinforcedWindowDirectional + parent: WindowDirectional + name: directional reinforced uranium window + description: Don't smudge up the glass down there. + placement: + mode: SnapgridCenter + snap: + - Window + components: + - type: Sprite + sprite: Structures/Windows/directional.rsi + state: uranium_reinforced_window + - type: Icon + sprite: Structures/Windows/directional.rsi + state: uranium_reinforced_window + - type: Construction + graph: WindowDirectional + node: uraniumReinforcedWindowDirectional + - type: Appearance + - type: DamageVisuals + thresholds: [4, 8, 12] + damageDivisor: 3.333 + trackAllDamage: true + damageOverlay: + sprite: Structures/Windows/cracks_directional.rsi + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 200 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: WindowShatter + - !type:SpawnEntitiesBehavior + spawn: + ShardGlassUranium: + min: 1 + max: 2 + PartRodMetal1: + min: 1 + max: 2 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: StaticPrice + price: 70 + - type: entity parent: ReinforcedUraniumWindow id: ReinforcedUraniumWindowDiagonal diff --git a/Resources/Prototypes/Entities/Structures/Windows/uranium.yml b/Resources/Prototypes/Entities/Structures/Windows/uranium.yml index 42ff0f4258..4152665fe0 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/uranium.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/uranium.yml @@ -51,6 +51,51 @@ - type: RadiationBlocker resistance: 3 +- type: entity + id: UraniumWindowDirectional + parent: WindowDirectional + name: directional uranium window + description: Don't smudge up the glass down there. + placement: + mode: SnapgridCenter + snap: + - Window + components: + - type: Sprite + sprite: Structures/Windows/directional.rsi + state: uranium_window + - type: Icon + sprite: Structures/Windows/directional.rsi + state: uranium_window + - type: Construction + graph: WindowDirectional + node: uraniumWindowDirectional + - type: Appearance + - type: DamageVisuals + thresholds: [4, 8, 12] + damageDivisor: 3.333 + trackAllDamage: true + damageOverlay: + sprite: Structures/Windows/cracks_directional.rsi + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 200 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: WindowShatter + - !type:SpawnEntitiesBehavior + spawn: + ShardGlassUranium: + min: 1 + max: 2 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: StaticPrice + price: 40 + - type: entity parent: UraniumWindow id: UraniumWindowDiagonal diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml index f87e515bd4..2acdfb5809 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml @@ -1,4 +1,4 @@ -- type: constructionGraph +- type: constructionGraph id: Windoor start: start graph: @@ -27,6 +27,7 @@ - !type:SnapToGrid {} - !type:SetAnchor {} edges: + #to normal - to: glass conditions: - !type:EntityAnchored {} @@ -34,6 +35,26 @@ - material: Glass amount: 5 doAfter: 1 + + #to plasma + - to: pglass + conditions: + - !type:EntityAnchored {} + steps: + - material: PlasmaGlass + amount: 5 + doAfter: 1 + + #to uranium + - to: uglass + conditions: + - !type:EntityAnchored {} + steps: + - material: UraniumGlass + amount: 5 + doAfter: 1 + + #back to start - to: start conditions: - !type:EntityAnchored @@ -47,6 +68,7 @@ - tool: Welding doAfter: 2 + #normal windoor node - node: glass entity: WindoorAssembly edges: @@ -120,12 +142,162 @@ - tool: Anchoring doAfter: 1 + #plasma windoor node + - node: pglass + entity: WindoorAssemblyPlasma + edges: + - to: pwired + conditions: + - !type:EntityAnchored { } + steps: + - material: Cable + amount: 5 + doAfter: 1 + - to: assembly + conditions: + - !type:EntityAnchored + anchored: false + completed: + - !type:SpawnPrototype + prototype: SheetPGlass1 + amount: 5 + steps: + - tool: Screwing + doAfter: 2 + + - node: pwired + entity: WindoorAssemblyPlasma + edges: + - to: pelectronics + conditions: + - !type:EntityAnchored {} + steps: + - tag: DoorElectronics + store: board + name: "door electronics circuit board" + icon: + sprite: "Objects/Misc/module.rsi" + state: "door_electronics" + doAfter: 1 + - to: pglass + completed: + - !type:SpawnPrototype + prototype: CableApcStack1 + amount: 5 + steps: + - tool: Cutting + doAfter: 1 + + - node: pelectronics + entity: WindoorAssemblyPlasma + edges: + - to: pwindoor + conditions: + - !type:EntityAnchored {} + steps: + - tool: Screwing + doAfter: 2 + + - node: pwindoor + entity: WindoorPlasma + edges: + - to: pwired + conditions: + - !type:EntityAnchored {} + - !type:DoorBolted + value: false + - !type:WirePanel {} + - !type:AllWiresCut + completed: + - !type:EmptyAllContainers + pickup: true + emptyAtUser: true + steps: + - tool: Anchoring + doAfter: 1 + + #uranium windoor node + - node: uglass + entity: WindoorAssemblyUranium + edges: + - to: uwired + conditions: + - !type:EntityAnchored { } + steps: + - material: Cable + amount: 5 + doAfter: 1 + - to: assembly + conditions: + - !type:EntityAnchored + anchored: false + completed: + - !type:SpawnPrototype + prototype: SheetUGlass1 + amount: 5 + steps: + - tool: Screwing + doAfter: 2 + + - node: uwired + entity: WindoorAssemblyUranium + edges: + - to: uelectronics + conditions: + - !type:EntityAnchored {} + steps: + - tag: DoorElectronics + store: board + name: "door electronics circuit board" + icon: + sprite: "Objects/Misc/module.rsi" + state: "door_electronics" + doAfter: 1 + - to: uglass + completed: + - !type:SpawnPrototype + prototype: CableApcStack1 + amount: 5 + steps: + - tool: Cutting + doAfter: 1 + + - node: uelectronics + entity: WindoorAssemblyUranium + edges: + - to: uwindoor + conditions: + - !type:EntityAnchored {} + steps: + - tool: Screwing + doAfter: 2 + + - node: uwindoor + entity: WindoorUranium + edges: + - to: uwired + conditions: + - !type:EntityAnchored {} + - !type:DoorBolted + value: false + - !type:WirePanel {} + - !type:AllWiresCut + completed: + - !type:EmptyAllContainers + pickup: true + emptyAtUser: true + steps: + - tool: Anchoring + doAfter: 1 + + #secure windoor nodes - node: assemblySecure entity: WindoorAssemblySecure actions: - !type:SnapToGrid { } - !type:SetAnchor { } edges: + #to secure - to: glassSecure conditions: - !type:EntityAnchored { } @@ -133,6 +305,26 @@ - material: ReinforcedGlass amount: 5 doAfter: 1 + + #to secure plasma + - to: pglassSecure + conditions: + - !type:EntityAnchored { } + steps: + - material: ReinforcedPlasmaGlass + amount: 5 + doAfter: 1 + + #to secure uranium + - to: uglassSecure + conditions: + - !type:EntityAnchored { } + steps: + - material: ReinforcedUraniumGlass + amount: 5 + doAfter: 1 + + #back to start - to: start conditions: - !type:EntityAnchored @@ -146,6 +338,7 @@ - tool: Welding doAfter: 10 + #secure node - node: glassSecure entity: WindoorAssemblySecure edges: @@ -219,3 +412,153 @@ steps: - tool: Anchoring doAfter: 4 + + #secure plasma node + - node: pglassSecure + entity: WindoorAssemblySecurePlasma + edges: + - to: pwiredSecure + conditions: + - !type:EntityAnchored { } + steps: + - material: Cable + amount: 5 + doAfter: 1 + - to: assemblySecure + conditions: + - !type:EntityAnchored + anchored: false + completed: + - !type:SpawnPrototype + prototype: SheetRPGlass1 + amount: 5 + steps: + - tool: Screwing + doAfter: 4 + + + - node: pwiredSecure + entity: WindoorAssemblySecurePlasma + edges: + - to: pelectronicsSecure + conditions: + - !type:EntityAnchored { } + steps: + - tag: DoorElectronics + store: board + name: "door electronics circuit board" + icon: + sprite: "Objects/Misc/module.rsi" + state: "door_electronics" + doAfter: 1 + - to: pglassSecure + completed: + - !type:SpawnPrototype + prototype: CableApcStack1 + amount: 5 + steps: + - tool: Cutting + doAfter: 3 + + - node: pelectronicsSecure + entity: WindoorAssemblySecurePlasma + edges: + - to: pwindoorSecure + conditions: + - !type:EntityAnchored { } + steps: + - tool: Screwing + doAfter: 4 + + - node: pwindoorSecure + entity: WindoorSecurePlasma + edges: + - to: pwiredSecure + conditions: + - !type:EntityAnchored {} + - !type:DoorBolted + value: false + - !type:WirePanel {} + - !type:AllWiresCut + completed: + - !type:EmptyAllContainers + pickup: true + emptyAtUser: true + steps: + - tool: Anchoring + doAfter: 4 + + #secure Uranium node + - node: uglassSecure + entity: WindoorAssemblySecureUranium + edges: + - to: uwiredSecure + conditions: + - !type:EntityAnchored { } + steps: + - material: Cable + amount: 5 + doAfter: 1 + - to: assemblySecure + conditions: + - !type:EntityAnchored + anchored: false + completed: + - !type:SpawnPrototype + prototype: SheetRUGlass1 + amount: 5 + steps: + - tool: Screwing + doAfter: 4 + + + - node: uwiredSecure + entity: WindoorAssemblySecureUranium + edges: + - to: uelectronicsSecure + conditions: + - !type:EntityAnchored { } + steps: + - tag: DoorElectronics + store: board + name: "door electronics circuit board" + icon: + sprite: "Objects/Misc/module.rsi" + state: "door_electronics" + doAfter: 1 + - to: uglassSecure + completed: + - !type:SpawnPrototype + prototype: CableApcStack1 + amount: 5 + steps: + - tool: Cutting + doAfter: 3 + + - node: uelectronicsSecure + entity: WindoorAssemblySecureUranium + edges: + - to: uwindoorSecure + conditions: + - !type:EntityAnchored { } + steps: + - tool: Screwing + doAfter: 4 + + - node: uwindoorSecure + entity: WindoorSecureUranium + edges: + - to: uwiredSecure + conditions: + - !type:EntityAnchored {} + - !type:DoorBolted + value: false + - !type:WirePanel {} + - !type:AllWiresCut + completed: + - !type:EmptyAllContainers + pickup: true + emptyAtUser: true + steps: + - tool: Anchoring + doAfter: 4 diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/windowdirectional.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/windowdirectional.yml index fdc45ff08c..3b1cd4bbb0 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/windowdirectional.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/windowdirectional.yml @@ -4,15 +4,22 @@ graph: - node: start edges: - - to: plasmaWindowDirectional + + - to: windowDirectional steps: - - material: PlasmaGlass + - material: Glass amount: 1 doAfter: 2 - to: windowReinforcedDirectional steps: - material: ReinforcedGlass + amount: 1 + doAfter: 3 + + - to: plasmaWindowDirectional + steps: + - material: PlasmaGlass amount: 1 doAfter: 2 @@ -21,13 +28,19 @@ - material: ReinforcedPlasmaGlass amount: 1 doAfter: 3 + - to: uraniumWindowDirectional + steps: + - material: UraniumGlass + amount: 1 + doAfter: 2 - - to: windowDirectional + - to: uraniumReinforcedWindowDirectional steps: - - material: Glass + - material: ReinforcedUraniumGlass amount: 1 doAfter: 3 + - node: windowDirectional entity: WindowDirectional edges: @@ -99,3 +112,40 @@ doAfter: 2 - tool: Anchoring doAfter: 3 + - node: uraniumWindowDirectional + entity: UraniumWindowDirectional + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetUGlass1 + amount: 1 + - !type:DeleteEntity {} + steps: + - tool: Screwing + doAfter: 2 + - tool: Prying + doAfter: 3 + - tool: Screwing + doAfter: 2 + - tool: Anchoring + doAfter: 3 + + - node: uraniumReinforcedWindowDirectional + entity: UraniumReinforcedWindowDirectional + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetRUGlass1 + amount: 1 + - !type:DeleteEntity {} + steps: + - tool: Screwing + doAfter: 2 + - tool: Prying + doAfter: 3 + - tool: Screwing + doAfter: 2 + - tool: Anchoring + doAfter: 3 diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml index b9e3477f3c..518a2eafc6 100644 --- a/Resources/Prototypes/Recipes/Construction/structures.yml +++ b/Resources/Prototypes/Recipes/Construction/structures.yml @@ -1020,7 +1020,7 @@ startNode: start targetNode: windoor category: construction-category-structures - description: It opens, it closes, and you can see through it! + description: It opens, it closes, and you can see through it! And it can be made of Plasma, Uranium, or normal Glass! icon: sprite: Structures/Doors/Windoors/windoor.rsi state: closed @@ -1037,7 +1037,7 @@ startNode: start targetNode: windoorSecure category: construction-category-structures - description: It opens, it closes, and you can see through it! This one looks tough. + description: It's tough, it's a door, and you can see through it! And it can be made of Plasma, Uranium, or normal Glass! icon: sprite: Structures/Doors/Windoors/windoor.rsi state: closed diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/assembly.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/assembly.png new file mode 100644 index 0000000000..3556cb6704 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/bolted_unlit.png new file mode 100644 index 0000000000..2ca98a410d Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/closed.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/closed.png new file mode 100644 index 0000000000..24b76c669b Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/closed_unlit.png new file mode 100644 index 0000000000..435a5cb044 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/closing.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/closing.png new file mode 100644 index 0000000000..fd245abf71 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/closing_unlit.png new file mode 100644 index 0000000000..a7265ce6ec Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/deny_unlit.png new file mode 100644 index 0000000000..aface6a2f6 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/emergency_unlit.png new file mode 100644 index 0000000000..ccd783a239 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/meta.json b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/meta.json new file mode 100644 index 0000000000..f8ce184aec --- /dev/null +++ b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/meta.json @@ -0,0 +1,172 @@ +{ + "version":1, + "license":"CC-BY-SA-3.0", + "copyright":"Taken from tgstation at https://github.com/tgstation/tgstation/blob/3681006d7102045e334e8eddb23a8685fcdb258a/icons/obj/doors/windoor.dmi, edited by SphiraI(github)", + "size": { + "x":32, + "y":32 + }, + "states":[ + { + "name":"assembly", + "directions":4, + "delays":[ + [ + 0.3,0.3 + ], + [ + 0.3,0.3 + ], + [ + 0.3,0.3 + ], + [ + 0.3,0.3 + ] + ] + }, + { + "name":"closed", + "directions":4 + }, + { + "name":"closed_unlit", + "directions":4 + }, + { + "name":"closing", + "directions":4, + "delays":[ + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1 + ], + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1 + ], + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1 + ], + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1 + ] + ] + }, + { + "name":"closing_unlit", + "directions":4, + "delays":[ + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1 + ], + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1 + ], + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1 + ], + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1] + ] + }, + { + "name":"open", + "directions":4 + }, + { + "name":"open_unlit", + "directions":4 + }, + { + "name":"opening", + "directions":4, + "delays":[ + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1 + ], + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1 + ], + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1 + ], + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1 + ] + ] + }, + { + "name":"opening_unlit", + "directions":4, + "delays":[ + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1 + ], + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1 + ], + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1 + ], + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1 + ] + ] + }, + { + "name":"deny_unlit", + "directions":4, + "delays":[ + [ + 0.1,0.2,0.1 + ], + [ + 0.1,0.2,0.1 + ], + [ + 0.1,0.2,0.1 + ], + [ + 0.1,0.2,0.1 + ] + ] + }, + { + "name":"sparks", + "directions":4, + "delays":[ + [ + 0.1,0.1,0.1,0.1,0.1,0.1 + ], + [ + 0.1,0.1,0.1,0.1,0.1,0.1 + ], + [ + 0.1,0.1,0.1,0.1,0.1,0.1 + ], + [ + 0.1,0.1,0.1,0.1,0.1,0.1 + ] + ] + }, + { + "name":"panel_open", + "directions":4 + }, + { + "name":"bolted_unlit", + "directions":4 + }, + { + "name":"welded", + "directions":4 + }, + { + "name":"secure_underlay", + "directions":4 + }, + { + "name": "emergency_unlit", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/open.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/open.png new file mode 100644 index 0000000000..ceb3e709ba Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/open_unlit.png new file mode 100644 index 0000000000..ddcc55de0a Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/opening.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/opening.png new file mode 100644 index 0000000000..a5761fe258 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/opening_unlit.png new file mode 100644 index 0000000000..9a3072db8a Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/panel_open.png new file mode 100644 index 0000000000..21bbb4dedf Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/secure_underlay.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/secure_underlay.png new file mode 100644 index 0000000000..e574e9a12c Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/secure_underlay.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/sparks.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/sparks.png new file mode 100644 index 0000000000..a139b5d3c3 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/welded.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/welded.png new file mode 100644 index 0000000000..2975c479be Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/assembly.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/assembly.png new file mode 100644 index 0000000000..e9a7113662 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/bolted_unlit.png new file mode 100644 index 0000000000..2ca98a410d Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/closed.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/closed.png new file mode 100644 index 0000000000..d8ee0cc068 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/closed_unlit.png new file mode 100644 index 0000000000..435a5cb044 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/closing.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/closing.png new file mode 100644 index 0000000000..bc90e8fb23 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/closing_unlit.png new file mode 100644 index 0000000000..a7265ce6ec Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/deny_unlit.png new file mode 100644 index 0000000000..aface6a2f6 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/emergency_unlit.png new file mode 100644 index 0000000000..ccd783a239 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/meta.json b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/meta.json new file mode 100644 index 0000000000..f8ce184aec --- /dev/null +++ b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/meta.json @@ -0,0 +1,172 @@ +{ + "version":1, + "license":"CC-BY-SA-3.0", + "copyright":"Taken from tgstation at https://github.com/tgstation/tgstation/blob/3681006d7102045e334e8eddb23a8685fcdb258a/icons/obj/doors/windoor.dmi, edited by SphiraI(github)", + "size": { + "x":32, + "y":32 + }, + "states":[ + { + "name":"assembly", + "directions":4, + "delays":[ + [ + 0.3,0.3 + ], + [ + 0.3,0.3 + ], + [ + 0.3,0.3 + ], + [ + 0.3,0.3 + ] + ] + }, + { + "name":"closed", + "directions":4 + }, + { + "name":"closed_unlit", + "directions":4 + }, + { + "name":"closing", + "directions":4, + "delays":[ + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1 + ], + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1 + ], + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1 + ], + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1 + ] + ] + }, + { + "name":"closing_unlit", + "directions":4, + "delays":[ + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1 + ], + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1 + ], + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1 + ], + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1] + ] + }, + { + "name":"open", + "directions":4 + }, + { + "name":"open_unlit", + "directions":4 + }, + { + "name":"opening", + "directions":4, + "delays":[ + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1 + ], + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1 + ], + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1 + ], + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1 + ] + ] + }, + { + "name":"opening_unlit", + "directions":4, + "delays":[ + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1 + ], + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1 + ], + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1 + ], + [ + 0.1,0.1,0.1,0.1,0.1,0.1,0.1 + ] + ] + }, + { + "name":"deny_unlit", + "directions":4, + "delays":[ + [ + 0.1,0.2,0.1 + ], + [ + 0.1,0.2,0.1 + ], + [ + 0.1,0.2,0.1 + ], + [ + 0.1,0.2,0.1 + ] + ] + }, + { + "name":"sparks", + "directions":4, + "delays":[ + [ + 0.1,0.1,0.1,0.1,0.1,0.1 + ], + [ + 0.1,0.1,0.1,0.1,0.1,0.1 + ], + [ + 0.1,0.1,0.1,0.1,0.1,0.1 + ], + [ + 0.1,0.1,0.1,0.1,0.1,0.1 + ] + ] + }, + { + "name":"panel_open", + "directions":4 + }, + { + "name":"bolted_unlit", + "directions":4 + }, + { + "name":"welded", + "directions":4 + }, + { + "name":"secure_underlay", + "directions":4 + }, + { + "name": "emergency_unlit", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/open.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/open.png new file mode 100644 index 0000000000..7d3efaaa73 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/open_unlit.png new file mode 100644 index 0000000000..ddcc55de0a Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/opening.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/opening.png new file mode 100644 index 0000000000..b06847f1c2 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/opening_unlit.png new file mode 100644 index 0000000000..9a3072db8a Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/panel_open.png new file mode 100644 index 0000000000..21bbb4dedf Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/secure_underlay.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/secure_underlay.png new file mode 100644 index 0000000000..e574e9a12c Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/secure_underlay.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/sparks.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/sparks.png new file mode 100644 index 0000000000..a139b5d3c3 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/welded.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/welded.png new file mode 100644 index 0000000000..2975c479be Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Windows/directional.rsi/meta.json b/Resources/Textures/Structures/Windows/directional.rsi/meta.json index 26742cfe6c..61a5e51e99 100644 --- a/Resources/Textures/Structures/Windows/directional.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/directional.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "tgstation at ff1c30ac123dd28c6b5fee11e7f03654f5daa731, plasma windows from paradise at 44c12c6d9d0e42a9d3a582dff7e9a8d72b6ea68a", + "copyright": "tgstation at ff1c30ac123dd28c6b5fee11e7f03654f5daa731, plasma windows from paradise at 44c12c6d9d0e42a9d3a582dff7e9a8d72b6ea68a, uranium windows made via edit by SphiraI(github)", "size": { "x": 32, "y": 32 @@ -27,9 +27,17 @@ "name": "plasma_window", "directions": 4 }, - { - "name": "plasma_reinforced_window", - "directions": 4 - } + { + "name": "plasma_reinforced_window", + "directions": 4 + }, + { + "name": "uranium_window", + "directions": 4 + }, + { + "name": "uranium_reinforced_window", + "directions": 4 + } ] } diff --git a/Resources/Textures/Structures/Windows/directional.rsi/uranium_reinforced_window.png b/Resources/Textures/Structures/Windows/directional.rsi/uranium_reinforced_window.png new file mode 100644 index 0000000000..2e5990bd0c Binary files /dev/null and b/Resources/Textures/Structures/Windows/directional.rsi/uranium_reinforced_window.png differ diff --git a/Resources/Textures/Structures/Windows/directional.rsi/uranium_window.png b/Resources/Textures/Structures/Windows/directional.rsi/uranium_window.png new file mode 100644 index 0000000000..8a4661a5f2 Binary files /dev/null and b/Resources/Textures/Structures/Windows/directional.rsi/uranium_window.png differ