diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs index 551b5108b1..def6afebeb 100644 --- a/Content.IntegrationTests/Tests/PostMapInitTest.cs +++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs @@ -45,22 +45,7 @@ namespace Content.IntegrationTests.Tests { "Dev", "TestTeg", - //"Fland", - //"Meta", - //"Packed", - //"Aspid", - //"Cluster", - //"Omega", - //"Bagel", - //"Origin", "CentComm", - //"Box", - //"Europa", - //"Barratry", - //"Saltern", - //"Core", - //"Marathon", - //"Kettle", "MeteorArena", "Pebble", //DeltaV "Edge", //DeltaV diff --git a/Resources/Audio/Ambience/ambitrain1.ogg b/Resources/Audio/Ambience/ambitrain1.ogg new file mode 100644 index 0000000000..bc24425922 Binary files /dev/null and b/Resources/Audio/Ambience/ambitrain1.ogg differ diff --git a/Resources/Audio/Ambience/ambitrain2.ogg b/Resources/Audio/Ambience/ambitrain2.ogg new file mode 100644 index 0000000000..3a3222a75f Binary files /dev/null and b/Resources/Audio/Ambience/ambitrain2.ogg differ diff --git a/Resources/Audio/Ambience/ambitrain3.ogg b/Resources/Audio/Ambience/ambitrain3.ogg new file mode 100644 index 0000000000..3f18b48234 Binary files /dev/null and b/Resources/Audio/Ambience/ambitrain3.ogg differ diff --git a/Resources/Audio/Ambience/attributions.yml b/Resources/Audio/Ambience/attributions.yml index 5ea0c24818..3e6e039cd7 100644 --- a/Resources/Audio/Ambience/attributions.yml +++ b/Resources/Audio/Ambience/attributions.yml @@ -97,8 +97,22 @@ copyright: "Taken from /vg/station" source: "https://github.com/vgstation-coders/vgstation13/commit/23303188abe6fe31b114a218a1950d7325a23730" +- files: ["ambitrain1.ogg"] + license: "CC-BY-4.0" + copyright: "Created by Badgie42 on Freesound.com, converted to Mono by TheShuEd" + source: "https://freesound.org/people/Badgie42/sounds/399876/" + +- files: ["ambitrain2.ogg"] + license: "CC0-1.0" + copyright: "Created by Hallkom on Freesound.com, cropped and converted to Mono by TheShuEd" + source: "https://freesound.org/people/Hallkom/sounds/588486/" + +- files: ["ambitrain3.ogg"] + license: "CC0-1.0" + copyright: "Created by ldezem on Freesound.com, cropped and converted to Mono by TheShuEd" + source: "https://freesound.org/people/ldezem/sounds/528238/" - files: ["anomaly_scary.ogg"] license: "CC0-1.0" - copyright: "Created by dimbark1, edited and converted to mono by TheShuEd (github)" - source: "https://freesound.org/people/dimbark1/sounds/316797/" \ No newline at end of file + copyright: "Created by dimbark1, edited and converted to mono by TheShuEd" + source: "https://freesound.org/people/dimbark1/sounds/316797/" diff --git a/Resources/Locale/en-US/tiles/tiles.ftl b/Resources/Locale/en-US/tiles/tiles.ftl index 42e0c08223..478175fc67 100644 --- a/Resources/Locale/en-US/tiles/tiles.ftl +++ b/Resources/Locale/en-US/tiles/tiles.ftl @@ -1,6 +1,7 @@ tiles-space = space tiles-plating = plating tiles-lattice = lattice +tiles-lattice-train = train lattice tiles-steel-floor = steel tile tiles-steel-floor-mini = steel mini-tile tiles-steel-floor-pavement = steel pavement diff --git a/Resources/Prototypes/Entities/Effects/portal.yml b/Resources/Prototypes/Entities/Effects/portal.yml index 19b6fc1be3..eb69ac821f 100644 --- a/Resources/Prototypes/Entities/Effects/portal.yml +++ b/Resources/Prototypes/Entities/Effects/portal.yml @@ -69,6 +69,38 @@ - type: Portal canTeleportToOtherMaps: true +- type: entity + id: PortalGatewayBlue + parent: BasePortal + components: + - type: Sprite + noRot: true + sprite: Structures/Machines/gateway.rsi + color: SkyBlue + layers: + - state: portal + - type: PointLight + color: SkyBlue + radius: 3 + energy: 1 + netsync: false + +- type: entity + id: PortalGatewayOrange + parent: BasePortal + components: + - type: Sprite + noRot: true + sprite: Structures/Machines/gateway.rsi + color: OrangeRed + layers: + - state: portal + - type: PointLight + color: OrangeRed + radius: 3 + energy: 1 + netsync: false + - type: entity id: ShadowPortal name: shadow rift @@ -90,4 +122,4 @@ range: 6 volume: -3 sound: - path: /Audio/Ambience/anomaly_scary.ogg \ No newline at end of file + path: /Audio/Ambience/anomaly_scary.ogg diff --git a/Resources/Prototypes/Entities/Structures/Decoration/statues.yml b/Resources/Prototypes/Entities/Structures/Decoration/statues.yml index c8806c5d95..1781190e29 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/statues.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/statues.yml @@ -6,6 +6,7 @@ description: An ancient marble statue. The subject is depicted with a floor-length braid and is wielding a red toolbox. components: - type: Sprite + noRot: true sprite: Structures/Decoration/statues.rsi state: venus_red drawdepth: Mobs @@ -19,6 +20,7 @@ description: An ancient marble statue. The subject is depicted with a floor-length braid and is wielding a blue toolbox. components: - type: Sprite + noRot: true sprite: Structures/Decoration/statues.rsi state: venus_blue drawdepth: Mobs @@ -31,6 +33,7 @@ description: A bananium statue. It portrays the return of the savior who will rise up and lead the clowns to the great honk. components: - type: Sprite + noRot: true sprite: Structures/Decoration/statues.rsi state: bananium_clown drawdepth: Mobs diff --git a/Resources/Prototypes/Entities/Structures/Furniture/bench.yml b/Resources/Prototypes/Entities/Structures/Furniture/bench.yml index 76bebd6166..c61f103dda 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/bench.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/bench.yml @@ -49,3 +49,18 @@ - type: Construction graph: Seat node: redComfBench + +- type: entity + id: BenchBlueComfy + suffix: Solo. Blue + parent: BenchComfy + components: + - type: Sprite + layers: + - state: bench_solo_base + color: "#767e82" + - state: bench_solo_cover + color: "#334e6d" + - type: Construction + graph: Seat + node: blueComfBench diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml index 2e381bf9bd..07a25d7b64 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml @@ -148,6 +148,11 @@ damage: types: Heat: 5 + - type: PointLight + radius: 15 + energy: 1 + softness: 0.9 + color: "#EEEEFF" - type: entity parent: AlwaysPoweredWallLight @@ -197,6 +202,11 @@ damage: types: Heat: 5 + - type: PointLight + radius: 10 + energy: 2.5 + softness: 0.9 + color: "#FFAF38" - type: entity parent: AlwaysPoweredWallLight @@ -369,6 +379,11 @@ damage: types: Heat: 5 + - type: PointLight + radius: 8 + energy: 3 + softness: 0.5 + color: "#47f8ff" - type: entity id: AlwaysPoweredlightCyan @@ -391,6 +406,11 @@ damage: types: Heat: 5 + - type: PointLight + radius: 8 + energy: 3 + softness: 0.5 + color: "#39a1ff" - type: entity id: AlwaysPoweredlightBlue @@ -413,6 +433,11 @@ damage: types: Heat: 5 + - type: PointLight + radius: 8 + energy: 3 + softness: 0.5 + color: "#ff66cc" - type: entity id: AlwaysPoweredlightPink @@ -435,6 +460,11 @@ damage: types: Heat: 5 + - type: PointLight + radius: 8 + energy: 3 + softness: 0.5 + color: "#ff8227" - type: entity id: AlwaysPoweredlightOrange @@ -457,6 +487,11 @@ damage: types: Heat: 5 + - type: PointLight + radius: 8 + energy: 3 + softness: 0.5 + color: "#fb4747" - type: entity id: AlwaysPoweredlightRed @@ -479,6 +514,11 @@ damage: types: Heat: 5 + - type: PointLight + radius: 8 + energy: 3 + softness: 0.5 + color: "#52ff39" - type: entity id: AlwaysPoweredlightGreen diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml index faae8b004b..2ca6b51e5c 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/window.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml @@ -236,4 +236,4 @@ sprite: Structures/Windows/cracks_diagonal.rsi - type: Construction graph: WindowDiagonal - node: windowDiagonal + node: windowDiagonal \ No newline at end of file diff --git a/Resources/Prototypes/Maps/Pools/default.yml b/Resources/Prototypes/Maps/Pools/default.yml index ac2bf25f61..7de404f7e4 100644 --- a/Resources/Prototypes/Maps/Pools/default.yml +++ b/Resources/Prototypes/Maps/Pools/default.yml @@ -1,20 +1,6 @@ - type: gameMapPool id: DefaultMapPool maps: - #- Aspid - #- Bagel - #- Barratry - #- Box - #- Cluster - #- Core - #- Fland - #- Kettle - #- Marathon - #- Meta - #- Omega - #- Origin - #- Saltern - #- Packed # DeltaV - Arena - Asterisk diff --git a/Resources/Prototypes/Parallaxes/train.yml b/Resources/Prototypes/Parallaxes/train.yml new file mode 100644 index 0000000000..e506043c85 --- /dev/null +++ b/Resources/Prototypes/Parallaxes/train.yml @@ -0,0 +1,68 @@ +- type: parallax + id: TrainStation + layers: + - texture: + !type:ImageParallaxTextureSource + path: "/Textures/Parallaxes/AspidParallaxBG.png" + slowness: 0.998046875 + scale: "0.5, 0.5" + scrolling: "0, -0.098046875" + - texture: + !type:GeneratedParallaxTextureSource + id: "hq_wizard_stars" + configPath: "/Prototypes/Parallaxes/parallax_config_stars.toml" + slowness: 0.996625 + scrolling: "0, -0.196625" + - texture: + !type:GeneratedParallaxTextureSource + id: "hq_wizard_stars_dim" + configPath: "/Prototypes/Parallaxes/parallax_config_stars_dim.toml" + slowness: 0.989375 + scrolling: "0, -0.209375" + - texture: + !type:GeneratedParallaxTextureSource + id: "hq_wizard_stars_faster" + configPath: "/Prototypes/Parallaxes/parallax_config_stars-2.toml" + slowness: 0.987265625 + scrolling: "0, -0.287265625" + - texture: + !type:GeneratedParallaxTextureSource + id: "hq_wizard_stars_dim_faster" + configPath: "/Prototypes/Parallaxes/parallax_config_stars_dim-2.toml" + slowness: 0.984352 + scrolling: "0, -0.384352" + - texture: + !type:ImageParallaxTextureSource + path: "/Textures/Parallaxes/AspidParallaxBG.png" + slowness: 0.978046875 + scrolling: "0, -0.578046875" + scale: "1, 1" + tiled: false + - texture: + !type:ImageParallaxTextureSource + path: "/Textures/Parallaxes/Asteroids.png" + slowness: 0.968046875 + scrolling: "0, -0.568046875" + scale: "1.3, 1.3" + worldHomePosition: "-624, 333" + - texture: + !type:ImageParallaxTextureSource + path: "/Textures/Parallaxes/AspidParallaxNeb.png" + slowness: 0.969046875 + scrolling: "0, -0.569046875" + scale: "0.5, 0.5" + worldHomePosition: "0, 0" + - texture: + !type:ImageParallaxTextureSource + path: "/Textures/Parallaxes/Asteroids.png" + slowness: 0.938046875 + scrolling: "0, -0.708046875" + scale: "1, 1" + layersLQ: + - texture: + !type:GeneratedParallaxTextureSource + id: "" + configPath: "/Prototypes/Parallaxes/parallax_config.toml" + slowness: 0.875 + scrolling: "0, -0.475" + layersLQUseHQ: false diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml index 9089de34e8..53d4ba7008 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml @@ -70,6 +70,13 @@ doAfter: 1 - material: Cloth amount: 1 + - to: blueComfBench + steps: + - material: Steel + amount: 2 + doAfter: 1 + - material: Cloth + amount: 1 - node: chair entity: Chair @@ -219,3 +226,20 @@ doAfter: 1 - tool: Screwing doAfter: 1 + + - node: blueComfBench + entity: BenchBlueComfy + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 2 + - !type:SpawnPrototype + prototype: MaterialCloth1 + amount: 1 + steps: + - tool: Cutting + doAfter: 1 + - tool: Screwing + doAfter: 1 diff --git a/Resources/Prototypes/Recipes/Construction/furniture.yml b/Resources/Prototypes/Recipes/Construction/furniture.yml index efe85a8546..19558c461b 100644 --- a/Resources/Prototypes/Recipes/Construction/furniture.yml +++ b/Resources/Prototypes/Recipes/Construction/furniture.yml @@ -220,6 +220,23 @@ conditions: - !type:TileNotBlocked +- type: construction + name: comfortable blue bench + id: BlueComfBench + graph: Seat + startNode: start + targetNode: blueComfBench + category: construction-category-furniture + description: A bench with an extremely comfortable backrest. + icon: + sprite: Structures/Furniture/Bench/comf_bench.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + #tables - type: construction name: steel table diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 33469c404a..425af690e7 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -1813,6 +1813,7 @@ collection: FootstepHull itemDrop: FloorTileItemSteel heatCapacity: 100000 #/tg/ has this set as "INFINITY." I don't know if that exists here so I've just added an extra 0 + indestructible: true - type: tile id: FloorReinforcedHardened diff --git a/Resources/Prototypes/Tiles/plating.yml b/Resources/Prototypes/Tiles/plating.yml index 3164e77fd2..5e888fbf6e 100644 --- a/Resources/Prototypes/Tiles/plating.yml +++ b/Resources/Prototypes/Tiles/plating.yml @@ -73,3 +73,18 @@ itemDrop: PartRodMetal1 heatCapacity: 10000 +- type: tile + id: TrainLattice + name: tiles-lattice-train + sprite: /Textures/Tiles/latticeTrain.png + baseTurf: Space + isSubfloor: true + deconstructTools: [ Cutting ] + weather: true + footstepSounds: + collection: FootstepPlating + friction: 0.3 + isSpace: true + itemDrop: PartRodMetal1 + heatCapacity: 10000 + diff --git a/Resources/Prototypes/audio.yml b/Resources/Prototypes/audio.yml index b5ab41091b..666bac4a2f 100644 --- a/Resources/Prototypes/audio.yml +++ b/Resources/Prototypes/audio.yml @@ -25,6 +25,15 @@ rules: NearPrayable priority: 4 +- type: ambientMusic + id: Train + sound: + params: + volume: -8 + collection: AmbienceTrain + rules: NearTrain + priority: 4 + # Departments - type: ambientMusic id: Medical @@ -205,6 +214,16 @@ - /Audio/Ambience/ambiruin6.ogg - /Audio/Ambience/ambiruin7.ogg +- type: soundCollection + id: AmbienceTrain + files: + - /Audio/Ambience/ambitrain1.ogg + - /Audio/Ambience/ambitrain2.ogg + - /Audio/Ambience/ambitrain3.ogg + - /Audio/Ambience/ambiruin3.ogg + - /Audio/Ambience/ambiruin5.ogg + - /Audio/Ambience/ambiruin6.ogg + - type: soundCollection id: AmbienceSpookyFog files: @@ -262,6 +281,16 @@ - Plating range: 2 +- type: rules + id: NearTrain + rules: + - !type:NearbyTilesPercentRule + ignoreAnchored: true + percent: 0.05 + tiles: + - TrainLattice + range: 4 + - type: rules id: NearMedical rules: diff --git a/Resources/Textures/Parallaxes/Asteroids.png b/Resources/Textures/Parallaxes/Asteroids.png new file mode 100644 index 0000000000..fd5f4b6e15 Binary files /dev/null and b/Resources/Textures/Parallaxes/Asteroids.png differ diff --git a/Resources/Textures/Parallaxes/attributions.yml b/Resources/Textures/Parallaxes/attributions.yml index 71f0c919d2..fac31a8c0b 100644 --- a/Resources/Textures/Parallaxes/attributions.yml +++ b/Resources/Textures/Parallaxes/attributions.yml @@ -6,4 +6,19 @@ - files: ["KettleParallaxNeb.png", "KettleParallaxBG.png", "AspidParallaxBG.png", "AspidParallaxBG.png"] license: "CC0-1.0" copyright: "adapted from Screaming Brain Studios" - source: "https://opengameart.org/content/seamless-space-backgrounds" \ No newline at end of file + source: "https://opengameart.org/content/seamless-space-backgrounds" + +- files: ["gas_giant.png"] + license: "CC-BY-NC-SA-3.0" + copyright: "made by brainfood1183 (github) for ss14" + source: "https://github.com/space-wizards/space-station-14/blob/master/Resources/Textures/Parallaxes/gas_giant.png" + +- files: ["Asteroids.png"] + license: "CC-BY-NC-SA-3.0" + copyright: "taken from tgstation on https://github.com/tgstation/tgstation/commit/3df5d3b42bfb6b3b5adba1067ab41f83816255bb from parallax.dmi" + source: "https://github.com/tgstation/tgstation" + +- files: ["core_planet.png"] + license: "CC-BY-NC-SA-3.0" + copyright: "Drawn by Ubaser" + source: "https://github.com/space-wizards/space-station-14/blob/master/Resources/Textures/Parallaxes/core_planet.png" diff --git a/Resources/Textures/Tiles/attributions.yml b/Resources/Textures/Tiles/attributions.yml index e9795a358b..622565f251 100644 --- a/Resources/Textures/Tiles/attributions.yml +++ b/Resources/Textures/Tiles/attributions.yml @@ -115,3 +115,8 @@ license: "CC-BY-SA-3.0" copyright: "taken at https://github.com/ParadiseSS13/Paradise/commit/43889a89d5a9378fd120d627f74613edb1841a66" source: "https://github.com/ParadiseSS13/Paradise" + +- files: ["latticeTrain.png"] + license: "CC0-1.0" + copyright: "Created by TheShuEd (github) for space-station-14." + source: "https://github.com/space-wizards/space-station-14/pull/ED_INSERT_PR_CODE_HERE!" diff --git a/Resources/Textures/Tiles/latticeTrain.png b/Resources/Textures/Tiles/latticeTrain.png new file mode 100644 index 0000000000..72905e4a41 Binary files /dev/null and b/Resources/Textures/Tiles/latticeTrain.png differ