diff --git a/Resources/Prototypes/Entities/Structures/Decoration/fireplace.yml b/Resources/Prototypes/Entities/Structures/Decoration/fireplace.yml new file mode 100644 index 0000000000..6273331230 --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/Decoration/fireplace.yml @@ -0,0 +1,19 @@ +- type: entity + id: Fireplace + parent: BaseStructure + name: fireplace + description: A place that has fire. Cozy! + components: + - type: Sprite + netsync: false + sprite: Structures/Decoration/fireplace.rsi + layers: + - state: fireplace + - state: fireplace_fire4 + shader: unshaded + - state: fireplace_glow + shader: unshaded + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#FF6F00" diff --git a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml new file mode 100644 index 0000000000..0978a79e3d --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml @@ -0,0 +1,9 @@ +- type: entity + id: Dresser + parent: BaseStructure + name: dresser + description: It is filled with underwear and shorts, finding an unused one is a gamble. + components: + - type: Sprite + sprite: Structures/Furniture/furniture.rsi + state: dresser diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index 22c7a91bc7..255e1bfb88 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -444,3 +444,31 @@ radius: 1.5 energy: 1.6 color: "#b89f25" + +- type: entity + parent: BaseStructure + id: ComputerTelevision + name: wooden television + description: It is an old television displaying the station's cameras, if they worked. + components: + - type: Sprite + sprite: Structures/Machines/computers.rsi + layers: + - state: television + - state: detective_television + shader: unshaded + visuals: + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#b89f25" + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeAabb + bounds: "-0.25,-0.25,0.25,0.25" + mass: 50 + layer: + - SmallImpassable + mask: + - Impassable diff --git a/Resources/Textures/Structures/Decoration/fireplace.rsi/fireplace.png b/Resources/Textures/Structures/Decoration/fireplace.rsi/fireplace.png new file mode 100644 index 0000000000..93afdb46e3 Binary files /dev/null and b/Resources/Textures/Structures/Decoration/fireplace.rsi/fireplace.png differ diff --git a/Resources/Textures/Structures/Decoration/fireplace.rsi/fireplace_fire4.png b/Resources/Textures/Structures/Decoration/fireplace.rsi/fireplace_fire4.png new file mode 100644 index 0000000000..b681f7e94d Binary files /dev/null and b/Resources/Textures/Structures/Decoration/fireplace.rsi/fireplace_fire4.png differ diff --git a/Resources/Textures/Structures/Decoration/fireplace.rsi/fireplace_glow.png b/Resources/Textures/Structures/Decoration/fireplace.rsi/fireplace_glow.png new file mode 100644 index 0000000000..8b4741b7e7 Binary files /dev/null and b/Resources/Textures/Structures/Decoration/fireplace.rsi/fireplace_glow.png differ diff --git a/Resources/Textures/Structures/Decoration/fireplace.rsi/meta.json b/Resources/Textures/Structures/Decoration/fireplace.rsi/meta.json new file mode 100644 index 0000000000..e5fffc1852 --- /dev/null +++ b/Resources/Textures/Structures/Decoration/fireplace.rsi/meta.json @@ -0,0 +1,63 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/commit/6449b65d307312a111deb592e7a1bb4093e085e4", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "fireplace", + "directions": 1 + }, + { + "name": "fireplace_fire4", + "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 + ] + ] + }, + { + "name": "fireplace_glow", + "directions": 4, + "delays": [ + [ + 0.4, + 0.1 + ], + [ + 0.4, + 0.1 + ], + [ + 0.4, + 0.1 + ], + [ + 0.4, + 0.1 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/dresser.png b/Resources/Textures/Structures/Furniture/furniture.rsi/dresser.png new file mode 100644 index 0000000000..20ce5dc0e9 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/furniture.rsi/dresser.png differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/meta.json b/Resources/Textures/Structures/Furniture/furniture.rsi/meta.json index 113b36f087..637386e12b 100644 --- a/Resources/Textures/Structures/Furniture/furniture.rsi/meta.json +++ b/Resources/Textures/Structures/Furniture/furniture.rsi/meta.json @@ -18,6 +18,9 @@ }, { "name": "rack" + }, + { + "name": "dresser" } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Structures/Machines/computers.rsi/detective_television.png b/Resources/Textures/Structures/Machines/computers.rsi/detective_television.png new file mode 100644 index 0000000000..cdd33d50b0 Binary files /dev/null and b/Resources/Textures/Structures/Machines/computers.rsi/detective_television.png differ diff --git a/Resources/Textures/Structures/Machines/computers.rsi/meta.json b/Resources/Textures/Structures/Machines/computers.rsi/meta.json index ab239ee231..f48024b8c1 100644 --- a/Resources/Textures/Structures/Machines/computers.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/computers.rsi/meta.json @@ -9,39 +9,11 @@ "states": [ { "name": "ai-fixer", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "ai-fixer-404", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "ai-fixer-empty", @@ -67,21 +39,7 @@ }, { "name": "ai-fixer-full", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "ai-fixer-on", @@ -141,57 +99,15 @@ }, { "name": "aiupload_key", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "alert-0", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "alert-1", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "alert-2", @@ -239,57 +155,15 @@ }, { "name": "atmos_key", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "atmos_key_off", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "broken", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "cameras", @@ -455,39 +329,11 @@ }, { "name": "computer", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "computer_broken", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "crew", @@ -825,7 +671,6 @@ }, { "name": "entertainment", - "directions": 1, "delays": [ [ 0.2, @@ -914,21 +759,7 @@ }, { "name": "error", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "explosive", @@ -1078,39 +909,11 @@ }, { "name": "generic_key", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "generic_key_off", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "holocontrol", @@ -1182,48 +985,14 @@ }, { "name": "id_key", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "id_key_off", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { - "name": "mass_driver", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "name": "mass_driver" }, { "name": "mecha", @@ -1265,39 +1034,11 @@ }, { "name": "med_key", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "med_key_off", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "medcomp", @@ -1421,75 +1162,19 @@ }, { "name": "mining_key", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "mining_key_off", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "power_key", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "power_key_off", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "power_monitor", @@ -1545,75 +1230,19 @@ }, { "name": "rd_key", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "rd_key_off", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "rdcomp", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "recharge_comp", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "recharge_comp_on", @@ -1697,21 +1326,7 @@ }, { "name": "robot", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "security", @@ -1737,39 +1352,11 @@ }, { "name": "security_key", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "security_key_off", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "shuttle", @@ -1829,147 +1416,35 @@ }, { "name": "supply", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "syndie_key", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "syndie_key_off", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "syndishuttle", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "tank", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "tcboss", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "tech_key", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "tech_key_off", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "teleport", @@ -2003,39 +1478,11 @@ }, { "name": "teleport_key", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "teleport_key_off", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "telesci", @@ -2069,69 +1516,30 @@ }, { "name": "telesci_key", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "telesci_key_off", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "turbinecomp", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { - "name": "computer-datatheory", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "name": "computer-datatheory" }, { "name": "avionics-systems" + }, + { + "name": "television" + }, + { + "name": "television_broken" + }, + { + "name": "detective_television" } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Structures/Machines/computers.rsi/television.png b/Resources/Textures/Structures/Machines/computers.rsi/television.png new file mode 100644 index 0000000000..988d1d39ea Binary files /dev/null and b/Resources/Textures/Structures/Machines/computers.rsi/television.png differ diff --git a/Resources/Textures/Structures/Machines/computers.rsi/television_broken.png b/Resources/Textures/Structures/Machines/computers.rsi/television_broken.png new file mode 100644 index 0000000000..3fa49adaa2 Binary files /dev/null and b/Resources/Textures/Structures/Machines/computers.rsi/television_broken.png differ