diff --git a/Content.Server.Database/Migrations/Postgres/20240906145851_Sponsors.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240906145851_Sponsors.Designer.cs index 2879538e99..f213f4f879 100644 --- a/Content.Server.Database/Migrations/Postgres/20240906145851_Sponsors.Designer.cs +++ b/Content.Server.Database/Migrations/Postgres/20240906145851_Sponsors.Designer.cs @@ -1228,9 +1228,9 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) .HasColumnType("text") .HasColumnName("allowed_markings"); - b.Property("ExpireDate") - .HasColumnType("text") - .HasColumnName("expire_date"); + // b.Property("ExpireDate") + // .HasColumnType("text") + // .HasColumnName("expire_date"); b.Property("ExtraSlots") .HasColumnType("integer") diff --git a/Content.Server.Database/Migrations/Postgres/20240906145851_Sponsors.cs b/Content.Server.Database/Migrations/Postgres/20240906145851_Sponsors.cs index 17ef34f800..277b642a37 100644 --- a/Content.Server.Database/Migrations/Postgres/20240906145851_Sponsors.cs +++ b/Content.Server.Database/Migrations/Postgres/20240906145851_Sponsors.cs @@ -21,7 +21,7 @@ protected override void Up(MigrationBuilder migrationBuilder) ooccolor = table.Column(type: "text", nullable: false), have_priority_join = table.Column(type: "boolean", nullable: false), allowed_markings = table.Column(type: "text", nullable: false), - expire_date = table.Column(type: "text", nullable: false), + //expire_date = table.Column(type: "text", nullable: false), extra_slots = table.Column(type: "integer", nullable: false) }, constraints: table => diff --git a/Content.Server.Database/Migrations/Postgres/20240906151158_Sponsors-allowjob.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240906151158_Sponsors-allowjob.Designer.cs index 3e20f72108..f388607327 100644 --- a/Content.Server.Database/Migrations/Postgres/20240906151158_Sponsors-allowjob.Designer.cs +++ b/Content.Server.Database/Migrations/Postgres/20240906151158_Sponsors-allowjob.Designer.cs @@ -1232,9 +1232,9 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) .HasColumnType("text") .HasColumnName("allowed_markings"); - b.Property("ExpireDate") - .HasColumnType("text") - .HasColumnName("expire_date"); + // b.Property("ExpireDate") + // .HasColumnType("text") + // .HasColumnName("expire_date"); b.Property("ExtraSlots") .HasColumnType("integer") diff --git a/Content.Server.Database/Migrations/Postgres/20240906152028_Donate.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240906152028_Donate.Designer.cs index d569024dfe..b1313799b8 100644 --- a/Content.Server.Database/Migrations/Postgres/20240906152028_Donate.Designer.cs +++ b/Content.Server.Database/Migrations/Postgres/20240906152028_Donate.Designer.cs @@ -1257,9 +1257,9 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) .HasColumnType("text") .HasColumnName("allowed_markings"); - b.Property("ExpireDate") - .HasColumnType("text") - .HasColumnName("expire_date"); + // b.Property("ExpireDate") + // .HasColumnType("text") + // .HasColumnName("expire_date"); b.Property("ExtraSlots") .HasColumnType("integer") diff --git a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs index 228ba760d9..00f288b770 100644 --- a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs +++ b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs @@ -1255,9 +1255,9 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("text") .HasColumnName("allowed_markings"); - b.Property("ExpireDate") - .HasColumnType("text") - .HasColumnName("expire_date"); + // b.Property("ExpireDate") + // .HasColumnType("text") + // .HasColumnName("expire_date"); b.Property("ExtraSlots") .HasColumnType("integer") diff --git a/Content.Server.Database/Migrations/Sqlite/20240906145842_Sponsors.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240906145842_Sponsors.Designer.cs index db66073b64..8188fdad1a 100644 --- a/Content.Server.Database/Migrations/Sqlite/20240906145842_Sponsors.Designer.cs +++ b/Content.Server.Database/Migrations/Sqlite/20240906145842_Sponsors.Designer.cs @@ -1161,9 +1161,9 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) .HasColumnType("TEXT") .HasColumnName("allowed_markings"); - b.Property("ExpireDate") - .HasColumnType("TEXT") - .HasColumnName("expire_date"); + // b.Property("ExpireDate") + // .HasColumnType("TEXT") + // .HasColumnName("expire_date"); b.Property("ExtraSlots") .HasColumnType("INTEGER") diff --git a/Content.Server.Database/Migrations/Sqlite/20240906145842_Sponsors.cs b/Content.Server.Database/Migrations/Sqlite/20240906145842_Sponsors.cs index 24cb0ca094..667fdb95d3 100644 --- a/Content.Server.Database/Migrations/Sqlite/20240906145842_Sponsors.cs +++ b/Content.Server.Database/Migrations/Sqlite/20240906145842_Sponsors.cs @@ -21,7 +21,7 @@ protected override void Up(MigrationBuilder migrationBuilder) ooccolor = table.Column(type: "TEXT", nullable: false), have_priority_join = table.Column(type: "INTEGER", nullable: false), allowed_markings = table.Column(type: "TEXT", nullable: false), - expire_date = table.Column(type: "TEXT", nullable: false), + // expire_date = table.Column(type: "TEXT", nullable: false), extra_slots = table.Column(type: "INTEGER", nullable: false) }, constraints: table => diff --git a/Content.Server.Database/Migrations/Sqlite/20240906151148_Sponsors-allowjob.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240906151148_Sponsors-allowjob.Designer.cs index b2f3432f4b..993b303031 100644 --- a/Content.Server.Database/Migrations/Sqlite/20240906151148_Sponsors-allowjob.Designer.cs +++ b/Content.Server.Database/Migrations/Sqlite/20240906151148_Sponsors-allowjob.Designer.cs @@ -1165,9 +1165,9 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) .HasColumnType("TEXT") .HasColumnName("allowed_markings"); - b.Property("ExpireDate") - .HasColumnType("TEXT") - .HasColumnName("expire_date"); + // b.Property("ExpireDate") + // .HasColumnType("TEXT") + // .HasColumnName("expire_date"); b.Property("ExtraSlots") .HasColumnType("INTEGER") diff --git a/Content.Server.Database/Migrations/Sqlite/20240906152019_Donate.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240906152019_Donate.Designer.cs index 1e0052f689..e14d0e8dab 100644 --- a/Content.Server.Database/Migrations/Sqlite/20240906152019_Donate.Designer.cs +++ b/Content.Server.Database/Migrations/Sqlite/20240906152019_Donate.Designer.cs @@ -1190,9 +1190,9 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) .HasColumnType("TEXT") .HasColumnName("allowed_markings"); - b.Property("ExpireDate") - .HasColumnType("TEXT") - .HasColumnName("expire_date"); + // b.Property("ExpireDate") + // .HasColumnType("TEXT") + // .HasColumnName("expire_date"); b.Property("ExtraSlots") .HasColumnType("INTEGER") diff --git a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs index d56bbc93f3..d8f3aa5bfb 100644 --- a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs +++ b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs @@ -1192,9 +1192,9 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("TEXT") .HasColumnName("allowed_markings"); - b.Property("ExpireDate") - .HasColumnType("TEXT") - .HasColumnName("expire_date"); + // b.Property("ExpireDate") + // .HasColumnType("TEXT") + // .HasColumnName("expire_date"); b.Property("ExtraSlots") .HasColumnType("INTEGER") diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs index 4b09d193a4..64ef941456 100644 --- a/Content.Server.Database/Model.cs +++ b/Content.Server.Database/Model.cs @@ -1061,7 +1061,7 @@ public class Sponsor public bool HavePriorityJoin { get; set; } public string AllowedMarkings { get; set; } = null!; public int ExtraSlots { get; set; } - public DateTime ExpireDate {get;set;} + //public DateTime ExpireDate {get;set;} public bool AllowJob { get; set; } = false; } #endif diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 31742257b9..90e904fe82 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -1490,6 +1490,12 @@ id: FloorGrass name: tiles-planet-grass-floor sprite: /Textures/Tiles/grass.png + variants: 4 #Corvax + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 baseTurf: FloorDirt isSubfloor: false canShovel: true #DV @@ -1503,14 +1509,20 @@ id: FloorGrassJungle name: tiles-jungle-grass-floor sprite: /Textures/Tiles/grassjungle.png - baseTurf: FloorDirt + variants: 4 #Corvax + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: FloorPlanetDirt isSubfloor: false - canShovel: true # Delta V footstepSounds: collection: FootstepGrass itemDrop: FloorTileItemGrassJungle heatCapacity: 10000 weather: true + indestructible: true - type: tile id: FloorGrassDark @@ -1927,7 +1939,8 @@ East: /Textures/Tiles/Planet/Grass/double_edge.png North: /Textures/Tiles/Planet/Grass/double_edge.png West: /Textures/Tiles/Planet/Grass/double_edge.png - baseTurf: Plating + baseTurf: FloorDirt + canShovel: true #Lost-Paradise isSubfloor: false deconstructTools: [ Cutting ] footstepSounds: @@ -1940,7 +1953,15 @@ id: FloorMowedAstroGrass name: tiles-mowed-astro-grass parent: FloorGrass - baseTurf: Plating + sprite: /Textures/Corvax/Tiles/mowed_grass.png #Corvax + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: FloorDirt + canShovel: true #Lost-Paradise isSubfloor: false deconstructTools: [ Cutting ] itemDrop: FloorTileItemMowedAstroGrass @@ -1950,7 +1971,8 @@ id: FloorJungleAstroGrass name: tiles-jungle-astro-grass parent: FloorGrassJungle - baseTurf: Plating + baseTurf: FloorDirt + canShovel: true #Lost-Paradise isSubfloor: false deconstructTools: [ Cutting ] itemDrop: FloorTileItemJungleAstroGrass diff --git a/Resources/ServerInfo/RulesLPP.txt b/Resources/ServerInfo/RulesLPP.txt index 2607686e0d..8159e505c7 100644 --- a/Resources/ServerInfo/RulesLPP.txt +++ b/Resources/ServerInfo/RulesLPP.txt @@ -124,7 +124,7 @@ [color=#2ff5eb]Правило 16[/color] - [color=#d9cc1c]Валидхант. Организация и ведение охоты на антагонистов, не будучи сотрудником службы безопасности.[/color] [color=#2ff5eb]16.1[/color] - Останавливать антагонистов - работа СБ. Если вы не сотрудник СБ, то не должны заниматься охотой на антагонистов. Вы не должны бросать свою работу или свои планы, чтобы охотиться на антагониста. Однако вы можете защищать себя и своих коллег от нападения антагониста, если вы оказались очевидцем этого. [color=#2ff5eb]16.2[/color] - Это правило не означает, что не стоит защищаться или в принципе мешать антагонистам. Ключевой момент в том, что рядовые сотрудники не должны специально охотиться на антагонистов или специально искать ситуации, в которых можно беспрепятственно его убить. - [color=#2ff5eb]16.3[/color] - [color=#ff0000]ММы не хотим поощрять игру "на победку"/"на гринтекст" на сервере. Относитесь к антагонистам не как к врагам, а как к оппонентам. Они такие же игроки, как и вы, и тоже, в большинстве своём, хотят создать интересный раунд, попробовать себя в другой роли.[/color] + [color=#2ff5eb]16.3[/color] - [color=#ff0000]Мы не хотим поощрять игру "на победку"/"на гринтекст" на сервере. Относитесь к антагонистам не как к врагам, а как к оппонентам. Они такие же игроки, как и вы, и тоже, в большинстве своём, хотят создать интересный раунд, попробовать себя в другой роли.[/color] [color=#2ff5eb]16.4[/color] - Самый простой способ не перейти черту: если вы или ваш коллега были атакованы антагонистом, вы можете себя защищать. Если антагонист бросился бежать, вы не должны его преследовать, вы уже успешно от него защитились. Не являясь сотрудником СБ, вы должны быть больше обеспокоены своим здоровьем или здоровьем жертвы. Если кого-то похитили, вы можете отправиться в погоню, но вашей главной целью должно быть спасение. [color=#2ff5eb]16.5[/color] - Если СБ и главы, готовые принять вас в СБ, отсутствуют, то вам разрешено защищать свою станцию по мере своих сил. [color=#2ff5eb]16.6[/color] - Необходимо какое-либо доказательство или свидетельство, чтобы считать кого-то антагонистом. diff --git a/Resources/Textures/Corvax/Tiles/attributions.yml b/Resources/Textures/Corvax/Tiles/attributions.yml new file mode 100644 index 0000000000..a23b082120 --- /dev/null +++ b/Resources/Textures/Corvax/Tiles/attributions.yml @@ -0,0 +1,4 @@ +- files: ["mowed_grass.png"] + license: "CC-BY-SA-3.0" + copyright: "Created by Ko4erga (discord)" + source: "https://github.com/space-syndicate/space-station-14/pull/2282" diff --git a/Resources/Textures/Corvax/Tiles/mowed_grass.png b/Resources/Textures/Corvax/Tiles/mowed_grass.png new file mode 100644 index 0000000000..1545a375a6 Binary files /dev/null and b/Resources/Textures/Corvax/Tiles/mowed_grass.png differ diff --git a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm.rsi/icon.png b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm.rsi/icon.png index b2fea90bc1..2f042d0f26 100644 Binary files a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm.rsi/icon.png and b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm.rsi/meta.json b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm.rsi/meta.json index bf6c485d5d..22c3183253 100644 --- a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Original by Visne, Assembled by Just-a-Unity-Dev on GitHub or eclips_e#0001 (728101795427254312) on Discord, texture from https://github.com/discordia-space/CEV-Eris/commit/026ee3250ac1de938b503e3eb46ad73dd9c3ca82", + "copyright": "Original by Visne, Assembled by Just-a-Unity-Dev on GitHub or eclips_e#0001 (728101795427254312) on Discord, texture by Ko4erga (discord)", "size": { "x": 18, "y": 18 diff --git a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm_tabletop.rsi/meta.json b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm_tabletop.rsi/meta.json index 5f3f5ea29e..59fd1c8ba0 100644 --- a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm_tabletop.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm_tabletop.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Assembled by Just-a-Unity-Dev on GitHub or eclips_e#0001 (728101795427254312) on Discord, texture from https://github.com/discordia-space/CEV-Eris/commit/026ee3250ac1de938b503e3eb46ad73dd9c3ca82", + "copyright": "Assembled by Just-a-Unity-Dev on GitHub or eclips_e#0001 (728101795427254312) on Discord, texture by Ko4erga (discord)", "size": { "x": 288, diff --git a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm_tabletop.rsi/tabletop.png b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm_tabletop.rsi/tabletop.png index 4e88b840d5..86afc25972 100644 Binary files a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm_tabletop.rsi/tabletop.png and b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm_tabletop.rsi/tabletop.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/astrograss.png b/Resources/Textures/Objects/Tiles/tile.rsi/astrograss.png index f548ef7ace..f83e2ba179 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/astrograss.png and b/Resources/Textures/Objects/Tiles/tile.rsi/astrograss.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/grass.png b/Resources/Textures/Objects/Tiles/tile.rsi/grass.png index 696d0eb543..cfebf1b1f9 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/grass.png and b/Resources/Textures/Objects/Tiles/tile.rsi/grass.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/grassjungle.png b/Resources/Textures/Objects/Tiles/tile.rsi/grassjungle.png index 8f3407369b..bf42c77ac8 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/grassjungle.png and b/Resources/Textures/Objects/Tiles/tile.rsi/grassjungle.png differ diff --git a/Resources/Textures/Tiles/Planet/Grass/attributions.yml b/Resources/Textures/Tiles/Planet/Grass/attributions.yml index 1749225e1a..193dc2e76a 100644 --- a/Resources/Textures/Tiles/Planet/Grass/attributions.yml +++ b/Resources/Textures/Tiles/Planet/Grass/attributions.yml @@ -1,4 +1,4 @@ - files: ["grass.png", "triple_edge.png", "double_edge.png", "single_edge.png"] license: "CC-BY-SA-3.0" - copyright: "tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49. double_edge, single_edge, and triple_edge modified from grass by github user @Flareguy" - source: "https://github.com/space-wizards/space-station-14/pull/27912" \ No newline at end of file + copyright: "Created by Ko4erga (discord)" + source: "https://github.com/space-wizards/space-station-14/pull/29134" \ No newline at end of file diff --git a/Resources/Textures/Tiles/Planet/Grass/double_edge.png b/Resources/Textures/Tiles/Planet/Grass/double_edge.png index 218751211c..804281db30 100644 Binary files a/Resources/Textures/Tiles/Planet/Grass/double_edge.png and b/Resources/Textures/Tiles/Planet/Grass/double_edge.png differ diff --git a/Resources/Textures/Tiles/Planet/Grass/grass.png b/Resources/Textures/Tiles/Planet/Grass/grass.png index b6d6e8b4db..425c1c5b79 100644 Binary files a/Resources/Textures/Tiles/Planet/Grass/grass.png and b/Resources/Textures/Tiles/Planet/Grass/grass.png differ diff --git a/Resources/Textures/Tiles/Planet/Grass/single_edge.png b/Resources/Textures/Tiles/Planet/Grass/single_edge.png index 60bbf65c79..e6fc903f28 100644 Binary files a/Resources/Textures/Tiles/Planet/Grass/single_edge.png and b/Resources/Textures/Tiles/Planet/Grass/single_edge.png differ diff --git a/Resources/Textures/Tiles/Planet/Grass/triple_edge.png b/Resources/Textures/Tiles/Planet/Grass/triple_edge.png index d19d64ba36..d1be035055 100644 Binary files a/Resources/Textures/Tiles/Planet/Grass/triple_edge.png and b/Resources/Textures/Tiles/Planet/Grass/triple_edge.png differ diff --git a/Resources/Textures/Tiles/Planet/dirt.rsi/dirt.png b/Resources/Textures/Tiles/Planet/dirt.rsi/dirt.png index 28d1862456..374df70cec 100644 Binary files a/Resources/Textures/Tiles/Planet/dirt.rsi/dirt.png and b/Resources/Textures/Tiles/Planet/dirt.rsi/dirt.png differ diff --git a/Resources/Textures/Tiles/Planet/dirt.rsi/meta.json b/Resources/Textures/Tiles/Planet/dirt.rsi/meta.json index c70bafbd1b..007f876b2e 100644 --- a/Resources/Textures/Tiles/Planet/dirt.rsi/meta.json +++ b/Resources/Textures/Tiles/Planet/dirt.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/20d0b1fab9002c32e5267f16ba2b5cbf4b6f1e07/icons/turf/flooring/dirt.dmi", + "copyright": "Created by Ko4erga (discord)", "size": { "x": 32, "y": 32 @@ -11,4 +11,4 @@ "name": "dirt" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Tiles/attributions.yml b/Resources/Textures/Tiles/attributions.yml index 6a6f545d1e..672620fd12 100644 --- a/Resources/Textures/Tiles/attributions.yml +++ b/Resources/Textures/Tiles/attributions.yml @@ -26,11 +26,16 @@ copyright: "Taken from /tg/station at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae." source: "https://github.com/tgstation/tgstation/" -- files: ["blue_circuit.png", "cropped_parallax.png", "eighties.png", "gold.png", "grass.png", "ironsand1.png", "ironsand2.png", "ironsand3.png", "ironsand4.png", "junglegrass.png", "lattice.png", "reinforced.png", "silver.png", "snow.png", "wood.png"] +- files: ["blue_circuit.png", "cropped_parallax.png", "eighties.png", "gold.png", "ironsand1.png", "ironsand2.png", "ironsand3.png", "ironsand4.png", "lattice.png", "reinforced.png", "silver.png", "snow.png", "wood.png"] license: "CC-BY-SA-3.0" copyright: "tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49, cropped_parallax modified from parallax." source: "https://github.com/tgstation/tgstation/" +- files: ["grass.png", "junglegrass.png", "grassdark.png", "grassjungle.png", "grasslight.png"] #Corvax + license: "CC-BY-SA-3.0" + copyright: "Created by Ko4erga (discord)" + source: "https://github.com/space-wizards/space-station-14/pull/29134" + - files: ["super_reinforced.png"] license: "CC-BY-SA-3.0" copyright: "Modified from reinforced.png by github user @Flareguy" @@ -86,9 +91,9 @@ copyright: "Mojave-Sun, taken at commit 0587dd16e28108bdf0b0a28e2caae4319845e861" source: "https://github.com/Mojave-Sun/mojave-sun-13" -- files: ["grassdark.png", "grasslight.png", "dirt.png"] +- files: ["dirt.png"] license: "CC-BY-SA-3.0" - copyright: "Fortuna commit 2a9408a47e2f83d945335e4feeeeafb552173e6f, grasslight and dirt by Peptide based on grassdark.png and dirt." + copyright: "Fortuna commit 2a9408a47e2f83d945335e4feeeeafb552173e6f, dirt by Peptide based on grassdark.png and dirt." source: "https://github.com/FortunaSS13/Fortuna" - files: ["steel_maint.png", "grating_maint.png", "wood_tile.png"] diff --git a/Resources/Textures/Tiles/grass.png b/Resources/Textures/Tiles/grass.png index 5c969fd869..2939d7e2f7 100644 Binary files a/Resources/Textures/Tiles/grass.png and b/Resources/Textures/Tiles/grass.png differ diff --git a/Resources/Textures/Tiles/grassdark.png b/Resources/Textures/Tiles/grassdark.png index 83236e1b80..854f3901e5 100644 Binary files a/Resources/Textures/Tiles/grassdark.png and b/Resources/Textures/Tiles/grassdark.png differ diff --git a/Resources/Textures/Tiles/grassjungle.png b/Resources/Textures/Tiles/grassjungle.png index 3cd34ffb64..d7a441bdc9 100644 Binary files a/Resources/Textures/Tiles/grassjungle.png and b/Resources/Textures/Tiles/grassjungle.png differ diff --git a/Resources/Textures/Tiles/grasslight.png b/Resources/Textures/Tiles/grasslight.png index 5993e91227..969ba21927 100644 Binary files a/Resources/Textures/Tiles/grasslight.png and b/Resources/Textures/Tiles/grasslight.png differ