]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Clockwork structures and furniture (#24673)
authorMACMAN2003 <macman2003c@gmail.com>
Wed, 6 Mar 2024 00:25:59 +0000 (16:25 -0800)
committerGitHub <noreply@github.com>
Wed, 6 Mar 2024 00:25:59 +0000 (03:25 +0300)
* sprites

something something strength and certainty of steel (except this is brass)

* test1

* commas it was commas

* commas and brackets

* LET THERE BE BRASS

* brass-glass-etc-windows-thindows-floors-lattice

* ALL THE STRUCTURES!!

"Which structures did you add?"
"all."

* buyable brass

and on the first day the quartermaster said "let there be brass" and all the cargo techs stopped inve$ting in awe

* Update windoor.yml

i forgor :skull:

* Update tiles.ftl

* i hate random capital letters

* linter fix 1

whew, thank god for linters

* fix 2

* maybe this

shot in the dark, idk what the hell i'm doing hopefully this fixes it?

* fix attempt 1

weather to true, maybe the thingy got confused?

* remove clockwork lattice

it's fixed the test fail... but at what cost?

* changes 1

* fix clockwork windoor

* FLOORS

HAHAHA LET THERE BE FLOORS

* try linter fix 1

i love linters they find things i'd never catch myself

* tweaks fixes 1

fixes merge conflict and does more stuff part two later because i'm tired

* tweaks fixes 2

i should probably do this stuff during the day when i have more energy but eh

* Update assembly.yml

* Update chairs.yml

* fix door sprites

somehow the deny_unlit was broken for all the clockwork doors

* fix glass.yml

154 files changed:
Resources/Locale/en-US/tiles/tiles.ftl
Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
Resources/Prototypes/Catalog/Fills/Crates/materials.yml
Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
Resources/Prototypes/Entities/Objects/Materials/shards.yml
Resources/Prototypes/Entities/Objects/Misc/tiles.yml
Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
Resources/Prototypes/Entities/Structures/Doors/Airlocks/clockwork.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
Resources/Prototypes/Entities/Structures/Doors/Windoors/clockwork.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml
Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
Resources/Prototypes/Entities/Structures/Walls/girders.yml
Resources/Prototypes/Entities/Structures/Walls/grille.yml
Resources/Prototypes/Entities/Structures/Walls/walls.yml
Resources/Prototypes/Entities/Structures/Windows/clockwork.yml [new file with mode: 0644]
Resources/Prototypes/Reagents/Materials/glass.yml
Resources/Prototypes/Reagents/Materials/metals.yml
Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml
Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml
Resources/Prototypes/Recipes/Construction/Graphs/materials/glass.yml
Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock_clockwork.yml [new file with mode: 0644]
Resources/Prototypes/Recipes/Construction/Graphs/structures/girder_clockwork.yml [new file with mode: 0644]
Resources/Prototypes/Recipes/Construction/Graphs/structures/grille_clockwork.yml [new file with mode: 0644]
Resources/Prototypes/Recipes/Construction/Graphs/structures/grille_diagonal.yml
Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml
Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml
Resources/Prototypes/Recipes/Construction/Graphs/structures/window_diagonal.yml
Resources/Prototypes/Recipes/Construction/Graphs/structures/windowdirectional.yml
Resources/Prototypes/Recipes/Construction/furniture.yml
Resources/Prototypes/Recipes/Construction/materials.yml
Resources/Prototypes/Recipes/Construction/structures.yml
Resources/Prototypes/Recipes/Crafting/Graphs/tiles.yml
Resources/Prototypes/Recipes/Crafting/tiles.yml
Resources/Prototypes/Stacks/Materials/Sheets/glass.yml
Resources/Prototypes/Stacks/Materials/Sheets/metal.yml
Resources/Prototypes/Stacks/floor_tile_stacks.yml
Resources/Prototypes/Tiles/floors.yml
Resources/Prototypes/Tiles/plating.yml
Resources/Prototypes/tags.yml
Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass_2.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass_3.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/Sheets/glass.rsi/meta.json
Resources/Textures/Objects/Tiles/tile.rsi/brass-filled.png [new file with mode: 0644]
Resources/Textures/Objects/Tiles/tile.rsi/brass.png [new file with mode: 0644]
Resources/Textures/Objects/Tiles/tile.rsi/meta.json
Resources/Textures/Objects/Tiles/tile.rsi/reebe.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/assembly.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/bolted_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closed.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closed_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closing.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closing_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/deny_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/emergency_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/open.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/opening.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/opening_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/panel_closing.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/panel_open.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/panel_opening.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/sparks.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/welded.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/assembly.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/bolted_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closed.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closed_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closing.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closing_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/deny_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/emergency_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/open.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/opening.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/opening_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/panel_closing.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/panel_open.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/panel_opening.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/sparks.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/welded.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/bolted_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/clockworkdeny.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/clockworkspark.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closed.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closed_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closing.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closing_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/deny_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/emergency_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/open.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/open_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/opening.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/opening_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/panel_open.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/welded.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/Tables/brass.rsi/full.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/Tables/brass.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_0.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_1.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_2.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_3.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_4.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_5.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_6.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_7.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/chairs.rsi/brass_chair.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
Resources/Textures/Structures/Walls/clock.rsi/clock0.png
Resources/Textures/Structures/Walls/clock.rsi/clock1.png
Resources/Textures/Structures/Walls/clock.rsi/clock2.png
Resources/Textures/Structures/Walls/clock.rsi/clock3.png
Resources/Textures/Structures/Walls/clock.rsi/clock4.png
Resources/Textures/Structures/Walls/clock.rsi/clock5.png
Resources/Textures/Structures/Walls/clock.rsi/clock6.png
Resources/Textures/Structures/Walls/clock.rsi/clock7.png
Resources/Textures/Structures/Walls/clock.rsi/full.png
Resources/Textures/Structures/Walls/clock.rsi/meta.json
Resources/Textures/Structures/Walls/clock.rsi/wall_gear.png [new file with mode: 0644]
Resources/Textures/Structures/Walls/clockwork_grille.rsi/brokenratvargrille.png [new file with mode: 0644]
Resources/Textures/Structures/Walls/clockwork_grille.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Walls/clockwork_grille.rsi/ratvargrille.png [new file with mode: 0644]
Resources/Textures/Structures/Walls/clockwork_grille.rsi/ratvargrille_diagonal.png [new file with mode: 0644]
Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/state0.png [new file with mode: 0644]
Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/state1.png [new file with mode: 0644]
Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow0.png [new file with mode: 0644]
Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow1.png [new file with mode: 0644]
Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow2.png [new file with mode: 0644]
Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow3.png [new file with mode: 0644]
Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow4.png [new file with mode: 0644]
Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow5.png [new file with mode: 0644]
Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow6.png [new file with mode: 0644]
Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow7.png [new file with mode: 0644]
Resources/Textures/Structures/Windows/clockwork_window.rsi/full.png [new file with mode: 0644]
Resources/Textures/Structures/Windows/clockwork_window.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Windows/directional.rsi/clock_window.png [new file with mode: 0644]
Resources/Textures/Structures/Windows/directional.rsi/meta.json
Resources/Textures/Tiles/Misc/clockwork/clockwork_floor.png [new file with mode: 0644]
Resources/Textures/Tiles/Misc/clockwork/clockwork_floor_filled.png [new file with mode: 0644]
Resources/Textures/Tiles/Misc/clockwork/clockwork_lattice.rsi/clock_lattice.png [new file with mode: 0644]
Resources/Textures/Tiles/Misc/clockwork/clockwork_lattice.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Tiles/Misc/clockwork/meta.json [new file with mode: 0644]
Resources/Textures/Tiles/Misc/clockwork/reebe.png [new file with mode: 0644]
Resources/Textures/Tiles/Misc/clockwork/reebegame.png [new file with mode: 0644]
Resources/Textures/Tiles/Misc/clockwork/reebelattice.png [new file with mode: 0644]
Resources/Textures/Tiles/Misc/clockwork/reebemap.png [new file with mode: 0644]
Resources/Textures/Tiles/Misc/clockwork/reebespawn.png [new file with mode: 0644]

index 0a0558b3cb0ea314efda35e6c62c0f3890dbdcd0..0a1b13a6e0db01ba1f3dea1b13d9c49ce1e5ace7 100644 (file)
@@ -54,6 +54,9 @@ tiles-lime-floor = lime floor
 tiles-hydro-floor = hydro floor
 tiles-bar-floor = bar floor
 tiles-clown-floor = clown floor
+tiles-brass-plating = brass plating
+tiles-brass-floor-filled = filled brass plating
+tiles-brass-floor-reebe = smooth brass plating
 tiles-mime-floor = mime floor
 tiles-kitchen-floor = kitchen floor
 tiles-laundry-floor = laundry floor
index e23a756ca062e16f987ade409befc32a28d1104e..e3b07af13baba021985324178594ec3d247e7fe4 100644 (file)
   category: Materials
   group: market
 
+- type: cargoProduct
+  id: MaterialBrass
+  icon:
+    sprite: Objects/Materials/Sheets/metal.rsi
+    state: brass_3
+  product: CrateMaterialBrass
+  cost: 2500
+  category: Materials
+  group: market
+
 - type: cargoProduct
   id: MaterialPlasteel
   icon:
index 513ab46ffbf52bb8fe6f55f51ba5cb369039ee40..bd47f984775f648bad118a910f8c913313304a39 100644 (file)
     contents:
       - id: MaterialWoodPlank
 
+- type: entity
+  id: CrateMaterialBrass
+  parent: CrateGenericSteel
+  name: brass crate
+  description: 90 sheets of brass.
+  components:
+  - type: StorageFill
+    contents:
+      - id: SheetBrass
+        amount: 3
+
 - type: entity
   id: CrateMaterialPlasteel
   parent: CrateGenericSteel
index 64c601b483048756041ba164f7983cb46e4b1f24..59d8ed192205e5b2d5dda5da4c3e21bb48f5e2ec 100644 (file)
   - type: Stack
     stackType: ReinforcedUraniumGlass
     count: 1
+
+- type: entity
+  parent: SheetGlassBase
+  id: SheetClockworkGlass
+  name: clockwork glass
+  description: A sheet of brass-hardened glass, primarily used by clockwork enthusiasts and remnants of Ratvarian cults.
+  suffix: Full
+  components:
+  - type: PhysicalComposition
+    materialComposition:
+      BrassGlass: 100
+  - type: Stack
+    stackType: ClockworkGlass
+    baseLayer: base
+    layerStates:
+    - cglass
+    - cglass_2
+    - cglass_3
+  - type: Sprite
+    state: cglass_3
+    layers:
+    - state: cglass_3
+      map: ["base"]
+  - type: Item
+    heldPrefix: cglass
+  - type: Construction
+    graph: Glass
+    node: SheetClockworkGlass
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+          params:
+            volume: -4
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlassClockwork:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Extractable
+    grindableSolutionName: brassglass
+  - type: SolutionContainerManager
+    solutions:
+      cglass:
+        reagents:
+        - ReagentId: Silicon
+          Quantity: 10
+        - ReagentId: Zinc
+          Quantity: 3.3
+        - ReagentId: Copper
+          Quantity: 6.7
+        canReact: false
+
+- type: entity
+  parent: SheetClockworkGlass
+  id: SheetClockworkGlass1
+  name: clockwork glass
+  suffix: Single
+  components:
+  - type: Sprite
+    state: cglass
+  - type: Stack
+    stackType: ClockworkGlass
+    count: 1
index ae817f6ffc1a089fd6baf9e3c2517da1fe791f63..82b9f62837a47b9f5bebed9038777625f87f6c8a 100644 (file)
     lingering: true
     count: 0
 
+- type: entity
+  parent: SheetMetalBase
+  id: SheetBrass
+  name: brass
+  description: A sheet of brass, primarily used by clockwork enthusiasts and the remnants of Ratvarian cults.
+  suffix: Full
+  components:
+  - type: Material
+  - type: PhysicalComposition
+    materialComposition:
+      Brass: 100
+  - type: Stack
+    stackType: Brass
+    baseLayer: base
+    layerStates:
+    - brass
+    - brass_2
+    - brass_3
+  - type: Sprite
+    state: brass_3
+    layers:
+    - state: brass_3
+      map: ["base"]
+  - type: Item
+    heldPrefix: brass
+  - type: Appearance
+  - type: FloorTile
+    outputs:
+    - PlatingBrass
+  - type: Extractable
+    grindableSolutionName: brass
+  - type: SolutionContainerManager
+    solutions:
+      brass:
+        reagents:
+        - ReagentId: Zinc
+          Quantity: 3.3
+        - ReagentId: Copper
+          Quantity: 6.7
+
+- type: entity
+  parent: SheetBrass
+  id: SheetBrass10
+  name: brass
+  suffix: 10
+  components:
+  - type: Sprite
+    state: brass
+  - type: Stack
+    stackType: Brass
+    count: 10
+
+- type: entity
+  parent: SheetBrass
+  id: SheetBrass1
+  name: brass
+  suffix: Single
+  components:
+  - type: Sprite
+    state: brass
+  - type: Stack
+    stackType: Brass
+    count: 1
+
 - type: entity
   parent: SheetMetalBase
   id: SheetPlasteel
index fa57f90c18f7d0e7f0f56ddfd552f210e400cc08..f94f0a7e0eb6d896e78670b6b798f924f20f5dcb 100644 (file)
   - type: Construction
     graph: UraniumShivConstruct
     node: start
+
+- type: entity
+  parent: ShardBase
+  id: ShardGlassClockwork
+  name: clockwork glass shard
+  description: A small piece of brass-infused glass.
+  components:
+  - type: Sprite
+    color: "#e0aa36"
+  - type: WelderRefinable
+    refineResult:
+    - SheetGlass1
+    - SheetBrass1
+  - type: DamageUserOnTrigger
+    damage:
+      types:
+        Piercing: 5
+  - type: Tag
+    tags:
+      - ClockworkGlassShard
+      - Trash
+  - type: Extractable
+    grindableSolutionName: shardcglass
+  - type: SolutionContainerManager
+    solutions:
+      shardcglass:
+        reagents:
+        - ReagentId: Silicon
+          Quantity: 5
+        - ReagentId: Zinc
+          Quantity: 1.65
+        - ReagentId: Copper
+          Quantity: 3.35
index 9a2196612de3a6cf0c79897f4822e644f0ec6efb..8e29c3c27e65b3236ee4aa4538c384364ba93991 100644 (file)
   - type: Stack
     stackType: FloorTileLino
 
+- type: entity
+  name: filled brass plate
+  parent: FloorTileItemBase
+  id: FloorTileItemBrassFilled
+  components:
+  - type: Sprite
+    state: brass-filled
+  - type: Item
+    heldPrefix: brass
+  - type: FloorTile
+    outputs:
+      - PlatingBrass
+      - FloorBrassFilled
+  - type: Stack
+    stackType: FloorTileBrassFilled
+  - type: Construction
+    graph: TilesBrass
+    node: filledPlate
+
+- type: entity
+  name: smooth brass plate
+  parent: FloorTileItemBase
+  id: FloorTileItemBrassReebe
+  components:
+  - type: Sprite
+    state: reebe
+  - type: Item
+    heldPrefix: brass
+  - type: FloorTile
+    outputs:
+      - PlatingBrass
+      - FloorBrassReebe
+  - type: Stack
+    stackType: FloorTileBrassReebe
+  - type: Construction
+    graph: TilesBrass
+    node: reebe
+
 - type: entity
   name: dirty tile
   parent: FloorTileItemBase
index bb9d5cccdd6a0173b01f8959826c328cca106318..c464c70a15f0be526b711149cd84a0d85e50a90d 100644 (file)
     sprite: Structures/Doors/Airlocks/Glass/cargo.rsi
     state: "assembly"
 
+#Clockwork
+- type: entity
+  id: PinionAirlockAssembly
+  name: airlock assembly
+  suffix: Pinion, Clockwork
+  parent: AirlockAssembly
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi
+    state: "assembly"
+  - type: Construction
+    graph: PinionAirlock
+    node: assembly
+  placement:
+    mode: SnapgridCenter
+
+- type: entity
+  parent: PinionAirlockAssembly
+  id: PinionAirlockAssemblyGlass
+  suffix: Pinion, Clockwork, Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi
+    state: "assembly"
+
 #Command
 - type: entity
   parent: AirlockAssembly
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/highsec/highsec.rsi
-    state: "assembly"
\ No newline at end of file
+    state: "assembly"
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/clockwork.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/clockwork.yml
new file mode 100644 (file)
index 0000000..2269358
--- /dev/null
@@ -0,0 +1,25 @@
+- type: entity
+  parent: Airlock
+  id: PinionAirlock
+  suffix: Pinion, Clockwork
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi
+  - type: Construction
+    graph: PinionAirlock
+    node: airlock
+    containers:
+    - board
+
+- type: entity
+  parent: AirlockGlass
+  id: PinionAirlockGlass
+  suffix: Pinion, Clockwork
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi
+  - type: Construction
+    graph: PinionAirlock
+    node: glassAirlock
+    containers:
+    - board
\ No newline at end of file
index 64a6a0c9e85f644024e9f84b4416f20828a9b7b1..8d9cedac03ad656bd3c06804a0b82f4a4e25292a 100644 (file)
     graph: Windoor
     node: assemblySecure
 
+- type: entity
+  id: WindoorAssemblyClockwork
+  name: clockwork windoor assembly
+  description: It opens, it closes, and you can see through it! This one looks tough.
+  parent: WindoorAssembly
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Windoors/clockwork_windoor.rsi
+    layers:
+    - state: open
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 450
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetBrass1:
+            min: 1
+            max: 2
+  - type: Construction
+    graph: Windoor
+    node: assemblyClockwork
+
 #plasma windoor assemblies
 - type: entity
   id: WindoorAssemblyPlasma
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/clockwork.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/clockwork.yml
new file mode 100644 (file)
index 0000000..196d453
--- /dev/null
@@ -0,0 +1,34 @@
+- type: entity
+  id: BaseClockworkWindoor
+  name: clockwork windoor
+  parent: BaseWindoor
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Windoors/clockwork_windoor.rsi
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 400
+      behaviors: #excess damage (nuke?). avoid computational cost of spawning entities.
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlassClockwork:
+            min: 1
+            max: 2
+          SheetBrass1:
+            min: 2
+            max: 4
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Construction
+    graph: Windoor
+    node: windoorClockwork
+    containers:
+    - board
index 86a788f7b512850778a655d99890efde4f5c2703..0c5b48df0952fbe8c79cab5149328de8f608bd2d 100644 (file)
   name: Secure Windoor
   description: It's a sturdy window and a sliding door. Wow!
 
+- type: entity
+  id: WindoorClockwork
+  parent: BaseClockworkWindoor
+  name: clockwork windoor
+  description: It's a sturdy window and a sliding door. Wow!
+
 - type: entity
   id: WindoorPlasma
   parent: BasePlasmaWindoor
index 584c3b57b2e8bb2855ee83f07c77e6a8972d1e3b..e424b1b40b4e88574057ada4d4603992cfde8af9 100644 (file)
     footstepSoundCollection:
       collection: FootstepTile
 
+- type: entity
+  id: TableBrass
+  parent: TableBase
+  name: brass table
+  description: A shiny, corrosion resistant brass table. Steampunk!
+  components:
+  - type: Sprite
+    sprite: Structures/Furniture/Tables/brass.rsi
+  - type: Icon
+    sprite: Structures/Furniture/Tables/brass.rsi
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Metallic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 125
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 25
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+          params:
+            volume: -6
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetBrass1:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Construction
+    graph: Table
+    node: TableBrass
+    
 - type: entity
   id: TableWood
   parent: TableBase
index d9f6270b45805f8ca9244b85a543cd0ce54f01f2..cc8cc325fbbf4523c4d692255aba2e5d2bfe2e71 100644 (file)
     graph: Seat
     node: stoolBar
 
+- type: entity
+  name: brass chair
+  id: ChairBrass
+  parent: StoolBase
+  components:
+  - type: Sprite
+    state: brass_chair
+  - type: Construction
+    graph: Seat
+    node: chairBrass
+
 - type: entity
   name: white office chair
   id: ChairOfficeLight
index 3c9a2e7033571b776ce1768d858b7f92b68bbf63..f3e9c826d3bea25c631afae153584d8f419f8c3e 100644 (file)
                 collection: MetalBreak
     - type: StaticPrice
       price: 66
+
+- type: entity
+  id: ClockworkGirder
+  parent: ReinforcedGirder
+  name: wall gear
+  description: A large gear with mounting brackets for additional plating; This could be made into a wall with more brass plating.
+  components:
+    - type: Sprite
+      sprite: Structures/Walls/clock.rsi
+      state: wall_gear
+    - type: Construction
+      graph: ClockworkGirder
+      node: clockGirder
+    - type: Destructible
+      thresholds:
+        - trigger:
+            !type:DamageTrigger
+            damage: 200
+          behaviors:
+            - !type:DoActsBehavior
+              acts: [ "Destruction" ]
+            - !type:PlaySoundBehavior
+              sound:
+                collection: MetalBreak
+        - trigger:
+            !type:DamageTrigger
+            damage: 50
+          behaviors:
+            - !type:SpawnEntitiesBehavior
+              spawn:
+                SheetBrass1:
+                  min: 1
+                  max: 2
+                PartRodMetal1:
+                  min: 1
+                  max: 2
+            - !type:DoActsBehavior
+              acts: [ "Destruction" ]
+            - !type:PlaySoundBehavior
+              sound:
+                collection: MetalBreak
\ No newline at end of file
index 1d9e0b3a5c10fdf281551f571e6816e6013f8cb3..b532db221dab29a2d74f3b121506c7be196f91e2 100644 (file)
             False: { visible: False }
     - type: AnimationPlayer
 
+- type: entity
+  id: ClockworkGrille
+  parent: Grille
+  name: clockwork grille
+  description: a flimsy framework of iron rods assembled in traditional Ratvarian fashion.
+  components:
+    - type: Sprite
+      drawdepth: Walls
+      sprite: Structures/Walls/clockwork_grille.rsi
+      state: ratvargrille
+      layers:
+        - state: ratvargrille
+    - type: Icon
+      sprite: Structures/Walls/clockwork_grille.rsi
+      state: ratvargrille
+    - type: Construction
+      graph: ClockGrille
+      node: clockGrille
+      deconstructionTarget: start
+
 - type: entity
   id: GrilleBroken
   parent: BaseStructure
             - !type:DoActsBehavior
               acts: ["Destruction"]
 
+- type: entity
+  id: ClockworkGrilleBroken
+  parent: GrilleBroken
+  name: clockwork grille
+  description: A flimsy framework of iron rods assembled in traditional Ratvarian fashion. It has seen better days.
+  components:
+    - type: Sprite
+      drawdepth: Walls
+      sprite: Structures/Walls/clockwork_grille.rsi
+      state: brokenratvargrille
+    - type: Icon
+      sprite: Structures/Walls/clockwork_grille.rsi
+      state: brokenratvargrille
+    - type: Construction
+      graph: ClockGrille
+      node: clockGrilleBroken
+
 - type: entity
   id: GrilleDiagonal
   parent: Grille
           - WallLayer
     - type: Construction
       graph: GrilleDiagonal
-      node: grilleDiagonal
\ No newline at end of file
+      node: grilleDiagonal
+
+- type: entity
+  id: ClockworkGrilleDiagonal
+  parent: ClockworkGrille
+  name: diagonal clockwork grille
+  components:
+    - type: Sprite
+      drawdepth: Walls
+      sprite: Structures/Walls/clockwork_grille.rsi
+      layers:
+        - state: ratvargrille_diagonal
+        - state: electrified_diagonal
+          sprite: Effects/electricity.rsi
+          map: ["enum.ElectrifiedLayers.Powered"]
+          shader: unshaded
+          visible: false
+    - type: Icon
+      sprite: Structures/Walls/clockwork_grille.rsi
+      state: ratvargrille_diagonal
+    - type: Fixtures
+      fixtures:
+        fix1:
+          shape:
+            !type:PolygonShape
+              vertices:
+              - "-0.5,-0.5"
+              - "0.5,0.5"
+              - "0.5,-0.5"
+          mask:
+          - FullTileMask
+          layer:
+          - WallLayer
+    - type: Construction
+      graph: GrilleDiagonal
+      node: clockworkGrilleDiagonal
+      
index bac81f62edc5a8493adbbef115a33ab874be7511..f83a32e4006e6c3f048d22020f1f3943cda2afa5 100644 (file)
@@ -94,6 +94,9 @@
     sprite: Structures/Walls/clock.rsi
   - type: Icon
     sprite: Structures/Walls/clock.rsi
+  - type: Construction
+    graph: ClockworkGirder
+    node: clockworkWall
   - type: Destructible
     thresholds:
     - trigger:
       behaviors:
       - !type:SpawnEntitiesBehavior
         spawn:
-          Girder:
+          ClockworkGirder:
             min: 1
             max: 1
       - !type:DoActsBehavior
diff --git a/Resources/Prototypes/Entities/Structures/Windows/clockwork.yml b/Resources/Prototypes/Entities/Structures/Windows/clockwork.yml
new file mode 100644 (file)
index 0000000..9902edd
--- /dev/null
@@ -0,0 +1,141 @@
+- type: entity
+  id: ClockworkWindow
+  name: clockwork window
+  description: Don't smudge up the brass down there.
+  parent: Window
+  components:
+  - type: Sprite
+    drawdepth: WallTops
+    sprite: Structures/Windows/clockwork_window.rsi
+  - type: Icon
+    sprite: Structures/Windows/clockwork_window.rsi
+  - type: Repairable
+    fuelCost: 10
+    doAfterDelay: 2
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: RGlass
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 150
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
+    - trigger:
+        !type:DamageTrigger
+        damage: 75
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlassClockwork:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: IconSmooth
+    base: cwindow
+  - type: Construction
+    graph: Window
+    node: clockworkWindow
+  - type: Appearance
+  - type: DamageVisuals
+    thresholds: [4, 8, 12]
+    damageDivisor: 4
+    trackAllDamage: true
+    damageOverlay:
+      sprite: Structures/Windows/cracks.rsi
+
+- type: entity
+  id: WindowClockworkDirectional
+  parent: WindowDirectional
+  name: directional clockwork window
+  description: Don't smudge up the brass down there.
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Window
+  components:
+  - type: Sprite
+    sprite: Structures/Windows/directional.rsi
+    state: clock_window
+  - type: Icon
+    sprite: Structures/Windows/directional.rsi
+    state: clock_window
+  - type: Construction
+    graph: WindowDirectional
+    node: windowClockworkDirectional
+  - type: Appearance
+  - type: DamageVisuals
+    thresholds: [4, 8, 12]
+    damageDivisor: 10
+    trackAllDamage: true
+    damageOverlay:
+      sprite: Structures/Windows/cracks_directional.rsi
+  - type: Damageable
+    damageModifierSet: RGlass
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 150
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlassClockwork:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: StaticPrice
+    price: 22
+
+- type: entity
+  parent: ClockworkWindow
+  id: ClockworkWindowDiagonal
+  suffix: diagonal
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Window
+  components:
+  - type: Sprite
+    drawdepth: WallTops
+    sprite: Structures/Windows/clockwork_diagonal.rsi
+    state: state0
+  - type: IconSmooth
+    mode: Diagonal
+    key: windows
+    base: state
+  - type: Icon
+    sprite: Structures/Windows/clockwork_diagonal.rsi
+    state: state0
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PolygonShape
+            vertices:
+            - "-0.5,-0.5"
+            - "0.5,0.5"
+            - "0.5,-0.5"
+        mask:
+        - FullTileMask
+        layer:
+        - GlassLayer
+  - type: DamageVisuals
+    damageOverlay:
+      sprite: Structures/Windows/cracks_diagonal.rsi
+  - type: Construction
+    graph: WindowDiagonal
+    node: clockworkWindowDiagonal
index 07bebf12dc9a117e7ca0e9e5a3c348b726a1a5f4..30e7762a81e3188f3d49a150bda4f72c7478216e 100644 (file)
   color: "#8c4069"
   price: 0.40 # 1-1-0.5 mix of plasma, glass, and metal.
 
+- type: material
+  id: BrassGlass
+  stackEntity: SheetClockworkGlass1
+  name: materials-clockwork-glass
+  icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: cglass }
+  color: "#9b6f07"
+  price: 0.0875 # average of glass and brass.
+
 - type: material
   id: UraniumGlass
   stackEntity: SheetUGlass1
