diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 59fa88be2b..b5ca240d5c 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -201,7 +201,7 @@ collection: FootstepHull itemDrop: FloorTileItemBrassFilled heatCapacity: 10000 - + - type: tile id: FloorBrassReebe name: tiles-brass-floor-reebe @@ -1207,12 +1207,6 @@ id: FloorShuttleWhite name: tiles-white-shuttle-floor sprite: /Textures/Tiles/shuttlewhite.png - variants: 4 - placementVariants: - - 1.0 - - 1.0 - - 1.0 - - 1.0 baseTurf: Plating isSubfloor: false deconstructTools: [ Prying ] @@ -1225,12 +1219,6 @@ id: FloorShuttleGrey name: tiles-grey-shuttle-floor sprite: /Textures/Tiles/shuttlegrey.png - variants: 4 - placementVariants: - - 1.0 - - 1.0 - - 1.0 - - 1.0 baseTurf: Plating isSubfloor: false deconstructTools: [ Prying ] @@ -1243,12 +1231,6 @@ id: FloorShuttleBlack name: tiles-black-shuttle-floor sprite: /Textures/Tiles/shuttleblack.png - variants: 4 - placementVariants: - - 1.0 - - 1.0 - - 1.0 - - 1.0 baseTurf: Plating isSubfloor: false deconstructTools: [ Prying ] @@ -1261,12 +1243,6 @@ id: FloorShuttleBlue name: tiles-blue-shuttle-floor sprite: /Textures/Tiles/shuttleblue.png - variants: 4 - placementVariants: - - 1.0 - - 1.0 - - 1.0 - - 1.0 baseTurf: Plating isSubfloor: false deconstructTools: [ Prying ] @@ -1279,12 +1255,6 @@ id: FloorShuttleOrange name: tiles-orange-shuttle-floor sprite: /Textures/Tiles/shuttleorange.png - variants: 4 - placementVariants: - - 1.0 - - 1.0 - - 1.0 - - 1.0 baseTurf: Plating isSubfloor: false deconstructTools: [ Prying ] @@ -1297,12 +1267,6 @@ id: FloorShuttlePurple name: tiles-purple-shuttle-floor sprite: /Textures/Tiles/shuttlepurple.png - variants: 4 - placementVariants: - - 1.0 - - 1.0 - - 1.0 - - 1.0 baseTurf: Plating isSubfloor: false deconstructTools: [ Prying ] @@ -1315,12 +1279,6 @@ id: FloorShuttleRed name: tiles-red-shuttle-floor sprite: /Textures/Tiles/shuttlered.png - variants: 4 - placementVariants: - - 1.0 - - 1.0 - - 1.0 - - 1.0 baseTurf: Plating isSubfloor: false deconstructTools: [ Prying ] @@ -1940,4 +1898,4 @@ barestepSounds: collection: BarestepWood itemDrop: FloorTileItemWoodLarge - heatCapacity: 10000 \ No newline at end of file + heatCapacity: 10000 diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_box.png b/Resources/Textures/Decals/bricktile.rsi/dark_box.png index 153e7d3cfc..d9b23d5676 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_box.png and b/Resources/Textures/Decals/bricktile.rsi/dark_box.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_corner_ne.png b/Resources/Textures/Decals/bricktile.rsi/dark_corner_ne.png index b10deefb78..284559148e 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_corner_ne.png and b/Resources/Textures/Decals/bricktile.rsi/dark_corner_ne.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_corner_nw.png b/Resources/Textures/Decals/bricktile.rsi/dark_corner_nw.png index 7f28df0961..d249245bd4 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_corner_nw.png and b/Resources/Textures/Decals/bricktile.rsi/dark_corner_nw.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_corner_se.png b/Resources/Textures/Decals/bricktile.rsi/dark_corner_se.png index 2cb5db32d3..c608bd12e0 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_corner_se.png and b/Resources/Textures/Decals/bricktile.rsi/dark_corner_se.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_corner_sw.png b/Resources/Textures/Decals/bricktile.rsi/dark_corner_sw.png index f4d9633ba2..7d47c299ba 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_corner_sw.png and b/Resources/Textures/Decals/bricktile.rsi/dark_corner_sw.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_end_e.png b/Resources/Textures/Decals/bricktile.rsi/dark_end_e.png index e7f63be421..323e75d76f 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_end_e.png and b/Resources/Textures/Decals/bricktile.rsi/dark_end_e.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_end_n.png b/Resources/Textures/Decals/bricktile.rsi/dark_end_n.png index 806c94fe73..3d91cfbdc0 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_end_n.png and b/Resources/Textures/Decals/bricktile.rsi/dark_end_n.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_end_s.png b/Resources/Textures/Decals/bricktile.rsi/dark_end_s.png index 4bae8c99b7..9692018205 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_end_s.png and b/Resources/Textures/Decals/bricktile.rsi/dark_end_s.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_end_w.png b/Resources/Textures/Decals/bricktile.rsi/dark_end_w.png index b010ef2399..dcb96039e9 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_end_w.png and b/Resources/Textures/Decals/bricktile.rsi/dark_end_w.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_inner_ne.png b/Resources/Textures/Decals/bricktile.rsi/dark_inner_ne.png index 08f219869f..7a9da46b87 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_inner_ne.png and b/Resources/Textures/Decals/bricktile.rsi/dark_inner_ne.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_inner_nw.png b/Resources/Textures/Decals/bricktile.rsi/dark_inner_nw.png index d716a81e83..d0ccf15f35 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_inner_nw.png and b/Resources/Textures/Decals/bricktile.rsi/dark_inner_nw.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_inner_se.png b/Resources/Textures/Decals/bricktile.rsi/dark_inner_se.png index fc60f89698..70b3944d6c 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_inner_se.png and b/Resources/Textures/Decals/bricktile.rsi/dark_inner_se.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_inner_sw.png b/Resources/Textures/Decals/bricktile.rsi/dark_inner_sw.png index c4ac0d8f10..9b74f97899 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_inner_sw.png and b/Resources/Textures/Decals/bricktile.rsi/dark_inner_sw.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_line_e.png b/Resources/Textures/Decals/bricktile.rsi/dark_line_e.png index 99cb16a6ad..f2f3b75fd8 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_line_e.png and b/Resources/Textures/Decals/bricktile.rsi/dark_line_e.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_line_n.png b/Resources/Textures/Decals/bricktile.rsi/dark_line_n.png index 928b56c942..ebf08c0ac2 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_line_n.png and b/Resources/Textures/Decals/bricktile.rsi/dark_line_n.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_line_s.png b/Resources/Textures/Decals/bricktile.rsi/dark_line_s.png index f0ffe1c434..5fc1efc7bb 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_line_s.png and b/Resources/Textures/Decals/bricktile.rsi/dark_line_s.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_line_w.png b/Resources/Textures/Decals/bricktile.rsi/dark_line_w.png index bfae586a07..1bd29e1497 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_line_w.png and b/Resources/Textures/Decals/bricktile.rsi/dark_line_w.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/meta.json b/Resources/Textures/Decals/bricktile.rsi/meta.json index 313a68db1a..2658bbe3b3 100644 --- a/Resources/Textures/Decals/bricktile.rsi/meta.json +++ b/Resources/Textures/Decals/bricktile.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Edited by Flareguy, originally created by github user @moonheart08", + "copyright": "Made by github user @Morb0. Modified v2 by ko4erga (discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_box.png b/Resources/Textures/Decals/bricktile.rsi/steel_box.png index f7e5af8496..124905eabf 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_box.png and b/Resources/Textures/Decals/bricktile.rsi/steel_box.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_corner_ne.png b/Resources/Textures/Decals/bricktile.rsi/steel_corner_ne.png index dcf9e52b7c..f17f3c1999 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_corner_ne.png and b/Resources/Textures/Decals/bricktile.rsi/steel_corner_ne.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_corner_nw.png b/Resources/Textures/Decals/bricktile.rsi/steel_corner_nw.png index 9601a55f50..86fa0e9e00 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_corner_nw.png and b/Resources/Textures/Decals/bricktile.rsi/steel_corner_nw.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_corner_se.png b/Resources/Textures/Decals/bricktile.rsi/steel_corner_se.png index 134997a611..203dce3f83 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_corner_se.png and b/Resources/Textures/Decals/bricktile.rsi/steel_corner_se.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_corner_sw.png b/Resources/Textures/Decals/bricktile.rsi/steel_corner_sw.png index bb107cb037..9eb1cfc533 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_corner_sw.png and b/Resources/Textures/Decals/bricktile.rsi/steel_corner_sw.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_end_e.png b/Resources/Textures/Decals/bricktile.rsi/steel_end_e.png index 58c70fb948..fb05cd35c4 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_end_e.png and b/Resources/Textures/Decals/bricktile.rsi/steel_end_e.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_end_n.png b/Resources/Textures/Decals/bricktile.rsi/steel_end_n.png index 36092d5d0f..e1e2e04c39 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_end_n.png and b/Resources/Textures/Decals/bricktile.rsi/steel_end_n.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_end_s.png b/Resources/Textures/Decals/bricktile.rsi/steel_end_s.png index b377ac46b9..0807027825 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_end_s.png and b/Resources/Textures/Decals/bricktile.rsi/steel_end_s.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_end_w.png b/Resources/Textures/Decals/bricktile.rsi/steel_end_w.png index e9fd6a0579..0eeb92f6f7 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_end_w.png and b/Resources/Textures/Decals/bricktile.rsi/steel_end_w.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_inner_ne.png b/Resources/Textures/Decals/bricktile.rsi/steel_inner_ne.png index d8e5a50f8c..33f2919865 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_inner_ne.png and b/Resources/Textures/Decals/bricktile.rsi/steel_inner_ne.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_inner_nw.png b/Resources/Textures/Decals/bricktile.rsi/steel_inner_nw.png index ea84f9755f..644f5448cd 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_inner_nw.png and b/Resources/Textures/Decals/bricktile.rsi/steel_inner_nw.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_inner_se.png b/Resources/Textures/Decals/bricktile.rsi/steel_inner_se.png index 7d29fb2257..0f9072cc9e 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_inner_se.png and b/Resources/Textures/Decals/bricktile.rsi/steel_inner_se.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_inner_sw.png b/Resources/Textures/Decals/bricktile.rsi/steel_inner_sw.png index d8fac15ac8..cca9bc52c4 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_inner_sw.png and b/Resources/Textures/Decals/bricktile.rsi/steel_inner_sw.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_line_e.png b/Resources/Textures/Decals/bricktile.rsi/steel_line_e.png index 0eded8ad61..10b910fe16 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_line_e.png and b/Resources/Textures/Decals/bricktile.rsi/steel_line_e.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_line_n.png b/Resources/Textures/Decals/bricktile.rsi/steel_line_n.png index 8c2112e975..0a6d337048 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_line_n.png and b/Resources/Textures/Decals/bricktile.rsi/steel_line_n.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_line_s.png b/Resources/Textures/Decals/bricktile.rsi/steel_line_s.png index 0624ec350e..60bf358d65 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_line_s.png and b/Resources/Textures/Decals/bricktile.rsi/steel_line_s.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_line_w.png b/Resources/Textures/Decals/bricktile.rsi/steel_line_w.png index a67b6abc83..aff9dabab6 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_line_w.png and b/Resources/Textures/Decals/bricktile.rsi/steel_line_w.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_box.png b/Resources/Textures/Decals/bricktile.rsi/white_box.png index d4454f0676..f95af9e5d6 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_box.png and b/Resources/Textures/Decals/bricktile.rsi/white_box.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_corner_ne.png b/Resources/Textures/Decals/bricktile.rsi/white_corner_ne.png index 292139bfe4..90cda6ec33 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_corner_ne.png and b/Resources/Textures/Decals/bricktile.rsi/white_corner_ne.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_corner_nw.png b/Resources/Textures/Decals/bricktile.rsi/white_corner_nw.png index 5624893809..3fe0a9634c 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_corner_nw.png and b/Resources/Textures/Decals/bricktile.rsi/white_corner_nw.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_corner_se.png b/Resources/Textures/Decals/bricktile.rsi/white_corner_se.png index addb819cec..c4cdab83f1 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_corner_se.png and b/Resources/Textures/Decals/bricktile.rsi/white_corner_se.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_corner_sw.png b/Resources/Textures/Decals/bricktile.rsi/white_corner_sw.png index fb06423131..a2157c064c 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_corner_sw.png and b/Resources/Textures/Decals/bricktile.rsi/white_corner_sw.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_end_e.png b/Resources/Textures/Decals/bricktile.rsi/white_end_e.png index 548bdd6303..6b857400be 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_end_e.png and b/Resources/Textures/Decals/bricktile.rsi/white_end_e.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_end_n.png b/Resources/Textures/Decals/bricktile.rsi/white_end_n.png index 68fe5bcf7b..739e4dcdfc 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_end_n.png and b/Resources/Textures/Decals/bricktile.rsi/white_end_n.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_end_s.png b/Resources/Textures/Decals/bricktile.rsi/white_end_s.png index 4b96c7858a..03b4eb7593 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_end_s.png and b/Resources/Textures/Decals/bricktile.rsi/white_end_s.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_end_w.png b/Resources/Textures/Decals/bricktile.rsi/white_end_w.png index c01877b176..a982e97bec 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_end_w.png and b/Resources/Textures/Decals/bricktile.rsi/white_end_w.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_inner_ne.png b/Resources/Textures/Decals/bricktile.rsi/white_inner_ne.png index 0726c45066..e8d326d08d 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_inner_ne.png and b/Resources/Textures/Decals/bricktile.rsi/white_inner_ne.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_inner_nw.png b/Resources/Textures/Decals/bricktile.rsi/white_inner_nw.png index 5e75689308..1b6e902e53 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_inner_nw.png and b/Resources/Textures/Decals/bricktile.rsi/white_inner_nw.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_inner_se.png b/Resources/Textures/Decals/bricktile.rsi/white_inner_se.png index 82013151cb..f41846183f 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_inner_se.png and b/Resources/Textures/Decals/bricktile.rsi/white_inner_se.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_inner_sw.png b/Resources/Textures/Decals/bricktile.rsi/white_inner_sw.png index 848d13c371..dfddc4c38c 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_inner_sw.png and b/Resources/Textures/Decals/bricktile.rsi/white_inner_sw.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_line_e.png b/Resources/Textures/Decals/bricktile.rsi/white_line_e.png index ecbc891f6f..1d70a2d6ed 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_line_e.png and b/Resources/Textures/Decals/bricktile.rsi/white_line_e.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_line_n.png b/Resources/Textures/Decals/bricktile.rsi/white_line_n.png index 1d7203daab..cfd681dcbb 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_line_n.png and b/Resources/Textures/Decals/bricktile.rsi/white_line_n.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_line_s.png b/Resources/Textures/Decals/bricktile.rsi/white_line_s.png index 408d3220d7..c92bae8346 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_line_s.png and b/Resources/Textures/Decals/bricktile.rsi/white_line_s.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_line_w.png b/Resources/Textures/Decals/bricktile.rsi/white_line_w.png index fd6bf60394..4bdf37aac2 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_line_w.png and b/Resources/Textures/Decals/bricktile.rsi/white_line_w.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_box.png b/Resources/Textures/Decals/minitile.rsi/dark_box.png index 1e25897961..87053060a3 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_box.png and b/Resources/Textures/Decals/minitile.rsi/dark_box.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_corner_ne.png b/Resources/Textures/Decals/minitile.rsi/dark_corner_ne.png index 000005cf10..044d3ee58a 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_corner_ne.png and b/Resources/Textures/Decals/minitile.rsi/dark_corner_ne.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_corner_nw.png b/Resources/Textures/Decals/minitile.rsi/dark_corner_nw.png index 428ce9c617..92590b4a51 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_corner_nw.png and b/Resources/Textures/Decals/minitile.rsi/dark_corner_nw.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_corner_se.png b/Resources/Textures/Decals/minitile.rsi/dark_corner_se.png index d369a1fee4..8fe46845e1 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_corner_se.png and b/Resources/Textures/Decals/minitile.rsi/dark_corner_se.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_corner_sw.png b/Resources/Textures/Decals/minitile.rsi/dark_corner_sw.png index bf3b1015df..48e3191936 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_corner_sw.png and b/Resources/Textures/Decals/minitile.rsi/dark_corner_sw.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_end_e.png b/Resources/Textures/Decals/minitile.rsi/dark_end_e.png index 15f5068670..82b0087a03 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_end_e.png and b/Resources/Textures/Decals/minitile.rsi/dark_end_e.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_end_n.png b/Resources/Textures/Decals/minitile.rsi/dark_end_n.png index 3bd2d26686..b642ce1bf4 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_end_n.png and b/Resources/Textures/Decals/minitile.rsi/dark_end_n.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_end_s.png b/Resources/Textures/Decals/minitile.rsi/dark_end_s.png index 68b87cb6f3..114b1ac821 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_end_s.png and b/Resources/Textures/Decals/minitile.rsi/dark_end_s.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_end_w.png b/Resources/Textures/Decals/minitile.rsi/dark_end_w.png index d6e3ca96ea..d9099511d8 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_end_w.png and b/Resources/Textures/Decals/minitile.rsi/dark_end_w.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_inner_ne.png b/Resources/Textures/Decals/minitile.rsi/dark_inner_ne.png index 82cfac9206..7dac62620b 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_inner_ne.png and b/Resources/Textures/Decals/minitile.rsi/dark_inner_ne.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_inner_nw.png b/Resources/Textures/Decals/minitile.rsi/dark_inner_nw.png index 6cebbf93f4..e3ef116630 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_inner_nw.png and b/Resources/Textures/Decals/minitile.rsi/dark_inner_nw.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_inner_se.png b/Resources/Textures/Decals/minitile.rsi/dark_inner_se.png index f6890fe52f..3ddb20a5f4 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_inner_se.png and b/Resources/Textures/Decals/minitile.rsi/dark_inner_se.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_inner_sw.png b/Resources/Textures/Decals/minitile.rsi/dark_inner_sw.png index 0a5c96d762..cc8919b283 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_inner_sw.png and b/Resources/Textures/Decals/minitile.rsi/dark_inner_sw.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_line_e.png b/Resources/Textures/Decals/minitile.rsi/dark_line_e.png index c50102d604..544580f150 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_line_e.png and b/Resources/Textures/Decals/minitile.rsi/dark_line_e.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_line_n.png b/Resources/Textures/Decals/minitile.rsi/dark_line_n.png index e1ca99dbc6..ba8bb6a176 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_line_n.png and b/Resources/Textures/Decals/minitile.rsi/dark_line_n.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_line_s.png b/Resources/Textures/Decals/minitile.rsi/dark_line_s.png index 1005b61e53..d2419e8cd3 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_line_s.png and b/Resources/Textures/Decals/minitile.rsi/dark_line_s.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_line_w.png b/Resources/Textures/Decals/minitile.rsi/dark_line_w.png index a53ed8a21c..9f809bd964 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_line_w.png and b/Resources/Textures/Decals/minitile.rsi/dark_line_w.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/meta.json b/Resources/Textures/Decals/minitile.rsi/meta.json index 313a68db1a..50dd3a3a1b 100644 --- a/Resources/Textures/Decals/minitile.rsi/meta.json +++ b/Resources/Textures/Decals/minitile.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Edited by Flareguy, originally created by github user @moonheart08", + "copyright": "Made by github user @Morb0", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Decals/minitile.rsi/steel_box.png b/Resources/Textures/Decals/minitile.rsi/steel_box.png index 25643de33c..65bfc266e9 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_box.png and b/Resources/Textures/Decals/minitile.rsi/steel_box.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_corner_ne.png b/Resources/Textures/Decals/minitile.rsi/steel_corner_ne.png index b11860e110..0eaa625b81 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_corner_ne.png and b/Resources/Textures/Decals/minitile.rsi/steel_corner_ne.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_corner_nw.png b/Resources/Textures/Decals/minitile.rsi/steel_corner_nw.png index 9cd5e7d03a..8216073046 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_corner_nw.png and b/Resources/Textures/Decals/minitile.rsi/steel_corner_nw.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_corner_se.png b/Resources/Textures/Decals/minitile.rsi/steel_corner_se.png index 1446f6856e..2535334eab 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_corner_se.png and b/Resources/Textures/Decals/minitile.rsi/steel_corner_se.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_corner_sw.png b/Resources/Textures/Decals/minitile.rsi/steel_corner_sw.png index 3d1a5dad3f..81f8f26353 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_corner_sw.png and b/Resources/Textures/Decals/minitile.rsi/steel_corner_sw.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_end_e.png b/Resources/Textures/Decals/minitile.rsi/steel_end_e.png index a01e46cc97..a5bd0f3807 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_end_e.png and b/Resources/Textures/Decals/minitile.rsi/steel_end_e.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_end_n.png b/Resources/Textures/Decals/minitile.rsi/steel_end_n.png index 631f02a18a..5ca7666458 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_end_n.png and b/Resources/Textures/Decals/minitile.rsi/steel_end_n.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_end_s.png b/Resources/Textures/Decals/minitile.rsi/steel_end_s.png index 19eede5c2d..58edc11fa1 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_end_s.png and b/Resources/Textures/Decals/minitile.rsi/steel_end_s.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_end_w.png b/Resources/Textures/Decals/minitile.rsi/steel_end_w.png index 465299858c..b03aa59c9c 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_end_w.png and b/Resources/Textures/Decals/minitile.rsi/steel_end_w.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_inner_ne.png b/Resources/Textures/Decals/minitile.rsi/steel_inner_ne.png index d8e5a50f8c..b32452a8db 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_inner_ne.png and b/Resources/Textures/Decals/minitile.rsi/steel_inner_ne.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_inner_nw.png b/Resources/Textures/Decals/minitile.rsi/steel_inner_nw.png index ea84f9755f..0bda9148f1 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_inner_nw.png and b/Resources/Textures/Decals/minitile.rsi/steel_inner_nw.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_inner_se.png b/Resources/Textures/Decals/minitile.rsi/steel_inner_se.png index 7d29fb2257..de8f47511a 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_inner_se.png and b/Resources/Textures/Decals/minitile.rsi/steel_inner_se.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_inner_sw.png b/Resources/Textures/Decals/minitile.rsi/steel_inner_sw.png index d8fac15ac8..bdee5ab5e0 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_inner_sw.png and b/Resources/Textures/Decals/minitile.rsi/steel_inner_sw.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_line_e.png b/Resources/Textures/Decals/minitile.rsi/steel_line_e.png index 3bdd0e2d4f..ba161c6f18 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_line_e.png and b/Resources/Textures/Decals/minitile.rsi/steel_line_e.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_line_n.png b/Resources/Textures/Decals/minitile.rsi/steel_line_n.png index 953586a1c5..f73aa627b9 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_line_n.png and b/Resources/Textures/Decals/minitile.rsi/steel_line_n.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_line_s.png b/Resources/Textures/Decals/minitile.rsi/steel_line_s.png index 89b0fe63f0..fe8804e8c9 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_line_s.png and b/Resources/Textures/Decals/minitile.rsi/steel_line_s.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_line_w.png b/Resources/Textures/Decals/minitile.rsi/steel_line_w.png index 37a7a41a7f..37f152f7ff 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_line_w.png and b/Resources/Textures/Decals/minitile.rsi/steel_line_w.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_box.png b/Resources/Textures/Decals/minitile.rsi/white_box.png index 995c63267d..b8f0174c49 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_box.png and b/Resources/Textures/Decals/minitile.rsi/white_box.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_corner_ne.png b/Resources/Textures/Decals/minitile.rsi/white_corner_ne.png index c584d39876..f0342975d2 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_corner_ne.png and b/Resources/Textures/Decals/minitile.rsi/white_corner_ne.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_corner_nw.png b/Resources/Textures/Decals/minitile.rsi/white_corner_nw.png index 04cdc186e5..8d751af952 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_corner_nw.png and b/Resources/Textures/Decals/minitile.rsi/white_corner_nw.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_corner_se.png b/Resources/Textures/Decals/minitile.rsi/white_corner_se.png index be5170a0e2..54eea747f0 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_corner_se.png and b/Resources/Textures/Decals/minitile.rsi/white_corner_se.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_corner_sw.png b/Resources/Textures/Decals/minitile.rsi/white_corner_sw.png index 756200c263..b57417997e 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_corner_sw.png and b/Resources/Textures/Decals/minitile.rsi/white_corner_sw.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_end_e.png b/Resources/Textures/Decals/minitile.rsi/white_end_e.png index 3fd25f4599..e256a86235 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_end_e.png and b/Resources/Textures/Decals/minitile.rsi/white_end_e.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_end_n.png b/Resources/Textures/Decals/minitile.rsi/white_end_n.png index edc8a69135..a8ba557477 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_end_n.png and b/Resources/Textures/Decals/minitile.rsi/white_end_n.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_end_s.png b/Resources/Textures/Decals/minitile.rsi/white_end_s.png index ca2528efd1..55823a7096 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_end_s.png and b/Resources/Textures/Decals/minitile.rsi/white_end_s.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_end_w.png b/Resources/Textures/Decals/minitile.rsi/white_end_w.png index b669f8e54d..d570b8c404 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_end_w.png and b/Resources/Textures/Decals/minitile.rsi/white_end_w.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_inner_ne.png b/Resources/Textures/Decals/minitile.rsi/white_inner_ne.png index 7f8448e502..76733f6c22 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_inner_ne.png and b/Resources/Textures/Decals/minitile.rsi/white_inner_ne.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_inner_nw.png b/Resources/Textures/Decals/minitile.rsi/white_inner_nw.png index 5e75689308..b368cd5731 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_inner_nw.png and b/Resources/Textures/Decals/minitile.rsi/white_inner_nw.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_inner_se.png b/Resources/Textures/Decals/minitile.rsi/white_inner_se.png index 82013151cb..819ebfa14d 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_inner_se.png and b/Resources/Textures/Decals/minitile.rsi/white_inner_se.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_inner_sw.png b/Resources/Textures/Decals/minitile.rsi/white_inner_sw.png index 7b3b53dde2..dbcb0a02d4 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_inner_sw.png and b/Resources/Textures/Decals/minitile.rsi/white_inner_sw.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_line_e.png b/Resources/Textures/Decals/minitile.rsi/white_line_e.png index 99edbdd838..8b81f03389 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_line_e.png and b/Resources/Textures/Decals/minitile.rsi/white_line_e.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_line_n.png b/Resources/Textures/Decals/minitile.rsi/white_line_n.png index 6846ec65fe..be0a78eb00 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_line_n.png and b/Resources/Textures/Decals/minitile.rsi/white_line_n.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_line_s.png b/Resources/Textures/Decals/minitile.rsi/white_line_s.png index 54749e90f5..d825870a08 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_line_s.png and b/Resources/Textures/Decals/minitile.rsi/white_line_s.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_line_w.png b/Resources/Textures/Decals/minitile.rsi/white_line_w.png index 663ee84761..53b8223cb1 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_line_w.png and b/Resources/Textures/Decals/minitile.rsi/white_line_w.png differ diff --git a/Resources/Textures/Tiles/arcadeblue2.png b/Resources/Textures/Tiles/arcadeblue2.png index 013af9f36f..3def0f19c7 100644 Binary files a/Resources/Textures/Tiles/arcadeblue2.png and b/Resources/Textures/Tiles/arcadeblue2.png differ diff --git a/Resources/Textures/Tiles/attributions.yml b/Resources/Textures/Tiles/attributions.yml index 7cfe5535a0..124113a903 100644 --- a/Resources/Textures/Tiles/attributions.yml +++ b/Resources/Textures/Tiles/attributions.yml @@ -6,27 +6,22 @@ copyright: "CEV-Eris commit 28e589f0ff72a009adf17db767e90be39054f0f2" source: "https://github.com/discordia-space/CEV-Eris/" -- files: ["plating.png"] - license: "CC-BY-SA-3.0" - copyright: "Taken from CEV-Eris commit 8e74e4370f4d5885f15c3f834973b1223ddb8b1b, modified by github user @Flareguy" - source: "https://github.com/discordia-space/CEV-Eris/" - -- files: ["plating_damaged.png", "plating_burnt.png"] - license: "CC-BY-SA-3.0" - copyright: "Modified by github user @Flareguy from plating.png, using damaged plating sprites from /tg/station at commit https://github.com/tgstation/tgstation/blob/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae/icons/turf/floors.dmi" - source: "https://github.com/space-wizards/space-station-14/pull/21711" - -- files: [ "asteroid_red.png", "asteroid_tile.png", "elevator_shaft.png", "freezer.png", "green_circuit.png", "lino.png", "mono.png", "rock_vault.png", "showroom.png"] +- files: [ "asteroid_red.png", "asteroid_tile.png", "elevator_shaft.png", "freezer.png", "lino.png", "mono.png", "rock_vault.png", "showroom.png"] license: "CC-BY-SA-3.0" copyright: "vgstation13 at roughly commit e4d3ea7f69d21c3667be12b114fa935c4640cb05, asteroid_red and asteroid_tile taken from commit /vg/station at commit 02b9f6894af4419c9f7e699a22c402b086d8067e." source: "https://github.com/vgstation-coders/vgstation13" - + - files: [ "asteroid.png", "asteroid_dug.png", "asteroid0.png"] license: "CC-BY-SA-3.0" 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: ["steel.png", "dark.png", "hydro.png", "plating.png", "reinforced.png", "steel_dirty.png", "white.png", "bar.png", "laundry.png", "mime.png", "clown.png", "kitchen.png"] + license: "CC-BY-SA-3.0" + copyright: "TauCetiStation commit 4cd533cf0a4243050364023af9a4fcaca209dce7" + source: "https://github.com/TauCetiStation/TauCetiClassic/" + +- files: ["cropped_parallax.png", "eighties.png", "gold.png", "grass.png", "ironsand1.png", "ironsand2.png", "ironsand3.png", "ironsand4.png", "junglegrass.png", "lattice.png", "plating.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/" @@ -40,7 +35,7 @@ license: "CC-BY-SA-3.0" copyright: "Modified from plating.png by github user @Flareguy" source: "https://github.com/space-wizards/space-station-14/" - + - files: ["rglass.png"] license: "CC-BY-SA-3.0" copyright: "tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49, rglass modified by github user @notquitehadouken." @@ -51,6 +46,16 @@ copyright: "Created by github user @notquitehadouken." source: "https://github.com/space-wizards/space-station-14/pull/17948" +- files: [ "steel_diagonal.png", "steel_mini.png", "steel_offset.png", "steel_pavement.png", "white_diagonal.png", "white_mini.png", "white_offset.png", "white_pavement.png", "white_plastic.png", "dark_diagonal.png", "dark_mini.png", "dark_offset.png", "dark_pavement.png", "dark_plastic.png" ] + license: "CC0-1.0" + copyright: "Created by github user @morb0" + source: "https://github.com/space-syndicate/space-station-14/pull/489" + +- files: [ "cafeteria.png", "checker_dark.png" ] + license: "CC-BY-SA-3.0" + copyright: "Created by github user @Flareguy, original, unedited base tiles modified from /tg/station at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae and github user @moonheart08" + source: "https://github.com/space-wizards/space-station-14/" + - files: [ "bar.png", "lime.png", "blue.png", "kitchen.png", "laundry.png", "mime.png", "steel.png", "steel_dirty.png", "steel_diagonal.png", "steel_mini.png", "steel_offset.png", "steel_pavement.png", "white.png", "white_diagonal.png", "white_mini.png", "white_offset.png", "white_pavement.png", "dark.png", "dark_diagonal.png", "dark_mini.png", "dark_offset.png", "dark_pavement.png", "hydro.png", "plastic.png", "dark_plastic.png", "white_plastic.png", "cafeteria.png", "checker_dark.png", "clown.png" ] license: "CC-BY-SA-3.0" copyright: "Created by github user @Flareguy, original, unedited base tiles modified from /tg/station at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae and github user @moonheart08" @@ -61,14 +66,14 @@ copyright: "arcadered renamed from eightiesred, arcadeblue by Peptide90 modified from arcadered.png, tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49" source: "https://github.com/tgstation/tgstation/" -- files: ["hull", "hull_reinforced.png", "steel_damaged.png", "steel_burnt.png"] +- files: ["hull", "hull_reinforced.png"] license: "CC-BY-SA-3.0" copyright: "Taken from /tg/station at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae" - source: "https://github.com/tgstation/tgstation/" + source: "https://github.com/space-wizards/space-station-14/pull/18676" -- files: ["shuttleblue.png", "shuttleorange.png", "shuttlepurple.png", "shuttlered.png", "shuttlewhite.png", "shuttlegrey.png", "shuttleblack.png"] +- files: ["shuttleblue.png", "shuttleorange.png", "shuttlepurple.png", "shuttlered.png", "shuttlewhite.png", "shuttlegrey.png", "shuttleblack.png", "green_circuit.png", "blue_circuit.png", "red_circuit.png"] license: "CC-BY-SA-3.0" - copyright: "Modified by Flareguy for Space Station 14. Unmodified sprite from paradisestation commit 69c831afcd9aef25a2889b507e4f36a3a5fc6def, originally from /VG/ eris" + copyright: "Taken from Paradise Station at https://github.com/ParadiseSS13/Paradise/blob/master/icons/turf/floors.dmi" source: "https://github.com/ParadiseSS13/Paradise" - files: ["deprecated.png"] @@ -90,7 +95,7 @@ license: "CC-BY-SA-3.0" copyright: "Fortuna commit 2a9408a47e2f83d945335e4feeeeafb552173e6f, grasslight and 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"] license: "CC-BY-SA-3.0" copyright: "by brainfood for space-station-14, ." @@ -105,7 +110,7 @@ license: "CC-BY-SA-3.0" copyright: "taken at https://github.com/ParadiseSS13/Paradise/blob/8b7f4c8b69c74c6de5a755272eb8d3520f3d87c7/icons/turf/floors.dmi" source: "https://github.com/ParadiseSS13/Paradise" - + - files: ["chromite.png"] license: "CC-BY-NC-SA-3.0" copyright: "taken at commit 0587dd16e28108bdf0b0a28e2caae4319845e861, and recolored by TheShuEd" diff --git a/Resources/Textures/Tiles/bar.png b/Resources/Textures/Tiles/bar.png index c7dded0c6b..d786d3ed76 100644 Binary files a/Resources/Textures/Tiles/bar.png and b/Resources/Textures/Tiles/bar.png differ diff --git a/Resources/Textures/Tiles/blue_circuit.png b/Resources/Textures/Tiles/blue_circuit.png index 021c5363d6..529654b467 100644 Binary files a/Resources/Textures/Tiles/blue_circuit.png and b/Resources/Textures/Tiles/blue_circuit.png differ diff --git a/Resources/Textures/Tiles/cafeteria.png b/Resources/Textures/Tiles/cafeteria.png index 69e8dc47f0..451b0825f5 100644 Binary files a/Resources/Textures/Tiles/cafeteria.png and b/Resources/Textures/Tiles/cafeteria.png differ diff --git a/Resources/Textures/Tiles/checker_dark.png b/Resources/Textures/Tiles/checker_dark.png index 01a9120958..3eefdfa34d 100644 Binary files a/Resources/Textures/Tiles/checker_dark.png and b/Resources/Textures/Tiles/checker_dark.png differ diff --git a/Resources/Textures/Tiles/clown.png b/Resources/Textures/Tiles/clown.png index 74e5971923..d81a759b12 100644 Binary files a/Resources/Textures/Tiles/clown.png and b/Resources/Textures/Tiles/clown.png differ diff --git a/Resources/Textures/Tiles/dark.png b/Resources/Textures/Tiles/dark.png index 70d0a801fd..5574f32a19 100644 Binary files a/Resources/Textures/Tiles/dark.png and b/Resources/Textures/Tiles/dark.png differ diff --git a/Resources/Textures/Tiles/dark_diagonal.png b/Resources/Textures/Tiles/dark_diagonal.png index d9cacd31e1..22b474995a 100644 Binary files a/Resources/Textures/Tiles/dark_diagonal.png and b/Resources/Textures/Tiles/dark_diagonal.png differ diff --git a/Resources/Textures/Tiles/dark_diagonal_mini.png b/Resources/Textures/Tiles/dark_diagonal_mini.png index c60af49c6d..12a1e64b42 100644 Binary files a/Resources/Textures/Tiles/dark_diagonal_mini.png and b/Resources/Textures/Tiles/dark_diagonal_mini.png differ diff --git a/Resources/Textures/Tiles/dark_herringbone.png b/Resources/Textures/Tiles/dark_herringbone.png index 01e0c4ef60..88b13a43b3 100644 Binary files a/Resources/Textures/Tiles/dark_herringbone.png and b/Resources/Textures/Tiles/dark_herringbone.png differ diff --git a/Resources/Textures/Tiles/dark_mini.png b/Resources/Textures/Tiles/dark_mini.png index 02c75c56c4..aeb982b732 100644 Binary files a/Resources/Textures/Tiles/dark_mini.png and b/Resources/Textures/Tiles/dark_mini.png differ diff --git a/Resources/Textures/Tiles/dark_mono.png b/Resources/Textures/Tiles/dark_mono.png index 9e156c6e02..279a72f409 100644 Binary files a/Resources/Textures/Tiles/dark_mono.png and b/Resources/Textures/Tiles/dark_mono.png differ diff --git a/Resources/Textures/Tiles/dark_offset.png b/Resources/Textures/Tiles/dark_offset.png index ca8a5b64aa..422811bd8f 100644 Binary files a/Resources/Textures/Tiles/dark_offset.png and b/Resources/Textures/Tiles/dark_offset.png differ diff --git a/Resources/Textures/Tiles/dark_pavement.png b/Resources/Textures/Tiles/dark_pavement.png index 1585211593..6ad0bc4209 100644 Binary files a/Resources/Textures/Tiles/dark_pavement.png and b/Resources/Textures/Tiles/dark_pavement.png differ diff --git a/Resources/Textures/Tiles/dark_pavement_vertical.png b/Resources/Textures/Tiles/dark_pavement_vertical.png index 776aaf605e..02f7735dcd 100644 Binary files a/Resources/Textures/Tiles/dark_pavement_vertical.png and b/Resources/Textures/Tiles/dark_pavement_vertical.png differ diff --git a/Resources/Textures/Tiles/dark_plastic.png b/Resources/Textures/Tiles/dark_plastic.png index 34c3e57ce6..79e0ff407e 100644 Binary files a/Resources/Textures/Tiles/dark_plastic.png and b/Resources/Textures/Tiles/dark_plastic.png differ diff --git a/Resources/Textures/Tiles/glass.png b/Resources/Textures/Tiles/glass.png index 37adc67679..bc782a9c6c 100644 Binary files a/Resources/Textures/Tiles/glass.png and b/Resources/Textures/Tiles/glass.png differ diff --git a/Resources/Textures/Tiles/green_circuit.png b/Resources/Textures/Tiles/green_circuit.png index 1628c20ae7..c215175c49 100644 Binary files a/Resources/Textures/Tiles/green_circuit.png and b/Resources/Textures/Tiles/green_circuit.png differ diff --git a/Resources/Textures/Tiles/hydro.png b/Resources/Textures/Tiles/hydro.png index 5878bce5b7..0d1c6fef23 100644 Binary files a/Resources/Textures/Tiles/hydro.png and b/Resources/Textures/Tiles/hydro.png differ diff --git a/Resources/Textures/Tiles/kitchen.png b/Resources/Textures/Tiles/kitchen.png index 83f371e63b..38d4181bb0 100644 Binary files a/Resources/Textures/Tiles/kitchen.png and b/Resources/Textures/Tiles/kitchen.png differ diff --git a/Resources/Textures/Tiles/laundry.png b/Resources/Textures/Tiles/laundry.png index 60f079498a..e89ae3d14c 100644 Binary files a/Resources/Textures/Tiles/laundry.png and b/Resources/Textures/Tiles/laundry.png differ diff --git a/Resources/Textures/Tiles/lime.png b/Resources/Textures/Tiles/lime.png index bf528d278b..3d421f3f7f 100644 Binary files a/Resources/Textures/Tiles/lime.png and b/Resources/Textures/Tiles/lime.png differ diff --git a/Resources/Textures/Tiles/mime.png b/Resources/Textures/Tiles/mime.png index fee58f7370..bd85fa6111 100644 Binary files a/Resources/Textures/Tiles/mime.png and b/Resources/Textures/Tiles/mime.png differ diff --git a/Resources/Textures/Tiles/plastic.png b/Resources/Textures/Tiles/plastic.png index 8fd6809031..8b004d5164 100644 Binary files a/Resources/Textures/Tiles/plastic.png and b/Resources/Textures/Tiles/plastic.png differ diff --git a/Resources/Textures/Tiles/plating.png b/Resources/Textures/Tiles/plating.png index fef6a3554d..5bdbadaa6a 100644 Binary files a/Resources/Textures/Tiles/plating.png and b/Resources/Textures/Tiles/plating.png differ diff --git a/Resources/Textures/Tiles/plating_burnt.png b/Resources/Textures/Tiles/plating_burnt.png index 7c89de081e..899e6c9188 100644 Binary files a/Resources/Textures/Tiles/plating_burnt.png and b/Resources/Textures/Tiles/plating_burnt.png differ diff --git a/Resources/Textures/Tiles/red_circuit.png b/Resources/Textures/Tiles/red_circuit.png new file mode 100644 index 0000000000..d7cee0fb61 Binary files /dev/null and b/Resources/Textures/Tiles/red_circuit.png differ diff --git a/Resources/Textures/Tiles/rglass.png b/Resources/Textures/Tiles/rglass.png index bae2908132..6dd3bb5917 100644 Binary files a/Resources/Textures/Tiles/rglass.png and b/Resources/Textures/Tiles/rglass.png differ diff --git a/Resources/Textures/Tiles/shuttleblack.png b/Resources/Textures/Tiles/shuttleblack.png index e5dc3ff666..8f3981a39f 100644 Binary files a/Resources/Textures/Tiles/shuttleblack.png and b/Resources/Textures/Tiles/shuttleblack.png differ diff --git a/Resources/Textures/Tiles/shuttleblue.png b/Resources/Textures/Tiles/shuttleblue.png index 8a57cf8b0a..98d7ea81d8 100644 Binary files a/Resources/Textures/Tiles/shuttleblue.png and b/Resources/Textures/Tiles/shuttleblue.png differ diff --git a/Resources/Textures/Tiles/shuttlegrey.png b/Resources/Textures/Tiles/shuttlegrey.png index 337fef7d30..8ffd372ab0 100644 Binary files a/Resources/Textures/Tiles/shuttlegrey.png and b/Resources/Textures/Tiles/shuttlegrey.png differ diff --git a/Resources/Textures/Tiles/shuttleorange.png b/Resources/Textures/Tiles/shuttleorange.png index 0e42ad3467..904d236f86 100644 Binary files a/Resources/Textures/Tiles/shuttleorange.png and b/Resources/Textures/Tiles/shuttleorange.png differ diff --git a/Resources/Textures/Tiles/shuttlepurple.png b/Resources/Textures/Tiles/shuttlepurple.png index 2236948d38..05601b839f 100644 Binary files a/Resources/Textures/Tiles/shuttlepurple.png and b/Resources/Textures/Tiles/shuttlepurple.png differ diff --git a/Resources/Textures/Tiles/shuttlered.png b/Resources/Textures/Tiles/shuttlered.png index 732cf385d6..8757c81aad 100644 Binary files a/Resources/Textures/Tiles/shuttlered.png and b/Resources/Textures/Tiles/shuttlered.png differ diff --git a/Resources/Textures/Tiles/shuttlewhite.png b/Resources/Textures/Tiles/shuttlewhite.png index 1308a78d9e..db7513c5ac 100644 Binary files a/Resources/Textures/Tiles/shuttlewhite.png and b/Resources/Textures/Tiles/shuttlewhite.png differ diff --git a/Resources/Textures/Tiles/steel.png b/Resources/Textures/Tiles/steel.png index b7792ef138..e5a1ed2879 100644 Binary files a/Resources/Textures/Tiles/steel.png and b/Resources/Textures/Tiles/steel.png differ diff --git a/Resources/Textures/Tiles/steel_diagonal.png b/Resources/Textures/Tiles/steel_diagonal.png index 0f54053295..b0c1f6927d 100644 Binary files a/Resources/Textures/Tiles/steel_diagonal.png and b/Resources/Textures/Tiles/steel_diagonal.png differ diff --git a/Resources/Textures/Tiles/steel_diagonal_mini.png b/Resources/Textures/Tiles/steel_diagonal_mini.png index 0b56a7794d..51cbdf8b04 100644 Binary files a/Resources/Textures/Tiles/steel_diagonal_mini.png and b/Resources/Textures/Tiles/steel_diagonal_mini.png differ diff --git a/Resources/Textures/Tiles/steel_dirty.png b/Resources/Textures/Tiles/steel_dirty.png index 660fdf8868..fda6fabe1f 100644 Binary files a/Resources/Textures/Tiles/steel_dirty.png and b/Resources/Textures/Tiles/steel_dirty.png differ diff --git a/Resources/Textures/Tiles/steel_herringbone.png b/Resources/Textures/Tiles/steel_herringbone.png index 2f676827d7..19ae3bb871 100644 Binary files a/Resources/Textures/Tiles/steel_herringbone.png and b/Resources/Textures/Tiles/steel_herringbone.png differ diff --git a/Resources/Textures/Tiles/steel_mini.png b/Resources/Textures/Tiles/steel_mini.png index 40a8706441..8fa958f3fe 100644 Binary files a/Resources/Textures/Tiles/steel_mini.png and b/Resources/Textures/Tiles/steel_mini.png differ diff --git a/Resources/Textures/Tiles/steel_mono.png b/Resources/Textures/Tiles/steel_mono.png index 94121926a3..a2a72581e0 100644 Binary files a/Resources/Textures/Tiles/steel_mono.png and b/Resources/Textures/Tiles/steel_mono.png differ diff --git a/Resources/Textures/Tiles/steel_offset.png b/Resources/Textures/Tiles/steel_offset.png index 850daeffd5..796fbcd595 100644 Binary files a/Resources/Textures/Tiles/steel_offset.png and b/Resources/Textures/Tiles/steel_offset.png differ diff --git a/Resources/Textures/Tiles/steel_pavement.png b/Resources/Textures/Tiles/steel_pavement.png index 5b561e9ae6..200471ea99 100644 Binary files a/Resources/Textures/Tiles/steel_pavement.png and b/Resources/Textures/Tiles/steel_pavement.png differ diff --git a/Resources/Textures/Tiles/steel_pavement_vertical.png b/Resources/Textures/Tiles/steel_pavement_vertical.png index 1c38de21e7..950a2c0e5f 100644 Binary files a/Resources/Textures/Tiles/steel_pavement_vertical.png and b/Resources/Textures/Tiles/steel_pavement_vertical.png differ diff --git a/Resources/Textures/Tiles/white.png b/Resources/Textures/Tiles/white.png index 0ec2c91191..048c1fe179 100644 Binary files a/Resources/Textures/Tiles/white.png and b/Resources/Textures/Tiles/white.png differ diff --git a/Resources/Textures/Tiles/white_diagonal.png b/Resources/Textures/Tiles/white_diagonal.png index e25e448a71..e9d52ab7d9 100644 Binary files a/Resources/Textures/Tiles/white_diagonal.png and b/Resources/Textures/Tiles/white_diagonal.png differ diff --git a/Resources/Textures/Tiles/white_diagonal_mini.png b/Resources/Textures/Tiles/white_diagonal_mini.png index 736733753a..e4e32c65cd 100644 Binary files a/Resources/Textures/Tiles/white_diagonal_mini.png and b/Resources/Textures/Tiles/white_diagonal_mini.png differ diff --git a/Resources/Textures/Tiles/white_herringbone.png b/Resources/Textures/Tiles/white_herringbone.png index fef9466a17..80d006810b 100644 Binary files a/Resources/Textures/Tiles/white_herringbone.png and b/Resources/Textures/Tiles/white_herringbone.png differ diff --git a/Resources/Textures/Tiles/white_mini.png b/Resources/Textures/Tiles/white_mini.png index b0fc32c2c8..717ec462c4 100644 Binary files a/Resources/Textures/Tiles/white_mini.png and b/Resources/Textures/Tiles/white_mini.png differ diff --git a/Resources/Textures/Tiles/white_mono.png b/Resources/Textures/Tiles/white_mono.png index 66eedee0f6..763f08b9d2 100644 Binary files a/Resources/Textures/Tiles/white_mono.png and b/Resources/Textures/Tiles/white_mono.png differ diff --git a/Resources/Textures/Tiles/white_offset.png b/Resources/Textures/Tiles/white_offset.png index 19537e3896..0b6239a324 100644 Binary files a/Resources/Textures/Tiles/white_offset.png and b/Resources/Textures/Tiles/white_offset.png differ diff --git a/Resources/Textures/Tiles/white_pavement.png b/Resources/Textures/Tiles/white_pavement.png index 78fcf0195d..69da122ba6 100644 Binary files a/Resources/Textures/Tiles/white_pavement.png and b/Resources/Textures/Tiles/white_pavement.png differ diff --git a/Resources/Textures/Tiles/white_pavement_vertical.png b/Resources/Textures/Tiles/white_pavement_vertical.png index 5126f699db..20d887903c 100644 Binary files a/Resources/Textures/Tiles/white_pavement_vertical.png and b/Resources/Textures/Tiles/white_pavement_vertical.png differ diff --git a/Resources/Textures/Tiles/white_plastic.png b/Resources/Textures/Tiles/white_plastic.png index 99d6c60e88..b31ea0e855 100644 Binary files a/Resources/Textures/Tiles/white_plastic.png and b/Resources/Textures/Tiles/white_plastic.png differ