diff --git a/Resources/Maps/stationstation.yml b/Resources/Maps/stationstation.yml index 2aa5635c2c..d99b3fa1bb 100644 --- a/Resources/Maps/stationstation.yml +++ b/Resources/Maps/stationstation.yml @@ -641,7 +641,7 @@ entities: pos: 1.5,3.5 rot: -1.5707963267949 rad type: Transform - - load: 120 + - load: 220 type: PowerProvider - type: solid_wall uid: 77 @@ -1799,7 +1799,7 @@ entities: pos: 4.5,-10.5 rot: -1.5707963267949 rad type: Transform - - load: 320 + - load: 460 type: PowerProvider - type: APC uid: 227 @@ -2559,6 +2559,10 @@ entities: pos: 0.5,-5.5 rot: 1.5707963267948966 rad type: Transform + - color: '#FFFFFFFF' + type: PointLight + - load: 40 + type: PowerDevice - containers: light_bulb: entities: @@ -2572,4 +2576,53 @@ entities: grid: 0 pos: -0.5,5.5 type: Transform +- type: chairOfficeDark + uid: 324 + components: + - grid: 0 + pos: 0.5,-6.5 + rot: 1.5707963267948966 rad + type: Transform +- type: chairOfficeLight + uid: 325 + components: + - grid: 0 + pos: -3.5,-0.5 + rot: -1.5707963267948966 rad + type: Transform +- type: chairOfficeLight + uid: 326 + components: + - grid: 0 + pos: -2.5,-0.5 + rot: -1.5707963267948966 rad + type: Transform +- type: chairOfficeLight + uid: 327 + components: + - grid: 0 + pos: -2.5,-2.5 + rot: 1.5707963267948966 rad + type: Transform +- type: chairOfficeLight + uid: 328 + components: + - grid: 0 + pos: -3.5,-2.5 + rot: 1.5707963267948966 rad + type: Transform +- type: stool + uid: 329 + components: + - grid: 0 + pos: -1.5,-9.5 + rot: 1.5707963267948966 rad + type: Transform +- type: stool + uid: 330 + components: + - grid: 0 + pos: -2.5,-6.5 + rot: 1.5707963267948966 rad + type: Transform ... diff --git a/Resources/Prototypes/Entities/buildings/furniture.yml b/Resources/Prototypes/Entities/buildings/furniture.yml new file mode 100644 index 0000000000..a5c08f096c --- /dev/null +++ b/Resources/Prototypes/Entities/buildings/furniture.yml @@ -0,0 +1,53 @@ +- type: entity + name: Stool + id: stool + components: + - type: Clickable + - type: BoundingBox + - type: Sprite + sprite: Buildings/furniture.rsi + state: stool_base + color: "#8e9799" + - type: Icon + sprite: Buildings/furniture.rsi + state: stool_base + +- type: entity + name: White Office Chair + id: chairOfficeLight + components: + - type: Clickable + - type: BoundingBox + - type: Sprite + sprite: Buildings/furniture.rsi + state: officechair_white + - type: Icon + sprite: Buildings/furniture.rsi + state: officechair_white + +- type: entity + name: Dark Office Chair + id: chairOfficeDark + components: + - type: Clickable + - type: BoundingBox + - type: Sprite + sprite: Buildings/furniture.rsi + state: officechair_dark + - type: Icon + sprite: Buildings/furniture.rsi + state: officechair_dark + +- type: entity + name: Chair + id: chair + components: + - type: Clickable + - type: BoundingBox + - type: Sprite + sprite: Buildings/furniture.rsi + state: chair + color: "#8e9799" + - type: Icon + sprite: Buildings/furniture.rsi + state: chair diff --git a/Resources/Textures/Buildings/furniture.rsi/chair.png b/Resources/Textures/Buildings/furniture.rsi/chair.png new file mode 100644 index 0000000000..e41dd742d9 Binary files /dev/null and b/Resources/Textures/Buildings/furniture.rsi/chair.png differ diff --git a/Resources/Textures/Buildings/furniture.rsi/meta.json b/Resources/Textures/Buildings/furniture.rsi/meta.json new file mode 100644 index 0000000000..514c0729fd --- /dev/null +++ b/Resources/Textures/Buildings/furniture.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "chair", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "officechair_dark", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "officechair_white", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "stool_base", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Buildings/furniture.rsi/officechair_dark.png b/Resources/Textures/Buildings/furniture.rsi/officechair_dark.png new file mode 100644 index 0000000000..f99f8464cc Binary files /dev/null and b/Resources/Textures/Buildings/furniture.rsi/officechair_dark.png differ diff --git a/Resources/Textures/Buildings/furniture.rsi/officechair_white.png b/Resources/Textures/Buildings/furniture.rsi/officechair_white.png new file mode 100644 index 0000000000..a2bf296f61 Binary files /dev/null and b/Resources/Textures/Buildings/furniture.rsi/officechair_white.png differ diff --git a/Resources/Textures/Buildings/furniture.rsi/stool_base.png b/Resources/Textures/Buildings/furniture.rsi/stool_base.png new file mode 100644 index 0000000000..04068a1200 Binary files /dev/null and b/Resources/Textures/Buildings/furniture.rsi/stool_base.png differ