index affeb9427eee0aa72ecddf36dd0293794f87904a..a2d2397dcde4e9e621e01ce9e315b3263000d0d9 100644 (file)
   color: "#C0C0C0"
   price: 0.15
 
+- type: material
+  id: Brass
+  stackEntity: SheetBrass1
+  name: materials-brass
+  icon: { sprite: Objects/Materials/Sheets/metal.rsi, state: brass }
+  color: "#b18b25"
+  price: 0.1
+
 - type: material
   id: Plasteel
   stackEntity: SheetPlasteel1
index 53d4ba70085624c5ccfcc0a874ca0fe16aa3b1af..f859daabc9faa4e1244fe5fbb48a72a952840e8b 100644 (file)
             - material: Steel
               amount: 1
               doAfter: 1
+        - to: chairBrass
+          steps:
+            - material: Brass
+              amount: 1
+              doAfter: 1
         - to: chairOffice
           steps:
             - material: Steel
             - tool: Screwing
               doAfter: 1
 
+    - node: chairBrass
+      entity: ChairBrass
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetBrass1
+          steps:
+            - tool: Screwing
+              doAfter: 1
+
     - node: chairOffice
       entity: ChairOfficeLight
       edges:
index 87384e81687d9a9f094826e503fbcb2d34c5d5b6..1c828b05ac5bb6343d64d8c004081314342a4764 100644 (file)
             - material: PlasmaGlass
               amount: 1
               doAfter: 1
