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 1082fd20819339d7495f7d8d4deee4364ea6ebc9..c4be0aa4531449207c0b59c210e877203f1bfb7d 100644 (file)
--- 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 95ff4de420b176b95ad0a3b02a192121a16cfea8..0de360401cc6e724b6d6347841a4b2e83c9ce090 100644 (file)
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 ea9fa956f2ffb7ddafc0b73de57a4d5b7ac19360..81173a705673faf03ba2c5cb37723ef31b5eeb87 100644 (file)
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 0987105109c70776c973a05d137506744a77d243..589f0d8d68491b8274e3a942d202e7bd61d37d70 100644 (file)
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 252bb6565acec17f8537b6a6d61549eb87af3d4b..6c02afec0fe0a9368b4c3168bddede2c4bfbc635 100644 (file)
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 19789a2562a0b848d0e3ce9107c868770b6fe414..c8672be7a7baf233e9222026d911c0ecaf54d1b2 100644 (file)
--- 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 79fb8baed5cb5a898096551e8c3bae1c8faed86b..fe94af7c00ea99eb8f862c2c3a1fdc8b9508a037 100644 (file)
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 d204501bd58559932f53ff4cca1de3f3b0a250a2..ad26489f38ad16a369b1403d28e0456c8b535af4 100644 (file)
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 8f625dd67ed489e864b339f6b2094a5ea0c28e2b..adeb59c4158c0286b0c52af03ab7f29258f3749e 100644 (file)
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 7402fe46d3ae42182f22e520af488accef944f9f..6e5d8103f623b5790a557082d67550dfbffe16c2 100644 (file)
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 25e7e61d32feff18e0e7a32643025e794d23eeb7..05ec735e1a47f930c210f114fed57166f466db92 100644 (file)
--- 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 4cd6eea346c8aa343a8fafae5e15b399fb04833e..96c47b9da7d78c1a7792368b59650beb877f52f7 100644 (file)
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 f769aa0a2014ed983f4a932d951131a17f33310e..dcdc71f9e7ec5dd61c257b91b0d2a910c16a539f 100644 (file)
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 5187c5e533035b7786048138da061ffc2315b59e..b88656b8137b974a49929181e90850a94caf64b8 100644 (file)
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 3e343a34f3c88b614c99c28883f869477fc4aaa4..8be6d23fb527de7c2bd76b40e4910a126dce4794 100644 (file)
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 09d18d5852e1100cbdee18da129ac4058e45091a..706e83db6a5e2c6b1bff7cb733c9880eaa5aa1d8 100644 (file)
--- 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 0bcdf1501664b421ae4367ae09d34e5b4e6a89fc..1405e21d950102ac21378b3056a6100681089b69 100644 (file)
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 907d59967270fe7470ab70f0e9159878f2be95d5..25fa12ab5c3ff7ebe36ad7fe03669a8a4260df73 100644 (file)
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 689538356dcac4d625f6287d30088ee508b70700..f0d3d9b459b6ebc1a24d3f56a80c0fb7dfa4072b 100644 (file)
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 eda778252f9264a78f427ff75d78b89b790bb1b5..98fd37c5e832a3f5227f41de26e38974e4d503ab 100644 (file)
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 25e7e61d32feff18e0e7a32643025e794d23eeb7..05ec735e1a47f930c210f114fed57166f466db92 100644 (file)
--- 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 6a334b3df91494041f1a372dfe98ee16763e3cbc..6319ae682da14f32e6a2910c87672b3f4987c07c 100644 (file)
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 9be524c789fb018c63467cd3c4d9dbf66f687945..3a1fc76e6e438193f7b8e125b45cc173a81d5efc 100644 (file)
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 c2920bd89d9740f78c88049d54e8e6ab4ca6eee4..2416451924a96ddc8f6a4b187347e070b4640ff7 100644 (file)
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 456b4c1adc22f466b0ed4bcdcd907a4a6e5aaf38..f4be4780713ab7264a18aa7001702ddbe8e7483e 100644 (file)
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 7f233404e034f95b69599421db1a337e834d795d..32fcb53c8054a326ca407c5c0e2c0d0572a1957e 100644 (file)
--- 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