highlights (#9332)

Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2022-07-06 12:57:23 +03:00
parent 8fe43cfde7
commit f6da17d7d9
41 changed files with 20 additions and 5 deletions
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -91,7 +91,7 @@
    # autoEject: true # Do not set this until the PVS prediction issue is resolved
  - type: MagazineVisuals
    magState: mag
-    steps: 1
+    steps: 6
    zeroVisible: true
  - type: Appearance

--- a/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/icon.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/icon.png
--- a/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/base.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/base.png
--- a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/base.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/base.png
--- a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/icon.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/icon.png
--- a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/mag-0.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/mag-0.png
--- a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/meta.json
@@ -1,7 +1,7 @@
 {
    "version": 1,
    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken/modified from pireamaineach at https://github.com/tgstation/tgstation/pull/43407/commits/b92e11e94466be5bcb465b781decf83764401ac1",
+    "copyright": "Taken from desertrose at https://github.com/DesertRose2/desertrose/commit/120961e254d7f83a6e00a02c76e734f9e5019345",
    "size": {
        "x": 32,
        "y": 32
--- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/icon.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/icon.png
--- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.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/pull/26621/commits/fc4cc47e5ae4a5562077239fc2dcfe1603d2645a",
+    "copyright": "Taken/modified from Shiptest at https://github.com/shiptest-ss13/Shiptest/pull/308/commits/252f82abfe3e74b6fbd7928b149bdbb9476a2624",
    "size": {
        "x": 32,
        "y": 32
--- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/icon.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/icon.png
--- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json
@@ -1,7 +1,7 @@
 {
    "version": 1,
    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from Shiptest at https://github.com/shiptest-ss13/Shiptest/pull/308/commits/252f82abfe3e74b6fbd7928b149bdbb9476a2624",
+    "copyright": "Taken/modified from Shiptest at https://github.com/shiptest-ss13/Shiptest/pull/308/commits/252f82abfe3e74b6fbd7928b149bdbb9476a2624",
    "size": {
        "x": 32,
        "y": 32
--- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/icon.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/icon.png
--- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.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/pull/26621/commits/fc4cc47e5ae4a5562077239fc2dcfe1603d2645a",
+    "copyright": "Taken from desertrose at https://github.com/DesertRose2/desertrose/commit/0b8f7b7694a4a814724ba8ed59f695916ce845ce",
    "size": {
        "x": 32,
        "y": 32
--- a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/base.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/base.png
--- a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/icon.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/icon.png
--- a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/mag-0.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/mag-0.png
--- a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/base.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/base.png
--- a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/icon.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/icon.png
--- a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/mag-0.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/mag-0.png
--- a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/base.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/base.png
--- a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/icon.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/icon.png
--- a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-0.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-0.png
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/base.png
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/base.png
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/icon.png
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/icon.png
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-0.png
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-0.png
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-1.png
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-1.png
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-2.png
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-2.png
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-3.png
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-3.png
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-4.png
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-4.png
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-5.png
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-5.png
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json
@@ -16,6 +16,21 @@
        {
            "name": "mag-0"
        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        },
+        {
+            "name": "mag-4"
+        },
+        {
+            "name": "mag-5"
+        },
        {
            "name": "suppressor"
        },
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/base.png
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/base.png
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/icon.png
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/icon.png
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/mag-0.png
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/mag-0.png
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/base.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/base.png
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/icon.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/icon.png
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/mag-0.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/mag-0.png
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/icon.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/icon.png
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/icon.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/icon.png
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/icon.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/icon.png