+        
+        - to: TableBrass
+          steps:
+            - material: Brass
+              amount: 1
+              doAfter: 1
 
         - to: TableWood
           steps:
             - tool: Anchoring
               doAfter: 1
 
+    - node: TableBrass
+      entity: TableBrass
+      edges:
+        - to: TableFrame
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetBrass1
+              amount: 1
+          steps:
+            - tool: Prying
+              doAfter: 1
+
     - node: TableWood
       entity: TableWood
       edges:
index 654dd7bdf36eb54962db35df53607a1260bcccc3..02c5d94f98c7c6b035ddc7ba6e790b75cb347ca7 100644 (file)
               amount: 1
             - material: MetalRod
               amount: 1
+
+        - to: SheetClockworkGlass
+          completed:
+            - !type:SetStackCount
+              amount: 1
+          steps:
+            - material: Glass
+              amount: 1
+            - material: Brass
+              amount: 1
+
         - to: SheetRUGlass0
           completed:
             - !type:SetStackCount
@@ -80,6 +91,7 @@
               amount: 1
             - material: MetalRod
               amount: 1
+
         - to: SheetRUGlass1
           completed:
             - !type:SetStackCount
               amount: 1
             - material: Uranium
               amount: 1
+
     - node: SheetGlass
       entity: SheetGlass
 
 
     - node: SheetRUGlass
       entity: SheetRUGlass
