The Pizdec

space-sunrise · Nov 30, 2024 · f5fca9e · f5fca9e
1 parent 69404e0
commit f5fca9e
Show file tree

Hide file tree

Showing 90 changed files with 187 additions and 41 deletions.
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
@@ -73,7 +73,7 @@
     whitelist:
       tags:
       - CartridgePistol
-    capacity: 45
+    capacity: 32
   - type: Item
     size: Small
   - type: ContainerContainer
@@ -106,7 +106,7 @@
     whitelist:
       tags:
       - CartridgePistol
-    capacity: 45
+    capacity: 32
   - type: Item
     size: Small
   - type: ContainerContainer
@@ -135,13 +135,13 @@
     - MagazinePPSH41
   - type: BallisticAmmoProvider
     mayTransfer: true
-    proto: CartridgeLightRifle  # 57x28
+    proto: CartridgePistol  # 57x28
     whitelist:
       tags:
-      - CartridgeLightRifle  # 57x28
+      - CartridgePistol  # 57x28
     capacity: 71
   - type: Item
-    size: Small
+    size: Normal
   - type: ContainerContainer
     containers:
       ballistic-ammo: !type:Container
@@ -170,14 +170,14 @@
   id: MagazineMP5Extended
   components:
   - type: BallisticAmmoProvider
-    capacity: 54
+    capacity: 42
 
 - type: entity
   parent: MagazineMP7
   id: MagazineMP7Extended
   components:
   - type: BallisticAmmoProvider
-    capacity: 51
+    capacity: 42
 
 - type: entity
   parent: MagazineP90

diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
@@ -190,11 +190,11 @@
     size: Small
   - type: BallisticAmmoProvider
     mayTransfer: true
-    proto: CartridgeLightRifle  # 556
+    proto: CartridgeRifle  # 556
     whitelist:
       tags:
-      - CartridgeLightRifle  # 556
-    capacity: 25
+      - CartridgeRifle  # 556
+    capacity: 30
   - type: ContainerContainer
     containers:
       ballistic-ammo: !type:Container

diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/sniper.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/sniper.yml
@@ -9,11 +9,11 @@
       - MagazineDragunov
   - type: BallisticAmmoProvider
     mayTransfer: true
-    capacity: 20
-    proto: CartridgeMagnum  # 762x54
+    capacity: 10
+    proto: CartridgeAntiMateriel  # 762x54
     whitelist:
       tags:
-        - CartridgeMagnum  # 762x54
+        - CartridgeAntiMateriel  # 762x54
   - type: ContainerContainer
     containers:
       ballistic-ammo: !type:Container
@@ -46,11 +46,11 @@
       - MagazineBR64
   - type: BallisticAmmoProvider
     mayTransfer: true
-    capacity: 20
-    proto: CartridgeAntiMateriel  # 062
+    capacity: 32
+    proto: CartridgeMagnum  # 062
     whitelist:
       tags:
-        - CartridgeAntiMateriel  # 062
+        - CartridgeMagnum  # 062
   - type: ContainerContainer
     containers:
       ballistic-ammo: !type:Container
@@ -112,14 +112,14 @@
   id: MagazineDragunovExtended
   components:
   - type: BallisticAmmoProvider
-    capacity: 25
+    capacity: 20
 
 - type: entity
   parent: MagazineBR64
   id: MagazineBR64Extended
   components:
   - type: BallisticAmmoProvider
-    capacity: 25
+    capacity: 36
 
 - type: entity
   parent: MagazineBauer127

diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -382,11 +382,11 @@
     sprite: _Sunrise/Objects/Weapons/Guns/SMGs/ppsh41/tiny.rsi
   - type: GunWieldBonus
     minAngle: -20
-    maxAngle: -28
+    maxAngle: -25
   - type: Gun
     minAngle: 24
-    maxAngle: 48
-    fireRate: 9.5
+    maxAngle: 50
+    fireRate: 9
     soundGunshot:
       path: /Audio/_Sunrise/Weapons/Guns/SMGs/ppsh41/ppsh_shot.ogg
       params:
@@ -404,6 +404,7 @@
         whitelist:
           tags:
           - MagazinePPSH41
+          - MagazinePistolSubMachineGun
       gun_chamber:
         name: Chamber
         startingItem: CartridgePistol

diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -21,9 +21,9 @@
     selectedMode: SemiAuto
     availableModes:
     - SemiAuto
-    minAngle: 24
-    maxAngle: 45
-    fireRate: 1.5
+    minAngle: 25
+    maxAngle: 46
+    fireRate: 1.6
     soundGunshot:
       path: /Audio/_Sunrise/Weapons/Guns/Snipers/Dragunov/dragunov_shot.ogg
       params:
@@ -45,11 +45,11 @@
             - MagazineDragunov
       gun_chamber:
         name: Chamber
-        startingItem: CartridgeMagnum  # 762x54
+        startingItem: CartridgeAntiMateriel  # 762x54
         priority: 1
         whitelist:
           tags:
-            - CartridgeMagnum  # 762x54
+            - CartridgeAntiMateriel  # 762x54
   - type: ContainerContainer
     containers:
       gun_magazine: !type:ContainerSlot
@@ -62,6 +62,7 @@
   - type: Telescope
   - type: UseDelay
     delay: 0.5
+  - type: GunRequiresWield
 
 - type: entity
   name: BR-64
@@ -80,12 +81,12 @@
   - type: Item
     sprite: _Sunrise/Objects/Weapons/Guns/Snipers/br-64/tiny.rsi
   - type: GunWieldBonus
-    minAngle: -23
-    maxAngle: -43
+    minAngle: -20
+    maxAngle: -40
   - type: Gun
-    fireRate: 1.25
-    minAngle: 24
-    maxAngle: 45
+    fireRate: 3
+    minAngle: 28
+    maxAngle: 48
     soundGunshot:
       path: /Audio/_Sunrise/Weapons/Guns/Snipers/SR-64/SR64_shot.ogg
       params:
@@ -105,11 +106,11 @@
             - MagazineBR64
       gun_chamber:
         name: Chamber
-        startingItem: CartridgeAntiMateriel  # 062
+        startingItem: CartridgeMagnum  # 062
         priority: 1
         whitelist:
           tags:
-          - CartridgeAntiMateriel  # 062
+          - CartridgeMagnum  # 062
   - type: ContainerContainer
     containers:
       gun_magazine: !type:ContainerSlot
@@ -147,7 +148,7 @@
     minAngle: -23
     maxAngle: -43
   - type: Gun
-    fireRate: 1.25
+    fireRate: 1.4
     minAngle: 24
     maxAngle: 45
     soundGunshot:

diff --git a/.../_Sunrise/Objects/Weapons/Guns/Battery/EGE_XR/tiny.rsi/equipped-SUITSTORAGE.png b/.../_Sunrise/Objects/Weapons/Guns/Battery/EGE_XR/tiny.rsi/equipped-SUITSTORAGE.png
diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/EGE_XR/tiny.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/EGE_XR/tiny.rsi/meta.json
@@ -19,6 +19,10 @@
             "name": "equipped-BACKPACK",
             "directions": 4
         },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
         {
             "name": "wielded-inhand-left",
             "directions": 4

diff --git a/...es/_Sunrise/Objects/Weapons/Guns/Battery/EG_C/tiny.rsi/equipped-SUITSTORAGE.png b/...es/_Sunrise/Objects/Weapons/Guns/Battery/EG_C/tiny.rsi/equipped-SUITSTORAGE.png
diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/EG_C/tiny.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/EG_C/tiny.rsi/meta.json
@@ -19,6 +19,10 @@
             "name": "equipped-BACKPACK",
             "directions": 4
         },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
         {
             "name": "wielded-inhand-left",
             "directions": 4

diff --git a/...s/_Sunrise/Objects/Weapons/Guns/Battery/EG_MG/tiny.rsi/equipped-SUITSTORAGE.png b/...s/_Sunrise/Objects/Weapons/Guns/Battery/EG_MG/tiny.rsi/equipped-SUITSTORAGE.png
diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/EG_MG/tiny.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/EG_MG/tiny.rsi/meta.json
@@ -16,7 +16,11 @@
             "directions": 4
         },
         {
-            "name": "equipped-BACKPACK",
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
             "directions": 4
         },
         {

diff --git a/...es/_Sunrise/Objects/Weapons/Guns/Battery/EG_R/tiny.rsi/equipped-SUITSTORAGE.png b/...es/_Sunrise/Objects/Weapons/Guns/Battery/EG_R/tiny.rsi/equipped-SUITSTORAGE.png
diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/EG_R/tiny.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/EG_R/tiny.rsi/meta.json
@@ -19,6 +19,10 @@
             "name": "equipped-BACKPACK",
             "directions": 4
         },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
         {
             "name": "wielded-inhand-left",
             "directions": 4

diff --git a/...unrise/Objects/Weapons/Guns/Battery/EG_Sniper/tiny.rsi/equipped-SUITSTORAGE.png b/...unrise/Objects/Weapons/Guns/Battery/EG_Sniper/tiny.rsi/equipped-SUITSTORAGE.png
diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/EG_Sniper/tiny.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/EG_Sniper/tiny.rsi/meta.json
@@ -19,6 +19,10 @@
             "name": "equipped-BACKPACK",
             "directions": 4
         },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
         {
             "name": "wielded-inhand-left",
             "directions": 4

diff --git a/...Sunrise/Objects/Weapons/Guns/Flamethrowers/M6/tiny.rsi/equipped-SUITSTORAGE.png b/...Sunrise/Objects/Weapons/Guns/Flamethrowers/M6/tiny.rsi/equipped-SUITSTORAGE.png
diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Flamethrowers/M6/tiny.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Flamethrowers/M6/tiny.rsi/meta.json
@@ -19,6 +19,10 @@
             "name": "equipped-BACKPACK",
             "directions": 4
         },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
         {
             "name": "wielded-inhand-left",
             "directions": 4

diff --git a/...tures/_Sunrise/Objects/Weapons/Guns/LMGs/mg42/tiny.rsi/equipped-SUITSTORAGE.png b/...tures/_Sunrise/Objects/Weapons/Guns/LMGs/mg42/tiny.rsi/equipped-SUITSTORAGE.png
diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/LMGs/mg42/tiny.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/LMGs/mg42/tiny.rsi/meta.json
@@ -19,6 +19,10 @@
             "name": "equipped-BACKPACK",
             "directions": 4
         },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
         {
             "name": "wielded-inhand-left",
             "directions": 4

diff --git a/...tures/_Sunrise/Objects/Weapons/Guns/LMGs/mg60/tiny.rsi/equipped-SUITSTORAGE.png b/...tures/_Sunrise/Objects/Weapons/Guns/LMGs/mg60/tiny.rsi/equipped-SUITSTORAGE.png
diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/LMGs/mg60/tiny.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/LMGs/mg60/tiny.rsi/meta.json
@@ -19,6 +19,10 @@
             "name": "equipped-BACKPACK",
             "directions": 4
         },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
         {
             "name": "wielded-inhand-left",
             "directions": 4

diff --git a/...urces/Textures/_Sunrise/Objects/Weapons/Guns/LMGs/rpd/tiny.rsi/inhand-right.png b/...urces/Textures/_Sunrise/Objects/Weapons/Guns/LMGs/rpd/tiny.rsi/inhand-right.png
diff --git a/...extures/_Sunrise/Objects/Weapons/Guns/LMGs/rpd/tiny.rsi/wielded-inhand-left.png b/...extures/_Sunrise/Objects/Weapons/Guns/LMGs/rpd/tiny.rsi/wielded-inhand-left.png
diff --git a/...xtures/_Sunrise/Objects/Weapons/Guns/LMGs/rpd/tiny.rsi/wielded-inhand-right.png b/...xtures/_Sunrise/Objects/Weapons/Guns/LMGs/rpd/tiny.rsi/wielded-inhand-right.png
diff --git a/...extures/_Sunrise/Objects/Weapons/Guns/Rifles/ak74u.rsi/equipped-SUITSTORAGE.png b/...extures/_Sunrise/Objects/Weapons/Guns/Rifles/ak74u.rsi/equipped-SUITSTORAGE.png
diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/ak74u.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/ak74u.rsi/meta.json
@@ -35,6 +35,10 @@
 		"name": "wielded-inhand-right",
 		"directions": 4
 	},
