From: Archee Date: Wed, 14 May 2025 22:05:45 +0000 (+0100) Subject: Bikehorn Retextures (#37413) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=dcd5bb16d5927cbda50a7dc6256f8333d7dfa166;p=space-station-14.git Bikehorn Retextures (#37413) * Bananium Horn .rsi * Bike Horn .rsi * Cluwne Horn .rsi * Gold Bike Horn .rsi * Push Horn .rsi * Bike horn (Instrument) .rsi * better inhand sprite for pushhorn * Revert "Push Horn .rsi" This reverts commit 243b3662c6bd23abad331658eb2c75b5c9183d1d. * rsi meta attributions * slight tweak to the golden honkers colour and energy * adds back castShadows false * position corrections for inhand and belt for bananium * inhand corrections for bikehorn inhands and belt * inhand corrections for cluwnehorn * inhand corrections for goldbikehorn * inhand corrections for bike_horn (instrument) * adds 'far-side held' sprites, bikehorn * adds 'far-side held' sprites, bikehorn(instrument) * bikehorn belt, i made the horn cone a shade too dark whoops * adds 'far-side held' sprites, goldbikehorn * adds 'far-side held' sprites, cluwnehorn * adds 'far-side held' sprites, bananiumhorn * cluwnehorn belt, same change as bikehorn belt earlier --- diff --git a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml index 1082fd2081..c4be0aa453 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml @@ -138,9 +138,9 @@ price: 1000 - type: PointLight radius: 1.2 - energy: 1 + energy: 2.2 castShadows: false - color: "#eef066" + color: "#ffca1b" - type: entity parent: BikeHorn diff --git a/Resources/Textures/Objects/Fun/Instruments/bike_horn.rsi/equipped-BELT.png b/Resources/Textures/Objects/Fun/Instruments/bike_horn.rsi/equipped-BELT.png index 95ff4de420..0de360401c 100644 Binary files a/Resources/Textures/Objects/Fun/Instruments/bike_horn.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Fun/Instruments/bike_horn.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/bike_horn.rsi/icon.png b/Resources/Textures/Objects/Fun/Instruments/bike_horn.rsi/icon.png index ea9fa956f2..81173a7056 100644 Binary files a/Resources/Textures/Objects/Fun/Instruments/bike_horn.rsi/icon.png and b/Resources/Textures/Objects/Fun/Instruments/bike_horn.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/bike_horn.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Instruments/bike_horn.rsi/inhand-left.png index 0987105109..589f0d8d68 100644 Binary files a/Resources/Textures/Objects/Fun/Instruments/bike_horn.rsi/inhand-left.png and b/Resources/Textures/Objects/Fun/Instruments/bike_horn.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/bike_horn.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Instruments/bike_horn.rsi/inhand-right.png index 252bb6565a..6c02afec0f 100644 Binary files a/Resources/Textures/Objects/Fun/Instruments/bike_horn.rsi/inhand-right.png and b/Resources/Textures/Objects/Fun/Instruments/bike_horn.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/bike_horn.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/bike_horn.rsi/meta.json index 19789a2562..c8672be7a7 100644 --- a/Resources/Textures/Objects/Fun/Instruments/bike_horn.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Instruments/bike_horn.rsi/meta.json @@ -1,11 +1,11 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331, Modified by Archee1 (github)", "size": { "x": 32, "y": 32 }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331", "states": [ { "name": "icon" diff --git a/Resources/Textures/Objects/Fun/bananiumhorn.rsi/equipped-BELT.png b/Resources/Textures/Objects/Fun/bananiumhorn.rsi/equipped-BELT.png index 79fb8baed5..fe94af7c00 100644 Binary files a/Resources/Textures/Objects/Fun/bananiumhorn.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Fun/bananiumhorn.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Fun/bananiumhorn.rsi/icon.png b/Resources/Textures/Objects/Fun/bananiumhorn.rsi/icon.png index d204501bd5..ad26489f38 100644 Binary files a/Resources/Textures/Objects/Fun/bananiumhorn.rsi/icon.png and b/Resources/Textures/Objects/Fun/bananiumhorn.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/bananiumhorn.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/bananiumhorn.rsi/inhand-left.png index 8f625dd67e..adeb59c415 100644 Binary files a/Resources/Textures/Objects/Fun/bananiumhorn.rsi/inhand-left.png and b/Resources/Textures/Objects/Fun/bananiumhorn.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/bananiumhorn.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/bananiumhorn.rsi/inhand-right.png index 7402fe46d3..6e5d8103f6 100644 Binary files a/Resources/Textures/Objects/Fun/bananiumhorn.rsi/inhand-right.png and b/Resources/Textures/Objects/Fun/bananiumhorn.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/bananiumhorn.rsi/meta.json b/Resources/Textures/Objects/Fun/bananiumhorn.rsi/meta.json index 25e7e61d32..05ec735e1a 100644 --- a/Resources/Textures/Objects/Fun/bananiumhorn.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/bananiumhorn.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github) for ss14", + "copyright": "Made by brainfood1183 (github) for ss14, Modified by Archee1 (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Fun/bikehorn.rsi/equipped-BELT.png b/Resources/Textures/Objects/Fun/bikehorn.rsi/equipped-BELT.png index 4cd6eea346..96c47b9da7 100644 Binary files a/Resources/Textures/Objects/Fun/bikehorn.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Fun/bikehorn.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Fun/bikehorn.rsi/icon.png b/Resources/Textures/Objects/Fun/bikehorn.rsi/icon.png index f769aa0a20..dcdc71f9e7 100644 Binary files a/Resources/Textures/Objects/Fun/bikehorn.rsi/icon.png and b/Resources/Textures/Objects/Fun/bikehorn.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/bikehorn.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/bikehorn.rsi/inhand-left.png index 5187c5e533..b88656b813 100644 Binary files a/Resources/Textures/Objects/Fun/bikehorn.rsi/inhand-left.png and b/Resources/Textures/Objects/Fun/bikehorn.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/bikehorn.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/bikehorn.rsi/inhand-right.png index 3e343a34f3..8be6d23fb5 100644 Binary files a/Resources/Textures/Objects/Fun/bikehorn.rsi/inhand-right.png and b/Resources/Textures/Objects/Fun/bikehorn.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/bikehorn.rsi/meta.json b/Resources/Textures/Objects/Fun/bikehorn.rsi/meta.json index 09d18d5852..706e83db6a 100644 --- a/Resources/Textures/Objects/Fun/bikehorn.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/bikehorn.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e, Modified by Archee1 (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Fun/cluwnehorn.rsi/equipped-BELT.png b/Resources/Textures/Objects/Fun/cluwnehorn.rsi/equipped-BELT.png index 0bcdf15016..1405e21d95 100644 Binary files a/Resources/Textures/Objects/Fun/cluwnehorn.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Fun/cluwnehorn.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Fun/cluwnehorn.rsi/icon.png b/Resources/Textures/Objects/Fun/cluwnehorn.rsi/icon.png index 907d599672..25fa12ab5c 100644 Binary files a/Resources/Textures/Objects/Fun/cluwnehorn.rsi/icon.png and b/Resources/Textures/Objects/Fun/cluwnehorn.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/cluwnehorn.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/cluwnehorn.rsi/inhand-left.png index 689538356d..f0d3d9b459 100644 Binary files a/Resources/Textures/Objects/Fun/cluwnehorn.rsi/inhand-left.png and b/Resources/Textures/Objects/Fun/cluwnehorn.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/cluwnehorn.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/cluwnehorn.rsi/inhand-right.png index eda778252f..98fd37c5e8 100644 Binary files a/Resources/Textures/Objects/Fun/cluwnehorn.rsi/inhand-right.png and b/Resources/Textures/Objects/Fun/cluwnehorn.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/cluwnehorn.rsi/meta.json b/Resources/Textures/Objects/Fun/cluwnehorn.rsi/meta.json index 25e7e61d32..05ec735e1a 100644 --- a/Resources/Textures/Objects/Fun/cluwnehorn.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/cluwnehorn.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github) for ss14", + "copyright": "Made by brainfood1183 (github) for ss14, Modified by Archee1 (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Fun/goldbikehorn.rsi/equipped-BELT.png b/Resources/Textures/Objects/Fun/goldbikehorn.rsi/equipped-BELT.png index 6a334b3df9..6319ae682d 100644 Binary files a/Resources/Textures/Objects/Fun/goldbikehorn.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Fun/goldbikehorn.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Fun/goldbikehorn.rsi/icon.png b/Resources/Textures/Objects/Fun/goldbikehorn.rsi/icon.png index 9be524c789..3a1fc76e6e 100644 Binary files a/Resources/Textures/Objects/Fun/goldbikehorn.rsi/icon.png and b/Resources/Textures/Objects/Fun/goldbikehorn.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/goldbikehorn.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/goldbikehorn.rsi/inhand-left.png index c2920bd89d..2416451924 100644 Binary files a/Resources/Textures/Objects/Fun/goldbikehorn.rsi/inhand-left.png and b/Resources/Textures/Objects/Fun/goldbikehorn.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/goldbikehorn.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/goldbikehorn.rsi/inhand-right.png index 456b4c1adc..f4be478071 100644 Binary files a/Resources/Textures/Objects/Fun/goldbikehorn.rsi/inhand-right.png and b/Resources/Textures/Objects/Fun/goldbikehorn.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/goldbikehorn.rsi/meta.json b/Resources/Textures/Objects/Fun/goldbikehorn.rsi/meta.json index 7f233404e0..32fcb53c80 100644 --- a/Resources/Textures/Objects/Fun/goldbikehorn.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/goldbikehorn.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e. Modified by brainfood1183 (github) for ss14", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e. Modified by brainfood1183 (github) for ss14 and later modified by Archee1 (github)", "size": { "x": 32, "y": 32