Drozd Colors for Kammerer (#34930)

* wooden grip on antique laser, changes description to match.

* darker grip

* update meta.json

* redesigned shape similar to ps3moira, edited mag to match, changed lights colors to match each other

* fixing an only SLIGHTLY catastrophic fuckup with an experimental inhand sprite that I didn't mean to save and sleepily added to the previous commit

* I DID IT AGAIN

* red kammerer bottom text

* killed the cap laser things (hopefully)

---------

Co-authored-by: gaussiarson-admin <stephenkitchens0306@gmail.com>

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/bolt-open.png
index 233850622eb3237b506eb3a8a2bff0b64910ba92..b1f87641c12ccb84b148ed7bac2c9db1cbd64ece 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/bolt-open.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/bolt-open.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png
index 302e6d14b5d37c97e510a1fe1d56e249ab33df90..7ae924a3bab3a858e22727b327b546f5615c3e35 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-SUITSTORAGE.png
index 302e6d14b5d37c97e510a1fe1d56e249ab33df90..4a54d0cd899cdeecacf1a8a6684d2ffacf69001c 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-SUITSTORAGE.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-SUITSTORAGE.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png
index 161c387047d794373475771c83cd25dd5be81459..018e3523163d14f310e4e42d42783e85e82850ba 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json
index 3e793381d0fa8eef505e5eda6093e59c622db841..87bbbc52f05ab03e03018dfbc93789a194a58028 100644 (file)
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-NC-4.0",
-    "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, bolt-open modified from icon.png by Flareguy",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, bolt-open modified from icon.png by Flareguy, colors edited by GaussiArson",
     "size": {
         "x": 32,
         "y": 32

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-left.png
index 9276fc552153534f83c438037eb125de3c367571..156ed5ceddeda28e8eb05ab0a662760871a469f8 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-right.png
index 56c4aff8745ce62428b7f1663804ede483f14d8f..a12b37663215a07c5570939cbe9afe13cdd49f56 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/meta.json
index 0e58a565b16ac63a201859ec16f6362f1c0d84e2..23f624fc7b613146f25f22bde5316bd0438424ff 100644 (file)
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-NC-4.0",
-    "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, wield sprites by ps3moira",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, wield sprites by ps3moira, colors edited by GaussiArson",
     "size": {
         "x": 64,
         "y": 64

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/wielded-inhand-left.png
index ce1b59aad4a19fa7ee6ee24ce5cae88daa05c06d..9cf6d62166faab9b11cb25dc4b0ff364dc32ccc0 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/wielded-inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/wielded-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/wielded-inhand-right.png
index 953c6b9bf2a8939ed9216cde803cff805a6e6c25..19aad710f515788fed6d761f42f152f1ce9c25c5 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/wielded-inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/wielded-inhand-right.png differ