Update Sunrise Dev-Map (#3450)

Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/snipers/snipers.ftl

@@ -6,8 +6,6 @@ ent-WeaponRifleBauer127 = SR-127 Bauer bolt action rifle
     .desc = { ent-BaseWeaponRifle.desc }
 ent-WeaponSniperGarand = M1 Garand
     .desc = { ent-BaseWeaponSniper.desc }
-ent-WeaponSniperMosinNew = Kardashev-Mosin
-    .desc = { ent-BaseWeaponSniper.desc }
 ent-WeaponSniperRepeater = N2524 Repeater
     .desc = A civilian grade lever action firearm, favored by space cowboys for its reliability and stopping power. Uses .45 magnum ammo.
 ent-WeaponSniperMosinLubed = Kardashev-Mosin

Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/snipers/snipers.ftl

@@ -6,8 +6,6 @@ ent-WeaponRifleBauer127 = затворная винтовка Bauer SR-127
     .desc = Bauer SR-127 - это стандартная винтовка с затвором, используемая Объединённым правительством Земли. Известен своей точностью на дальних дистанциях и используется стрелками, несмотря на свой возраст и отсутствие IFF. У него несъёмный прицел. Использует магазины с патронами .60 антиматериальный.
 ent-WeaponSniperGarand = M1 Garand
     .desc = Carlford-1 - это переделанная классика производства Carl ford Armories, адаптированная к современным условиям. Большинство заметных отличий - это незначительные модификации рельсов, не считая этого.
-ent-WeaponSniperMosinNew = Кардашев-Мосин
-    .desc = Оружие для охоты или бесконечной окопной войны. Использует винтовочные патроны калибра 7.62x54R.
 ent-WeaponSniperRepeater = Н2524 Рычажок
     .desc = Гражданское ружье с рычажным механизмом, любимое космическими ковбоями за его надежность и мощную поражающую силу. Использует патроны калибра .45 магнум.
 ent-WeaponSniperMosinLubed = Кардашев-Мосин

Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml

@@ -115,7 +115,11 @@
   # Sunrise start
   - type: Gun
     pump: true
-    fireRate: 1
+    fireRate: 1.3
+  - type: Item
+    storedSprite:
+      sprite: _Sunrise/Objects/Weapons/Guns/Snipers/mosin.rsi
+      state: icon
   # Sunrise end
 
 - type: entity

Resources/Prototypes/Maps/debug.yml

@@ -16,7 +16,7 @@
 - type: gameMap
   id: Dev
   mapName: Dev
-  mapPath: /Maps/Test/dev_map.yml
+  mapPath: /Maps/_Sunrise/Test/dev_map.yml #/Maps/Test/dev_map.yml # Sunrise-edit
   minPlayers: 0
   stations:
     Dev:

Resources/Prototypes/_Sunrise/Catalog/VendingMachines/Inventories/liberation.yml

@@ -100,8 +100,6 @@
     WeaponSniperRepeater: 3
     WeaponRifleBauer127: 3
     WeaponSniperDragunov: 3
-    WeaponSniperMosinNew: 3
-    WeaponSniperMosinLubed: 3
 
     WeaponLauncherChinaLake: 3
     WeaponLauncherRocket: 3
@@ -226,7 +224,12 @@
     ShellShotgunImprovisedIncendiary: 8
     ShellShotgunImprovisedUranium: 8
     ShellShotgunCoin: 8
-
+    # Ammo Shotgun Magazine
+    MagazineShotgun: 8
+    MagazineShotgunUranium: 8
+    MagazineShotgunSlug: 8
+    MagazineShotgunBeanbag: 8
+    MagazineShotgunIncendiary: 8
     # Ammo magnum
     MagazineBoxImprovisedMagnum: 3
     SpeedLoaderMagnumRubber: 8
@@ -239,6 +242,42 @@
     MagazineBoxMagnumHP: 3
     MagazineBoxMagnumFMJ: 3
     MagazineBoxMagnumAP: 3
+    # Pistol 45 Ammo
+    MagazineMagnumPractice: 3
+    MagazineMagnumRubber: 3
+    MagazineMagnum: 3
+    MagazineMagnumHP: 3
+    MagazineMagnumFMJ: 3
+    MagazineMagnumUranium: 3
+    MagazineMagnumAP: 3
+    # Pistol 40 mag Ammo
+    MagazinePistol40SP: 3
+    MagazinePistol40HP: 3
+    MagazinePistol40FMJ: 3
+    MagazinePistol40AP: 3
+    # Pistol 40 smg Ammo
+    MagazinePistol40SubMachineGunSP: 3
+    MagazinePistol40SubMachineGunHP: 3
+    MagazinePistol40SubMachineGunFMJ: 3
+    MagazinePistol40SubMachineGunAP: 3
+    # Pistol 35 smg Ammo
+    MagazinePistolSubMachineGunPractice: 3
+    MagazinePistolSubMachineGunRubber: 3
+    MagazinePistolSubMachineGunUranium: 3
+    MagazinePistolSubMachineGunIncendiary: 3
+    MagazinePistolSubMachineGunSP: 3
+    MagazinePistolSubMachineGunHP: 3
+    MagazinePistolSubMachineGunFMJ: 3
+    MagazinePistolSubMachineGunAP: 3
+    # Pistol 550 smg Ammo
+    MagazinePistolSubMachineGunTopMountedRubber: 3
+    MagazinePistolSubMachineGunTopMountedPractice: 3
+    MagazinePistolSubMachineGunTopMountedIncendiary: 3
+    MagazinePistolSubMachineGunTopMountedUranium: 3
+    MagazinePistolSubMachineGunTopMountedHP: 3
+    MagazinePistolSubMachineGunTopMountedSP: 3
+    MagazinePistolSubMachineGunTopMounted: 3
+    MagazinePistolSubMachineGunTopMountedAP: 3
     # Pistol Ammo
     MagazinePistolImprovisedFilled: 8
     MagazinePistolSubMachineGunImprovisedFilled: 8

Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Snipers/snipers.yml

@@ -260,28 +260,6 @@
     delay: 0.5
   - type: GunRequiresWield
 
-- type: entity
-  name: Kardashev-Mosin
-  parent: BaseWeaponSniper
-  id: WeaponSniperMosinNew
-  components:
-  - type: Sprite
-    sprite: _Sunrise/Objects/Weapons/Guns/Snipers/mosin/big.rsi
-  - type: Clothing
-    sprite: _Sunrise/Objects/Weapons/Guns/Snipers/mosin/tiny.rsi
-  - type: Item
-    size: Huge
-    shape:
-    - 0,0,4,1
-    sprite: _Sunrise/Objects/Weapons/Guns/Snipers/mosin/tiny.rsi
-  - type: Gun
-    pump: true
-    fireRate: 0.8
-  - type: Wieldable
-  - type: UseDelay
-    delay: 0.5
-  - type: GunRequiresWield
-
 - type: entity
   name: N2524 Repeater
   parent: [ BaseWeaponSniper, BaseGunWieldable, BaseMinorContraband ]

Resources/Textures/_Sunrise/Objects/Weapons/Guns/Snipers/mosin.rsi/meta.json

@@ -9,12 +9,6 @@
     "states": [
 	{
 		"name": "icon"
-	},
-	{
-		"name": "bolt-open"
-	},
-	{
-		"name": "base"
-    }
+	}
     ]
 }

Resources/Textures/_Sunrise/Objects/Weapons/Guns/Snipers/mosin/tiny.rsi/meta.json

@@ -1,35 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Made by ME DIO(or no_mad)",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "equipped-BACKPACK",
-            "directions": 4
-        },
-        {
-            "name": "equipped-SUITSTORAGE",
-            "directions": 4
-        },
-        {
-            "name": "wielded-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "wielded-inhand-right",
-            "directions": 4
-        }
-    ]
-}

Resources/migration.yml

@@ -859,6 +859,7 @@ MagazinePPSH41: MagazinePistolSubMachineGunPPSHExtended
 MagazinePPSH41Extended: null
 WeaponSTG44: null
 MagazineSTG44: null
+WeaponSniperMosinNew: null
 # SL HITSCAN START
 BoxMagazineRifle: BoxMagazineRifleSP
 MagazineBoxLightRifle: MagazineBoxLightRifleSP