diff --git a/Resources/Audio/Stray/Mech/mech.ogg b/Resources/Audio/Stray/Mech/mech.ogg new file mode 100644 index 00000000000..4c4545c5d2a Binary files /dev/null and b/Resources/Audio/Stray/Mech/mech.ogg differ diff --git a/Resources/Audio/Stray/Mech/mech2.ogg b/Resources/Audio/Stray/Mech/mech2.ogg new file mode 100644 index 00000000000..15628c7cfc7 Binary files /dev/null and b/Resources/Audio/Stray/Mech/mech2.ogg differ diff --git a/Resources/Audio/Stray/RoundEnd/Goida.ogg b/Resources/Audio/Stray/RoundEnd/Goida.ogg new file mode 100644 index 00000000000..bd0841f98df Binary files /dev/null and b/Resources/Audio/Stray/RoundEnd/Goida.ogg differ diff --git a/Resources/Audio/Stray/RoundEnd/Ponabirayt.ogg b/Resources/Audio/Stray/RoundEnd/Ponabirayt.ogg new file mode 100644 index 00000000000..501bfbb4754 Binary files /dev/null and b/Resources/Audio/Stray/RoundEnd/Ponabirayt.ogg differ diff --git a/Resources/Audio/Stray/RoundEnd/pyshnoy.ogg b/Resources/Audio/Stray/RoundEnd/pyshnoy.ogg new file mode 100644 index 00000000000..86219d8ee07 Binary files /dev/null and b/Resources/Audio/Stray/RoundEnd/pyshnoy.ogg differ diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml index 2279bfdbb76..56ffb734bb1 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -27,6 +27,11 @@ name: cyborg - type: Construction node: cyborg + - type: FootstepModifier + footstepSoundCollection: + path: /Audio/Stray/Mech/mech.ogg + params: + variation: 0.07 - type: Speech speechVerb: Robotic diff --git a/Resources/Prototypes/Parallaxes/default.yml b/Resources/Prototypes/Parallaxes/default.yml index 4a84b4618b3..fca75334b34 100644 --- a/Resources/Prototypes/Parallaxes/default.yml +++ b/Resources/Prototypes/Parallaxes/default.yml @@ -10,25 +10,23 @@ slowness: 0.998046875 scale: "1, 1" - texture: - !type:GeneratedParallaxTextureSource - id: "hq_wizard_stars" - configPath: "/Prototypes/Parallaxes/parallax_config_stars.toml" - slowness: 0.996625 + !type:ImageParallaxTextureSource + path: "/Textures/Parallaxes/planet.png" + slowness: 0.999 + tiled: false + scale: "1.5, 1.5" - texture: - !type:GeneratedParallaxTextureSource - id: "hq_wizard_stars_dim" - configPath: "/Prototypes/Parallaxes/parallax_config_stars_dim.toml" - slowness: 0.989375 + !type:ImageParallaxTextureSource + path: "/Textures/Parallaxes/Asteroids.png" + slowness: 0.9969 - texture: - !type:GeneratedParallaxTextureSource - id: "hq_wizard_stars_faster" - configPath: "/Prototypes/Parallaxes/parallax_config_stars-2.toml" - slowness: 0.987265625 + !type:ImageParallaxTextureSource + path: "/Textures/Parallaxes/AsteroidsMedium.png" + slowness: 0.98 - texture: - !type:GeneratedParallaxTextureSource - id: "hq_wizard_stars_dim_faster" - configPath: "/Prototypes/Parallaxes/parallax_config_stars_dim-2.toml" - slowness: 0.984352 + !type:ImageParallaxTextureSource + path: "/Textures/Parallaxes/AsteroidsBig.png" + slowness: 0.8856 layersLQ: - texture: !type:GeneratedParallaxTextureSource @@ -43,9 +41,9 @@ layers: - texture: !type:ImageParallaxTextureSource - path: "/Textures/Parallaxes/layer1.png" + path: "/Textures/Parallaxes/space_map2.png" slowness: 0.5 - scale: "3, 3" + scale: "2, 2" - texture: !type:GeneratedParallaxTextureSource id: "hq_wizard_stars" diff --git a/Resources/Prototypes/SoundCollections/announcements.yml b/Resources/Prototypes/SoundCollections/announcements.yml index 85471798c78..06ecb556b9e 100644 --- a/Resources/Prototypes/SoundCollections/announcements.yml +++ b/Resources/Prototypes/SoundCollections/announcements.yml @@ -27,3 +27,7 @@ - /Audio/Announcements/RoundEnd/this_drink.ogg - /Audio/Announcements/RoundEnd/truth_imagination.ogg - /Audio/Announcements/RoundEnd/oney.ogg + #Аська насрал саундов + - /Audio/Stray/RoundEnd/Goida.ogg + - /Audio/Stray/RoundEnd/Ponabirayt.ogg + - /Audio/Stray/RoundEnd/pyshnoy.ogg diff --git a/Resources/Prototypes/Stray/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Stray/Entities/Mobs/Cyborgs/borg_chassis.yml index 7cbd456a349..52f9b10bd0f 100644 --- a/Resources/Prototypes/Stray/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/Stray/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -51,5 +51,10 @@ 120: Critical # +20 to Crit Threshold 200: Dead - type: NoSlip + - type: FootstepModifier + footstepSoundCollection: + path: /Audio/Stray/Mech/mech.ogg + params: + variation: 0.07 - type: Speech speechVerb: Robotic diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json b/Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json index a87db50d6d2..8f8abd17136 100644 --- a/Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json +++ b/Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/faf6db214927874c19b8fa8585d26b5d40de1acc", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/faf6db214927874c19b8fa8585d26b5d40de1acc. Security and Robot textures taken from NES-Station", "states": [ { "name": "clown", diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/robot.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/robot.png index a18a9978e54..90594bb4087 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/robot.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/robot.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/robot_e.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/robot_e.png index 3fe4b86946a..75ac937eb57 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/robot_e.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/robot_e.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/robot_e_r.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/robot_e_r.png index 7f73680c4c2..fbe80536838 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/robot_e_r.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/robot_e_r.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/robot_l.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/robot_l.png index e88a451a55b..c2861855173 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/robot_l.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/robot_l.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/security.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/security.png index 52590572fe7..ad0894e216b 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/security.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/security.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/security_e.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/security_e.png index 7d0039083cc..d99f864bd99 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/security_e.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/security_e.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/security_e_r.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/security_e_r.png index a6df5269699..656b959f445 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/security_e_r.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/security_e_r.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/security_l.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/security_l.png index b099c8610a0..ca361b9bea9 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/security_l.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/security_l.png differ diff --git a/Resources/Textures/Nyanotrasen/Clothing/Uniforms/Costume/swimsuit.rsi/equipped-INNERCLOTHING-shadowkin.png b/Resources/Textures/Nyanotrasen/Clothing/Uniforms/Costume/swimsuit.rsi/equipped-INNERCLOTHING-shadowkin.png new file mode 100644 index 00000000000..9c8def4e5b7 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Clothing/Uniforms/Costume/swimsuit.rsi/equipped-INNERCLOTHING-shadowkin.png differ diff --git a/Resources/Textures/Nyanotrasen/Clothing/Uniforms/Costume/swimsuit.rsi/meta.json b/Resources/Textures/Nyanotrasen/Clothing/Uniforms/Costume/swimsuit.rsi/meta.json index 380a3f0c136..a8fb75f1cf3 100644 --- a/Resources/Textures/Nyanotrasen/Clothing/Uniforms/Costume/swimsuit.rsi/meta.json +++ b/Resources/Textures/Nyanotrasen/Clothing/Uniforms/Costume/swimsuit.rsi/meta.json @@ -21,6 +21,10 @@ { "name": "equipped-INNERCLOTHING", "directions": 4 - } + }, + { + "name": "equipped-INNERCLOTHING-shadowkin", + "directions": 4 + } ] } diff --git a/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/icon.png b/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/icon.png index 3dcf4ce7693..19eeac4947d 100644 Binary files a/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/inhand-left.png index 567bc8f6e8c..0b7ddbf8ff4 100644 Binary files a/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/inhand-right.png index 81ee9b51e24..9147eb7598d 100644 Binary files a/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/meta.json b/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/meta.json index 448b9155a1f..16c2ce2affb 100644 --- a/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Bombs/spidercharge.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/commit/db2efd4f0df2b630a8bb9851f53f4922b669a5b3 and modified by Jackal298", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/db2efd4f0df2b630a8bb9851f53f4922b669a5b3", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/primed.png b/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/primed.png index cbfd370b920..a3a5df18633 100644 Binary files a/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/primed.png and b/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/primed.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/icon.png b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/icon.png index aec9818274f..f0b8a4b3ac3 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json index 28d3e6969a9..5352c9178a3 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json @@ -1,27 +1,27 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b13d244d761a07e200a9a41730bd446e776020d5", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/d91390a4474e511279b6ee7525c5982266b9a858", + "size": { + "x": 32, + "y": 32 }, - { - "name": "primed", - "delays": [ - [ - 0.1, - 0.1 - ] - ] - }, - { - "name": "equipped-BELT", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "primed", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/primed.png index 596bfb6a15c..cdcae9ea1f6 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/primed.png and b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/primed.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/icon.png b/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/icon.png new file mode 100644 index 00000000000..b986e226650 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/meta.json new file mode 100644 index 00000000000..ba5198513b6 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from goonstation at https://github.com/goonstation/goonstation/pull/13630", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "primed" + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/primed.png new file mode 100644 index 00000000000..0d8b9b7a97b Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/primed.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/icon.png b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/icon.png index 9c6bc8b1647..429c7231b3b 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json index 28d3e6969a9..2eaa1828014 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json @@ -1,27 +1,23 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b13d244d761a07e200a9a41730bd446e776020d5", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/d91390a4474e511279b6ee7525c5982266b9a858", + "size": { + "x": 32, + "y": 32 }, - { - "name": "primed", - "delays": [ - [ - 0.1, - 0.1 - ] - ] - }, - { - "name": "equipped-BELT", - "directions": 4 - } - ] -} + "states": [ + { + "name": "icon" + }, + { + "name": "primed" + }, + { + "directions": 4, + "name": "equipped-BELT" + } + ] +} + + diff --git a/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/primed.png index 72df008d651..67f7e86d3a2 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/primed.png and b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/primed.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/complete.png b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/complete.png index af0997e1f69..18d88d99af2 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/complete.png and b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/complete.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/empty.png b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/empty.png index 7e577c3cc6d..b5d5a4c4743 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/empty.png and b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/empty.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/meta.json index b0b12127c59..78e753dbd1e 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/meta.json @@ -1,38 +1,38 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/29c0ed1b000619cb5398ef921000a8d4502ba0b6 and modified by Swept & ElectroSR", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "empty", - "directions": 1 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d91390a4474e511279b6ee7525c5982266b9a858 & ElectroSR", + "size": { + "x": 32, + "y": 32 }, - { - "name": "wired", - "directions": 1 - }, - { - "name": "no-payload", - "directions": 1 - }, - { - "name": "no-trigger", - "directions": 1 - }, - { - "name": "complete", - "directions": 1 - }, - { - "name": "primed", - "directions": 1, - "delays": [ - [ 0.2, 0.2 ] - ] - } - ] + "states": [ + { + "name": "empty", + "directions": 1 + }, + { + "name": "wired", + "directions": 1 + }, + { + "name": "no-payload", + "directions": 1 + }, + { + "name": "no-trigger", + "directions": 1 + }, + { + "name": "complete", + "directions": 1 + }, + { + "name": "primed", + "directions": 1, + "delays": [ + [ 0.2, 0.2 ] + ] + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/no-payload.png b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/no-payload.png index 39d3f2b3653..18d88d99af2 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/no-payload.png and b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/no-payload.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/primed.png index c5a39eab1da..4b2d12e3e9b 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/primed.png and b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/primed.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/wired.png b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/wired.png index fbdd8455272..2dcd63d3cb6 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/wired.png and b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/wired.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/icon.png b/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/icon.png index d6e9ebe4fb9..5448dcd7a47 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/meta.json index 52f62726ec0..aafb01c97e7 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/meta.json @@ -1,23 +1,23 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/b13d244d761a07e200a9a41730bd446e776020d5", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/d91390a4474e511279b6ee7525c5982266b9a858 and modified by DanTheSynth ", + "size": { + "x": 32, + "y": 32 }, - { - "name": "primed", - "delays": [ - [ - 0.1, - 0.1 - ] - ] - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "primed", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/primed.png index 6938870e056..c066ca0ef36 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/primed.png and b/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/primed.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json index 9274592a7f2..a7aa232decf 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json @@ -60,6 +60,12 @@ }, { "name": "depleted-uranium-spent" + }, + { + "name": "tranquilizer" + }, + { + "name": "tranquilizer-spent" } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/tranquilizer-spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/tranquilizer-spent.png new file mode 100644 index 00000000000..1f05d6388de Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/tranquilizer-spent.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/tranquilizer.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/tranquilizer.png new file mode 100644 index 00000000000..9eaa42de844 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/tranquilizer.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/base.png index 003858cf9d9..398032cf36c 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/icon.png index 88be89b3780..5aa2e21ce18 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-left-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-left-0.png index 9c4b6595ca1..32ec43938cf 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-left-0.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-left-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-right-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-right-0.png index ed537d5e868..b3fbec0dbec 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-right-0.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-right-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-0.png index 042d52f5d74..262cc20fed6 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-0.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-1.png index 5e64562bdc3..c73a59a863b 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-1.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-2.png index df4767bff9f..d0f1fbfec69 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-2.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-3.png index fcbbc48af1a..ecf2375729d 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-3.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-4.png index 40e557d736c..9ae2c3610a1 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-4.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json index 86ecf2bff1a..3f3d4bc1dcf 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "icon by RiceMar1244 based on icon taken from tg station at commit https://github.com/tgstation/tgstation/commit/8b7f8ba6a3327c7381967c550f185dffafd11a57", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/484fcb08e8e2058b81059424fb5aa77034a3fcf1", "size": { "x": 32, "y": 32 @@ -14,7 +14,15 @@ "name": "base" }, { - "name": "mag-unshaded-0" + "name": "mag-unshaded-0", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] }, { "name": "mag-unshaded-1" @@ -30,11 +38,47 @@ }, { "name": "inhand-left-0", - "directions": 4 + "directions": 4, + "delays": [ + [ + 0.3, + 0.3 + ], + [ + 0.3, + 0.3 + ], + [ + 0.3, + 0.3 + ], + [ + 0.3, + 0.3 + ] + ] }, { "name": "inhand-right-0", - "directions": 4 + "directions": 4, + "delays": [ + [ + 0.3, + 0.3 + ], + [ + 0.3, + 0.3 + ], + [ + 0.3, + 0.3 + ], + [ + 0.3, + 0.3 + ] + ] }, { "name": "inhand-left-1", diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/equipped-BACKPACK.png index c58b7e3c455..5ce9790816f 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/equipped-BACKPACK.png index e511f1379ef..c6a449e1d35 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/equipped-BACKPACK.png index 2e4445adfab..e2082b009bc 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/equipped-BACKPACK.png index 5ac3c6c8c48..bc9de55b7e3 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/equipped-BACKPACK.png index e13760d4eb3..bc9de55b7e3 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/equipped-BACKPACK.png index 6ae9d358cd7..a8a38cb8933 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/equipped-BACKPACK.png index 63c4bdf3d6d..ac00895a4e4 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/equipped-BACKPACK.png index 42d58d9d371..6d48b1122d5 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/equipped-BACKPACK.png index d20bca74f5b..8df48e825c7 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/equipped-BACKPACK.png index 8e2f1548b12..9a7febc8e7c 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/bolt-open.png new file mode 100644 index 00000000000..7a11eab654e Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..ec34a1b9ea1 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..ec34a1b9ea1 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/icon.png new file mode 100644 index 00000000000..ba597a85909 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/meta.json new file mode 100644 index 00000000000..ceffec91b50 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b and modified from the foam force poster by IProduceWidgets (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "bolt-open" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/inhand-left.png new file mode 100644 index 00000000000..931a8ef9732 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/inhand-right.png new file mode 100644 index 00000000000..570f8be130b Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/meta.json new file mode 100644 index 00000000000..b89b33c08ff --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b sprite created from foam force poster by IProduceWidgets (github)", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..3526954b4e2 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..297ae7a752a Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png index 7e73d94ffa2..163d04bdf23 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/equipped-BACKPACK.png index 17384b58575..0e63c7c77e8 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/equipped-BACKPACK.png index caac143bc4b..ede2d0ddd81 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png index 061f8bdae9d..0e63c7c77e8 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/equipped-BACKPACK.png index ee46b3bcf73..a803ef8b95b 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/equipped-BACKPACK.png index c325b84c7e0..b64dbffd534 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/equipped-BACKPACK.png index c5e9fb43241..b64dbffd534 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/equipped-BACKPACK.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 302e6d14b5d..04258d8a70a 100644 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/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json index 3add3a471b6..3e793381d0f 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json @@ -22,4 +22,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/equipped-BACKPACK.png index d4e3306e6bb..32a949f349a 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-BACKPACK.png index a9ad62c9be8..254438cca19 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/equipped-BACKPACK.png index a349de44b0f..0f50f8f7142 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/equipped-BACKPACK.png index ddab849d4fd..b2ceb527ce9 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/icon.png index ea90cafb92f..514c1c0e19a 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/inhand-left.png index ff87ea8c7c7..11150230318 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/inhand-right.png index 0eed1badec9..531b6cb62fb 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json index 6eb88a0dff4..564552ccfaf 100644 --- a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Taken from goonstation and modified by Swept at commit https://github.com/goonstation/goonstation/pull/3555/commits/b24eb6260647c0fcfe858268a26b6160bc50017a, wielded version by Easypoll", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-left.png index 30839286d43..1a434cc2a73 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-right.png index f5c0b483c0d..40452ed25ee 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/icon.png index d4d1c3ca46c..eb0476a5c1f 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-left.png index 6b53ba68975..d2e03668a2d 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-right.png index b0e6a2ce8dd..6ff5e7e9ba3 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/meta.json index a6b30533f54..da97197ae2f 100644 --- a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.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": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/equipped-BACKPACK.png index 89c21dcf3c6..868ec518522 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/icon.png index 68cec56d9c1..f10ddda66d4 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/inhand-left.png index c559a407414..0ae1aa6a8e4 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/inhand-right.png index 183178c6715..77bb7ea9456 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/meta.json index a4993147355..811cb0fa258 100644 --- a/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/claymore.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/49264/commits/c9ddcd603adeab3822c2845f6be9dfb53452c119", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/butch.png b/Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/butch.png index 922bb19c1ae..9eb6e305269 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/butch.png and b/Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/butch.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/meta.json index 266149d72ce..72b10f55462 100644 --- a/Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/cleaver.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": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/equipped-BELT.png index ec356bc7912..8a290bc223d 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/icon.png index 0bb7498e956..5347ae1fd4a 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png index a7ea7539408..de25caf237a 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png index 368c73da327..ef9b29d571b 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json index 08894a12a7b..8b91ce96a59 100644 --- a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/pull/378/commits/9e081bd2a0d7614be5a9dabbca34886ce204105d", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/cult_blade.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/cult_blade.rsi/icon.png index 4dc5a3807de..3e6032d2945 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/cult_blade.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/cult_blade.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/cult_blade.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/cult_blade.rsi/inhand-left.png index 48d10b56565..ad0b0419900 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/cult_blade.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/cult_blade.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/cult_blade.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/cult_blade.rsi/inhand-right.png index 92f70dcd0aa..98536b1f9a3 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/cult_blade.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/cult_blade.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/cult_blade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/cult_blade.rsi/meta.json index 520fb47bb8f..dcc616ec3ef 100644 --- a/Resources/Textures/Objects/Weapons/Melee/cult_blade.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/cult_blade.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/commit/115340490365e480b80adc06da54ee52aa99f653", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/cult_dagger.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/cult_dagger.rsi/icon.png index 3dc00c1054f..b0601e8133d 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/cult_dagger.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/cult_dagger.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/cult_dagger.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/cult_dagger.rsi/inhand-left.png index ea8a6200a7c..43110e9d0a5 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/cult_dagger.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/cult_dagger.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/cult_dagger.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/cult_dagger.rsi/inhand-right.png index bbb0c72223f..140c730cd61 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/cult_dagger.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/cult_dagger.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/cult_dagger.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/cult_dagger.rsi/meta.json index 13ee8ef3754..dcc616ec3ef 100644 --- a/Resources/Textures/Objects/Weapons/Melee/cult_dagger.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/cult_dagger.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/commit/115340490365e480b80adc06da54ee52aa99f653", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/icon.png index f64aad494bc..d8b342cb1fe 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/inhand-left.png index 692577941c1..878bc471374 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/inhand-right.png index f21ece7ce7c..900d0d7eaee 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/meta.json index 5d17427e028..a1d4f2f0240 100644 --- a/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Taken/modified from tgstation at commit https://github.com/tgstation/tgstation/commit/115340490365e480b80adc06da54ee52aa99f653", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/wielded-inhand-left.png index 8aabe566702..d0c398a2414 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/wielded-inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/wielded-inhand-right.png index d6dd8b4773a..8569fe6537d 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/wielded-inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/debug.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/debug.rsi/icon.png index 0403f27a357..d3428e3afbb 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/debug.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/debug.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/debug.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/debug.rsi/inhand-left.png index 16342b93dca..406d937e1f0 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/debug.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/debug.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/debug.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/debug.rsi/inhand-right.png index 99e0e13dd11..52b3463e763 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/debug.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/debug.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/debug.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/debug.rsi/meta.json index 67d2c83c710..2467ee9eb09 100644 --- a/Resources/Textures/Objects/Weapons/Melee/debug.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/debug.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "swept", + "copyright": "swept by discord:𝘽𝙚𝙡𝙖𝙮#7441", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/equipped-BELT.png index abdef910aa9..f31e92edce1 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/icon.png index 62ba976b343..e185890fbf3 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-left.png index 39f26b42fc2..5f35b502dac 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-right.png index 6a365e77283..5926122d27b 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json index de27e15fb75..1dfa76c4e38 100644 --- a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/energykatana.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/commit/a9451f4d22f233d328b63490c2bcf64a640e42ff and modified by Jackal298", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/a9451f4d22f233d328b63490c2bcf64a640e42ff", "size": { "x": 32, "y": 32 @@ -21,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-BACKPACK", - "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/equipped-BACKPACK.png index 2d245210084..511e89fdf46 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/icon.png index 9f8ae76c3c6..c594138d95d 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-left.png index ce78cfc2760..339d96b14c8 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-right.png index 910dda1a140..77311514584 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json index 3d83a91ae59..d558b8b07ec 100644 --- a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Taken and modified by Taral from goonstation at commit https://github.com/goonstation/goonstation/pull/2816/commits/b99c5dff45a6527bbf698bc00f7d24b8ca75a806", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-left.png index f928b92fb12..31c8bec2411 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-right.png index 65a94423945..27f6733f76a 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/equipped-BACKPACK.png index c4a05dd80e7..2e33383a001 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/icon.png index 58e2f149426..f4702cec4f8 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/inhand-left.png index 420ab540384..cde202e811b 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/inhand-right.png index b9ef6c0e9ae..92f591290d7 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/meta.json index 6432748b6fe..d558b8b07ec 100644 --- a/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Taken and modified by Taral from goonstation at commit https://github.com/goonstation/goonstation/pull/2816/commits/b99c5dff45a6527bbf698bc00f7d24b8ca75a806 and then further modified by EmoGarbage404", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/wielded-inhand-left.png index c40ba4c0653..be352a376a5 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/wielded-inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/wielded-inhand-right.png index 7775de7e605..58288092224 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/wielded-inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/gohei.rsi/gohei.png b/Resources/Textures/Objects/Weapons/Melee/gohei.rsi/gohei.png index 2d7953a6f42..e6bab4f2863 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/gohei.rsi/gohei.png and b/Resources/Textures/Objects/Weapons/Melee/gohei.rsi/gohei.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/gohei.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/gohei.rsi/inhand-left.png index e0a337bdf3c..57aeddc61aa 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/gohei.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/gohei.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/gohei.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/gohei.rsi/inhand-right.png index 2e33d7d08e1..cc869ff3f0f 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/gohei.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/gohei.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/gohei.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/gohei.rsi/meta.json index 556867a9f21..500702d97e0 100644 --- a/Resources/Textures/Objects/Weapons/Melee/gohei.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/gohei.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/799647e170c9b7dbdbb28bdf46234e012b6bd6c8", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/icon.png index 4a1b7d82cd2..d27d2f0ddae 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/inhand-left.png index bcaee4ac97f..b2430cc7e13 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/inhand-right.png index 8fd468ac648..d41c7a16416 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/meta.json index b2c66cff5b2..da97197ae2f 100644 --- a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken and modified by Taral from tgstation at https://github.com/tgstation/tgstation/pull/20520/commits/47d235721d658027a9effd37177cc8104844e0bf", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/equipped-BELT.png index 288f9fbce59..4550985e2f9 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/icon.png index 4a9e66b72a2..5ba284e8f71 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/inhand-left.png index b2f253c30b7..dfe5c9d5142 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/inhand-right.png index ac3aec22479..f3df34072df 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/meta.json index 08894a12a7b..8b91ce96a59 100644 --- a/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/pull/378/commits/9e081bd2a0d7614be5a9dabbca34886ce204105d", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/icon.png index 8c426b9b264..988a67acb54 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/inhand-left.png index 3628524b6cb..ecbf9b49d1f 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/inhand-right.png index b08efd07a78..6f325b8117c 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/meta.json index 069cee5a704..6a1d75eee51 100644 --- a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Taken from Baystation12 and modified by Taral at https://github.com/Baystation12/Baystation12/pull/29841/commits/57265cd89e6b66b9a67915172f60bbbeacbeced0", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/equipped-BELT.png index 451406ab1ec..0270b708965 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/icon.png index b3381fb2bf1..6eeed4fe203 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/inhand-left.png index 0fdfd47b986..c7b1debc069 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/inhand-right.png index 7b3b020f967..0bf4ca35257 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/meta.json index 455734e0447..925b9922c45 100644 --- a/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.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/6cdc0503d32e249125151e369edf951e93bccd1a", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-BACKPACK.png index 648fff08e4c..e3f40352348 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-left.png index 70df3922a3a..1087d3f6c67 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-right.png index ee343bf4be3..d3231408f4b 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/meta.json index 5a18552d2e0..31cf2a800c2 100644 --- a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/spear.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/spear.png index fcc238e2060..87df20c7e85 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/spear.png and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/spear.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-left.png index 6877ed50f1e..68675e7f9d9 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-right.png index 55bdd73faed..d0e078c88ae 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/equipped-BELT.png index 5960b255371..db04bc7a853 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/icon.png index e98557d62ac..4b2f5590ed6 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/inhand-left.png index 89547bf155e..b633f605975 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/inhand-right.png index a5cbe99193b..0428fb12d5a 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/meta.json index 455734e0447..925b9922c45 100644 --- a/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.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/6cdc0503d32e249125151e369edf951e93bccd1a", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-BACKPACK.png index e194aff0a62..11411f77911 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-left.png index b6cfc5e2cf2..31c3d329b6a 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-right.png index 3acb387c7cd..ba599f03145 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/meta.json index 5a18552d2e0..31cf2a800c2 100644 --- a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/spear.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/spear.png index 3bbf3be8dc2..1fc7841beb5 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/spear.png and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/spear.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-left.png index 988df02ef7f..c06fdac4968 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-right.png index 11b3e3d3d14..46c99396fe9 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/equipped-BELT.png index e3c69de10b6..221b935712e 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/icon.png index 87be9073496..b28bd8fc06d 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/inhand-left.png index d2e5a28123d..82f101deafa 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/inhand-right.png index a36da4037b6..2f25f9ce6bd 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/meta.json index 455734e0447..925b9922c45 100644 --- a/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/shiv.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/6cdc0503d32e249125151e369edf951e93bccd1a", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-BACKPACK.png index cb8ff3d7441..46d987826db 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-left.png index 5a2b620b11e..9ece4fc167c 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-right.png index 34d3fb1a35d..64e7c480b08 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json index 421037eac37..31cf2a800c2 100644 --- a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/spear.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/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/spear.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/spear.png index a7ff81de58b..74c71d137ea 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/spear.png and b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/spear.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-left.png index 93d4bdbdec3..46989b6d8de 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-right.png index ccf554d0b89..d2d55d4fdcd 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/equipped-BELT.png index 288f9fbce59..4f24bae15a0 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/icon.png index 8ec73e718b1..d1cae1befa8 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png index b2f253c30b7..6739d43adc0 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png index ac3aec22479..db4b3ed7f1c 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json index 455734e0447..925b9922c45 100644 --- a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/survival_knife.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/6cdc0503d32e249125151e369edf951e93bccd1a", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/icon.png index 2c61755b52c..5817fac2bec 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/equipped-BELT.png index be1468364c9..2e9af1781e3 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/icon.png index d5a566bd72d..367edbe3da2 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/inhand-left.png index e2734410aee..09d3be9ecd3 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/inhand-right.png index 97a2f4917df..d952312450f 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/meta.json index 455734e0447..925b9922c45 100644 --- a/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.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/6cdc0503d32e249125151e369edf951e93bccd1a", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-BACKPACK.png index fc03f154a4a..f632427c22c 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-left.png index 4e47d5e0718..d36666f58ae 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-right.png index a9c616c7ae3..e174b79a614 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/meta.json index 5a18552d2e0..31cf2a800c2 100644 --- a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/spear.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/spear.png index e02b108226a..e04b3e86530 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/spear.png and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/spear.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-left.png index f6e24ea9ce2..ee6b47b3277 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-right.png index 28e4f0c1fbc..2a7fb333150 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/pflash.rsi/flashing.png b/Resources/Textures/Objects/Weapons/pflash.rsi/flashing.png index 075fc537331..00375942fb7 100644 Binary files a/Resources/Textures/Objects/Weapons/pflash.rsi/flashing.png and b/Resources/Textures/Objects/Weapons/pflash.rsi/flashing.png differ diff --git a/Resources/Textures/Objects/Weapons/pflash.rsi/meta.json b/Resources/Textures/Objects/Weapons/pflash.rsi/meta.json index c7b536cf6e1..0413ac7e898 100644 --- a/Resources/Textures/Objects/Weapons/pflash.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/pflash.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/f349b842c84f500399bd5673e5e34a6bc45b001a", + "copyright": "Taken from TauCetiStation at commit https://github.com/TauCetiStation/TauCetiClassic/commit/b9a629d13b54be97631e4aa83a06c6a6225136d9", "size": { "x": 32, "y": 32 @@ -20,9 +20,10 @@ "name": "flashing", "delays": [ [ - 0.1, - 0.1, - 0.1 + 1, + 0.075, + 0.075, + 0.075 ] ] } diff --git a/Resources/Textures/Objects/Weapons/pflash.rsi/off.png b/Resources/Textures/Objects/Weapons/pflash.rsi/off.png index b7007484036..1db05eebb7f 100644 Binary files a/Resources/Textures/Objects/Weapons/pflash.rsi/off.png and b/Resources/Textures/Objects/Weapons/pflash.rsi/off.png differ diff --git a/Resources/Textures/Objects/Weapons/pflash.rsi/on-unlit.png b/Resources/Textures/Objects/Weapons/pflash.rsi/on-unlit.png index 8057f65fe43..67f9704c390 100644 Binary files a/Resources/Textures/Objects/Weapons/pflash.rsi/on-unlit.png and b/Resources/Textures/Objects/Weapons/pflash.rsi/on-unlit.png differ diff --git a/Resources/Textures/Objects/Weapons/pflash.rsi/on.png b/Resources/Textures/Objects/Weapons/pflash.rsi/on.png index 2e044957268..524f3131431 100644 Binary files a/Resources/Textures/Objects/Weapons/pflash.rsi/on.png and b/Resources/Textures/Objects/Weapons/pflash.rsi/on.png differ diff --git a/Resources/Textures/Parallaxes/Asteroids.png b/Resources/Textures/Parallaxes/Asteroids.png index fd5f4b6e150..d5857fa351e 100644 Binary files a/Resources/Textures/Parallaxes/Asteroids.png and b/Resources/Textures/Parallaxes/Asteroids.png differ diff --git a/Resources/Textures/Parallaxes/AsteroidsBig.png b/Resources/Textures/Parallaxes/AsteroidsBig.png new file mode 100644 index 00000000000..55c32f95585 Binary files /dev/null and b/Resources/Textures/Parallaxes/AsteroidsBig.png differ diff --git a/Resources/Textures/Parallaxes/AsteroidsMedium.png b/Resources/Textures/Parallaxes/AsteroidsMedium.png new file mode 100644 index 00000000000..5e9648ccba1 Binary files /dev/null and b/Resources/Textures/Parallaxes/AsteroidsMedium.png differ diff --git a/Resources/Textures/Parallaxes/layer1.png b/Resources/Textures/Parallaxes/layer1.png index c5f7954630d..585320716e5 100644 Binary files a/Resources/Textures/Parallaxes/layer1.png and b/Resources/Textures/Parallaxes/layer1.png differ diff --git a/Resources/Textures/Parallaxes/space_map2.png b/Resources/Textures/Parallaxes/space_map2.png index d4e69b6a5b5..a430e2ec81f 100644 Binary files a/Resources/Textures/Parallaxes/space_map2.png and b/Resources/Textures/Parallaxes/space_map2.png differ diff --git a/Resources/Textures/Stray/LobbyScreens/bluat.png b/Resources/Textures/Stray/LobbyScreens/bluat.png new file mode 100644 index 00000000000..1b2eab7880a Binary files /dev/null and b/Resources/Textures/Stray/LobbyScreens/bluat.png differ diff --git a/Resources/Textures/Stray/LobbyScreens/bluat.png.yml b/Resources/Textures/Stray/LobbyScreens/bluat.png.yml new file mode 100644 index 00000000000..5c43e233050 --- /dev/null +++ b/Resources/Textures/Stray/LobbyScreens/bluat.png.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/Stray/LobbyScreens/blueplanet.png b/Resources/Textures/Stray/LobbyScreens/blueplanet.png new file mode 100644 index 00000000000..bfe3e09dd29 Binary files /dev/null and b/Resources/Textures/Stray/LobbyScreens/blueplanet.png differ diff --git a/Resources/Textures/Stray/LobbyScreens/blueplanet.yml b/Resources/Textures/Stray/LobbyScreens/blueplanet.yml new file mode 100644 index 00000000000..5c43e233050 --- /dev/null +++ b/Resources/Textures/Stray/LobbyScreens/blueplanet.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/Stray/LobbyScreens/darkness.png b/Resources/Textures/Stray/LobbyScreens/darkness.png new file mode 100644 index 00000000000..5be0bb11674 Binary files /dev/null and b/Resources/Textures/Stray/LobbyScreens/darkness.png differ diff --git a/Resources/Textures/Stray/LobbyScreens/darkness.yml b/Resources/Textures/Stray/LobbyScreens/darkness.yml new file mode 100644 index 00000000000..5c43e233050 --- /dev/null +++ b/Resources/Textures/Stray/LobbyScreens/darkness.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/Stray/LobbyScreens/earth.png b/Resources/Textures/Stray/LobbyScreens/earth.png new file mode 100644 index 00000000000..f04896491ec Binary files /dev/null and b/Resources/Textures/Stray/LobbyScreens/earth.png differ diff --git a/Resources/Textures/Stray/LobbyScreens/meta.txt b/Resources/Textures/Stray/LobbyScreens/meta.txt new file mode 100644 index 00000000000..f39e9d3a3b7 --- /dev/null +++ b/Resources/Textures/Stray/LobbyScreens/meta.txt @@ -0,0 +1 @@ +All backgrounds created by Aserovich aka Aserovich[BAD] aka Aserovich[Плохой] \ No newline at end of file diff --git a/Resources/Textures/Stray/LobbyScreens/salvagers.png b/Resources/Textures/Stray/LobbyScreens/salvagers.png new file mode 100644 index 00000000000..00c7c72b94f Binary files /dev/null and b/Resources/Textures/Stray/LobbyScreens/salvagers.png differ diff --git a/Resources/Textures/Stray/LobbyScreens/salvagers.png.yml b/Resources/Textures/Stray/LobbyScreens/salvagers.png.yml new file mode 100644 index 00000000000..5c43e233050 --- /dev/null +++ b/Resources/Textures/Stray/LobbyScreens/salvagers.png.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/Stray/LobbyScreens/shuttle.png b/Resources/Textures/Stray/LobbyScreens/shuttle.png new file mode 100644 index 00000000000..04150e73aae Binary files /dev/null and b/Resources/Textures/Stray/LobbyScreens/shuttle.png differ diff --git a/Resources/Textures/Stray/LobbyScreens/time.png b/Resources/Textures/Stray/LobbyScreens/time.png new file mode 100644 index 00000000000..98f42ed7baa Binary files /dev/null and b/Resources/Textures/Stray/LobbyScreens/time.png differ diff --git a/Resources/Textures/Stray/LobbyScreens/time.yml b/Resources/Textures/Stray/LobbyScreens/time.yml new file mode 100644 index 00000000000..5c43e233050 --- /dev/null +++ b/Resources/Textures/Stray/LobbyScreens/time.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/Stray/LobbyScreens/traitor.png b/Resources/Textures/Stray/LobbyScreens/traitor.png new file mode 100644 index 00000000000..95001e4d9a7 Binary files /dev/null and b/Resources/Textures/Stray/LobbyScreens/traitor.png differ diff --git a/Resources/Textures/Stray/LobbyScreens/traitor.png.yml b/Resources/Textures/Stray/LobbyScreens/traitor.png.yml new file mode 100644 index 00000000000..5c43e233050 --- /dev/null +++ b/Resources/Textures/Stray/LobbyScreens/traitor.png.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/bed-MED.png b/Resources/Textures/Structures/Furniture/furniture.rsi/bed-MED.png index a2fd75e3236..1a6c5278e56 100644 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/bed-MED.png and b/Resources/Textures/Structures/Furniture/furniture.rsi/bed-MED.png differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/bed.png b/Resources/Textures/Structures/Furniture/furniture.rsi/bed.png index ef697475885..d0f1ffaaeac 100644 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/bed.png and b/Resources/Textures/Structures/Furniture/furniture.rsi/bed.png differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/dresser.png b/Resources/Textures/Structures/Furniture/furniture.rsi/dresser.png index 20ce5dc0e90..070fc0e305b 100644 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/dresser.png and b/Resources/Textures/Structures/Furniture/furniture.rsi/dresser.png differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/mattress.png b/Resources/Textures/Structures/Furniture/furniture.rsi/mattress.png index f4efb44cb38..d9b1ba15a4f 100644 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/mattress.png and b/Resources/Textures/Structures/Furniture/furniture.rsi/mattress.png differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/meta.json b/Resources/Textures/Structures/Furniture/furniture.rsi/meta.json index 1f7049dfbe1..8dfa0de4790 100644 --- a/Resources/Textures/Structures/Furniture/furniture.rsi/meta.json +++ b/Resources/Textures/Structures/Furniture/furniture.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/d5cb4288ec5f7cb9fb5b6f6e798f4c64cd82cd09, Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/9d7ff729b6b89eee0b3d750327f9fbaff4aeb045", + "copyright": "NES-Station. Artist`s : Maxgab", "size": { "x": 32, "y": 32 @@ -29,4 +29,4 @@ "name": "dresser" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/psychbed.png b/Resources/Textures/Structures/Furniture/furniture.rsi/psychbed.png index 1fd4b9609b1..c621a40ce0c 100644 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/psychbed.png and b/Resources/Textures/Structures/Furniture/furniture.rsi/psychbed.png differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/rack.png b/Resources/Textures/Structures/Furniture/furniture.rsi/rack.png index b299cc49e14..3a7d723ccc4 100644 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/rack.png and b/Resources/Textures/Structures/Furniture/furniture.rsi/rack.png differ diff --git a/Resources/Textures/Structures/Power/Generation/solar_panel.rsi/broken.png b/Resources/Textures/Structures/Power/Generation/solar_panel.rsi/broken.png index ded81ca75f5..a35d92fe627 100644 Binary files a/Resources/Textures/Structures/Power/Generation/solar_panel.rsi/broken.png and b/Resources/Textures/Structures/Power/Generation/solar_panel.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Power/Generation/solar_panel.rsi/normal.png b/Resources/Textures/Structures/Power/Generation/solar_panel.rsi/normal.png index 1e1c620029d..6a82649ced8 100644 Binary files a/Resources/Textures/Structures/Power/Generation/solar_panel.rsi/normal.png and b/Resources/Textures/Structures/Power/Generation/solar_panel.rsi/normal.png differ diff --git a/Resources/Textures/Structures/Power/Generation/solar_panel.rsi/solar_tracker.png b/Resources/Textures/Structures/Power/Generation/solar_panel.rsi/solar_tracker.png index 17abc02d28a..2b195083d50 100644 Binary files a/Resources/Textures/Structures/Power/Generation/solar_panel.rsi/solar_tracker.png and b/Resources/Textures/Structures/Power/Generation/solar_panel.rsi/solar_tracker.png differ diff --git a/Resources/Textures/Structures/Power/Generation/solar_panel.rsi/static.png b/Resources/Textures/Structures/Power/Generation/solar_panel.rsi/static.png index 455a061b31b..d13525edc6b 100644 Binary files a/Resources/Textures/Structures/Power/Generation/solar_panel.rsi/static.png and b/Resources/Textures/Structures/Power/Generation/solar_panel.rsi/static.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/base.png b/Resources/Textures/Structures/Power/apc.rsi/base.png index 25bc492f291..e70c3b31005 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/base.png and b/Resources/Textures/Structures/Power/apc.rsi/base.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/broken.png b/Resources/Textures/Structures/Power/apc.rsi/broken.png index b1ee54cea12..2945b6e0ee4 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/broken.png and b/Resources/Textures/Structures/Power/apc.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_off.png index 0d181878fcf..4ed4231183c 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_off.png and b/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_off.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png index c7a0d87ccc3..cba0a848e34 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png and b/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png index 4be0bbfb0bc..a788482e678 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png and b/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png index 720dc4976ab..04ff48e2306 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png and b/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png index 7f0a13a7a4c..d66e31b98c8 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png and b/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png index 87191be5207..b44d2d9e1e4 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png and b/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_off.png index 031213f74ad..01a02b52a3c 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_off.png and b/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_off.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png index ac5f1c1befe..5ff2f3916f6 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png and b/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_on.png index 4e04387ed3d..b6d56ce9516 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_on.png and b/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_on.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png index 2f9802281e0..0674af61398 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png and b/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_on.png index fb9e2180bb6..cccaf752d5c 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_on.png and b/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_on.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/display-charging.png b/Resources/Textures/Structures/Power/apc.rsi/display-charging.png index d5e356d943e..a2f8b1d48d9 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/display-charging.png and b/Resources/Textures/Structures/Power/apc.rsi/display-charging.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/display-full.png b/Resources/Textures/Structures/Power/apc.rsi/display-full.png index 4a9bd7ed643..e0deb615c73 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/display-full.png and b/Resources/Textures/Structures/Power/apc.rsi/display-full.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/display-lack.png b/Resources/Textures/Structures/Power/apc.rsi/display-lack.png index d1d2df4858d..ae8dc3f4043 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/display-lack.png and b/Resources/Textures/Structures/Power/apc.rsi/display-lack.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/display-remote.png b/Resources/Textures/Structures/Power/apc.rsi/display-remote.png index 07265ab67de..8e330545ca4 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/display-remote.png and b/Resources/Textures/Structures/Power/apc.rsi/display-remote.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png b/Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png index 77c2518e63d..60f5dfc55cb 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png and b/Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/frame.png b/Resources/Textures/Structures/Power/apc.rsi/frame.png index 3a66a771c70..d48bbc95585 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/frame.png and b/Resources/Textures/Structures/Power/apc.rsi/frame.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/lock0-locked.png b/Resources/Textures/Structures/Power/apc.rsi/lock0-locked.png index e16642502b9..0fa3a497f3f 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/lock0-locked.png and b/Resources/Textures/Structures/Power/apc.rsi/lock0-locked.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/lock0-unlocked.png b/Resources/Textures/Structures/Power/apc.rsi/lock0-unlocked.png index f99f7551bd9..65a4799742f 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/lock0-unlocked.png and b/Resources/Textures/Structures/Power/apc.rsi/lock0-unlocked.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/lock1-locked.png b/Resources/Textures/Structures/Power/apc.rsi/lock1-locked.png index e621693cac2..f45c48287f2 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/lock1-locked.png and b/Resources/Textures/Structures/Power/apc.rsi/lock1-locked.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/lock1-unlocked.png b/Resources/Textures/Structures/Power/apc.rsi/lock1-unlocked.png index 5c2bb5ccc34..4eddf3ce6cb 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/lock1-unlocked.png and b/Resources/Textures/Structures/Power/apc.rsi/lock1-unlocked.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/meta.json b/Resources/Textures/Structures/Power/apc.rsi/meta.json index 867e5ce0ffd..703ffee724c 100644 --- a/Resources/Textures/Structures/Power/apc.rsi/meta.json +++ b/Resources/Textures/Structures/Power/apc.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fca7f2a0f9154c0c6c4efc2f8f58441fb9b34759", + "copyright": "Made by Aserovich", "size": { "x": 32, "y": 32 @@ -74,8 +74,17 @@ "name": "display-lack", "delays": [ [ + 0.5, + 0.1, + 0.1, + 0.1, 1, - 2 + 0.3, + 0.3, + 0.3, + 0.3, + 0.3, + 0.1 ] ] }, @@ -88,6 +97,7 @@ 0.1, 0.1, 0.1, + 0.1, 0.2 ] ] @@ -105,6 +115,15 @@ "name": "display-remote", "delays": [ [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, 0.1, 0.1, 0.1, @@ -117,8 +136,14 @@ "name": "emag-unlit", "delays": [ [ - 0.5, - 0.5 + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 1 ] ] }, diff --git a/Resources/Textures/Structures/Power/apc.rsi/panel.png b/Resources/Textures/Structures/Power/apc.rsi/panel.png index 4cf8d0381ae..7bf7c7184cc 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/panel.png and b/Resources/Textures/Structures/Power/apc.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/static.png b/Resources/Textures/Structures/Power/apc.rsi/static.png index eeb458ab62f..0d9cb00f973 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/static.png and b/Resources/Textures/Structures/Power/apc.rsi/static.png differ diff --git a/Resources/Textures/Structures/Power/cable_terminal.rsi/meta.json b/Resources/Textures/Structures/Power/cable_terminal.rsi/meta.json index 53441759859..436f0cfd66b 100644 --- a/Resources/Textures/Structures/Power/cable_terminal.rsi/meta.json +++ b/Resources/Textures/Structures/Power/cable_terminal.rsi/meta.json @@ -5,7 +5,7 @@ "x": 32, "y": 32 }, - "copyright": "Taken from https://github.com/tgstation/tgstation at 21e50aebdac3e30b3f85b5e44e552e3e37ed00ea", + "copyright": "Aserovich", "license": "CC-BY-SA-3.0", "states": [ diff --git a/Resources/Textures/Structures/Power/cable_terminal.rsi/term.png b/Resources/Textures/Structures/Power/cable_terminal.rsi/term.png index dbae38dbe90..39d2931deca 100644 Binary files a/Resources/Textures/Structures/Power/cable_terminal.rsi/term.png and b/Resources/Textures/Structures/Power/cable_terminal.rsi/term.png differ diff --git a/Resources/Textures/Structures/Power/cell_recharger.rsi/empty.png b/Resources/Textures/Structures/Power/cell_recharger.rsi/empty.png index b78ee8ee5cf..7a5fdf5faa7 100644 Binary files a/Resources/Textures/Structures/Power/cell_recharger.rsi/empty.png and b/Resources/Textures/Structures/Power/cell_recharger.rsi/empty.png differ diff --git a/Resources/Textures/Structures/Power/cell_recharger.rsi/full.png b/Resources/Textures/Structures/Power/cell_recharger.rsi/full.png index c133fd30e35..2c1c97877ca 100644 Binary files a/Resources/Textures/Structures/Power/cell_recharger.rsi/full.png and b/Resources/Textures/Structures/Power/cell_recharger.rsi/full.png differ diff --git a/Resources/Textures/Structures/Power/cell_recharger.rsi/light-charged.png b/Resources/Textures/Structures/Power/cell_recharger.rsi/light-charged.png index 03b9ffcef61..a09668eae03 100644 Binary files a/Resources/Textures/Structures/Power/cell_recharger.rsi/light-charged.png and b/Resources/Textures/Structures/Power/cell_recharger.rsi/light-charged.png differ diff --git a/Resources/Textures/Structures/Power/cell_recharger.rsi/light-charging.png b/Resources/Textures/Structures/Power/cell_recharger.rsi/light-charging.png index 15011fda1c0..740724c4c15 100644 Binary files a/Resources/Textures/Structures/Power/cell_recharger.rsi/light-charging.png and b/Resources/Textures/Structures/Power/cell_recharger.rsi/light-charging.png differ diff --git a/Resources/Textures/Structures/Power/cell_recharger.rsi/light-empty.png b/Resources/Textures/Structures/Power/cell_recharger.rsi/light-empty.png index 82f905fdd9a..2fafd0f1b6b 100644 Binary files a/Resources/Textures/Structures/Power/cell_recharger.rsi/light-empty.png and b/Resources/Textures/Structures/Power/cell_recharger.rsi/light-empty.png differ diff --git a/Resources/Textures/Structures/Power/cell_recharger.rsi/meta.json b/Resources/Textures/Structures/Power/cell_recharger.rsi/meta.json index 42ad3ab990d..d1ad8c09620 100644 --- a/Resources/Textures/Structures/Power/cell_recharger.rsi/meta.json +++ b/Resources/Textures/Structures/Power/cell_recharger.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Goonstation at commit https://github.com/goonstation/goonstation/commit/4f88b9314336631929c9cdddb1567fc08f83bf9e and modified by potato1234x (github), then again by EmoGarbage404 (github) for ss14", + "copyright": "Taken from https://github.com/Artea-Station/Artea-Station-Server", "states": [ { "name": "light-off" diff --git a/Resources/Textures/Structures/Power/cell_recharger.rsi/open.png b/Resources/Textures/Structures/Power/cell_recharger.rsi/open.png index 139296e1802..55a4208c656 100644 Binary files a/Resources/Textures/Structures/Power/cell_recharger.rsi/open.png and b/Resources/Textures/Structures/Power/cell_recharger.rsi/open.png differ diff --git a/Resources/Textures/Structures/Power/smes.rsi/meta.json b/Resources/Textures/Structures/Power/smes.rsi/meta.json index 2ca8d1fb226..afaaee3b4fa 100644 --- a/Resources/Textures/Structures/Power/smes.rsi/meta.json +++ b/Resources/Textures/Structures/Power/smes.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/9c7d509354ee030300f63c701da63c17928c3b3b and modified by Swept", + "copyright": "NES-Station : Aserovich", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-open.png b/Resources/Textures/Structures/Power/smes.rsi/smes-open.png index 472e3fd7201..ca585dd1eb4 100644 Binary files a/Resources/Textures/Structures/Power/smes.rsi/smes-open.png and b/Resources/Textures/Structures/Power/smes.rsi/smes-open.png differ diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes.png b/Resources/Textures/Structures/Power/smes.rsi/smes.png index ecfbc4cd58f..c3aa5bad68d 100644 Binary files a/Resources/Textures/Structures/Power/smes.rsi/smes.png and b/Resources/Textures/Structures/Power/smes.rsi/smes.png differ diff --git a/Resources/Textures/Structures/Power/smes.rsi/static.png b/Resources/Textures/Structures/Power/smes.rsi/static.png index 3e52b6c43e4..32f1e00be17 100644 Binary files a/Resources/Textures/Structures/Power/smes.rsi/static.png and b/Resources/Textures/Structures/Power/smes.rsi/static.png differ diff --git a/Resources/Textures/Structures/Power/substation.rsi/charging.png b/Resources/Textures/Structures/Power/substation.rsi/charging.png index 538dc2b7a84..7675535164c 100644 Binary files a/Resources/Textures/Structures/Power/substation.rsi/charging.png and b/Resources/Textures/Structures/Power/substation.rsi/charging.png differ diff --git a/Resources/Textures/Structures/Power/substation.rsi/dead.png b/Resources/Textures/Structures/Power/substation.rsi/dead.png index 9fbff744ca7..27440c1c770 100644 Binary files a/Resources/Textures/Structures/Power/substation.rsi/dead.png and b/Resources/Textures/Structures/Power/substation.rsi/dead.png differ diff --git a/Resources/Textures/Structures/Power/substation.rsi/full.png b/Resources/Textures/Structures/Power/substation.rsi/full.png index d1797426699..d0b9726cacf 100644 Binary files a/Resources/Textures/Structures/Power/substation.rsi/full.png and b/Resources/Textures/Structures/Power/substation.rsi/full.png differ diff --git a/Resources/Textures/Structures/Power/substation.rsi/meta.json b/Resources/Textures/Structures/Power/substation.rsi/meta.json index 0125458641c..d19066274d1 100644 --- a/Resources/Textures/Structures/Power/substation.rsi/meta.json +++ b/Resources/Textures/Structures/Power/substation.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Drawn by Ubaser.", + "license": "CC0-1.0", + "copyright": "Created by EmoGarbage404 (github)", "size": { "x": 32, "y": 32 @@ -13,8 +13,39 @@ { "name": "substation_static" }, - { - "name": "substation_wall" + { + "name": "substation_wall", + "directions": 4 + }, + { + "name": "screen_wall", + "directions": 4, + "delays": [ + [ + 5.0, + 0.5, + 0.5, + 0.5 + ], + [ + 5.0, + 0.5, + 0.5, + 0.5 + ], + [ + 5.0, + 0.5, + 0.5, + 0.5 + ], + [ + 5.0, + 0.5, + 0.5, + 0.5 + ] + ] }, { "name": "substation_wall_static" @@ -23,21 +54,31 @@ "name": "full" }, { - "name": "charging" + "name": "charging", + "delays": [ + [ + 0.1, + 0.1 + ] + ] }, { - "name": "dead" + "name": "dead", + "delays": [ + [ + 0.3, + 0.1 + ] + ] }, { "name": "screen", "delays": [ [ - 0.15, - 0.15, - 0.15, - 0.15, - 0.15, - 0.15 + 5.0, + 0.5, + 0.5, + 0.5 ] ] } diff --git a/Resources/Textures/Structures/Power/substation.rsi/screen.png b/Resources/Textures/Structures/Power/substation.rsi/screen.png index 60c922c53f6..24420ec31ca 100644 Binary files a/Resources/Textures/Structures/Power/substation.rsi/screen.png and b/Resources/Textures/Structures/Power/substation.rsi/screen.png differ diff --git a/Resources/Textures/Structures/Power/substation.rsi/screen_wall.png b/Resources/Textures/Structures/Power/substation.rsi/screen_wall.png new file mode 100644 index 00000000000..c1dfb87b1c1 Binary files /dev/null and b/Resources/Textures/Structures/Power/substation.rsi/screen_wall.png differ diff --git a/Resources/Textures/Structures/Power/substation.rsi/substation.png b/Resources/Textures/Structures/Power/substation.rsi/substation.png index b9d1eb18d8f..d8874145443 100644 Binary files a/Resources/Textures/Structures/Power/substation.rsi/substation.png and b/Resources/Textures/Structures/Power/substation.rsi/substation.png differ diff --git a/Resources/Textures/Structures/Power/substation.rsi/substation_static.png b/Resources/Textures/Structures/Power/substation.rsi/substation_static.png index 9d5b8598f4b..24ee3fd9796 100644 Binary files a/Resources/Textures/Structures/Power/substation.rsi/substation_static.png and b/Resources/Textures/Structures/Power/substation.rsi/substation_static.png differ diff --git a/Resources/Textures/Structures/Power/substation.rsi/substation_wall.png b/Resources/Textures/Structures/Power/substation.rsi/substation_wall.png index 155ced7128a..bda37924c6d 100644 Binary files a/Resources/Textures/Structures/Power/substation.rsi/substation_wall.png and b/Resources/Textures/Structures/Power/substation.rsi/substation_wall.png differ diff --git a/Resources/Textures/Structures/Power/substation.rsi/substation_wall_static.png b/Resources/Textures/Structures/Power/substation.rsi/substation_wall_static.png index e810e6a5a4a..2f882453bb1 100644 Binary files a/Resources/Textures/Structures/Power/substation.rsi/substation_wall_static.png and b/Resources/Textures/Structures/Power/substation.rsi/substation_wall_static.png differ diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png index fdc9376d67f..3e2be97e2cb 100644 Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png differ diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png index d371695e129..2646cbe94e5 100644 Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png differ diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png index 9d8640f85b0..9471c247f0c 100644 Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png differ diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b1.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b1.png index 5fbc157750b..1beeda96b6e 100644 Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b1.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b1.png differ diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b2.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b2.png index 38b22ccd815..e13bd67ebce 100644 Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b2.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b2.png differ diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_bitem.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_bitem.png index 6f1292bb058..e13bd67ebce 100644 Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_bitem.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_bitem.png differ diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmp.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmp.png index 0b3192122be..d866b5f82d6 100644 Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmp.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmp.png differ diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmx.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmx.png index 61ecb87ff48..308f0cc0fa4 100644 Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmx.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmx.png differ diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire0.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire0.png index 278e5cf03b2..8aab167e4a7 100644 Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire0.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire0.png differ diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_0.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_0.png index 621410d043e..c0d8b5fd747 100644 Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_0.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_0.png differ diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_1.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_1.png index fb775d3098b..0151499c5ce 100644 Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_1.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_1.png differ diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_2.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_2.png index 7f004eb9b7b..4559e78d9b4 100644 Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_2.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_2.png differ diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_3.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_3.png index 71b96f2130d..87f8939c731 100644 Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_3.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_3.png differ diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_b0.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_b0.png index cfe596102d2..48c96f0c982 100644 Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_b0.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_b0.png differ diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_b1.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_b1.png index 1a620adc144..dcbe96e3b71 100644 Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_b1.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_b1.png differ diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_b2.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_b2.png index c199a7ff31e..13948780d7c 100644 Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_b2.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_b2.png differ diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_bitem.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_bitem.png index 5be7e11fc85..95b1d6e05fb 100644 Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_bitem.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_bitem.png differ diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_emagged.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_emagged.png index bafb4249565..fe44172ae82 100644 Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_emagged.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_emagged.png differ diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_off.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_off.png index 3eb61db8b6c..4f9f3cfa36b 100644 Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_off.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_off.png differ diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_on.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_on.png index ce3697456ff..86edd5f7c8f 100644 Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_on.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_on.png differ diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/firex.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/firex.png index dd31be02f80..4e74556ea11 100644 Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/firex.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/firex.png differ diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json index e59184e0b2b..cde462b98d4 100644 --- a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/b7ac5798ae0d411b0cdeaf7efbc4ac86d24b4634, fire_emagged.png edited by github:Morb0", + "copyright": "Taken from https://github.com/Artea-Station/Artea-Station-Server and respraited by Aserovich", "size": { "x": 32, "y": 32 @@ -9,96 +9,19 @@ "states": [ { "name": "alarm0", - "directions": 4, + "directions": 1, "delays": [ [ - 2.8, - 2.8 - ], - [ - 2.8, - 2.8 - ], - [ - 2.8, - 2.8 - ], - [ - 2.8, - 2.8 + 0.5, + 0.5, + 0.5 ] ] }, { "name": "alarm1", - "directions": 4, + "directions": 1, "delays": [ - [ - 0.6, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.6, - 0.6, - 0.6 - ], - [ - 0.6, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.6, - 0.6, - 0.6 - ], - [ - 0.6, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.6, - 0.6, - 0.6 - ], [ 0.6, 0.2, @@ -125,56 +48,8 @@ }, { "name": "alarm2", - "directions": 4, + "directions": 1, "delays": [ - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.4, - 0.4, - 0.4, - 0.4, - 0.4, - 0.4 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.4, - 0.4, - 0.4, - 0.4, - 0.4, - 0.4 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.4, - 0.4, - 0.4, - 0.4, - 0.4, - 0.4 - ], [ 0.2, 0.2, @@ -195,11 +70,11 @@ }, { "name": "alarm_b1", - "directions": 4 + "directions": 1 }, { "name": "alarm_b2", - "directions": 4 + "directions": 1 }, { "name": "alarm_bitem", @@ -207,11 +82,11 @@ }, { "name": "alarmp", - "directions": 4 + "directions": 1 }, { "name": "alarmx", - "directions": 4 + "directions": 1 }, { "name": "auth_off", @@ -234,32 +109,20 @@ }, { "name": "fire0", - "directions": 4 + "directions": 1 }, { "name": "fire_0", - "directions": 4 + "directions": 1 }, { "name": "fire_1", - "directions": 4 + "directions": 1 }, { "name": "fire_2", - "directions": 4, + "directions": 1, "delays": [ - [ - 0.5, - 0.5 - ], - [ - 0.5, - 0.5 - ], - [ - 0.5, - 0.5 - ], [ 0.5, 0.5 @@ -268,20 +131,8 @@ }, { "name": "fire_3", - "directions": 4, + "directions": 1, "delays": [ - [ - 0.3, - 0.3 - ], - [ - 0.3, - 0.3 - ], - [ - 0.3, - 0.3 - ], [ 0.3, 0.3 @@ -290,15 +141,15 @@ }, { "name": "fire_b0", - "directions": 4 + "directions": 1 }, { "name": "fire_b1", - "directions": 4 + "directions": 1 }, { "name": "fire_b2", - "directions": 4 + "directions": 1 }, { "name": "fire_bitem", @@ -306,20 +157,8 @@ }, { "name": "fire_emagged", - "directions": 4, + "directions": 1, "delays": [ - [ - 0.3, - 0.3 - ], - [ - 0.3, - 0.3 - ], - [ - 0.3, - 0.3 - ], [ 0.3, 0.3 @@ -328,36 +167,12 @@ }, { "name": "fire_off", - "directions": 4 + "directions": 1 }, { "name": "fire_on", - "directions": 4, + "directions": 1, "delays": [ - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ], [ 0.2, 0.2, @@ -368,17 +183,9 @@ ] ] }, - { - "name": "fire_overlay", - "directions": 4 - }, - { - "name": "fire_detected", - "directions": 4 - }, { "name": "firex", - "directions": 4 + "directions": 1 } ] } diff --git a/Resources/Textures/Structures/Wallmounts/defib_cabinet.rsi/closed.png b/Resources/Textures/Structures/Wallmounts/defib_cabinet.rsi/closed.png index a9b42ec09bf..e32bce08b96 100644 Binary files a/Resources/Textures/Structures/Wallmounts/defib_cabinet.rsi/closed.png and b/Resources/Textures/Structures/Wallmounts/defib_cabinet.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Wallmounts/defib_cabinet.rsi/frame.png b/Resources/Textures/Structures/Wallmounts/defib_cabinet.rsi/frame.png index f15421658c6..62dfe8057b3 100644 Binary files a/Resources/Textures/Structures/Wallmounts/defib_cabinet.rsi/frame.png and b/Resources/Textures/Structures/Wallmounts/defib_cabinet.rsi/frame.png differ diff --git a/Resources/Textures/Structures/Wallmounts/defib_cabinet.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/defib_cabinet.rsi/meta.json index 30a6ef2a555..7ce8eb53700 100644 --- a/Resources/Textures/Structures/Wallmounts/defib_cabinet.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/defib_cabinet.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Created by EmoGarbage404 (github) for Space Station 14", + "copyright": "NES-Station, by Aserovich", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Wallmounts/defib_cabinet.rsi/open.png b/Resources/Textures/Structures/Wallmounts/defib_cabinet.rsi/open.png index aaac1394c60..7ea15b501d9 100644 Binary files a/Resources/Textures/Structures/Wallmounts/defib_cabinet.rsi/open.png and b/Resources/Textures/Structures/Wallmounts/defib_cabinet.rsi/open.png differ diff --git a/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/closed.png b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/closed.png index 626d22bd9f5..c430999ca54 100644 Binary files a/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/closed.png and b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/extinguisher.png b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/extinguisher.png index 7a17bd0ef9f..9e033344684 100644 Binary files a/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/extinguisher.png and b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/extinguisher.png differ diff --git a/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/frame.png b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/frame.png index f012bfae5de..b8fcfce90a7 100644 Binary files a/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/frame.png and b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/frame.png differ diff --git a/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/meta.json index 3a8eeb4b496..ba588e9026d 100644 --- a/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiStation at https://github.com/TauCetiStation/TauCetiClassic/commit/afc73216e6a893d5f2fc3caa6bdd2adb06c113e3", + "copyright": "NES-Station, by Aserovich", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/open.png b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/open.png index 66e67861868..553cbebe0b8 100644 Binary files a/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/open.png and b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/open.png differ diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png b/Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png index 7ddea57eded..ca008f85678 100644 Binary files a/Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png and b/Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png differ diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/broadcasting.png b/Resources/Textures/Structures/Wallmounts/intercom.rsi/broadcasting.png index fb01e708619..c7180284749 100644 Binary files a/Resources/Textures/Structures/Wallmounts/intercom.rsi/broadcasting.png and b/Resources/Textures/Structures/Wallmounts/intercom.rsi/broadcasting.png differ diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/build.png b/Resources/Textures/Structures/Wallmounts/intercom.rsi/build.png index 21fc9a1bad5..12706f83da5 100644 Binary files a/Resources/Textures/Structures/Wallmounts/intercom.rsi/build.png and b/Resources/Textures/Structures/Wallmounts/intercom.rsi/build.png differ diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/intercom.rsi/meta.json index d4440c99a04..3f6ecd0592b 100644 --- a/Resources/Textures/Structures/Wallmounts/intercom.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/intercom.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/Skyrat-SS13/Skyrat-tg/blob/6e7197f550aac62a165c0a8c6b0835de19342623/modular_skyrat/modules/aesthetics/intercom/icons/intercom.dmi & build state from DenLemp#2965", + "copyright": "Taken from https://github.com/Artea-Station/Artea-Station-Server and respraited by Aserovich", "states": [ { "name": "base", diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png b/Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png index 3bfeb8df584..db3f9e9dafd 100644 Binary files a/Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png and b/Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png b/Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png index ea319b11876..50127d4c7c2 100644 Binary files a/Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png and b/Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png differ diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png b/Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png index 9c4c3f199e6..38da55018b5 100644 Binary files a/Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png and b/Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png differ diff --git a/Resources/Textures/Structures/Wallmounts/screen.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/screen.rsi/meta.json index a4c3148aa8e..ee61df5a2dd 100644 --- a/Resources/Textures/Structures/Wallmounts/screen.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/screen.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "From vgstation: https://github.com/vgstation-coders/vgstation13/commit/a7290010020e541ed6b57817a07023ca6bef26fe#diff-20395160138bed693d15eee6f16d671531b5fa533ec52c50e8df6d52370dbecd", + "copyright": "NES-Station, by Aserovich", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Wallmounts/screen.rsi/screen.png b/Resources/Textures/Structures/Wallmounts/screen.rsi/screen.png index a3e7a3fe55a..57b8fc80385 100644 Binary files a/Resources/Textures/Structures/Wallmounts/screen.rsi/screen.png and b/Resources/Textures/Structures/Wallmounts/screen.rsi/screen.png differ