diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape.rsi/equipped-CLOAK.png index a57695ea54..f6ee713b5d 100644 Binary files a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape.rsi/equipped-CLOAK.png and b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape.rsi/equipped-CLOAK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape.rsi/icon.png index 0584398c46..4ec70e2686 100644 Binary files a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape.rsi/icon.png and b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape.rsi/meta.json index 049bd400e8..c280ca88d9 100644 --- a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-SA-4.0", - "copyright": "Created by KBAS5", + "license": "All right reserved", + "copyright": "Created by Jaraten", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape2.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape2.rsi/equipped-CLOAK.png index eba4a89e94..f7cd8f499c 100644 Binary files a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape2.rsi/equipped-CLOAK.png and b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape2.rsi/equipped-CLOAK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape2.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape2.rsi/icon.png index 3fc79bf89d..dd75d31016 100644 Binary files a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape2.rsi/icon.png and b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape2.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape2.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape2.rsi/meta.json index 049bd400e8..c280ca88d9 100644 --- a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape2.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape2.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-SA-4.0", - "copyright": "Created by KBAS5", + "license": "All right reserved", + "copyright": "Created by Jaraten", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_CP14/Clothing/Cloak/bone_cloak.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/bone_cloak.rsi/equipped-CLOAK.png index af27e74ddc..7ecca5f4a9 100644 Binary files a/Resources/Textures/_CP14/Clothing/Cloak/bone_cloak.rsi/equipped-CLOAK.png and b/Resources/Textures/_CP14/Clothing/Cloak/bone_cloak.rsi/equipped-CLOAK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Cloak/bone_cloak.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Cloak/bone_cloak.rsi/icon.png index a825ab00ff..e38628c71a 100644 Binary files a/Resources/Textures/_CP14/Clothing/Cloak/bone_cloak.rsi/icon.png and b/Resources/Textures/_CP14/Clothing/Cloak/bone_cloak.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Cloak/bone_cloak.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/bone_cloak.rsi/meta.json index 2124f3278a..c280ca88d9 100644 --- a/Resources/Textures/_CP14/Clothing/Cloak/bone_cloak.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Cloak/bone_cloak.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-SA-4.0", - "copyright": "Created by perzonaz (discord)", + "license": "All right reserved", + "copyright": "Created by Jaraten", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_CP14/Clothing/Cloak/bone_mage_cloak.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/bone_mage_cloak.rsi/equipped-CLOAK.png index da50be7e9f..2eeab94ba1 100644 Binary files a/Resources/Textures/_CP14/Clothing/Cloak/bone_mage_cloak.rsi/equipped-CLOAK.png and b/Resources/Textures/_CP14/Clothing/Cloak/bone_mage_cloak.rsi/equipped-CLOAK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Cloak/bone_mage_cloak.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Cloak/bone_mage_cloak.rsi/icon.png index bb7f347f5c..05e63c15f7 100644 Binary files a/Resources/Textures/_CP14/Clothing/Cloak/bone_mage_cloak.rsi/icon.png and b/Resources/Textures/_CP14/Clothing/Cloak/bone_mage_cloak.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Cloak/bone_mage_cloak.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/bone_mage_cloak.rsi/meta.json index 2124f3278a..c280ca88d9 100644 --- a/Resources/Textures/_CP14/Clothing/Cloak/bone_mage_cloak.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Cloak/bone_mage_cloak.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-SA-4.0", - "copyright": "Created by perzonaz (discord)", + "license": "All right reserved", + "copyright": "Created by Jaraten", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/meta.json b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/meta.json index 21122621e0..8219fbfd64 100644 --- a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/meta.json +++ b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/meta.json @@ -1,124 +1,130 @@ { "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "taken from tg station at commit https://github.com/tgstation/tgstation/blob/832ae532766d491d91db53746d15b4b55be3f2b0", + "license": "All right reserved", + "copyright": "by TTTomaTTT for CrystallEdge", "size": { - "x": 32, - "y": 32 + "x": 48, + "y": 48 }, "states": [ - { - "name": "stamina6", - "delays": [ - [ - 0.5, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.5 - ] - ] - }, - { - "name": "stamina5", - "delays": [ - [ - 0.5, - 0.2, - 0.2, - 0.2, - 0.2, - 0.5 - ] - ] - }, - { - "name": "stamina4", - "delays": [ - [ - 0.3, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.3 - ] - ] - }, - { - "name": "stamina3", - "delays": [ - [ - 0.3, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.3 - ] - ] - }, - { - "name": "stamina2", - "delays": [ - [ - 0.3, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.3 - ] - ] - }, - { - "name": "stamina1", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "stamina0", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - } + { + "name": "stamina0", + "delays": [ + [ + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12 + ] ] -} \ No newline at end of file + }, + { + "name": "stamina1", + "delays": [ + [ + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12 + ] + ] + }, + { + "name": "stamina2", + "delays": [ + [ + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12 + ] + ] + }, + { + "name": "stamina3", + "delays": [ + [ + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12 + ] + ] + }, + { + "name": "stamina4", + "delays": [ + [ + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12 + ] + ] + }, + { + "name": "stamina5", + "delays": [ + [ + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12 + ] + ] + }, + { + "name": "stamina6", + "delays": [ + [ + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12, + 0.12 + ] + ] + } + ] +} diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina0.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina0.png index 10e3e8c956..d5daf3c54b 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina0.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina0.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina1.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina1.png index a34d57cf26..13a8c6a448 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina1.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina1.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina2.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina2.png index a3d263d751..cf6ee3cca4 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina2.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina2.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina3.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina3.png index 356916dfe0..f818b321b6 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina3.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina3.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina4.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina4.png index d0645f4ebd..11242e7056 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina4.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina4.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina5.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina5.png index 46f439dfd5..d86d602222 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina5.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina5.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina6.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina6.png index 60a536643d..aec2bb6cbc 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina6.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina6.png differ diff --git a/Resources/Textures/_CP14/Interface/Paper/paper_passport.png b/Resources/Textures/_CP14/Interface/Paper/paper_passport.png index 77306e199b..edfa70e5f5 100644 Binary files a/Resources/Textures/_CP14/Interface/Paper/paper_passport.png and b/Resources/Textures/_CP14/Interface/Paper/paper_passport.png differ diff --git a/Resources/Textures/_CP14/Mobs/Monster/flyagaric.rsi/dead.png b/Resources/Textures/_CP14/Mobs/Monster/flyagaric.rsi/dead.png index f028e6c4a3..01311821b7 100644 Binary files a/Resources/Textures/_CP14/Mobs/Monster/flyagaric.rsi/dead.png and b/Resources/Textures/_CP14/Mobs/Monster/flyagaric.rsi/dead.png differ diff --git a/Resources/Textures/_CP14/Mobs/Monster/flyagaric.rsi/flyagaric.png b/Resources/Textures/_CP14/Mobs/Monster/flyagaric.rsi/flyagaric.png index ea2f65b628..550eeef194 100644 Binary files a/Resources/Textures/_CP14/Mobs/Monster/flyagaric.rsi/flyagaric.png and b/Resources/Textures/_CP14/Mobs/Monster/flyagaric.rsi/flyagaric.png differ diff --git a/Resources/Textures/_CP14/Mobs/Monster/flyagaric.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Monster/flyagaric.rsi/meta.json index 48b6460e93..c06aa96040 100644 --- a/Resources/Textures/_CP14/Mobs/Monster/flyagaric.rsi/meta.json +++ b/Resources/Textures/_CP14/Mobs/Monster/flyagaric.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-4.0", - "copyright": "Created by prazat911 (Discord)", + "copyright": "Created by prazat911 (Discord) resprite by jaraten", "states": [ { "name": "flyagaric", diff --git a/Resources/Textures/_CP14/Mobs/Monster/lumish.rsi/dead.png b/Resources/Textures/_CP14/Mobs/Monster/lumish.rsi/dead.png index a55b2ff298..c1a791c8ae 100644 Binary files a/Resources/Textures/_CP14/Mobs/Monster/lumish.rsi/dead.png and b/Resources/Textures/_CP14/Mobs/Monster/lumish.rsi/dead.png differ diff --git a/Resources/Textures/_CP14/Mobs/Monster/lumish.rsi/dead_cap.png b/Resources/Textures/_CP14/Mobs/Monster/lumish.rsi/dead_cap.png index 54f0f64528..5602aa2957 100644 Binary files a/Resources/Textures/_CP14/Mobs/Monster/lumish.rsi/dead_cap.png and b/Resources/Textures/_CP14/Mobs/Monster/lumish.rsi/dead_cap.png differ diff --git a/Resources/Textures/_CP14/Mobs/Monster/lumish.rsi/lumishroom.png b/Resources/Textures/_CP14/Mobs/Monster/lumish.rsi/lumishroom.png index 4b07bac6a8..90dea8ade3 100644 Binary files a/Resources/Textures/_CP14/Mobs/Monster/lumish.rsi/lumishroom.png and b/Resources/Textures/_CP14/Mobs/Monster/lumish.rsi/lumishroom.png differ diff --git a/Resources/Textures/_CP14/Mobs/Monster/lumish.rsi/lumishroom_cap.png b/Resources/Textures/_CP14/Mobs/Monster/lumish.rsi/lumishroom_cap.png index 8cb1f9d281..baf1856d27 100644 Binary files a/Resources/Textures/_CP14/Mobs/Monster/lumish.rsi/lumishroom_cap.png and b/Resources/Textures/_CP14/Mobs/Monster/lumish.rsi/lumishroom_cap.png differ diff --git a/Resources/Textures/_CP14/Mobs/Monster/lumish.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Monster/lumish.rsi/meta.json index 187bc51f03..d684db047b 100644 --- a/Resources/Textures/_CP14/Mobs/Monster/lumish.rsi/meta.json +++ b/Resources/Textures/_CP14/Mobs/Monster/lumish.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-4.0", - "copyright": "Created by prazat911 (Discord)", + "copyright": "Created by prazat911 (Discord) resprite by jaraten", "states": [ { "name": "lumishroom", diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/base1.png b/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/base1.png index 308076c7ae..c40d2c5dd7 100644 Binary files a/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/base1.png and b/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/base1.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/base2.png b/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/base2.png index 75eb4c47ea..0f6c5a7d6c 100644 Binary files a/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/base2.png and b/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/base2.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/base3.png b/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/base3.png index f505e86472..5661c8211c 100644 Binary files a/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/base3.png and b/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/base3.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/base4.png b/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/base4.png index 2972130d81..30497114c3 100644 Binary files a/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/base4.png and b/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/base4.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/base5.png b/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/base5.png index 249a61f646..23eeb73a52 100644 Binary files a/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/base5.png and b/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/base5.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/meta.json b/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/meta.json index d74af1377e..5e14108ff1 100644 --- a/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd (Github)", + "copyright": "Created by TheShuEd (Github), resprite by jaraten", "states": [ { "name": "base1"