+	{
+		"name": "equipped-SUITSTORAGE",
+		"directions": 4
+	},
     {
       "name": "equipped-BACKPACK",
       "directions": 4

diff --git a/...es/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/akms/tiny.rsi/inhand-right.png b/...es/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/akms/tiny.rsi/inhand-right.png
diff --git a/...res/_Sunrise/Objects/Weapons/Guns/Rifles/ar18/tiny.rsi/equipped-SUITSTORAGE.png b/...res/_Sunrise/Objects/Weapons/Guns/Rifles/ar18/tiny.rsi/equipped-SUITSTORAGE.png
diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/ar18/tiny.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/ar18/tiny.rsi/meta.json
@@ -19,6 +19,10 @@
             "name": "equipped-BACKPACK",
             "directions": 4
         },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
         {
             "name": "wielded-inhand-left",
             "directions": 4

diff --git a/...es/_Sunrise/Objects/Weapons/Guns/Rifles/famas/tiny.rsi/equipped-SUITSTORAGE.png b/...es/_Sunrise/Objects/Weapons/Guns/Rifles/famas/tiny.rsi/equipped-SUITSTORAGE.png
diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/famas/tiny.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/famas/tiny.rsi/meta.json
@@ -19,6 +19,10 @@
             "name": "equipped-BACKPACK",
             "directions": 4
         },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
         {
             "name": "wielded-inhand-left",
             "directions": 4

diff --git a/...ures/_Sunrise/Objects/Weapons/Guns/Rifles/g36/tiny.rsi/equipped-SUITSTORAGE.png b/...ures/_Sunrise/Objects/Weapons/Guns/Rifles/g36/tiny.rsi/equipped-SUITSTORAGE.png
diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/g36/tiny.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/g36/tiny.rsi/meta.json
@@ -19,6 +19,10 @@
             "name": "equipped-BACKPACK",
             "directions": 4
         },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
         {
             "name": "wielded-inhand-left",
             "directions": 4

diff --git a/...es/_Sunrise/Objects/Weapons/Guns/Rifles/m16a4/tiny.rsi/equipped-SUITSTORAGE.png b/...es/_Sunrise/Objects/Weapons/Guns/Rifles/m16a4/tiny.rsi/equipped-SUITSTORAGE.png
diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/m16a4/tiny.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/m16a4/tiny.rsi/meta.json
@@ -19,6 +19,10 @@
             "name": "equipped-BACKPACK",
             "directions": 4
         },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
         {
             "name": "wielded-inhand-left",
             "directions": 4

diff --git a/...ures/_Sunrise/Objects/Weapons/Guns/Rifles/m28/tiny.rsi/equipped-SUITSTORAGE.png b/...ures/_Sunrise/Objects/Weapons/Guns/Rifles/m28/tiny.rsi/equipped-SUITSTORAGE.png
diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/m28/tiny.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/m28/tiny.rsi/meta.json
@@ -19,6 +19,10 @@
             "name": "equipped-BACKPACK",
             "directions": 4
         },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
         {
             "name": "wielded-inhand-left",
             "directions": 4

diff --git a/...es/_Sunrise/Objects/Weapons/Guns/Rifles/stg44/tiny.rsi/equipped-SUITSTORAGE.png b/...es/_Sunrise/Objects/Weapons/Guns/Rifles/stg44/tiny.rsi/equipped-SUITSTORAGE.png
diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/stg44/tiny.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/stg44/tiny.rsi/meta.json
@@ -19,6 +19,10 @@
             "name": "equipped-BACKPACK",
             "directions": 4
         },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
         {
             "name": "wielded-inhand-left",
             "directions": 4

diff --git a/...ures/_Sunrise/Objects/Weapons/Guns/Rifles/v31/tiny.rsi/equipped-SUITSTORAGE.png b/...ures/_Sunrise/Objects/Weapons/Guns/Rifles/v31/tiny.rsi/equipped-SUITSTORAGE.png
diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/v31/tiny.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/v31/tiny.rsi/meta.json
@@ -19,6 +19,10 @@
             "name": "equipped-BACKPACK",
             "directions": 4
         },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
         {
             "name": "wielded-inhand-left",
             "directions": 4

diff --git a/...Textures/_Sunrise/Objects/Weapons/Guns/SMGs/AJ-100.rsi/equipped-SUITSTORAGE.png b/...Textures/_Sunrise/Objects/Weapons/Guns/SMGs/AJ-100.rsi/equipped-SUITSTORAGE.png