+      
+    - node: SheetClockworkGlass
+      entity: SheetClockworkGlass
 
     - node: SheetRUGlass0
       entity: SheetRUGlass
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock_clockwork.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock_clockwork.yml
new file mode 100644 (file)
index 0000000..b0cfe30
--- /dev/null
@@ -0,0 +1,165 @@
+- type: constructionGraph
+  id: PinionAirlock
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: assembly
+      completed:
+      - !type:SetAnchor
+        value: false
+      steps:
+      - material: Brass
+        amount: 4
+        doAfter: 2
+
+  - node: assembly
+    entity: PinionAirlockAssembly
+    actions:
+    - !type:SnapToGrid {}
+    - !type:SetAnchor {}
+    edges:
+    - to: wired
+      conditions:
+      - !type:EntityAnchored {}
+      steps:
+      - material: Cable
+        amount: 5
+        doAfter: 2.5
+    - to: start
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetBrass1
+        amount: 4
+      - !type:DeleteEntity {}
+      steps:
+      - tool: Welding
+        doAfter: 3
+
+  - node: wired
+    entity: PinionAirlockAssembly
+    edges:
+    - to: electronics
+      conditions:
+      - !type:EntityAnchored {}
+      steps:
+      - tag: DoorElectronics
+        store: board
+        name: "door electronics circuit board"
+        icon:
+          sprite: "Objects/Misc/module.rsi"
+          state: "door_electronics"
+        doAfter: 3
+    - to: assembly
+      completed:
+      - !type:SpawnPrototype
+        prototype: CableApcStack1
+        amount: 5
+      steps:
+      - tool: Cutting
+        doAfter: 2.5
+
+  - node: electronics
+    edges:
+    - to: airlock
+      conditions:
+      - !type:EntityAnchored {}
+      steps:
+      - tool: Screwing
+        doAfter: 2.5
+    - to: glassElectronics
+      conditions:
+      - !type:EntityAnchored {}
+      steps:
+      - material: ClockworkGlass
+        amount: 1
+        doAfter: 2
+    - to: wired
+      conditions:
+      - !type:EntityAnchored {}
+      completed:
+      - !type:EmptyAllContainers
+        pickup: true
+        emptyAtUser: true
+      steps:
+      - tool: Prying
+        doAfter: 5
+
+  - node: glassElectronics
+    entity: PinionAirlockAssemblyGlass
+    edges:
+    - to: glassAirlock
+      conditions:
+      - !type:EntityAnchored {}
+      steps:
+      - material: ClockworkGlass
+        amount: 1
+        doAfter: 2
+      - tool: Screwing
+        doAfter: 2.5
+    - to: wired
+      conditions:
+      - !type:EntityAnchored {}
+      completed:
+      - !type:EmptyAllContainers
+        pickup: true
+        emptyAtUser: true
+      - !type:SpawnPrototype
+        prototype: SheetClockworkGlass1
+        amount: 1
+      steps:
+      - tool: Prying
+        doAfter: 5
+
+## Glass airlock
+  - node: glassAirlock
+    entity: PinionAirlockGlass
+    doNotReplaceInheritingEntities: true
+    actions:
+    - !type:SetWiresPanelSecurity
+      wiresAccessible: true
+      weldingAllowed: true
+    edges:
+    - to: glassElectronics
+      conditions:
+      - !type:EntityAnchored {}
+      - !type:DoorWelded {}
+      - !type:DoorBolted
+        value: false
+      - !type:WirePanel {}
+      - !type:AllWiresCut
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetClockworkGlass1
+        amount: 1
+      steps:
+      - tool: Prying
+        doAfter: 2
+
+## Standard airlock
+  - node: airlock
+    entity: PinionAirlock
+    doNotReplaceInheritingEntities: true
+    actions:
+    - !type:SetWiresPanelSecurity
+      wiresAccessible: true
+      weldingAllowed: true
+    edges:
+    - to: wired
+      conditions:
+      - !type:EntityAnchored {}
+      - !type:DoorWelded {}
+      - !type:DoorBolted
+        value: false
+      - !type:WirePanel {}
+      - !type:AllWiresCut
+      completed:
+      - !type:EmptyAllContainers
+        pickup: true
+        emptyAtUser: true
+      steps:
+      - tool: Prying
+        doAfter: 5
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder_clockwork.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder_clockwork.yml
new file mode 100644 (file)
index 0000000..b4ca5ce
--- /dev/null
@@ -0,0 +1,63 @@
+- type: constructionGraph
+  id: ClockworkGirder
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: clockGirder
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: Brass
+              amount: 2
+              doAfter: 1
+
+    - node: clockGirder
+      entity: ClockworkGirder
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetBrass1
+              amount: 2
+            - !type:DeleteEntity {}
+          conditions:
+            - !type:EntityAnchored
+              anchored: false
+          steps:
+            - tool: Screwing
+              doAfter: 2
+
+        - to: clockworkWall
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          conditions:
+            - !type:EntityAnchored {}
+          steps:
+            - material: MetalRod
+              amount: 2
+              doAfter: 2
+            - material: Brass
+              amount: 2
+              doAfter: 1
+
+    - node: clockworkWall
+      entity: WallClock
+      edges:
+        - to: clockGirder
+          completed:
+            - !type:GivePrototype
+              prototype: PartRodMetal1
+              amount: 2
+            - !type:GivePrototype
+              prototype: SheetBrass1
+              amount: 2
+          steps:
+            - tool: Welding
+              doAfter: 10
+            - tool: Cutting
+              doAfter: 1
+            - tool: Prying
+              doAfter: 2
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/grille_clockwork.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/grille_clockwork.yml
new file mode 100644 (file)
index 0000000..d51fed4
--- /dev/null
@@ -0,0 +1,46 @@
+- type: constructionGraph
+  id: ClockGrille
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: clockGrille
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: MetalRod
+              amount: 2
+              doAfter: 1
+
+    - node: clockGrille
+      entity: ClockworkGrille
+      edges:
+        - to: start
+          completed:
+            - !type:AdminLog # Needs a log for start of attempt in addition to the completion log
+              message: "A grille was cut"
+            - !type:SpawnPrototype
+              prototype: PartRodMetal1
+              amount: 2
+            - !type:DeleteEntity
+          steps:
+            - tool: Cutting
+              doAfter: 0.25
+
+    - node: clockGrilleBroken
+      entity: ClockworkGrilleBroken
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: PartRodMetal1
+              amount: 1
+            - !type:DeleteEntity
+          steps:
+            - tool: Cutting
+        - to: clockGrille
+          steps:
+            - material: MetalRod
+              amount: 1
+              doAfter: 0.5
index 3f1bad5d342ef7a3354fe948c011925687536e49..d24656faa5bdd993238ddf17fea57284299531f0 100644 (file)
             - material: MetalRod
               amount: 2
               doAfter: 1
+              
+        - to: clockworkGrilleDiagonal
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: MetalRod
+              amount: 2
+              doAfter: 1
 
     - node: grilleDiagonal
       entity: GrilleDiagonal
           steps:
             - tool: Cutting
               doAfter: 0.25
+              
+    - node: clockworkGrilleDiagonal
+      entity: ClockworkGrilleDiagonal
+      edges:
+        - to: start
+          completed:
+            - !type:AdminLog
+              message: "A grille was cut"
+            - !type:SpawnPrototype
+              prototype: PartRodMetal1
+              amount: 2
+            - !type:DeleteEntity
+          steps:
+            - tool: Cutting
+              doAfter: 0.25
index 2acdfb5809df144114d1b89fcfe4300359980efe..64809ee1dbc9682cb8d30d1bd6632b3ddf95da54 100644 (file)
         amount: 4
         doAfter: 2
 
+    - to: assemblyClockwork
+      completed:
+      - !type:SetAnchor
+        value: false
+      steps:
+      - material: Brass
+        amount: 4
+        doAfter: 2
+
   - node: assembly
     entity: WindoorAssembly
     actions:
       - tool: Anchoring
         doAfter: 4
 
+  - node: assemblyClockwork
+    entity: WindoorAssemblyClockwork
+    actions:
+    - !type:SnapToGrid { }
+    - !type:SetAnchor { }
+    edges:
+    - to: glassClockwork
+      conditions:
+      - !type:EntityAnchored { }
+      steps:
+      - material: ClockworkGlass
+        amount: 5
+        doAfter: 1
+    - to: start
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetBrass1
+        amount: 4
+      - !type:DeleteEntity { }
+      steps:
+      - tool: Welding
+        doAfter: 10
+
+  - node: glassClockwork
+    entity: WindoorAssemblyClockwork
+    edges:
+    - to: wiredClockwork
+      conditions:
+      - !type:EntityAnchored { }
+      steps:
+      - material: Cable
+        amount: 5
+        doAfter: 1
+    - to: assemblyClockwork
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetClockworkGlass1
+        amount: 5
+      steps:
+      - tool: Screwing
+        doAfter: 4
+
+  - node: wiredClockwork
+    entity: WindoorAssemblyClockwork
+    edges:
+    - to: electronicsClockwork
+      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: glassClockwork
+      completed:
+      - !type:SpawnPrototype
+        prototype: CableApcStack1
+        amount: 5
+      steps:
+      - tool: Cutting
+        doAfter: 3
+
+  - node: electronicsClockwork
+    entity: WindoorAssemblyClockwork
+    edges:
+    - to: windoorClockwork
+      conditions:
+      - !type:EntityAnchored { }
+      steps:
+      - tool: Screwing
+        doAfter: 4
+
+  - node: windoorClockwork
+    entity: WindoorClockwork
+    edges:
+    - to: wiredClockwork
+      conditions:
+      - !type:EntityAnchored {}
+      - !type:DoorBolted
+        value: false
+      - !type:WirePanel {}
+      - !type:AllWiresCut
+      completed:
+      - !type:EmptyAllContainers
+        pickup: true
+        emptyAtUser: true
+      steps:
+      - tool: Anchoring
+        doAfter: 4
+
   #secure plasma node
   - node: pglassSecure
     entity: WindoorAssemblySecurePlasma
       - material: Cable
         amount: 5
         doAfter: 1
+
     - to: assemblySecure
       conditions:
       - !type:EntityAnchored
       - tool: Screwing
         doAfter: 4
 
-
   - node: pwiredSecure
     entity: WindoorAssemblySecurePlasma
     edges:
index 10284bdca2613c36baa0ccd285aa46a08e21a81c..1c1aaec4e1e4de2b3bb1be4a629f7b36ab04ef90 100644 (file)
             - material: ReinforcedGlass
               amount: 2
               doAfter: 4
+        
+        - to: clockworkWindow
+          steps:
+            - material: ClockworkGlass
+              amount: 2
+              doAfter: 3
 
     - node: window
       entity: Window
             - tool: Anchoring
               doAfter: 3
 
+    - node: clockworkWindow
+      entity: ClockworkWindow
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetClockworkGlass1
+              amount: 2
+            - !type:DeleteEntity {}
+          steps:
+            - tool: Welding
+              doAfter: 5
+            - tool: Screwing
+              doAfter: 2
+            - tool: Prying
+              doAfter: 3
+            - tool: Welding
+              doAfter: 5
+            - tool: Screwing
+              doAfter: 2
+            - tool: Anchoring
+              doAfter: 3
+    
     - node: shuttleWindow
       entity: ShuttleWindow
       edges:
index 1a1169521262263b5b8c3621f513cc3de76315e2..55036b755998739e48c41a23a7d2e14aa6136ac5 100644 (file)
               amount: 2
               doAfter: 3
 
+        - to: clockworkWindowDiagonal
+          steps:
+            - material: ClockworkGlass
+              amount: 2
+              doAfter: 3
+
         - to: windowDiagonal
           steps:
             - material: Glass
             - tool: Anchoring
               doAfter: 2
 
