diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 26edce4948..1bb71beaaa 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -744,3 +744,4 @@ - type: Tag tags: - WhitelistChameleon + - HamsterWearable \ No newline at end of file diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/sheath.rsi/equipped-BELT.png index ea9b5643ca..dd9b95e219 100644 Binary files a/Resources/Textures/Clothing/Belt/sheath.rsi/equipped-BELT.png and b/Resources/Textures/Clothing/Belt/sheath.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/meta.json b/Resources/Textures/Clothing/Belt/sheath.rsi/meta.json index e549767f3a..17c10f2f7f 100644 --- a/Resources/Textures/Clothing/Belt/sheath.rsi/meta.json +++ b/Resources/Textures/Clothing/Belt/sheath.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/555fa0ed9f380509156d94131bd8a3f1c1fee1cf", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/555fa0ed9f380509156d94131bd8a3f1c1fee1cf , edited by Skarletto (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-sabre-equipped-BELT.png b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-sabre-equipped-BELT.png index a1e69cd243..87671ca19a 100644 Binary files a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-sabre-equipped-BELT.png and b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-sabre-equipped-BELT.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png index 4ad9dfc6fa..76c034d634 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png and b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png index da2494f79e..a2b60b0551 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png and b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-left.png index a8294230dc..e06e2748e9 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-left.png and b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-right.png index 8dcb9ddadb..0a50f7e642 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-right.png and b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/meta.json index 88e3ebd509..23e44f0be0 100644 --- a/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/meta.json +++ b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 edited by Skarletto (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000..e997023f30 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png index 9e6bdff9f2..7616a5d8e1 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png index 771ba8fca3..b2a2f4ef4b 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json index d70351fe4a..9c0583a7c5 100644 --- a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 edited by Skarletto (github)", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/0671297bb1c1b31d5885f2768aecbe9dc51d39e7 , edited by Skarletto (github)", "size": { "x": 32, "y": 32 @@ -10,6 +10,10 @@ { "name": "icon" }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, { "name": "equipped-HELMET", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET-hamster.png index 7fe3a8683b..81ed7934ce 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET-hamster.png and b/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png index 45674ed23c..9cb857e9f4 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png index 30bfb25bbe..6cc73037aa 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-left.png index 6cb8ec6337..8684787c2d 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-right.png index ebce39298a..00813d1a11 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json index ade65863af..2bfe92b12e 100644 --- a/Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json @@ -1,15 +1,12 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 edited by Skarletto (github)", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "icon" - }, { "name": "equipped-HELMET", "directions": 4 @@ -25,6 +22,9 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "icon" } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/equipped-NECK.png index e857cf4a7c..b8b19a7492 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/icon.png index b1e470f427..8cc45c4de2 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-left.png index e7b3d4a180..b95b11e351 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-left.png and b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-right.png index 3112d956ac..7ef44eddff 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-right.png and b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/meta.json index fde00d6116..58f9b41222 100644 --- a/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875, colors edited by Skarletto (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png index 2514495069..309230e3ee 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png index 7cc31543e4..11fc99f20c 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json index b8a9fb7361..7de01f8732 100644 --- a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/pull/62603 which was taken from bee station. Bee station does not have a history on the cloaks on their github, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/pull/62603 which was taken from bee station. Bee station does not have a history on the cloaks on their github, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875 , colors edited by Skarletto (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK.png index 7c2f00fc12..ee9a05fcdb 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png b/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png index 1bc4508494..5264b993e4 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png and b/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/meta.json b/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/meta.json index 887d1c4c20..0a02908d9c 100644 --- a/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "made by emisse for ss14", + "copyright": "made by Emisse (github) for ss14, edited by Skarletto (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png index ce947bed2a..89a24c93fe 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png index e7c04b2aef..a02c9b842b 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-left.png index aea0f39676..7b1cd0e4b8 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-right.png index cef6f162c7..61b0e7a911 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json index e574cffe1f..81e4553e83 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/9ddb8cf084e292571d4e9c79745db25befbd82fe", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 edited by Skarletto (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png index 021858378a..0b3086ac58 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png index 4181f01c72..dd14ac0a8a 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/inhand-left.png index aee6e4964c..b663f23d36 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/inhand-right.png index 10e5a4e56d..567058cda9 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json index 7752722477..46b3e631a0 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62 , edited by Skarletto (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING-monkey.png index da1528d155..f7e8abd58d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png index 116cce4ad7..7966d2d815 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png index 477d8e4873..4029e6b99a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png index e72f2a773d..4502068730 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png index b4867ef9d8..f6bcc2b143 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json index bbcef071e2..0b57c04149 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "monkey derivative derived by brainfood1183 (github) for ss14 from tgstation at commit https://github.com/tgstation/tgstation/commit/dd97a0e45d904fffadd9d2caad22aedd0d09f3ab then edited by Skarletto (github). Other sprites taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 and edited by Skarletto (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING-monkey.png index 6abe45c4ab..368d24a333 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png index d5d1d5c979..86c999c882 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png index 153195f561..eecc668d4b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png index e72f2a773d..4502068730 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png index b4867ef9d8..f6bcc2b143 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json index 3f72fb4460..b2404c68cd 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "monkey derivative derived by brainfood1183 (github) for ss14 from tgstation at commit https://github.com/tgstation/tgstation/commit/dd97a0e45d904fffadd9d2caad22aedd0d09f3ab then edited by Skarletto (github). Other sprites taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 and edited by Skarletto (github)", "size": { "x": 32, "y": 32 @@ -27,4 +27,4 @@ "directions": 4 } ] -} +} \ No newline at end of file