Merge branch 'arumoon-server' of https://github.com/Wizard-Grin/space…

…-station-14 into arumoon-server
Workbench-Team · Jul 31, 2023 · fe4d024 · fe4d024
2 parents 8ce3bdf + 05a7933
commit fe4d024
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 17 deletions.
diff --git a/Resources/Locale/ru-RU/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/store/uplink-catalog.ftl
@@ -221,5 +221,5 @@ uplink-scarf-syndie-red-desc = Стильный полосатый красны
 uplink-scarf-syndie-green-name = Полосатый зелёный шарф синдиката
 uplink-scarf-syndie-green-desc = Стильный полосатый зелёный шарф синдиката. Идеальный зимний аксессуар для тех, у кого обостренное чувство моды, и  тех, у кого есть настроение что-нибудь украсть.
 
-uplink-miniature-energy-crossbow-syndie-green-name = энергетический мини арбалет
-uplink-miniature-energy-crossbow-syndie-green-desc = энергетический арбалет синдиката, маленький, бесшумный и смертоносный.
+uplink-miniature-energy-crossbow-syndie-green-name = Энергетический мини арбалет
+uplink-miniature-energy-crossbow-syndie-green-desc = Энергетический арбалет синдиката, маленький, бесшумный и смертоносный.
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -1323,9 +1323,9 @@
   id: UplinkMiniatureEnergyCrossbow
   name: uplink-miniature-energy-crossbow-syndie-green-name
   description: uplink-miniature-energy-crossbow-syndie-green-desc
-  icon: { sprite: Objects/Weapons/Guns/Battery/MiniatureEnergyCrossbow.rsi, state: icon }
+  icon: { sprite: Objects/Weapons/Guns/Battery/miniature_ebow.rsi, state: icon }
   productEntity: MiniatureEnergyCrossbow
   cost:
     Telecrystal: 10
   categories:
-  - UplinkWeapons
+  - UplinkWeapons
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -466,18 +466,17 @@
   description: The syndicate's energy crossbow, small, silent and deadly.
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Battery/MiniatureEnergyCrossbow.rsi
+    sprite: Objects/Weapons/Guns/Battery/miniature_ebow.rsi
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
-    - state: mag-unshaded-
-      map: ["enum.GunVisualLayers.MagUnshaded"]
-      shader: unshaded
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
   - type: Gun
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/heavy_shot_suppressed.ogg
   - type: ProjectileBatteryAmmoProvider
-    proto: BulletMIC
+    proto: BulletMic
     fireCost: 900
   - type: BatterySelfRecharger
     autoRecharge: true
@@ -521,4 +520,4 @@
     - type: ProjectileBatteryAmmoProvider
       proto: BulletCutter
       fireCost: 5
-    - type: Appearance
+    - type: Appearance
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -746,21 +746,17 @@
     - type: GrapplingProjectile
 
 - type: entity
-  id: BulletMIC
+  id: BulletMic
   name: MIC bolt
   parent: BaseBullet
   noSpawn: true
   description: Not too bad, but you still don't want to get hit by it.
   components:
-  - type: Reflective
-    reflective:
-      - NonEnergy
   - type: Sprite
     noRot: false
     sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
     layers:
     - state: cbbolt
-      shader: unshaded
   - type: GatheringProjectile
   - type: Projectile
     damage:

diff --git a/...tery/MiniatureEnergyCrossbow.rsi/base.png → .../Guns/Battery/miniature_ebow.rsi/base.png b/...tery/MiniatureEnergyCrossbow.rsi/base.png → .../Guns/Battery/miniature_ebow.rsi/base.png
diff --git a/...atureEnergyCrossbow.rsi/equipped-BELT.png → ...tery/miniature_ebow.rsi/equipped-BELT.png b/...atureEnergyCrossbow.rsi/equipped-BELT.png → ...tery/miniature_ebow.rsi/equipped-BELT.png
diff --git a/...tery/MiniatureEnergyCrossbow.rsi/icon.png → .../Guns/Battery/miniature_ebow.rsi/icon.png b/...tery/MiniatureEnergyCrossbow.rsi/icon.png → .../Guns/Battery/miniature_ebow.rsi/icon.png
diff --git a/...niatureEnergyCrossbow.rsi/inhand-left.png → ...attery/miniature_ebow.rsi/inhand-left.png b/...niatureEnergyCrossbow.rsi/inhand-left.png → ...attery/miniature_ebow.rsi/inhand-left.png
diff --git a/...iatureEnergyCrossbow.rsi/inhand-right.png → ...ttery/miniature_ebow.rsi/inhand-right.png b/...iatureEnergyCrossbow.rsi/inhand-right.png → ...ttery/miniature_ebow.rsi/inhand-right.png
diff --git a/...tureEnergyCrossbow.rsi/mag-unshaded-0.png → ...Guns/Battery/miniature_ebow.rsi/mag-0.png b/...tureEnergyCrossbow.rsi/mag-unshaded-0.png → ...Guns/Battery/miniature_ebow.rsi/mag-0.png
diff --git a/...tureEnergyCrossbow.rsi/mag-unshaded-4.png → ...Guns/Battery/miniature_ebow.rsi/mag-1.png b/...tureEnergyCrossbow.rsi/mag-unshaded-4.png → ...Guns/Battery/miniature_ebow.rsi/mag-1.png
diff --git a/...ery/MiniatureEnergyCrossbow.rsi/meta.json → ...Guns/Battery/miniature_ebow.rsi/meta.json b/...ery/MiniatureEnergyCrossbow.rsi/meta.json → ...Guns/Battery/miniature_ebow.rsi/meta.json
@@ -14,10 +14,10 @@
             "name": "base"
         },
         {
-            "name": "mag-unshaded-0"
+            "name": "mag-0"
         },
         {
-            "name": "mag-unshaded-4"
+            "name": "mag-1"
         },
         {
             "name": "inhand-left",