+    - node: clockworkWindowDiagonal
+      entity: ClockworkWindowDiagonal
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetClockworkGlass1
+              amount: 2
+            - !type:DeleteEntity {}
+          steps:
+            - tool: Welding
+              doAfter: 5
+            - tool: Screwing
+              doAfter: 1
+            - tool: Prying
+              doAfter: 2
+            - tool: Welding
+              doAfter: 5
+            - tool: Screwing
+              doAfter: 1
+            - tool: Anchoring
+              doAfter: 2
+
     - node: plasmaWindowDiagonal
       entity: PlasmaWindowDiagonal
       edges:
index 3b1cd4bbb0499619996a9ef16a02bbe35459b69d..96f009fabb760aeadc2f66752f85361a59d8706e 100644 (file)
               amount: 1
               doAfter: 3
 
+        - to: windowClockworkDirectional
+          steps:
+            - material: ClockworkGlass
+              amount: 1
+              doAfter: 3
 
     - node: windowDirectional
       entity: WindowDirectional
             - tool: Anchoring
               doAfter: 3
 
+    - node: windowClockworkDirectional
+      entity: WindowClockworkDirectional
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetClockworkGlass1
+              amount: 1
+            - !type:DeleteEntity {}
+          steps:
+            - tool: Screwing
+              doAfter: 2
+            - tool: Prying
+              doAfter: 3
+            - tool: Screwing
+              doAfter: 2
+            - tool: Anchoring
+              doAfter: 3
+
     - node: plasmaReinforcedWindowDirectional
       entity: PlasmaReinforcedWindowDirectional
       edges:
index bbe307ad236d18a8c827417aa3515079e44d2508..4e05a4dfb868fe1764d6d026c8310b9aab1ed6fe 100644 (file)
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  name: brass chair
+  id: ChairBrass
+  graph: Seat
+  startNode: start
+  targetNode: chairBrass
+  category: construction-category-furniture
+  description: You sit in this. Either by will or force.
+  icon:
+    sprite: Structures/Furniture/chairs.rsi
+    state: brass_chair
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
 - type: construction
   name: office chair
   id: ChairOfficeLight
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  name: brass table
+  id: TableBrass
+  graph: Table
+  startNode: start
+  targetNode: TableBrass
+  category: construction-category-furniture
+  description: A shiny, corrosion resistant brass table. Steampunk!
+  icon:
+    sprite: Structures/Furniture/Tables/brass.rsi
+    state: full
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
 - type: construction
   name: wood table
   id: TableWood
index eea19c9c627fe7561242a7612bc35fc3ded363c5..d644538a452f962bbc9d1503c4955d67cdea6ef0 100644 (file)
   icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: rglass }
   objectType: Item
 
+- type: construction
+  name: clockwork glass
+  description: A brass-reinforced sheet of glass.
+  id: SheetClockworkGlass
+  graph: Glass
+  startNode: start
+  targetNode: SheetClockworkGlass
+  category: construction-category-materials
+  icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: cglass }
+  objectType: Item
+
 - type: construction
   name: plasma glass
   description: A sheet of translucent plasma.
index 518a2eafc66c4aba676a01d7529b652098d11fca..4aaebaba9f50d9638b2237c34f4bd038e6aa6f4e 100644 (file)
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  name: wall gear
+  id: ClockworkGirder
+  graph: ClockworkGirder
+  startNode: start
+  targetNode: clockGirder
+  category: construction-category-structures
+  description: A large gear with mounting brackets for additional plating.
+  icon:
+    sprite: /Textures/Structures/Walls/clock.rsi
+    state: wall_gear
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canRotate: false
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
 - type: construction
   name: wall
   id: Wall
   placementMode: SnapgridCenter
   canRotate: false
   canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked    
+
+- type: construction
+  name: clock wall
+  id: WallClock
+  graph: ClockworkGirder
+  startNode: start
+  targetNode: clockworkWall
+  category: construction-category-structures
+  description: Keeps the air in and the greytide out.
+  icon:
+    sprite: Structures/Walls/clock.rsi
+    state: full
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canRotate: false
+  canBuildInImpassable: false
   conditions:
     - !type:TileNotBlocked
 # here
   placementMode: SnapgridCenter
   canRotate: false
 
+- type: construction
+  name: clockwork grille
+  id: ClockGrille
+  graph: ClockGrille
+  startNode: start
+  targetNode: clockGrille
+  category: construction-category-structures
+  description: A flimsy framework of iron rods assembled in traditional ratvarian fashion.
+  conditions:
+    - !type:TileNotBlocked
+      failIfSpace: false
+  icon:
+    sprite: Structures/Walls/clockwork_grille.rsi
+    state: ratvargrille
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canRotate: false
+
 - type: construction
   name: diagonal grille
   id: GrilleDiagonal
   objectType: Structure
   placementMode: SnapgridCenter
 
+- type: construction
+  name: diagonal clockwork grille
+  id: ClockworkGrilleDiagonal
+  graph: GrilleDiagonal
+  startNode: start
+  targetNode: clockworkGrilleDiagonal
+  category: construction-category-structures
+  description: A flimsy framework of iron rods assembled in traditional ratvarian fashion.
+  conditions:
+    - !type:TileNotBlocked
+      failIfSpace: false
+  icon:
+    sprite: Structures/Walls/clockwork_grille.rsi
+    state: ratvargrille_diagonal
+  objectType: Structure
+  placementMode: SnapgridCenter
+
 - type: construction
   name: window
   id: Window
   placementMode: SnapgridCenter
   canRotate: false
 
+- type: construction
+  name: clockwork window
+  id: ClockworkWindow
+  graph: Window
+  startNode: start
+  targetNode: clockworkWindow
+  category: construction-category-structures
+  description: Clear and tough, with a golden tint.
+  canBuildInImpassable: true
+  conditions:
+    - !type:EmptyOrWindowValidInTile
+    - !type:NoWindowsInTile
+  icon:
+    sprite: Structures/Windows/clockwork_window.rsi
+    state: full
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canRotate: false
+
+- type: construction
+  name: diagonal clockwork window
+  id: ClockworkWindowDiagonal
+  graph: WindowDiagonal
+  startNode: start
+  targetNode: clockworkWindowDiagonal
+  category: construction-category-structures
+  description: Clear and tough, with a golden tint.
+  canBuildInImpassable: true
+  conditions:
+    - !type:EmptyOrWindowValidInTile
+    - !type:NoWindowsInTile
+  icon:
+    sprite: Structures/Windows/clockwork_diagonal.rsi
+    state: state0
+  objectType: Structure
+  placementMode: SnapgridCenter
+
 - type: construction
   name: plasma window
   id: PlasmaWindow
   objectType: Structure
   placementMode: SnapgridCenter
 
+- type: construction
+  name: directional clockwork window
+  id: WindowClockworkDirectional
+  graph: WindowDirectional
+  startNode: start
+  targetNode: windowClockworkDirectional
+  category: construction-category-structures
+  description: Clear and tough, with a golden tint.
+  canBuildInImpassable: true
+  conditions:
+    - !type:EmptyOrWindowValidInTile
+    - !type:NoWindowsInTile
+  icon:
+    sprite: Structures/Windows/directional.rsi
+    state: clock_window
+  objectType: Structure
+  placementMode: SnapgridCenter
+
 - type: construction
   name: directional plasma window
   id: PlasmaWindowDirectional
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  name: pinion airlock
+  id: PinionAirlock
+  graph: PinionAirlock
+  startNode: start
+  targetNode: airlock
+  category: construction-category-structures
+  description: It opens, it closes, and maybe crushes you.
+  icon:
+    sprite: Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi
+    state: assembly
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
+- type: construction
+  name: glass pinion airlock
+  id: PinionAirlockGlass
+  graph: PinionAirlock
+  startNode: start
+  targetNode: glassAirlock
+  category: construction-category-structures
+  description: It opens, it closes, and maybe crushes you.
+  icon:
+    sprite: Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi
+    state: assembly
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
 - type: construction
   name: shuttle airlock
   id: AirlockShuttle
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  name: clockwork windoor
+  id: ClockworkWindoor
+  graph: Windoor
+  startNode: start
+  targetNode: windoorClockwork
+  category: construction-category-structures
+  description: It opens, it closes, and you can see through it! This one looks tough.
+  icon:
+    sprite: Structures/Doors/Windoors/clockwork_windoor.rsi
+    state: closed
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
 
 #lighting
 - type: construction
index 4cb5d6c0f833709a3b5c2c402c3f63ca6278eee1..2b84e905b37ac07924122333b010a12141092442 100644 (file)
     - node: woodtile
       entity: FloorTileItemWood
 
+- type: constructionGraph
+  id: TilesBrass
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: filledPlate
+          completed:
+            - !type:SetStackCount
+              amount: 4
+          steps:
+            - material: Brass
+              amount: 1
+        - to: reebe
+          completed:
+            - !type:SetStackCount
+              amount: 4
+          steps:
+            - material: Brass
+              amount: 1
+    
+    - node: filledPlate
+      entity: FloorTileItemBrassFilled
+      
+    - node: reebe
+      entity: FloorTileItemBrassReebe
+
 - type: constructionGraph
   id: TileWhite
   start: start
index 1cabb7dedd46ba21b1eb20f916ac29a35c1acf8f..433a3bec29c4002da633fa37e885ff9285673338 100644 (file)
   description: "Four pieces of wooden station flooring."
   icon: { sprite: Objects/Tiles/tile.rsi, state: wood }
   objectType: Item
+  
+- type: construction
+  name: filled brass plate
+  id: TileBrassFilled
+  graph: TilesBrass
+  startNode: start
+  targetNode: filledPlate
+  category: construction-category-tiles
+  description: "Four pieces of brass station flooring, only compatible with brass plating."
+  icon: { sprite: Objects/Tiles/tile.rsi, state: brass-filled }
+  objectType: Item
+  
+- type: construction
+  name: smooth brass plate
+  id: TileBrassReebe
+  graph: TilesBrass
+  startNode: start
+  targetNode: reebe
+  category: construction-category-tiles
+  description: "Four pieces of smooth brass station flooring, only compatible with brass plating."
+  icon: { sprite: Objects/Tiles/tile.rsi, state: reebe }
+  objectType: Item
 
 - type: construction
   name: white tile
index 84a31a3a073a0c859347587ac3884559ef724004..0caffb301f500c4c9574432cc009ed57f0172a13 100644 (file)
   spawn: SheetRUGlass1
   maxCount: 30
   itemSize: 1
+
+- type: stack
+  id: ClockworkGlass
+  name: clockwork glass
+  icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: cglass }
+  spawn: SheetClockworkGlass1
+  maxCount: 30
+  itemSize: 1
index 0954ab70623fd4ced334e17a7dc997e0724771d3..77f750c205b987b5a0b22fbe00a451bf02efffe9 100644 (file)
   spawn: SheetPlasteel1
   maxCount: 30
   itemSize: 1
+
+- type: stack
+  id: Brass
+  name: brass
+  icon: { sprite: /Textures/Objects/Materials/Sheets/metal.rsi, state: brass }
+  spawn: SheetBrass1
+  maxCount: 30
+  itemSize: 1
index 975447a138ab6236b40482220b3d9796e35e2436..b469f55c59c044b48fa91665474e5cfc048b9c0a 100644 (file)
   maxCount: 30
   itemSize: 5
 
+- type: stack
+  id: FloorTileBrassFilled
+  name: filled brass plate
+  spawn: FloorTileItemBrassFilled
+  maxCount: 30
+  itemSize: 5
+  
+- type: stack
+  id: FloorTileBrassReebe
+  name: smooth brass plate
+  spawn: FloorTileItemBrassReebe
+  maxCount: 30
+  itemSize: 5
+
 - type: stack
   id: FloorTileLino
   name: linoleum floor
index 93d3aee34c2823397e6311e6f257174e558624e5..9aba3f61ec7262db51322d4e33aacb8552b7de66 100644 (file)
   itemDrop: FloorTileItemSteel
   heatCapacity: 10000
 
+- type: tile
+  id: FloorBrassFilled
+  name: tiles-brass-floor-filled
+  sprite: /Textures/Tiles/Misc/clockwork/clockwork_floor_filled.png
+  baseTurf: PlatingBrass
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepHull
+  itemDrop: FloorTileItemBrassFilled
+  heatCapacity: 10000
+  
+- type: tile
+  id: FloorBrassReebe
+  name: tiles-brass-floor-reebe
+  sprite: /Textures/Tiles/Misc/clockwork/reebe.png
+  baseTurf: PlatingBrass
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepHull
+  itemDrop: FloorTileItemBrassReebe
+  heatCapacity: 10000
+
 - type: tile
   id: FloorPlastic
   name: tiles-plastic-floor
index 5e888fbf6ee7ed1d8632ae458a770086e4f8bbb4..7edb1ae784c9a6b336fa49c519da51156fea84d6 100644 (file)
   friction: 0.3
   heatCapacity: 10000
 
+- type: tile
+  id: PlatingBrass
+  name: tiles-brass-plating
+  sprite: /Textures/Tiles/Misc/clockwork/clockwork_floor.png
+  baseTurf: Lattice
+  isSubfloor: true
+  footstepSounds:
+    collection: FootstepPlating
+  friction: 0.3
+  heatCapacity: 10000
+
 - type: tile
   id: PlatingSnow
   name: tiles-snow-plating
@@ -87,4 +98,3 @@
   isSpace: true
   itemDrop: PartRodMetal1
   heatCapacity: 10000
-
index 400f6191eae5fc45f6310411497b92ae4125e1eb..9f06df7bcb38c8a1f1ba7cf1877496841576afa4 100644 (file)
 - type: Tag
   id: Cleaver
 
+- type: Tag
+  id: ClockworkGlassShard
+
 - type: Tag
   id: ClothMade
 
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass-inhand-left.png
new file mode 100644 (file)
index 0000000..e4389e3
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass-inhand-right.png
new file mode 100644 (file)
index 0000000..372ab89
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass.png
new file mode 100644 (file)
index 0000000..18c1aa6
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass.png differ
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass_2.png
new file mode 100644 (file)
index 0000000..5a32cbd
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass_2.png differ
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass_3.png
new file mode 100644 (file)
index 0000000..0e68bb7
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass_3.png differ
index c4102df71d5b00cdd0e30d38a1e601b393a61d00..0e5cf13ec28c2ea2333d8f2ce6605fb845ab0412 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 clockwork glass sprited by MACMAN2003",
   "size": {
     "x": 32,
     "y": 32
       {
         "name": "ruglass-inhand-right",
         "directions": 4
+      },
+      {
+        "name": "cglass"
+      },
+      {
+        "name": "cglass_2"
+      },
+      {
+        "name": "cglass_3"
+      },
+      {
+        "name": "cglass-inhand-left",
+        "directions": 4
+      },
+      {
+        "name": "cglass-inhand-right",
+        "directions": 4
       }
   ]
 }
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/brass-filled.png b/Resources/Textures/Objects/Tiles/tile.rsi/brass-filled.png
new file mode 100644 (file)
index 0000000..a6f2df2
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/brass-filled.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/brass.png b/Resources/Textures/Objects/Tiles/tile.rsi/brass.png
new file mode 100644 (file)
index 0000000..36ad463
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/brass.png differ
index 6f4d5e8efcecdb38428c427d5bdc9edc5871f5cd..11992954f89cde4c4a60af439dc8a9afd319fa46 100644 (file)
     {
       "name": "blue"
     },
+       {
+         "name": "brass"
+       },
+       {
+         "name": "brass-filled"
+       },
+       {
+         "name": "reebe"
+       },
     {
       "name": "lime"
     },
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/reebe.png b/Resources/Textures/Objects/Tiles/tile.rsi/reebe.png
new file mode 100644 (file)
index 0000000..bc906c2
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/reebe.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/assembly.png
new file mode 100644 (file)
index 0000000..fe56e9f
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/assembly.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/bolted_unlit.png
new file mode 100644 (file)
index 0000000..8937692
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/bolted_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closed.png
new file mode 100644 (file)
index 0000000..4e0bdad
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closed_unlit.png
new file mode 100644 (file)
index 0000000..c78d01c
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closed_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closing.png
new file mode 100644 (file)
index 0000000..b02200b
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closing.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closing_unlit.png
new file mode 100644 (file)
index 0000000..f7b9eff
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closing_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/deny_unlit.png
new file mode 100644 (file)
index 0000000..d5e7367
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/deny_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/emergency_unlit.png
new file mode 100644 (file)
index 0000000..0303ac6
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/emergency_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/meta.json
new file mode 100644 (file)
index 0000000..f686706
--- /dev/null
@@ -0,0 +1,167 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/a406e8388f763e496caac32c3cf11e455b20d28d/icons/obj/doors/airlocks/clockwork/pinion_airlock.dmi and https://github.com/tgstation/tgstation/blob/a406e8388f763e496caac32c3cf11e455b20d28d/icons/obj/doors/airlocks/clockwork/overlays.dmi modified for SS14 by MACMAN2003",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+         "name": "assembly"
+       },
+       {
+         "name": "bolted_unlit"
+       },
+    {
+      "name": "closed"
+    },
+       {
+         "name": "closed_unlit"
+       },
+    {
+      "name": "closing",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "closing_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "deny_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+       {
+         "name": "open",
+         "delays": [
+           [ 
+                 1 
+               ]
+         ]
+       },
+    {
+      "name": "opening",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+       {
+      "name": "opening_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "panel_closing",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "panel_open",
+      "delays": [
+        [
+          0.4,
+          0.04,
+          0.07,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.07,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "panel_opening",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "sparks",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/open.png
new file mode 100644 (file)
index 0000000..0c68b4b
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/opening.png
new file mode 100644 (file)
index 0000000..b480119
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/opening.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/opening_unlit.png
new file mode 100644 (file)
index 0000000..20421c9
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/opening_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/panel_closing.png
new file mode 100644 (file)
index 0000000..cc06c93
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/panel_closing.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/panel_open.png
new file mode 100644 (file)
index 0000000..a8d3a3d
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/panel_open.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/panel_opening.png
new file mode 100644 (file)
index 0000000..325548c
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/panel_opening.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/sparks.png
new file mode 100644 (file)
index 0000000..453cbff
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/sparks.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/welded.png
new file mode 100644 (file)
index 0000000..87166f1
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/assembly.png
new file mode 100644 (file)
index 0000000..18cb58c
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/assembly.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/bolted_unlit.png
new file mode 100644 (file)
index 0000000..8937692
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/bolted_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closed.png
new file mode 100644 (file)
index 0000000..b070cf3
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closed_unlit.png
new file mode 100644 (file)
index 0000000..c78d01c
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closed_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closing.png
new file mode 100644 (file)
index 0000000..fc8b201
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closing.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closing_unlit.png
new file mode 100644 (file)
index 0000000..f7b9eff
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closing_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/deny_unlit.png
new file mode 100644 (file)
index 0000000..d5e7367
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/deny_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/emergency_unlit.png
new file mode 100644 (file)
index 0000000..0303ac6
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/emergency_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/meta.json
new file mode 100644 (file)
index 0000000..f686706
--- /dev/null
@@ -0,0 +1,167 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/a406e8388f763e496caac32c3cf11e455b20d28d/icons/obj/doors/airlocks/clockwork/pinion_airlock.dmi and https://github.com/tgstation/tgstation/blob/a406e8388f763e496caac32c3cf11e455b20d28d/icons/obj/doors/airlocks/clockwork/overlays.dmi modified for SS14 by MACMAN2003",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+         "name": "assembly"
+       },
+       {
+         "name": "bolted_unlit"
+       },
+    {
+      "name": "closed"
+    },
+       {
+         "name": "closed_unlit"
+       },
+    {
+      "name": "closing",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "closing_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "deny_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+       {
+         "name": "open",
+         "delays": [
+           [ 
+                 1 
+               ]
+         ]
+       },
+    {
+      "name": "opening",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+       {
+      "name": "opening_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "panel_closing",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "panel_open",
+      "delays": [
+        [
+          0.4,
+          0.04,
+          0.07,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.07,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "panel_opening",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "sparks",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/open.png
new file mode 100644 (file)
index 0000000..0c68b4b
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/opening.png
new file mode 100644 (file)
index 0000000..c629103
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/opening.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/opening_unlit.png
new file mode 100644 (file)
index 0000000..20421c9
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/opening_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/panel_closing.png
new file mode 100644 (file)
index 0000000..cc06c93
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/panel_closing.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/panel_open.png
new file mode 100644 (file)
index 0000000..a8d3a3d
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/panel_open.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/panel_opening.png
new file mode 100644 (file)
index 0000000..325548c
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/panel_opening.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/sparks.png
new file mode 100644 (file)
index 0000000..453cbff
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/sparks.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/welded.png
new file mode 100644 (file)
index 0000000..87166f1
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/bolted_unlit.png
new file mode 100644 (file)
index 0000000..68f1e08
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/bolted_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/clockworkdeny.png b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/clockworkdeny.png
new file mode 100644 (file)
index 0000000..702774e
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/clockworkdeny.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/clockworkspark.png b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/clockworkspark.png
new file mode 100644 (file)
index 0000000..ef405aa
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/clockworkspark.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closed.png b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closed.png
new file mode 100644 (file)
index 0000000..d9168af
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closed_unlit.png
new file mode 100644 (file)
index 0000000..50550c7
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closed_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closing.png b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closing.png
new file mode 100644 (file)
index 0000000..2b9fd5b
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closing.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closing_unlit.png
new file mode 100644 (file)
index 0000000..92c270a
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closing_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/deny_unlit.png
new file mode 100644 (file)
index 0000000..adc7115
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/deny_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/emergency_unlit.png
new file mode 100644 (file)
index 0000000..50550c7
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/emergency_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/meta.json b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/meta.json
new file mode 100644 (file)
index 0000000..30fb625
--- /dev/null
@@ -0,0 +1,305 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/59b26e9715e9690903c4174cc52c49c0362f6181/icons/obj/doors/windoor.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "closed",
+      "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,
+          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,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+       {
+         "name": "closed_unlit",
+         "directions": 4
+       },
+       {
+         "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": "welded",
+         "directions": 4
+       },
+       {
+         "name": "bolted_unlit",
+         "directions": 4
+       },
+       {
+         "name": "emergency_unlit",
+         "directions": 4
+       },
+    {
+      "name": "open",
+      "directions": 4
+    },
+    {
+      "name": "open_unlit",
+      "directions": 4
+    },
+       {
+      "name": "panel_open",
+      "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,
+          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,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "clockworkdeny",
+      "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": "clockworkspark",
+      "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
+        ]
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/open.png b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/open.png
new file mode 100644 (file)
index 0000000..eef1c1e
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/open_unlit.png
new file mode 100644 (file)
index 0000000..070fb91
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/open_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/opening.png b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/opening.png
new file mode 100644 (file)
index 0000000..adb6efa
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/opening.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/opening_unlit.png
new file mode 100644 (file)
index 0000000..92c270a
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/opening_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/panel_open.png
new file mode 100644 (file)
index 0000000..21bbb4d
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/panel_open.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/welded.png b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/welded.png
new file mode 100644 (file)
index 0000000..f154b0f
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/brass.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/full.png
new file mode 100644 (file)
index 0000000..7af0d50
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/brass.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/meta.json
new file mode 100644 (file)
index 0000000..4ef0681
--- /dev/null
@@ -0,0 +1,163 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/3793e6187a25aa3edd925f2c8984fd3bc5fa3581/icons/obj/smooth_structures/brass_table.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "full",
+         "delays": [
+           [
+                 1
+               ]
+         ]
+    },
+    {
+      "name": "state_0",
+         "directions": 4,
+         "delays": [
+           [
+                 1.0
+               ],
+               [
+                 1.0
+               ],
+               [
+                 1.0
+               ],
+               [
+                 1.0
+               ]
+         ]
+    },
+    {
+      "name": "state_1",
+         "directions": 4,
+         "delays": [
+           [
+                 1.0
+               ],
+               [
+                 1.0
+               ],
+               [
+                 1.0
+               ],
+               [
+                 1.0
+               ]
+         ]
+    },
+    {
+      "name": "state_2",
+         "directions": 4,
+         "delays": [
+           [
+                 1.0
+               ],
+               [
+                 1.0
+               ],
+               [
+                 1.0
+               ],
+               [
+                 1.0
+               ]
+         ]
+    },
+    {
+      "name": "state_3",
+         "directions": 4,
+         "delays": [
+           [
+                 1.0
+               ],
+               [
+                 1.0
+               ],
+               [
+                 1.0
+               ],
+               [
+                 1.0
+               ]
+         ]
+    },
+    {
+      "name": "state_4",
+         "directions": 4,
+         "delays": [
+           [
+                 1.0
+               ],
+               [
+                 1.0
+               ],
+               [
+                 1.0
+               ],
+               [
+                 1.0
+               ]
+         ]
+    },
+    {
+      "name": "state_5",
+         "directions": 4,
+         "delays": [
+           [
+                 1.0
+               ],
+               [
+                 1.0
+               ],
+               [
+                 1.0
+               ],
+               [
+                 1.0
+               ]
+         ]
+    },
+    {
+      "name": "state_6",
+         "directions": 4,
+         "delays": [
+           [
+                 1.0
+               ],
+               [
+                 1.0
+               ],
+               [
+                 1.0
+               ],
+               [
+                 1.0
+               ]
+         ]
+    },
+    {
+      "name": "state_7",
+         "directions": 4,
+         "delays": [
+           [
+                 1.0
+               ],
+               [
+                 1.0
+               ],
+               [
+                 1.0
+               ],
+               [
+                 1.0
+               ]
+         ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_0.png
new file mode 100644 (file)
index 0000000..e966d94
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_0.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_1.png
new file mode 100644 (file)
index 0000000..be9b83a
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_1.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_2.png
new file mode 100644 (file)
index 0000000..e966d94
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_2.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_3.png
new file mode 100644 (file)
index 0000000..be9b83a
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_3.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_4.png
new file mode 100644 (file)
index 0000000..f486ae7
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_4.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_5.png
new file mode 100644 (file)
index 0000000..e6a083c
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_5.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_6.png
new file mode 100644 (file)
index 0000000..f486ae7
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_6.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_7.png
new file mode 100644 (file)
index 0000000..ee16f00
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_7.png differ
diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/brass_chair.png b/Resources/Textures/Structures/Furniture/chairs.rsi/brass_chair.png
new file mode 100644 (file)
index 0000000..7d2d0a7
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/chairs.rsi/brass_chair.png differ
index f73db12625fa4d11b0cf1990812a9e202ffa17e8..c94ef9790923400f75037dd8c08fc02540df5dc5 100644 (file)
@@ -1,7 +1,7 @@
 {\r
   "version": 1,\r
   "license": "CC-BY-SA-3.0",\r
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/11402f6ae62facc2e8bcfa1f8ef5353b26663278, meat.png is CC0-1.0 by EmoGarbage404 (github) for Space Station 14. chair.png and its derrivatives taken from shiptest at commit https://github.com/shiptest-ss13/Shiptest/commit/f761c784812e827960a66cd10aac17ebc6edfac3, palette for chair.png, steel-bench.png and chair-greyscale.png taken from paradise equivalent chairs at commit https://github.com/ParadiseSS13/Paradise/commit/5ce5a66c814c4a60118d24885389357fd0240002, steel by SonicHDC",\r
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/11402f6ae62facc2e8bcfa1f8ef5353b26663278, meat.png is CC0-1.0 by EmoGarbage404 (github) for Space Station 14. chair.png and its derrivatives taken from shiptest at commit https://github.com/shiptest-ss13/Shiptest/commit/f761c784812e827960a66cd10aac17ebc6edfac3, palette for chair.png, steel-bench.png and chair-greyscale.png taken from paradise equivalent chairs at commit https://github.com/ParadiseSS13/Paradise/commit/5ce5a66c814c4a60118d24885389357fd0240002, steel by SonicHDC, brass chair.png taken from tgstation at https://github.com/tgstation/tgstation/blob/b7e7779c19b76449c290aaf2150fb93545b1a79a/icons/obj/chairs.dmi",\r
   "size": {\r
     "x": 32,\r
     "y": 32\r
     {\r
       "name": "steel-bench",\r
       "directions": 4\r
-    }\r
+    },\r
+       {\r
+               "name": "brass_chair",\r
+               "directions": 4\r
+       }\r
   ]\r
 }\r
index fb72d3a1f49d1add0b5f9b9b1506821bd576b2c2..b33b2aec31f623de8ccd8684503269cc83290a69 100644 (file)
Binary files a/Resources/Textures/Structures/Walls/clock.rsi/clock0.png and b/Resources/Textures/Structures/Walls/clock.rsi/clock0.png differ
index 626b446736685567cd2b1b11032b260d938c6af5..254366d60ca746896e8fd32aebb2b12e07ed0122 100644 (file)
Binary files a/Resources/Textures/Structures/Walls/clock.rsi/clock1.png and b/Resources/Textures/Structures/Walls/clock.rsi/clock1.png differ
index fb72d3a1f49d1add0b5f9b9b1506821bd576b2c2..b33b2aec31f623de8ccd8684503269cc83290a69 100644 (file)
Binary files a/Resources/Textures/Structures/Walls/clock.rsi/clock2.png and b/Resources/Textures/Structures/Walls/clock.rsi/clock2.png differ
index 626b446736685567cd2b1b11032b260d938c6af5..254366d60ca746896e8fd32aebb2b12e07ed0122 100644 (file)
Binary files a/Resources/Textures/Structures/Walls/clock.rsi/clock3.png and b/Resources/Textures/Structures/Walls/clock.rsi/clock3.png differ
index 16598b39f123c3584357bdb94d984b43a3b9feda..13d68063f6e9377ae7fabb912c318eae6e352e97 100644 (file)
Binary files a/Resources/Textures/Structures/Walls/clock.rsi/clock4.png and b/Resources/Textures/Structures/Walls/clock.rsi/clock4.png differ
index de9c4642df4be91567d990ac8e7e9d8017899c95..bab09c5415cef036471fcac83dc92066292e0f89 100644 (file)
Binary files a/Resources/Textures/Structures/Walls/clock.rsi/clock5.png and b/Resources/Textures/Structures/Walls/clock.rsi/clock5.png differ
index 16598b39f123c3584357bdb94d984b43a3b9feda..13d68063f6e9377ae7fabb912c318eae6e352e97 100644 (file)
Binary files a/Resources/Textures/Structures/Walls/clock.rsi/clock6.png and b/Resources/Textures/Structures/Walls/clock.rsi/clock6.png differ
index de9c4642df4be91567d990ac8e7e9d8017899c95..bab09c5415cef036471fcac83dc92066292e0f89 100644 (file)
Binary files a/Resources/Textures/Structures/Walls/clock.rsi/clock7.png and b/Resources/Textures/Structures/Walls/clock.rsi/clock7.png differ
index 6768f805bbb7e1bbdd648294073f08bf65dbb78b..4dd1fe88992e5f0f0542613d597c5787ba6dea33 100644 (file)
Binary files a/Resources/Textures/Structures/Walls/clock.rsi/full.png and b/Resources/Textures/Structures/Walls/clock.rsi/full.png differ
index 2fe048c6b8e97550a2a98e9b52eae6ed80a9fa5a..35463148c858838f58978f100c2463088c95c5bd 100644 (file)
@@ -1 +1,49 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi", "states": [{"name": "clock0", "directions": 4}, {"name": "clock1", "directions": 4}, {"name": "clock2", "directions": 4}, {"name": "clock3", "directions": 4}, {"name": "clock4", "directions": 4}, {"name": "clock5", "directions": 4}, {"name": "clock6", "directions": 4}, {"name": "clock7", "directions": 4}, {"name": "full"}]}
\ No newline at end of file
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/b8fc9b367ebb26def792a68bcb25294e518698d8/icons/turf/walls/clockwork_wall.dmi and https://github.com/tgstation/tgstation/blob/f64e687250f028359d811b2c7e9d4974b2e7ffeb/icons/effects/clockwork.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+         "name": "wall_gear"
+       },
+    {
+      "name": "clock0",
+         "directions": 4
+    },
+    {
+      "name": "clock1",
+         "directions": 4
+    },
+    {
+      "name": "clock2",
+         "directions": 4
+    },
+    {
+      "name": "clock3",
+         "directions": 4
+    },
+    {
+      "name": "clock4",
+         "directions": 4
+    },
+    {
+      "name": "clock5",
+         "directions": 4
+    },
+    {
+      "name": "clock6",
+         "directions": 4
+    },
+    {
+      "name": "clock7",
+         "directions": 4
+    },
+       {
+         "name": "full"
+       }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Walls/clock.rsi/wall_gear.png b/Resources/Textures/Structures/Walls/clock.rsi/wall_gear.png
new file mode 100644 (file)
index 0000000..aef69dd
Binary files /dev/null and b/Resources/Textures/Structures/Walls/clock.rsi/wall_gear.png differ
diff --git a/Resources/Textures/Structures/Walls/clockwork_grille.rsi/brokenratvargrille.png b/Resources/Textures/Structures/Walls/clockwork_grille.rsi/brokenratvargrille.png
new file mode 100644 (file)
index 0000000..e7552af
Binary files /dev/null and b/Resources/Textures/Structures/Walls/clockwork_grille.rsi/brokenratvargrille.png differ
diff --git a/Resources/Textures/Structures/Walls/clockwork_grille.rsi/meta.json b/Resources/Textures/Structures/Walls/clockwork_grille.rsi/meta.json
new file mode 100644 (file)
index 0000000..ff20b1d
--- /dev/null
@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f64e687250f028359d811b2c7e9d4974b2e7ffeb/icons/effects/clockwork.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "ratvargrille"
+    },
+    {
+      "name": "brokenratvargrille"
+    },
+       {
+         "name": "ratvargrille_diagonal"
+       }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Walls/clockwork_grille.rsi/ratvargrille.png b/Resources/Textures/Structures/Walls/clockwork_grille.rsi/ratvargrille.png
new file mode 100644 (file)
index 0000000..919cb02
Binary files /dev/null and b/Resources/Textures/Structures/Walls/clockwork_grille.rsi/ratvargrille.png differ
diff --git a/Resources/Textures/Structures/Walls/clockwork_grille.rsi/ratvargrille_diagonal.png b/Resources/Textures/Structures/Walls/clockwork_grille.rsi/ratvargrille_diagonal.png
new file mode 100644 (file)
index 0000000..61a7600
Binary files /dev/null and b/Resources/Textures/Structures/Walls/clockwork_grille.rsi/ratvargrille_diagonal.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/meta.json b/Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/meta.json
new file mode 100644 (file)
index 0000000..06b6f4a
--- /dev/null
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/b8fc9b367ebb26def792a68bcb25294e518698d8/icons/obj/smooth_structures/clockwork_window.dmi diagonalized by MACMAN2003",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+         "name": "state0",
+         "directions": 4
+       },
+    {
+      "name": "state1",
+         "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/state0.png
new file mode 100644 (file)
index 0000000..084563b
Binary files /dev/null and b/Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/state0.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/state1.png
new file mode 100644 (file)
index 0000000..0e48f9c
Binary files /dev/null and b/Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/state1.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow0.png b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow0.png
new file mode 100644 (file)
index 0000000..48ba09f
Binary files /dev/null and b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow0.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow1.png b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow1.png
new file mode 100644 (file)
index 0000000..0253768
Binary files /dev/null and b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow1.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow2.png b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow2.png
new file mode 100644 (file)
index 0000000..48ba09f
Binary files /dev/null and b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow2.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow3.png b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow3.png
new file mode 100644 (file)
index 0000000..0253768
Binary files /dev/null and b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow3.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow4.png b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow4.png
new file mode 100644 (file)
index 0000000..aa4ed12
Binary files /dev/null and b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow4.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow5.png b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow5.png
new file mode 100644 (file)
index 0000000..6bf733f
Binary files /dev/null and b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow5.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow6.png b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow6.png
new file mode 100644 (file)
index 0000000..aa4ed12
Binary files /dev/null and b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow6.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow7.png b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow7.png
new file mode 100644 (file)
index 0000000..6d2c0e0
Binary files /dev/null and b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow7.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_window.rsi/full.png b/Resources/Textures/Structures/Windows/clockwork_window.rsi/full.png
new file mode 100644 (file)
index 0000000..d50a9f1
Binary files /dev/null and b/Resources/Textures/Structures/Windows/clockwork_window.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_window.rsi/meta.json b/Resources/Textures/Structures/Windows/clockwork_window.rsi/meta.json
new file mode 100644 (file)
index 0000000..be03eb5
--- /dev/null
@@ -0,0 +1,46 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/b8fc9b367ebb26def792a68bcb25294e518698d8/icons/obj/smooth_structures/clockwork_window.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+         "name": "full"
+       },
+    {
+      "name": "cwindow0",
+         "directions": 4
+    },
+    {
+      "name": "cwindow1",
+         "directions": 4
+    },
+    {
+      "name": "cwindow2",
+         "directions": 4
+    },
+    {
+      "name": "cwindow3",
+         "directions": 4
+    },
+    {
+      "name": "cwindow4",
+         "directions": 4
+    },
+    {
+      "name": "cwindow5",
+         "directions": 4
+    },
+    {
+      "name": "cwindow6",
+         "directions": 4
+    },
+    {
+      "name": "cwindow7",
+         "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Windows/directional.rsi/clock_window.png b/Resources/Textures/Structures/Windows/directional.rsi/clock_window.png
new file mode 100644 (file)
index 0000000..8572dd8
Binary files /dev/null and b/Resources/Textures/Structures/Windows/directional.rsi/clock_window.png differ
index 61a5e51e99a6e03b554af93d49205aa56ef49817..5a01452c005cf3ff952e847bd23cdfa92521ea58 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "tgstation at ff1c30ac123dd28c6b5fee11e7f03654f5daa731, plasma windows from paradise at 44c12c6d9d0e42a9d3a582dff7e9a8d72b6ea68a, uranium windows made via edit by SphiraI(github)",
+  "copyright": "tgstation at ff1c30ac123dd28c6b5fee11e7f03654f5daa731, plasma windows from paradise at 44c12c6d9d0e42a9d3a582dff7e9a8d72b6ea68a, uranium windows made via edit by SphiraI(github), clockwork windows from https://github.com/tgstation/tgstation/blob/21b42d49ecf2b87f665b5f122368f6a247676721/icons/obj/smooth_structures/structure_variations.dmi",
   "size": {
     "x": 32,
     "y": 32
       "name": "frosted_window",
       "directions": 4
     },
+       {
+         "name": "clock_window",
+         "directions": 4
+       },
        {
          "name": "plasma_window",
          "directions": 4
diff --git a/Resources/Textures/Tiles/Misc/clockwork/clockwork_floor.png b/Resources/Textures/Tiles/Misc/clockwork/clockwork_floor.png
new file mode 100644 (file)
index 0000000..3d15a8b
Binary files /dev/null and b/Resources/Textures/Tiles/Misc/clockwork/clockwork_floor.png differ
diff --git a/Resources/Textures/Tiles/Misc/clockwork/clockwork_floor_filled.png b/Resources/Textures/Tiles/Misc/clockwork/clockwork_floor_filled.png
new file mode 100644 (file)
index 0000000..387b8c9
Binary files /dev/null and b/Resources/Textures/Tiles/Misc/clockwork/clockwork_floor_filled.png differ
diff --git a/Resources/Textures/Tiles/Misc/clockwork/clockwork_lattice.rsi/clock_lattice.png b/Resources/Textures/Tiles/Misc/clockwork/clockwork_lattice.rsi/clock_lattice.png
new file mode 100644 (file)
index 0000000..2682d44
Binary files /dev/null and b/Resources/Textures/Tiles/Misc/clockwork/clockwork_lattice.rsi/clock_lattice.png differ
diff --git a/Resources/Textures/Tiles/Misc/clockwork/clockwork_lattice.rsi/meta.json b/Resources/Textures/Tiles/Misc/clockwork/clockwork_lattice.rsi/meta.json
new file mode 100644 (file)
index 0000000..b6e458d
--- /dev/null
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/99e6a1b09e800f1dd5ac6003053e0a8b05939511/icons/obj/smooth_structures/lattice_clockwork.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "clock_lattice"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Tiles/Misc/clockwork/meta.json b/Resources/Textures/Tiles/Misc/clockwork/meta.json
new file mode 100644 (file)
index 0000000..fc49c23
--- /dev/null
@@ -0,0 +1,32 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/cf00ca220063bedbb8838277bec32ef8ce90ede7/icons/turf/floors.dmi, item icons taken from tgstation at https://github.com/tgstation/tgstation/blob/c0f9d2e7e84856063bf2dbb93b35dc5c62cfdd5c/icons/obj/tiles.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "clockwork_floor"
+    },
+    {
+      "name": "reebe"
+    },
+    {
+      "name": "reebemap"
+    },
+    {
+      "name": "reebespawn"
+    },
+    {
+      "name": "reebelattice"
+    },
+    {
+      "name": "reebegame"
+    },
+    {
+      "name": "clockwork_floor_filled"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Tiles/Misc/clockwork/reebe.png b/Resources/Textures/Tiles/Misc/clockwork/reebe.png
new file mode 100644 (file)
index 0000000..6718f9a
Binary files /dev/null and b/Resources/Textures/Tiles/Misc/clockwork/reebe.png differ
diff --git a/Resources/Textures/Tiles/Misc/clockwork/reebegame.png b/Resources/Textures/Tiles/Misc/clockwork/reebegame.png
new file mode 100644 (file)
index 0000000..ccd8500
Binary files /dev/null and b/Resources/Textures/Tiles/Misc/clockwork/reebegame.png differ
diff --git a/Resources/Textures/Tiles/Misc/clockwork/reebelattice.png b/Resources/Textures/Tiles/Misc/clockwork/reebelattice.png
new file mode 100644 (file)
index 0000000..50b8f1e
Binary files /dev/null and b/Resources/Textures/Tiles/Misc/clockwork/reebelattice.png differ
diff --git a/Resources/Textures/Tiles/Misc/clockwork/reebemap.png b/Resources/Textures/Tiles/Misc/clockwork/reebemap.png
new file mode 100644 (file)
index 0000000..7171205
Binary files /dev/null and b/Resources/Textures/Tiles/Misc/clockwork/reebemap.png differ
diff --git a/Resources/Textures/Tiles/Misc/clockwork/reebespawn.png b/Resources/Textures/Tiles/Misc/clockwork/reebespawn.png
new file mode 100644 (file)
index 0000000..20f9b3b
Binary files /dev/null and b/Resources/Textures/Tiles/Misc/clockwork/reebespawn.png differ