From 082f17975a61565783c26bf7018bff01cbd5bbaa Mon Sep 17 00:00:00 2001 From: no_mad Date: Thu, 6 Feb 2025 00:13:27 +0900 Subject: [PATCH 01/16] spritiki --- .../ru-RU/_backmen/energydome/energydome.ftl | 4 +- .../ru-RU/_backmen/technologys/security.ftl | 2 + .../Ammunition/Boxes/cartonka.rsi/base.png | Bin 0 -> 268 bytes .../Guns/Ammunition/Boxes/cartonka.rsi/bb.png | Bin 0 -> 149 bytes .../Ammunition/Boxes/cartonka.rsi/close.png | Bin 0 -> 231 bytes .../Ammunition/Boxes/cartonka.rsi/mag-1.png | Bin 0 -> 133 bytes .../Ammunition/Boxes/cartonka.rsi/mag-10.png | Bin 0 -> 195 bytes .../Ammunition/Boxes/cartonka.rsi/mag-11.png | Bin 0 -> 192 bytes .../Ammunition/Boxes/cartonka.rsi/mag-12.png | Bin 0 -> 183 bytes .../Ammunition/Boxes/cartonka.rsi/mag-2.png | Bin 0 -> 147 bytes .../Ammunition/Boxes/cartonka.rsi/mag-3.png | Bin 0 -> 147 bytes .../Ammunition/Boxes/cartonka.rsi/mag-4.png | Bin 0 -> 155 bytes .../Ammunition/Boxes/cartonka.rsi/mag-5.png | Bin 0 -> 155 bytes .../Ammunition/Boxes/cartonka.rsi/mag-6.png | Bin 0 -> 154 bytes .../Ammunition/Boxes/cartonka.rsi/mag-7.png | Bin 0 -> 174 bytes .../Ammunition/Boxes/cartonka.rsi/mag-8.png | Bin 0 -> 185 bytes .../Ammunition/Boxes/cartonka.rsi/mag-9.png | Bin 0 -> 186 bytes .../Ammunition/Boxes/cartonka.rsi/meta.json | 68 ++++++++++++++++++ .../Ammunition/Boxes/cartonka.rsi/open.png | Bin 0 -> 236 bytes .../Ammunition/Boxes/cartonka.rsi/uchebka.png | Bin 0 -> 166 bytes .../Ammunition/Boxes/cartonka.rsi/uran.png | Bin 0 -> 161 bytes .../Boxes/cartonka.rsi/zajigalka.png | Bin 0 -> 151 bytes .../Guns/Ammunition/Boxes/rifle.rsi/mag-1.png | Bin 227 -> 134 bytes .../Guns/Ammunition/Boxes/rifle.rsi/mag-2.png | Bin 0 -> 147 bytes .../Guns/Ammunition/Boxes/rifle.rsi/mag-3.png | Bin 0 -> 145 bytes .../Guns/Ammunition/Boxes/rifle.rsi/mag-4.png | Bin 0 -> 177 bytes .../Guns/Ammunition/Boxes/rifle.rsi/mag-5.png | Bin 0 -> 175 bytes .../Guns/Ammunition/Boxes/rifle.rsi/mag-6.png | Bin 0 -> 227 bytes .../Guns/Ammunition/Boxes/rifle.rsi/meta.json | 15 ++++ .../large_casing.rsi/50combat-spent.png | Bin 0 -> 278 bytes .../Casings/large_casing.rsi/50combat.png | Bin 0 -> 363 bytes .../Casings/large_casing.rsi/meta.json | 6 ++ .../Magazines/Heavy/mg42.rsi/mag-2.png | Bin 0 -> 515 bytes .../Magazines/Heavy/mg42.rsi/meta.json | 3 + .../Magazines/Heavy/mg60.rsi/mag-2.png | Bin 0 -> 304 bytes .../Magazines/Heavy/mg60.rsi/meta.json | 3 + .../Gunsx64/Magazines/Heavy/rpd.rsi/base.png | Bin 0 -> 324 bytes .../Gunsx64/Magazines/Heavy/rpd.rsi/mag-1.png | Bin 0 -> 407 bytes .../Gunsx64/Magazines/Heavy/rpd.rsi/mag-2.png | Bin 0 -> 407 bytes .../Gunsx64/Magazines/Heavy/rpd.rsi/meta.json | 21 ++++++ .../Gunsx64/Magazines/Heavy/v41.rsi/mag-2.png | Bin 0 -> 413 bytes .../Gunsx64/Magazines/Heavy/v41.rsi/meta.json | 3 + .../Magazines/Pistol/divet.rsi/mag-2.png | Bin 0 -> 114 bytes .../Magazines/Pistol/divet.rsi/meta.json | 3 + .../Pistol/pistol_mag.rsi/high_velocity.png | Bin 221 -> 0 bytes .../Magazines/Pistol/pistol_mag.rsi/icon.png | Bin 0 -> 321 bytes .../Magazines/Pistol/pistol_mag.rsi/mag-1.png | Bin 149 -> 130 bytes .../Magazines/Pistol/pistol_mag.rsi/mag-2.png | Bin 152 -> 130 bytes .../Magazines/Pistol/pistol_mag.rsi/mag-3.png | Bin 155 -> 0 bytes .../Magazines/Pistol/pistol_mag.rsi/mag-4.png | Bin 159 -> 0 bytes .../Magazines/Pistol/pistol_mag.rsi/mag-5.png | Bin 162 -> 0 bytes .../Magazines/Pistol/pistol_mag.rsi/meta.json | 24 +------ .../Pistol/pistol_mag.rsi/practice.png | Bin 221 -> 0 bytes .../Pistol/pistol_mag.rsi/red-icon.png | Bin 233 -> 0 bytes .../Magazines/Pistol/pistol_mag.rsi/red.png | Bin 221 -> 0 bytes .../Pistol/pistol_mag.rsi/rubber.png | Bin 221 -> 0 bytes .../Pistol/pistol_mag_45acp.rsi/base.png | Bin 0 -> 293 bytes .../Pistol/pistol_mag_45acp.rsi/icon.png | Bin 0 -> 331 bytes .../Pistol/pistol_mag_45acp.rsi/mag-1.png | Bin 0 -> 130 bytes .../Pistol/pistol_mag_45acp.rsi/mag-2.png | Bin 0 -> 135 bytes .../Pistol/pistol_mag_45acp.rsi/mag-3.png | Bin 0 -> 140 bytes .../Pistol/pistol_mag_45acp.rsi/mag-4.png | Bin 0 -> 143 bytes .../Pistol/pistol_mag_45acp.rsi/mag-5.png | Bin 0 -> 148 bytes .../Pistol/pistol_mag_45acp.rsi/meta.json | 33 +++++++++ .../Pistol/pistol_mag_545.rsi/base.png | Bin 0 -> 348 bytes .../Pistol/pistol_mag_545.rsi/icon.png | Bin 0 -> 384 bytes .../Pistol/pistol_mag_545.rsi/mag-1.png | Bin 0 -> 130 bytes .../Pistol/pistol_mag_545.rsi/mag-2.png | Bin 0 -> 133 bytes .../Pistol/pistol_mag_545.rsi/mag-3.png | Bin 0 -> 137 bytes .../Pistol/pistol_mag_545.rsi/mag-4.png | Bin 0 -> 139 bytes .../Pistol/pistol_mag_545.rsi/mag-5.png | Bin 0 -> 139 bytes .../Pistol/pistol_mag_545.rsi/meta.json | 33 +++++++++ .../Pistol/submachinegun.rsi/base.png | Bin 0 -> 292 bytes .../Pistol/submachinegun.rsi/mag-1.png | Bin 0 -> 303 bytes .../Pistol/submachinegun.rsi/mag-2.png | Bin 0 -> 303 bytes .../Pistol/submachinegun.rsi/meta.json | 21 ++++++ .../Pistol/submachinegun_boxmag.rsi/mag-2.png | Bin 0 -> 147 bytes .../Pistol/submachinegun_boxmag.rsi/meta.json | 3 + .../submachinegun_drummag.rsi/mag-2.png | Bin 0 -> 143 bytes .../submachinegun_drummag.rsi/meta.json | 3 + .../Pistol/submachinegun_mp7.rsi/base.png | Bin 0 -> 252 bytes .../Pistol/submachinegun_mp7.rsi/mag-1.png | Bin 0 -> 266 bytes .../Pistol/submachinegun_mp7.rsi/mag-2.png | Bin 0 -> 266 bytes .../Pistol/submachinegun_mp7.rsi/meta.json | 21 ++++++ .../submachinegun_scorpion.rsi/base.png | Bin 0 -> 321 bytes .../submachinegun_scorpion.rsi/mag-1.png | Bin 0 -> 344 bytes .../submachinegun_scorpion.rsi/mag-2.png | Bin 0 -> 344 bytes .../submachinegun_scorpion.rsi/meta.json | 21 ++++++ .../Pistol/submachinegun_vector.rsi/base.png | Bin 0 -> 255 bytes .../base_extended.png | Bin 0 -> 315 bytes .../Pistol/submachinegun_vector.rsi/mag-1.png | Bin 0 -> 265 bytes .../Pistol/submachinegun_vector.rsi/mag-2.png | Bin 0 -> 265 bytes .../mag_extended-1.png | Bin 0 -> 322 bytes .../mag_extended-2.png | Bin 0 -> 322 bytes .../Pistol/submachinegun_vector.rsi/meta.json | 30 ++++++++ .../Magazines/Rifle/ak_long_mag.rsi/mag-2.png | Bin 0 -> 147 bytes .../Magazines/Rifle/ak_long_mag.rsi/meta.json | 3 + .../Magazines/Rifle/ak_mag.rsi/base.png | Bin 0 -> 314 bytes .../Magazines/Rifle/ak_mag.rsi/mag-1.png | Bin 0 -> 343 bytes .../Magazines/Rifle/ak_mag.rsi/mag-2.png | Bin 0 -> 343 bytes .../Magazines/Rifle/ak_mag.rsi/meta.json | 21 ++++++ .../Magazines/Rifle/ar_mag.rsi/base.png | Bin 0 -> 439 bytes .../Magazines/Rifle/ar_mag.rsi/mag-1.png | Bin 0 -> 487 bytes .../Magazines/Rifle/ar_mag.rsi/mag-2.png | Bin 0 -> 487 bytes .../Magazines/Rifle/ar_mag.rsi/meta.json | 21 ++++++ .../Magazines/Rifle/big_mag.rsi/base.png | Bin 0 -> 254 bytes .../Magazines/Rifle/big_mag.rsi/mag-1.png | Bin 0 -> 279 bytes .../Magazines/Rifle/big_mag.rsi/mag-2.png | Bin 0 -> 279 bytes .../Magazines/Rifle/big_mag.rsi/meta.json | 21 ++++++ .../Magazines/Rifle/famas_mag.rsi/base.png | Bin 0 -> 319 bytes .../Magazines/Rifle/famas_mag.rsi/mag-1.png | Bin 0 -> 337 bytes .../Magazines/Rifle/famas_mag.rsi/mag-2.png | Bin 0 -> 337 bytes .../Magazines/Rifle/famas_mag.rsi/meta.json | 21 ++++++ .../Magazines/Rifle/m16_mag.rsi/mag-2.png | Bin 0 -> 321 bytes .../Magazines/Rifle/m16_mag.rsi/meta.json | 3 + .../Magazines/Rifle/sr127_mag.rsi/mag-2.png | Bin 0 -> 319 bytes .../Magazines/Rifle/sr127_mag.rsi/meta.json | 3 + .../Magazines/Rifle/svd_mag.rsi/mag-2.png | Bin 0 -> 383 bytes .../Magazines/Rifle/svd_mag.rsi/meta.json | 3 + 119 files changed, 387 insertions(+), 26 deletions(-) create mode 100644 Resources/Locale/ru-RU/_backmen/technologys/security.ftl create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/base.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/bb.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/close.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/mag-1.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/mag-10.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/mag-11.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/mag-12.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/mag-2.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/mag-3.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/mag-4.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/mag-5.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/mag-6.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/mag-7.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/mag-8.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/mag-9.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/meta.json create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/open.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/uchebka.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/uran.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/zajigalka.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-2.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-3.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-4.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-5.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-6.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Ammunition/Casings/large_casing.rsi/50combat-spent.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Ammunition/Casings/large_casing.rsi/50combat.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Heavy/mg42.rsi/mag-2.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Heavy/mg60.rsi/mag-2.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Heavy/rpd.rsi/base.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Heavy/rpd.rsi/mag-1.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Heavy/rpd.rsi/mag-2.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Heavy/rpd.rsi/meta.json create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Heavy/v41.rsi/mag-2.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/divet.rsi/mag-2.png delete mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag.rsi/high_velocity.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag.rsi/icon.png delete mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag.rsi/mag-3.png delete mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag.rsi/mag-4.png delete mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag.rsi/mag-5.png delete mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag.rsi/practice.png delete mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag.rsi/red-icon.png delete mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag.rsi/red.png delete mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag.rsi/rubber.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_45acp.rsi/base.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_45acp.rsi/icon.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_45acp.rsi/mag-1.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_45acp.rsi/mag-2.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_45acp.rsi/mag-3.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_45acp.rsi/mag-4.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_45acp.rsi/mag-5.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_45acp.rsi/meta.json create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_545.rsi/base.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_545.rsi/icon.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_545.rsi/mag-1.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_545.rsi/mag-2.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_545.rsi/mag-3.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_545.rsi/mag-4.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_545.rsi/mag-5.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_545.rsi/meta.json create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun.rsi/base.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun.rsi/mag-1.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun.rsi/mag-2.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun.rsi/meta.json create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_boxmag.rsi/mag-2.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_drummag.rsi/mag-2.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_mp7.rsi/base.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_mp7.rsi/mag-1.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_mp7.rsi/mag-2.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_mp7.rsi/meta.json create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_scorpion.rsi/base.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_scorpion.rsi/mag-1.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_scorpion.rsi/mag-2.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_scorpion.rsi/meta.json create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_vector.rsi/base.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_vector.rsi/base_extended.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_vector.rsi/mag-1.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_vector.rsi/mag-2.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_vector.rsi/mag_extended-1.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_vector.rsi/mag_extended-2.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_vector.rsi/meta.json create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/ak_long_mag.rsi/mag-2.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/ak_mag.rsi/base.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/ak_mag.rsi/mag-1.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/ak_mag.rsi/mag-2.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/ak_mag.rsi/meta.json create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/ar_mag.rsi/base.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/ar_mag.rsi/mag-1.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/ar_mag.rsi/mag-2.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/ar_mag.rsi/meta.json create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/big_mag.rsi/base.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/big_mag.rsi/mag-1.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/big_mag.rsi/mag-2.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/big_mag.rsi/meta.json create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/famas_mag.rsi/base.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/famas_mag.rsi/mag-1.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/famas_mag.rsi/mag-2.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/famas_mag.rsi/meta.json create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/m16_mag.rsi/mag-2.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/sr127_mag.rsi/mag-2.png create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/svd_mag.rsi/mag-2.png diff --git a/Resources/Locale/ru-RU/_backmen/energydome/energydome.ftl b/Resources/Locale/ru-RU/_backmen/energydome/energydome.ftl index b2e2485b2c1..4e63299baa4 100644 --- a/Resources/Locale/ru-RU/_backmen/energydome/energydome.ftl +++ b/Resources/Locale/ru-RU/_backmen/energydome/energydome.ftl @@ -6,7 +6,5 @@ energy-dome-on-examine-is-on-message = Энергетический барьер energy-dome-on-examine-is-off-message = Энергетический барьер [color=darkred]выключен[/color]. energy-dome-verb-toggle = Включить энергетический барьер -research-technology-energy_barriers = Энергетические барьеры - uplink-energy-dome-name = Энергетический барьер -uplink-energy-dome-desc = Генератор щита, защищающий владельца от лазеров и пуль, но не позволяющий самому использовать оружие дальнего боя. Использует батареи. \ No newline at end of file +uplink-energy-dome-desc = Генератор щита, защищающий владельца от лазеров и пуль, но не позволяющий самому использовать оружие дальнего боя. Использует батареи. diff --git a/Resources/Locale/ru-RU/_backmen/technologys/security.ftl b/Resources/Locale/ru-RU/_backmen/technologys/security.ftl new file mode 100644 index 00000000000..290015870c0 --- /dev/null +++ b/Resources/Locale/ru-RU/_backmen/technologys/security.ftl @@ -0,0 +1,2 @@ +research-technology-armorpiercingammo = Бронебойные боеприпасы +research-technology-energy_barriers = Энергетические барьеры diff --git a/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/base.png b/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..b30de7fb2cde3e1991de473fb3c29cf077ac5639 GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ%bqTdArYL(2@T;IAJnxV3*(HuC4m_>kao*d~Qt8^w`2&5b3h=M}u`k zfy*5h(cpvNm PdXK@=)z4*}Q$iB}@)K&D literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/bb.png b/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/bb.png new file mode 100644 index 0000000000000000000000000000000000000000..f9e0b1c4e8736a1c6a0a8f20ddda90aec908a066 GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ7*7|+kOUw2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/mag-1.png b/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..55e6b01f33b86b55b94a44019db6abd33c10e88b GIT binary patch literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzA5Ry@kOfXXfBt_Gb?kqL*))sC+s-BZh@XAbz+js2^CN+w$Z8?FIGh<6=I`Nnd~jQH7tmY= MPgg&ebxsLQ0F|jJwEzGB literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/mag-10.png b/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/mag-10.png new file mode 100644 index 0000000000000000000000000000000000000000..8c5e75765c5df38cd69004a1084c1bf45239b9b6 GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJE>9Q7kOaHXXka5MK$R(Mf8fw?n?<zopr08=JJH2?qr literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/mag-11.png b/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/mag-11.png new file mode 100644 index 0000000000000000000000000000000000000000..f3fc6ef8005544508f5f1349567755ea788ab8e7 GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJc25__kO7T+)yFM@-Dkt&Ggfh9#d(*qWXh zD@Hf;^M3ld_jnJF=fN{PM=l(R;M>%{fZMSv<6-fHor@DpSlpb^2nG=*20tUGN3$gF RegnFM!PC{xWt~$(69A%4J|O@A literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/mag-2.png b/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..6e008fb0f9b27667ace27ef86c82d8e3edb96f2b GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJC{Gv1kOfXXfBt_Gb?m>vtcYaE&d?73yVoLl{`=6ib$614DIl}do7aZzkf_Z!Ultc1czm_mm3D8=$Y+yJL=|~V8Vhz c{Agof5S<{-bHsjO8PFC6Pgg&ebxsLQ0E^EoUjP6A literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/mag-4.png b/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/mag-4.png new file mode 100644 index 0000000000000000000000000000000000000000..7ae534967cbc1e099db50d7f0abc4dcfb77318a9 GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJBu^K|kOu|MM+B^dCIl*vTk8_x7Lp8k;+VTHc*lyIJDj{2d1lBqSa<(9oMV@0i21 poiD!id~$bAFkx{+CQ@1$7#u~UnSY;HkOs7k!PC{xWt~$(699a6HQxXL literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/mag-5.png b/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/mag-5.png new file mode 100644 index 0000000000000000000000000000000000000000..48b8b95234b2d15d468df97e16cefe3acbfb1a2a GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJBu^K|kO|~Umd;8CPjm@1wEX7Z*Me_Xjk4Z?_V33e-z}?(GS>a^N njGv3YWN`Gf9Y7(@2rw`l$x&bqT%fiDXd8p4tDnm{r-UW|x9&6v literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/mag-6.png b/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/mag-6.png new file mode 100644 index 0000000000000000000000000000000000000000..2df7362940d889165e098b9d4fb2b2a59c0c6545 GIT binary patch literal 154 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJL{AsTkO}-^<+Wyl%Fim)A#%rCn|LS@M1`!el1_I9J{>cibVv=m_ mSLK=ozI?qy$tg4r!MzfF2p61}kG;x_M4O&~AjtChS;GXoQcLIaTa6aRqCeu+-% Uhq>P0fev8sboFyt=akR{06~B}$N&HU literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/mag-8.png b/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/mag-8.png new file mode 100644 index 0000000000000000000000000000000000000000..b8668267905d9774ce64a734db781d90ea2a2d4f GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ22U5qkOk(%G(`TyT17NUVb9CU~&VCib7*Q>pI=d`?#N- z^l@Kyr0klY*;(_hI}c9ABzWEX*gx&BW3aoyO|`|_R!*ufo8u754Ri~Gr>mdKI;Vst03+@|!Tv&62&tD zId&~SMWpB6{xe@=b7v6Cr-z-~JUn7-JUmA(oV_g3VI=-+XJC~Hi<@%-3Q@+vz_82A WYQ^n+cP0TH!{F)a=d#Wzp$Pycfj;j5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/meta.json b/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/meta.json new file mode 100644 index 00000000000..2fb27206e70 --- /dev/null +++ b/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/meta.json @@ -0,0 +1,68 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "By no_mad", + "states": [ + { + "name": "base" + }, + { + "name": "open" + }, + { + "name": "close" + }, + { + "name": "bb" + }, + { + "name": "uchebka" + }, + { + "name": "uran" + }, + { + "name": "zajigalka" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + }, + { + "name": "mag-5" + }, + { + "name": "mag-6" + }, + { + "name": "mag-7" + }, + { + "name": "mag-8" + }, + { + "name": "mag-9" + }, + { + "name": "mag-10" + }, + { + "name": "mag-11" + }, + { + "name": "mag-12" + } + ] +} diff --git a/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/open.png b/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/open.png new file mode 100644 index 0000000000000000000000000000000000000000..3bf713bb97e3feba254e57638f1f85de6bbc9808 GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ&7LlfArYL(2@JTWFGic~ojV=hTN`re?F#>Vr%vy>%JPt{b! zVV#nhN=FgH35O`lrVRE2GK`BlS>NBQOWpDLhp1{52;w zq(8UZQ}$r0%k~bD(~ec~`z!q~)HHD=^et$8s<64Uh+(Zxdu84fIo`&L0uso?L|G<= Yih4sIrX}lpfX-*|boFyt=akR{0A=V_DF6Tf literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/uchebka.png b/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/uchebka.png new file mode 100644 index 0000000000000000000000000000000000000000..48dc8b0ae446f833a7f9dea3aa6443c95ba94da2 GIT binary patch literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJTu&FrkOw4(T!3dzm44$rjF6*2U FngCYuIQIYm literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/uran.png b/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/uran.png new file mode 100644 index 0000000000000000000000000000000000000000..8355b53cdf6223f5716c5833ad55829654dca56d GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ3{MxwkOjX=&nkGC7{Bo>Q~=^k&zrB!hNec1DF z@e|vl&v^GrFt#%2h$MWu@cHP9Zg=Md6Bak;1O;aX2E8tkX;V*drU30^@O1TaS?83{ F1OUTSG*kcp literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/zajigalka.png b/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi/zajigalka.png new file mode 100644 index 0000000000000000000000000000000000000000..1b0fdc8d7bcfd6d6aed1a34e8cbc4459ba100dd0 GIT binary patch literal 151 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJI8PVHkOjX=&nkGTFtcYr>P~%r~ngB{*hvFG-zZdC0lp(UDCoy6cbk>|o*G qVvNu@@Ir9jD!0A%P*YUe7#I$n;oUSXZK4~{CI(MeKbLh*2~7a1W-ws@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-1.png b/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-1.png index 4028a40788fd6ef176956b7a0b5544a982b9dd7f..f6d0e0ce8e85893f52aee97fe4908745f6ee06f8 100644 GIT binary patch delta 105 zcmaFN*v2?PCCS&*#W5s;GdV$mb+Mv>6cdb?<8=d#Wzp$PzTF(*j? delta 199 zcmV;&0671K0pkIXB!2;OQb$4nuFf3k0001;NklJ&5I50@Mk8BE#0?}O5}R<7r$Q9|HY=i;ubE_CG06iF5&1I<9n&Q8e$QEN zjUu_sV9`zduKKpFPwDcE5L_|b>?FKG!eXob%s7e3;002ovPDHLkV1gg) BSVsT= diff --git a/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-2.png b/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..bc7877e264f4e35fa1586262d3c89e0c89935954 GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJC{Gv1kO@Z%b|DUK{KE&44$rjF6*2UngD1EFzWyS literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-3.png b/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-3.png new file mode 100644 index 0000000000000000000000000000000000000000..42871cc8db9c400a7da7026118d5325dd6d97d01 GIT binary patch literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ2u~NskOYCYhP}aDCfteu>6YCzfxQPs%uwetyNB433_*1IPqV c1_uMft*v%ze-vXy=HY{zN$@1Oo7FWno;Y}j;z=Wr^gU13d` z;p5366Vr1N5`LU7_|2%na&q~0`J{{^>E~D6$>8W|JAh2^WNtaU`}V+0CWR` Mr>mdKI;Vst01IY6=Kufz literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-5.png b/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-5.png new file mode 100644 index 0000000000000000000000000000000000000000..7f51b7ac31fb5f858ca83f0fcb5b5792f8878cc9 GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJGEW!BkOYCYhP}aDCfteg{PlyS;w}oR#gW-JZHRCz!CH5Dv}^3>}YhZ8(%QrvhET;OXk; Jvd$@?2>@T_JDmUk literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-6.png b/Resources/Textures/Backmen/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-6.png new file mode 100644 index 0000000000000000000000000000000000000000..4028a40788fd6ef176956b7a0b5544a982b9dd7f GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}b3I)gLn2z= zUNGciEEGBN@c!-IN!l73Q*XKMWxhC2Cg^$0juqP=N#YiMcf4l>fW;H X71pkAf4IU6=uievS3j3^P6&k(q^@^DxAZs$pk5zY-$AM#%iSQBKyTmSO` z@8O-3Jb6x^%X}Ep?8~%T_kP^}#2=sEupjo`XMW>Lf@t;kd7?V+lxim?o)4~FleK{} zsg%Lv;py-7lK<}iZu8|2GxT$;YkPF_{=$!SVykBb9=s?Z!P^KW4u~-^{IfG;Jvo8F Q5a>|`Pgg&ebxsLQ031SbPXGV_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Ammunition/Casings/large_casing.rsi/50combat.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Ammunition/Casings/large_casing.rsi/50combat.png new file mode 100644 index 0000000000000000000000000000000000000000..e39b1ded7e08250a22bd80e9e6df51169b71a6da GIT binary patch literal 363 zcmV-x0hIoUP)asjr~^hrU^E0qLtr!nSdfciMn*SQ_Me5J0zV(Uxm)UoQl!fDl+60Frw7{x8G-d*6_h;%9OS@-r0A{tmZ< zf#Dif4ao5iQox8TFe1wVln}rgW;7NY@RD%U0iz)>8Umvs005e_S8Z^@#<2hZ002ov JPDHLkV1i1)mP`Nu literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Ammunition/Casings/large_casing.rsi/meta.json b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Ammunition/Casings/large_casing.rsi/meta.json index 53463fd14a9..7745216b66d 100644 --- a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Ammunition/Casings/large_casing.rsi/meta.json +++ b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Ammunition/Casings/large_casing.rsi/meta.json @@ -12,6 +12,12 @@ }, { "name": "base-spent" + }, + { + "name": "50combat" + }, + { + "name": "50combat-spent" } ] } diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Heavy/mg42.rsi/mag-2.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Heavy/mg42.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..0d3455916aae29a7c2408253f35788e87a869a01 GIT binary patch literal 515 zcmV+e0{s1nP)Y5S_?@@i-zF4O%3kkYGS7ODh{YOIxwFv9l2@tVBex3E0}&2>zQCibt6qv*A8(pj1 z#vnZPTt1+k?E!%V{CO=T-}edo42U%hdob+VkPry~yx;Gugwju?Qlfgjp+cA#7B(b2 zDKVb`Ak6@bGH?vm?O`x0k#>*wMFMzwJQ0$<_FibMTIPFW9wcC_21tDMMI@C%dRZvl)w=3EY_*Y5VPC7O}I$>9=R9IYoNL20-|Itg3= z38*NU*aMw#kQpiv<$^FV2f(>cxCcf9ac&}DQ~)H>nh2c^5WV9ey$P6!8VPV9d%dnY zILF!gZxgUhY#S&36Y5E3XFT<>nJ+BpM`P>f)|1*p3C9jcHpIh`xOj>$o=tsCz;Qx1 zaSAvE{=EX944ke7P&yfW0000EWmrjOO-%qQ00008000000002eQjPYNH)#ZTWx23MxBNV%*|p%Jlv0H_ zTU+6WIp5Q^bjr80Ml^uXzu*O_QkAz&4BpIsVaetuoN(cz!MF5|%RHX5Ot)})?09`+ zhFm~T@J5a^{j*O?DP%;i(+Z4qIHY^q>3XsJytjWg%;9|1bm@1NEaO3C!NiR*Q$v{_ z#@#uRv2NBWrjlbU%RCnFG-e*@x_Vt`g3$Fl+H1M~c{IFZe7ci4sKa`}R%Vvz4Hmo& tr5}p=x1GOmziYew443b+Khhv>J7*G|-Vr)MqXXz$22WQ%mvv4FO#lf6dkp{p literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Heavy/mg60.rsi/meta.json b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Heavy/mg60.rsi/meta.json index 3db87328d61..8e83ef880b3 100644 --- a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Heavy/mg60.rsi/meta.json +++ b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Heavy/mg60.rsi/meta.json @@ -12,6 +12,9 @@ }, { "name": "mag-1" + }, + { + "name": "mag-2" } ] diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Heavy/rpd.rsi/base.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Heavy/rpd.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..3a1508791d3f7d1723a8e90b5cc98c0e9a1ec55a GIT binary patch literal 324 zcmV-K0lWT*P)yr5C( zO^7XpdzSox-*=-i&+Nw$0TB=Z5%^Dmx~|Mui5z$eztIHZMtK4CUF()78f2Q;7eS=Z~Ya2l8CvGqE12V&6i9dWkf&(MBoK- W9g*=_MzqTS0000hMR@wa(IyjcaKj07X57foc z#nGvwA;!dDSE5syN`M9CvoG-ydWG^`Lt{+tT{!N@Jm0$}k!IMPj;awiq6-u6M<$> zF)D{tTlJP@QI=)H2*}DM6hY-GSat;0JkL2>^8}Wa;4leQLQNB1mgTTNB2}U*=oS~Q zC7?=l!GE7&NBawS%iRC~002ovPDHLkV1g(Z BvCjYi literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Heavy/rpd.rsi/mag-2.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Heavy/rpd.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..8cc8cab48f927863e7124a27d28e6b4ce3e4af2d GIT binary patch literal 407 zcmV;I0cie-P)hMR@wa(IyjcaKj07X57foc z#nGvwA;!dDSE5syN`M9CvoG-ydWG^`Lt{+tT{!N@Jm0$}k!IMPj;awiq6-u6M<$> zF)D{tTlJP@QI=)H2*}DM6hY-GSat;0JkL2>^8}Wa;4leQLQNB1mgTTNB2}U*=oS~Q zC7?=l!GE7&NBawS%iRC~002ovPDHLkV1g(Z BvCjYi literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Heavy/rpd.rsi/meta.json b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Heavy/rpd.rsi/meta.json new file mode 100644 index 00000000000..8e83ef880b3 --- /dev/null +++ b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Heavy/rpd.rsi/meta.json @@ -0,0 +1,21 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi", + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + + } + ] +} diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Heavy/v41.rsi/mag-2.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Heavy/v41.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..db4973a65d471bc7f72b8b08c1d8e80d022f1c85 GIT binary patch literal 413 zcmV;O0b>4%P)MqDIFw8V!XR`cpH5zCLgQu&X%Q~lo FCIFvyA!Yyo literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/divet.rsi/meta.json b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/divet.rsi/meta.json index ddcc919389d..d4709e55564 100644 --- a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/divet.rsi/meta.json +++ b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/divet.rsi/meta.json @@ -12,6 +12,9 @@ }, { "name": "mag-1" + }, + { + "name": "mag-2" } ] diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag.rsi/high_velocity.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag.rsi/high_velocity.png deleted file mode 100644 index 780d9cc4eb585444278acc99640eb51d67b6995b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2@;6XFV_6A}_iN=nwPTQ_CO6l-g11}_G_EC$u745nw9&af%?0#$I8 z1o;Is{D*<*?S)^j0DE2A%5{3{ob93MF#z-0+C~0;=`}c)@{@M^8|DCE^=LzW%#sLW4%DckDI5XH7>osw^#XA zOxGfYl+_!y*hnspX-5XJFH2@I2l-E9o}k+l`S15_=}EOf z&V}0kHxflRL|Pe^?o+p9S@E`dk}N}4dc?HFZSNiV6s)9`e*gPq`N_+6LhFl$40eU= zDMI1Q(<=-N6AHh~zw(FwvUf=*>m>#*Rsr5Ft`diJ%ool|KJ9NiaDtnW;Wl%|;(3h5 RR=}WP@O1TaS?83{1OOMfda(ci literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag.rsi/mag-1.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag.rsi/mag-1.png index 751c90c6d492628ffffb30fe059827479b347ca3..e437494bd241a2fc33adba081d50b14f2a6c21d3 100644 GIT binary patch delta 113 zcmbQr*u*$NB8!8Kfq|j8s_F}n^7M3Z42j@OPLN<-tY{#`1SXViStM49G8{kW@{fIH zY2_vEwlA)~SElK0y44}vF`%Igp00i_>zopr0OIQ< AqyPW_ delta 132 zcmZo-oXR*sqLzu7fq{WfWKueiVk{1FcVfJGQl}os;VkfoEM{Qf76xHPhFNnYK!O22 zA+A9B*qO+gagLnAmo0!C=8_=4V21zyT>`Et0=Z(IE{-7;bCMGlNNi|37?Hy}WwzM~ a28O-f43AhJs2>BWVDNPHb6Mw<&;$S`f+P6= diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag.rsi/mag-2.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag.rsi/mag-2.png index 83cde54ae750ffa0040bc730040f522c5d8cfd14..e437494bd241a2fc33adba081d50b14f2a6c21d3 100644 GIT binary patch delta 113 zcmbQi*u*$NB8!8Kfq|j8s_F}n^7M3Z42j@OPLN<-tY{#`1SXViStM49G8{kW@{fIH zY2_vEwlA)~SElK0y44}vF`%Igp00i_>zopr0OUR; ArvLx| delta 136 zcmZo-oWVFjqMnJFfq{WfWKueiVk{1FcVfJGQl}os;VkfoEM{Qf76xHPhFNnYK!O22 zA+A9B*qO+gagLnAmo0!C=8_=4V21zyT>`Et0=bf&E{-7;bCMGlNNi|37?H!fl{0v{`njxgN@xNA?71oO diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag.rsi/meta.json b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag.rsi/meta.json index 945138a8ad9..7fcfe4fc6d5 100644 --- a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag.rsi/meta.json +++ b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag.rsi/meta.json @@ -11,35 +11,13 @@ "name": "base" }, { - "name": "high_velocity" - }, - { - "name": "practice" - }, - { - "name": "red" - }, - { - "name": "red-icon" - }, - { - "name": "rubber" + "name": "icon" }, { "name": "mag-1" }, { "name": "mag-2" - }, - { - "name": "mag-3" - }, - { - "name": "mag-4" - }, - { - "name": "mag-5" - } ] } diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag.rsi/practice.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag.rsi/practice.png deleted file mode 100644 index 4e6907fa1928e9dfe3f95342945154ec340a7739..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2@;6XFV_6A}_iN=nwPTQ_CO6l-hi{RRxD{g_`xF#K=jcHuHw3sk{X z666=m@E->1Iz_^OqE4PJjv*Cuk`p9C8Uh0Zd>w8|gmwfTJ$ggH)#2(1Iz_^OqE4PJjv*Cuk`p9C8Uh0Zd>w8|gmwfTJ$ggH)#2(l6tCiaL3^IEGZrNluUmX$TAu@O8K;5!w-W^ym!%SBI-dSzR4Y96cJz zu-}1W6~hIe5M=|_j0DbTSNG#4f3|TkF?KC1VP{Bfdl7O(i3 z3a-hsJn$1}SY2n-u)EGk!R-XYxnG_P;r4c3n$v&`ahnOo_ZnXRoHE0F>-Due%l4Za m{b#$_Zm=cI%%KP9BK^J51=&lB!sY?J$l&Sf=d#Wzp$Py(U2?Mk literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_45acp.rsi/icon.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_45acp.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5928ae29518f3124bfa73d366eb0922caa505e40 GIT binary patch literal 331 zcmV-R0kr;!P)d4lLDfCWEDlcJ&`MTHN@3>Y9e1VE)7H388f0J0Rl{zrERDMc{4-ckN& d2#nki008twW^=5!yOsa|002ovPDHLkV1j~Sg&_a{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_45acp.rsi/mag-1.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_45acp.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..c709301a556d20f07db7da6d529aea4a10aea830 GIT binary patch literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzPfr)ekOt2tS_im$A>C?LVxh)KjKGBA8CWoN4Yb{k|UgQu&X J%Q~loCIBl|DN+Cc literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_45acp.rsi/mag-2.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_45acp.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..16734a3c04a309a1e99db9858ea92850391a0281 GIT binary patch literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzKTj9OkOt2tS_im&LrYGu$lw=(_F3Qw47uof^Ot2tS_im&LrYGu$lw=(_F3Qv`m0~sGC3q&mTa(7NJ gVR3^J1?>zBfBJc@85ADf2Q;3+)78&qol`;+0AIQt2tS_im&LrYGu$lw=(_F3Qv`m0~sGC3q)KAx03pE ph5vG(u)A}D35%O^f=W9BL+L{P1E-iHUI1-i@O1TaS?83{1OOP#FxmhB literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_45acp.rsi/mag-5.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_45acp.rsi/mag-5.png new file mode 100644 index 0000000000000000000000000000000000000000..f37f46f69dc22fb795036bebeed392205be7f21c GIT binary patch literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJXipc%kOt2tS_im&LrYGu$lw=(_F3Qv`m0~sGC3q)KAx03pE ug+ExxM~1gfh$%bdWd=u2+kp!lj0}^4gjU_q$}|L8!{F)a=d#Wzp$PyJDl%&T literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_45acp.rsi/meta.json b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_45acp.rsi/meta.json new file mode 100644 index 00000000000..2a134bd417f --- /dev/null +++ b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_45acp.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi", + "states": [ + { + "name": "base" + }, + { + "name": "icon" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + }, + { + "name": "mag-5" + + } + ] +} diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_545.rsi/base.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_545.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..8ada44e6778307c430dfb357aad8712a4d9086e4 GIT binary patch literal 348 zcmV-i0i*tjP)nDW<8$F{4+K%H-qQGW{futg04pxNX~)xxcQf+qO+& unN}46B17T1diEf|o@EH(pDYph2?7tDo}7}zq^$4&0000Aa!G>%KMH<3$`-?8u4OhGBRs%aW!|)0nEN z_!Zf%>qN0dPA`!k69`Dt)WmU27nUIeS6$a;RsldCMG+-J;vfiM%s7r@rODyEq8*ku zBrb}AszwN|UK4Jqai03_4r`h+cG$LUr!Jyr^*6xyku1xyXZ4ul2sHSi(3*g#Jb{yy z0LCwf|ItNt1g`NzofUzPWhorg0$k#UPVo`Ufgb|Y1hC2FPzi92ABBjHU@rU+AR>T2 z9RKOC$>k6cK3$rCt+*TJdH&Y-`@T2BFmNm@DG4sTKh0S{YRR<^R%do$CX6dxwZf7NV8!rk-U?cV@0*!so&XlVulLs`E!PC{x JWt~$(695LrCfWc1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_545.rsi/mag-2.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_545.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..7f416aaab7c049cadab08a2c90190faf817eb467 GIT binary patch literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzA5Ry@kOG4sTKh0S{YRR<^R%do$CX6dxwZf7Oi6dAlr4qwP#94E!wcu_zCnV2ZX#Bj}x V^G!!o;3A;844$rjF6*2UngGgpDpmjh literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_545.rsi/mag-3.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_545.rsi/mag-3.png new file mode 100644 index 0000000000000000000000000000000000000000..5cff600b9ce4c0b02384b695f410e51a2bc8e5f4 GIT binary patch literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ08bakkOG4sTKh0S{YRR<^R%do$CX6dxwZf7Oi6dAlr4qwQ2KIpyppuI>^=9ONsCKyrT a#K52*#dD37*?bw$Yz9wPKbLh*2~7ZqxGLEI literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_545.rsi/mag-4.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_545.rsi/mag-4.png new file mode 100644 index 0000000000000000000000000000000000000000..106f5ab6bcd0e6ffac0c2f2a113125581469a7ef GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJAWs*^kOG4sTKh0S{YRR<^R%do$CX6dxwZf7Oi6dAlr4qwQ2KIpypp#6f4CQ^TxrT#3Q k*57s@gQEvTTu@?R(Bb7j@KCg`5NJAsr>mdKI;Vst0BBk-=l}o! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_545.rsi/mag-5.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_545.rsi/mag-5.png new file mode 100644 index 0000000000000000000000000000000000000000..04de808a51357b6573cc350d05452280a2fbcd11 GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJAWs*^kOG4sTKh0S{YRR<^R%do$CX6dxwZf7Oi6dAlr4qwQ2KIpypp#6f4CQ^Suw4y=Q k&kT;9wgVX)7nE2S&cq9?VqOu#2{fI-)78&qol`;+0BB7wssI20 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_545.rsi/meta.json b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_545.rsi/meta.json new file mode 100644 index 00000000000..2a134bd417f --- /dev/null +++ b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_545.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi", + "states": [ + { + "name": "base" + }, + { + "name": "icon" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + }, + { + "name": "mag-5" + + } + ] +} diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun.rsi/base.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..0074dd485871cf6e5d7dcabb561bbd175a61abe5 GIT binary patch literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D0t1& z#WAE}&fBRQxegf!w5`A3_&UJ-=*ry*zZIH(EKvHvwP^8O*-aW;O%X?~Id;S-`03u* zEztQS+Nph;{Qr7)ryquK2e>O3zq1_jQ~4;v{{DKYO5m>dgReTx zTn=mFWWK-UzH)Ho!M$7)c1f+!+%eNZc#6mgCg0l&-go31PCM|k;ZoqJ<|K4kE8^>bP0l+XkKS#osX literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun.rsi/mag-1.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..cafa80942d6277daa56309aa4393094484c2c0f7 GIT binary patch literal 303 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DEQFR z#WAE}&fBRQxeghKxaKcxy0);dD>z&*$KFLCeE<1SmT>oro@?Y4VntXTb&_5ygavg3 zbAMavqGaj)BA{r8xxV4YFo@n_Kqd+$pIu}GM%<~v?^ z;ccaazq$i!$_ddm)4EIE^0&<}gQu&X%Q~loCII+dc8>r6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun.rsi/mag-2.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..cafa80942d6277daa56309aa4393094484c2c0f7 GIT binary patch literal 303 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DEQFR z#WAE}&fBRQxeghKxaKcxy0);dD>z&*$KFLCeE<1SmT>oro@?Y4VntXTb&_5ygavg3 zbAMavqGaj)BA{r8xxV4YFo@n_Kqd+$pIu}GM%<~v?^ z;ccaazq$i!$_ddm)4EIE^0&<}gQu&X%Q~loCII+dc8>r6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun.rsi/meta.json b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun.rsi/meta.json new file mode 100644 index 00000000000..8e83ef880b3 --- /dev/null +++ b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun.rsi/meta.json @@ -0,0 +1,21 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi", + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + + } + ] +} diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_boxmag.rsi/mag-2.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_boxmag.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..33d34cdb045b39ad0b3828082b02e3b6bd10c508 GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz2TvErkOl$9a4C2)i1Kvxb6Mw<&;$VUR3~Nt literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_boxmag.rsi/meta.json b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_boxmag.rsi/meta.json index 3db87328d61..8e83ef880b3 100644 --- a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_boxmag.rsi/meta.json +++ b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_boxmag.rsi/meta.json @@ -12,6 +12,9 @@ }, { "name": "mag-1" + }, + { + "name": "mag-2" } ] diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_drummag.rsi/mag-2.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_drummag.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..178bb7ec08f89f3fee8185c18bab1af0991e386e GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz8&4O9qA?VE9qA?VEcSC^qc~5RCCqx)JH4+`)2W!H?{D#m$WqPW_x9 zFe930=Bv4t`)A8-)!~1@XwzVJAj9aXfz0JVxu!4%ftrmm7t1!Mi3_-?-gqx0s{&rW``Hdq4mckZhdPkWP5e`M949Qb(<2dGM{kTDd?-XhM|t_$kYS31g-@$ zD6iT(@5-WIw`JEd-s`VkAT#Oo?scZtH<=p(8Y7=S^9Re$vEwX4!`u Rl7QZ4@O1TaS?83{1OTUyd^!LC literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_scorpion.rsi/mag-1.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_scorpion.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..c28a0977fed0842bfbc4602f2caff856c4dd4ba5 GIT binary patch literal 344 zcmV-e0jK_nP)2MX-GkL0o-42Nw~11$Pz1 z#UTy_DFv}8{td=lF`%8yO=v0PY{_!Jocos&|z02J1N$Unz6)U5-u1LUh0p@{EFk_BSQ$dQ3vdyoUJqhW!N1#48{mF9J7Pm}dB(J;tY#x~ q03k$RuJUrD0I1A9B&KBnEWisgFQMB9zC1Mm0000t literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_scorpion.rsi/mag-2.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_scorpion.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..c28a0977fed0842bfbc4602f2caff856c4dd4ba5 GIT binary patch literal 344 zcmV-e0jK_nP)2MX-GkL0o-42Nw~11$Pz1 z#UTy_DFv}8{td=lF`%8yO=v0PY{_!Jocos&|z02J1N$Unz6)U5-u1LUh0p@{EFk_BSQ$dQ3vdyoUJqhW!N1#48{mF9J7Pm}dB(J;tY#x~ q03k$RuJUrD0I1A9B&KBnEWisgFQMB9zC1Mm0000t literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_scorpion.rsi/meta.json b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_scorpion.rsi/meta.json new file mode 100644 index 00000000000..8e83ef880b3 --- /dev/null +++ b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_scorpion.rsi/meta.json @@ -0,0 +1,21 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi", + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + + } + ] +} diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_vector.rsi/base.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_vector.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..ff2658561b0f1ba3faba58f2feda5922d7b09add GIT binary patch literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D7ewn z#WAE}&f9Cdd7TV-SOb&;+uHn{mu#7-!ks!nXHw^-WeXTDO<=mn60@NpH&O8?--maV zKl2?e*$fz@1(IXdZtdkdP`%$vb3(D2@(BhVe@(}=qR-}BIe&ri{Pm{u@yzCHG+*p> z=5XYHFo!wsU%j-{0S2}J_8!A83>BOY18b!DWgC74p4r*v${=y>!)C@GY8LOxtFj+N z*X@t1`>kd(=bZPVIXnkErc7oOI;zu2{!6Wox5!UewsPI7RgYN&j&IcKVyc`sSumwRa$c(BsZA|G zUB9HP9{jxYV~y0E4civ1%U1Dx#3#_ExFhqw;THz}0=60c?<4d?(k3&9y=Isle7NE5 zy8ge0O#+XiJs8&Z-HcXPnqqsNX-5Bqm5)}}>|p%kEBc-3Q!UFrcAJJ;9^W%x&u|`S zxy+c;5cxB}o&w^|&Cx}Dr(;456oW5jUUnPWmw)3sZl8qVKQ ze9m)c!?Xocn9f;RHW;$)`1wD11p}*wgG@m7ROScDE#V(G?@MKP6mIxjQjY0B!Ls?h z2kZ~l?Vfm>dH<*DkNtk}Ph#ACcw@hYIIY% Lu6{1-oD!M<)GuW{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_vector.rsi/mag-2.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_vector.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..ce461e537e97bfdcb6edb7a426b536fd66a7a0c6 GIT binary patch literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D7f3x z#WAE}&f9C&d`^l2tQQP79y#W(%&DuLD4BQQ*psX48hbY=X$f;lPj%z^EOkaCFQIKu z=gB*)1^z$QJ6doBFi1bx`~LcAp5>o&w^|&Cx}Dr(;456oW5jUUnPWmw)3sZl8qVKQ ze9m)c!?Xocn9f;RHW;$)`1wD11p}*wgG@m7ROScDE#V(G?@MKP6mIxjQjY0B!Ls?h z2kZ~l?Vfm>dH<*DkNtk}Ph#ACcw@hYIIY% Lu6{1-oD!M<)GuW{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_vector.rsi/mag_extended-1.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_vector.rsi/mag_extended-1.png new file mode 100644 index 0000000000000000000000000000000000000000..f79e43280fc649533bc7dde243d9ff0899de4f67 GIT binary patch literal 322 zcmV-I0lof-P)07UEwNnZo!SAu@5>}f z5XZ6hJG236coaoQ(-cC8`T?I(BFi#RL%M>ZC=djJJ%H=Fpr-ksVGC#h)&TSA3#)~| zY?5QMcW}7Y3^<07UEwNnZo!SAu@5>}f z5XZ6hJG236coaoQ(-cC8`T?I(BFi#RL%M>ZC=djJJ%H=Fpr-ksVGC#h)&TSA3#)~| zY?5QMcW}7Y3^<l$9a4C2)i1Kvxb6Mw<&;$Sk+$Yum literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/ak_long_mag.rsi/meta.json b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/ak_long_mag.rsi/meta.json index 3db87328d61..8e83ef880b3 100644 --- a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/ak_long_mag.rsi/meta.json +++ b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/ak_long_mag.rsi/meta.json @@ -12,6 +12,9 @@ }, { "name": "mag-1" + }, + { + "name": "mag-2" } ] diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/ak_mag.rsi/base.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/ak_mag.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..96b74bd02bd62252e9bdcd51255a9fb43db1041d GIT binary patch literal 314 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DEP+H z#WAE}&fBZLT+IdotPeCfbeAXuIpsgN_gh}6ditYfEjlf1S|UO50UKgDCadY{R!aXr zP}5_)Y=OQyvylRGL_?8&Or_n=&+A^7&1d)NzFxXFW|suVH}wlqzaR4yp03T-l}x^& zAeOL0V!yzp?|(0E{{7WWF_E$Babt@>Na)o4(}IF-Z`&v3rMc+hGS(#?Y%YumMzfYV z%3His*}(Am^xqc?1veT<3G{Zf@px|W7l>jtOIXdtAuhO<{Thc~6T|w@3U7|9{gD=YgH~Hk)d7h6x572HN$8oom zoAm_t8NiAyVV51WfXGKsmZf?k$o9wq#_hXv4vaBbRTUY61W=zU5JITBD2k_Vx62iD zL;~>UGw^*M!Z1|pD2jk{uG~n|6rd4y0c^+t7y-b}NRk9|K<)$*z~ko$SGCm)bn3f+LML!OSZ%{02pm*( pBkWGY0SImV$5reA9KcTl+yT^lg=;35wK)I)002ovPDHLkV1hMSf!zQA literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/ak_mag.rsi/mag-2.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/ak_mag.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..27a0c51a9a08b5addf6f3713c11a390bebab172d GIT binary patch literal 343 zcmV-d0jU0oP)7|9{gD=YgH~Hk)d7h6x572HN$8oom zoAm_t8NiAyVV51WfXGKsmZf?k$o9wq#_hXv4vaBbRTUY61W=zU5JITBD2k_Vx62iD zL;~>UGw^*M!Z1|pD2jk{uG~n|6rd4y0c^+t7y-b}NRk9|K<)$*z~ko$SGCm)bn3f+LML!OSZ%{02pm*( pBkWGY0SImV$5reA9KcTl+yT^lg=;35wK)I)002ovPDHLkV1hMSf!zQA literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/ak_mag.rsi/meta.json b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/ak_mag.rsi/meta.json new file mode 100644 index 00000000000..8e83ef880b3 --- /dev/null +++ b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/ak_mag.rsi/meta.json @@ -0,0 +1,21 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi", + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + + } + ] +} diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/ar_mag.rsi/base.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/ar_mag.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..d6ff2b9d29628b09dc3be49ae73e58cba0647bcb GIT binary patch literal 439 zcmV;o0Z9IdP)8U^TWRJ033h+Ajt;v)OqEP%-)-s01ey literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/ar_mag.rsi/mag-1.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/ar_mag.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..4398f01826c94bf40dd4eaa9cae670bfe198c217 GIT binary patch literal 487 zcmVSmY)-MaV@` z2syxZ0qfue>tU}*xzR?YxyKrYYUC7K-o8FML) z(Ii_jtmpo)>xaIsYooou8UR*fNwVYNf~)<;0K05@o&nSpeK4v7Q}n^{9LGcA0cG2W zP5^o%@_yjj2gU%08gXAA*zAZ_4s>0og6cxnfIwjV?l3t3#UKRI-=Y2}1++Ps2K&GX zfPs;SmY)-MaV@` z2syxZ0qfue>tU}*xzR?YxyKrYYUC7K-o8FML) z(Ii_jtmpo)>xaIsYooou8UR*fNwVYNf~)<;0K05@o&nSpeK4v7Q}n^{9LGcA0cG2W zP5^o%@_yjj2gU%08gXAA*zAZ_4s>0og6cxnfIwjV?l3t3#UKRI-=Y2}1++Ps2K&GX zfPs;*}AQg9)`9{P|t|V2lGQD^Krqg1=n>ibQE;!V%NBz_f zG4poThz8bqsvB~nrw7$tb>>*_&B9=QtV80lL`M*p_wkTyQBBoJJU_YAWD=g=S&_Nc zop<%tZNVyj)y$U9oqx~!$`RQBGNFz&SK>dzrKsI*3H);{FZFpcF)-OUTD<*tWU0uf w?LI;bXR7zJ#0Xh1?@;;Bzkz}Kj@}1Gu0O$j`qQpm0lJ;R)78&qol`;+0F%sE^#A|> literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/big_mag.rsi/mag-1.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/big_mag.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..3b5708fee19278ea0f56ba9c18eec5963bc35dcc GIT binary patch literal 279 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D0tG- z#WAE}&fBSmT!$4z+Ts_Kl&tKop3WC{So+I^rQsSSnkjsG3&jPFc*@+lWar2+#i`fR z`N3a>E`|Hc?Mm3S+gUssShlGikdU@`F8}#?F!Of42NePZFXhfAF>!=@H5#g!_6RVo zi(-Dm`0g3!Qq6r$JnkFZK3E5xGHI{9y{&ocx97n#*0Rkho_sBLHHT*d$hdv1^B)R0 zNgbE?uWZov%%`%in?<1G0neekedTZV>i_EMW)-;hy;gLCR{~$c)B{3_j6xBy4_FVm W2cO=>Zut`EDF#nhKbLh*2~7Y&jAr8i literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/big_mag.rsi/mag-2.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/big_mag.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..3b5708fee19278ea0f56ba9c18eec5963bc35dcc GIT binary patch literal 279 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D0tG- z#WAE}&fBSmT!$4z+Ts_Kl&tKop3WC{So+I^rQsSSnkjsG3&jPFc*@+lWar2+#i`fR z`N3a>E`|Hc?Mm3S+gUssShlGikdU@`F8}#?F!Of42NePZFXhfAF>!=@H5#g!_6RVo zi(-Dm`0g3!Qq6r$JnkFZK3E5xGHI{9y{&ocx97n#*0Rkho_sBLHHT*d$hdv1^B)R0 zNgbE?uWZov%%`%in?<1G0neekedTZV>i_EMW)-;hy;gLCR{~$c)B{3_j6xBy4_FVm W2cO=>Zut`EDF#nhKbLh*2~7Y&jAr8i literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/big_mag.rsi/meta.json b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/big_mag.rsi/meta.json new file mode 100644 index 00000000000..8e83ef880b3 --- /dev/null +++ b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/big_mag.rsi/meta.json @@ -0,0 +1,21 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi", + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + + } + ] +} diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/famas_mag.rsi/base.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/famas_mag.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..35dd6cd22b73996a1e64c9bba8abdc0a6c4ac90c GIT binary patch literal 319 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DEQIS z#WAE}&f6=7+)WN5>>tFpw41mtWbt+M?hf|L_08k0-P2~ae4E-_nJmsM&O;iroqn-A zy>B6yxzpIcr@Fvq&%y7X-`UO%Db#3Sf}ktH3BGTyKQ3EX7QX!Q!Q}@psFXi8S;7!- zXI6yBoW&*l5^uT{b}(wRJvvxA-$r_`AmfuY)0{Z+9KP(id@la-jXA0v=an`+=Pt6H z{=M|*EP>?{os7bjcqg$}zBho?I;sW^bq19Qfx&B^h8>`OjzmCd%i^ikuK zm)NfgK|#I+kD{ELH*TNzp5wCCU53?puUAWoH%U7jU9qDuX7~B5g-lFe+nLkdjrPoc z%pP&wc-m*dRa>`pSLiIb{5H{OZU=isbJ=6gk20Pa4Eim7kFp!el?)n86;F$75njlU z@o(kll`kX0x;@z!Gu&>iVEC&kT06B;S)jq~;`~fi;hhBx{~j&N+_ioFg;G)78&qol`;+05EoiMgRZ+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/famas_mag.rsi/mag-2.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/famas_mag.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..05314bef43b299c443a678a62fc7f6cc75be04ab GIT binary patch literal 337 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv(mfq{|P z)5S5QV$RzuhWrN|MA$#r8{Tjc5WI9O!5~6M%xdP09Jcu$}zBho?I;sW^bq19Qfx&B^h8>`OjzmCd%i^ikuK zm)NfgK|#I+kD{ELH*TNzp5wCCU53?puUAWoH%U7jU9qDuX7~B5g-lFe+nLkdjrPoc z%pP&wc-m*dRa>`pSLiIb{5H{OZU=isbJ=6gk20Pa4Eim7kFp!el?)n86;F$75njlU z@o(kll`kX0x;@z!Gu&>iVEC&kT06B;S)jq~;`~fi;hhBx{~j&N+_ioFg;G)78&qol`;+05EoiMgRZ+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/famas_mag.rsi/meta.json b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/famas_mag.rsi/meta.json new file mode 100644 index 00000000000..8e83ef880b3 --- /dev/null +++ b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/famas_mag.rsi/meta.json @@ -0,0 +1,21 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi", + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + + } + ] +} diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/m16_mag.rsi/mag-2.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/m16_mag.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..95b2a9858dcc84397bda57dd7146f9bce79e07da GIT binary patch literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DEQga z#WAE}&fBRQxtbjWT+9_$Zn?Pn68r9&33KPCiGSkPY~H(Mv&|cq^%oDF+R>CWvE@yc zNFw`@-NJL8_snCDh-6Y=0HPFz+uNkCm$vV`R<&J&VOI4#^SG=(rv={`9*CU#K+N95 zVGY+N9qD6zj}Ls!Wcc=W*Tn@>vOd}Tmu%t*5Md1o{ra&g_WF|F8?`u^7!Db{S>-Wl z$!zz)E2@*1X--M~Y0n@sYvC`gs^VmxpK))_3+#4xwn^riaZHKf{;%g9JPDE4b}y`U`fc^%V5)3c-_O( RWi8PA44$rjF6*2UngAeugb4ru literal 0 HcmV?d00001 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/m16_mag.rsi/meta.json b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/m16_mag.rsi/meta.json index 3db87328d61..8e83ef880b3 100644 --- a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/m16_mag.rsi/meta.json +++ b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/m16_mag.rsi/meta.json @@ -12,6 +12,9 @@ }, { "name": "mag-1" + }, + { + "name": "mag-2" } ] diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/sr127_mag.rsi/mag-2.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/sr127_mag.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..6527818aea8239d5f59faa9bac6a211c3f388592 GIT binary patch literal 319 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DEQIS z#WAE}PI96|g2AhXK=vN1ge#0HmJO}VukF>v&D(xFFJCYD@)5&?r)+F(5|707=KPS(XoeZ(q-Ig-s>>Fk>l$?tu&up0yedY#UxU zEYEz!FhTXiPno+#6J$Dkb8HXfBB>QuH$WPlN|b#gdXY*D02mtusFe5PZAe7<}AGpCVd0W5$8m>z)RIKp*Z z>C3XD-OH2oZ(l#;JwDUx=f}ff00@ucnDRW=bH~et4%-!-u5(%}XSAWU=mOCR0F@)W z2@r-M?cWpW&*iu53P7u>VnMJ0uqYN!lH}KXQ4})N^E^F=F;^@Agrib~M^U7^5Cnnt zX`1T)xz)1)Ak}sih{~HDfXdeZ++}$HsHm<`pMH~KcK{GIfEWz`Qiss@eL4Qi*AiKl znY{%=X<7jH>m^KXgV7G)jI`f`!2wh#?mvX^K^`I{wGHji# Date: Thu, 6 Feb 2025 00:34:13 +0900 Subject: [PATCH 02/16] types and tags --- Resources/Prototypes/Damage/groups.yml | 1 + .../Prototypes/_Backmen/Damage/types.yml | 5 ++ Resources/Prototypes/_Backmen/tags.yml | 69 +++++++++++++++++++ 3 files changed, 75 insertions(+) create mode 100644 Resources/Prototypes/_Backmen/Damage/types.yml diff --git a/Resources/Prototypes/Damage/groups.yml b/Resources/Prototypes/Damage/groups.yml index 3beeed7e6b2..ad9466f2994 100644 --- a/Resources/Prototypes/Damage/groups.yml +++ b/Resources/Prototypes/Damage/groups.yml @@ -5,6 +5,7 @@ - Blunt - Slash - Piercing + - ArmorPiercing #backmen-Armoures - type: damageGroup id: Burn diff --git a/Resources/Prototypes/_Backmen/Damage/types.yml b/Resources/Prototypes/_Backmen/Damage/types.yml new file mode 100644 index 00000000000..2b65794cb45 --- /dev/null +++ b/Resources/Prototypes/_Backmen/Damage/types.yml @@ -0,0 +1,5 @@ +- type: damageType + id: ArmorPiercing + name: damage-type-armor-piercing + armorCoefficientPrice: 2 + armorFlatPrice: 10 diff --git a/Resources/Prototypes/_Backmen/tags.yml b/Resources/Prototypes/_Backmen/tags.yml index b9f50eac53e..a9ba22a5ab1 100644 --- a/Resources/Prototypes/_Backmen/tags.yml +++ b/Resources/Prototypes/_Backmen/tags.yml @@ -150,3 +150,72 @@ - type: Tag id: Eyes + +- type: Tag + id: CartridgeRifle762x39 + +- type: Tag + id: CartridgeRifle762UEG + +- type: Tag + id: CartridgeRifle556UEG + +- type: Tag + id: CartridgeRifle50BMG + +- type: Tag + id: CartridgeRifle300win + +- type: Tag + id: CartridgePistol9x17 + +- type: Tag + id: CartridgePistol45ACP + +- type: Tag + id: CartridgePistol57x28 + +- type: Tag + id: CartridgePistol50AE + +- type: Tag + id: MagazinePistol9x17 + +- type: Tag + id: MagazinePistol45ACP + +- type: Tag + id: MagazinePistol57x28 + +- type: Tag + id: MagazinePistol50AE + +- type: Tag + id: MagazineSMG9x17 + +- type: Tag + id: MagazineSMGVector9x17 + +- type: Tag + id: MagazineSMGScorpion9x17 + +- type: Tag + id: MagazineSMG45ACP + +- type: Tag + id: MagazineSMG57x28 + +- type: Tag + id: MagazineRifleLight762x39 + +- type: Tag + id: MagazineRifle556UEG + +- type: Tag + id: MagazineRifleFamas556UEG + +- type: Tag + id: MagazineRifle762UEG + +- type: Tag + id: MagazineLightMachineGunRPD From c494b82f71829a17c24dce9b825e5604a58d2c59 Mon Sep 17 00:00:00 2001 From: no_mad Date: Thu, 6 Feb 2025 00:34:56 +0900 Subject: [PATCH 03/16] pulki --- .../Weapons/Guns/Ammunition/Boxes/boxes.yml | 258 +++++++++++++++- .../Guns/Ammunition/Cartridges/pistol.yml | 114 +++++++ .../Guns/Ammunition/Cartridges/rifle.yml | 184 ++++++++++- .../Weapons/Guns/Ammunition/Magazine/SMG.yml | 228 ++++++++++++++ .../Guns/Ammunition/Magazine/heavy.yml | 55 +++- .../Guns/Ammunition/Magazine/pistol.yml | 186 +++++++++--- .../Guns/Ammunition/Magazine/rifle.yml | 259 +++++++++++++++- .../Guns/Ammunition/Projectiles/pistol.yml | 202 ++++++++++++ .../Guns/Ammunition/Projectiles/rifle.yml | 287 ++++++++++++++++++ 9 files changed, 1699 insertions(+), 74 deletions(-) create mode 100644 Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/SMG.yml create mode 100644 Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml create mode 100644 Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml diff --git a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Boxes/boxes.yml b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Boxes/boxes.yml index 8090abadabf..bd17b5021be 100644 --- a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Boxes/boxes.yml +++ b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Boxes/boxes.yml @@ -11,22 +11,27 @@ proto: CartridgeRifleHeavy capacity: 30 - type: Item - size: Small + size: Normal - type: ContainerContainer containers: ballistic-ammo: !type:Container - type: Sprite sprite: Backmen/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] - type: MagazineVisuals magState: mag - steps: 2 + steps: 7 zeroVisible: false - type: Appearance - type: entity parent: BaseMagazineBoxHeavyRifle id: MagazineBoxHeavyRifle - name: ammunition box (.62 rifle) + name: ammunition box (.308 win) components: - type: Sprite layers: @@ -35,7 +40,7 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - type: BallisticAmmoProvider - proto: CartridgeRifleHeavy + proto: Cartridge308win - type: entity parent: BaseItem @@ -65,7 +70,7 @@ - type: entity parent: BaseMagazineBoxRifleLightSniper id: MagazineBoxRifleLightSniper - name: ammunition packet (7,62 rifle) + name: ammunition packet (7,62x52) components: - type: Sprite layers: @@ -75,3 +80,246 @@ map: ["enum.GunVisualLayers.Mag"] - type: BallisticAmmoProvider proto: CartridgeRifleLight762 + +- type: entity + parent: BaseMagazineBoxHeavyRifle + id: MagazineBoxRifle762x39 + name: ammunition box (7,62x39) + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleLight762x39 + capacity: 200 + +- type: entity + parent: BaseMagazineBoxHeavyRifle + id: MagazineBoxRifle762UEG + name: ammunition box (7,62 UEG) + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleLight762UEG + capacity: 200 + +- type: entity + parent: BaseMagazineBoxHeavyRifle + id: MagazineBoxRifle556UEG + name: ammunition box (5.56 UEG) + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleLight556UEG + capacity: 200 + +- type: entity + parent: BaseMagazineBoxHeavyRifle + id: MagazineBoxHeavyRifle50BMG + name: ammunition box (.50 BMG) + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi + layers: + - state: base-b + map: ["enum.GunVisualLayers.Base"] + - state: magb-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: magb + steps: 4 + zeroVisible: false + - type: BallisticAmmoProvider + proto: BaseCartridgeRifleLightSniper + capacity: 60 + +- type: entity + parent: BaseMagazineBoxHeavyRifle + id: MagazineBoxHeavyRifle762 + name: ammunition box (7,62x52) + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleLight762 + capacity: 60 + +- type: entity + parent: BaseMagazineBoxHeavyRifle + id: MagazinePacketRifle556UEG + name: ammunition packet (5.56 UEG) + components: + - type: Sprite + sprite: Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: open + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 13 + zeroVisible: false + - type: BallisticAmmoProvider + proto: CartridgeRifleLight556UEG + capacity: 60 + +- type: entity + parent: MagazinePacketRifle556UEG + id: MagazinePacketRifle556UEGIncendiary + name: ammunition packet incendiary (5.56 UEG) + components: + - type: Sprite + sprite: Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: open + - state: zajigalka + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: BallisticAmmoProvider + proto: CartridgeRifleLight556UEGIncendiary + +- type: entity + parent: MagazinePacketRifle556UEG + id: MagazinePacketRifle556UEGAP + name: ammunition packet (5.56 UEG AP) + components: + - type: Sprite + sprite: Backmen/Objects/Weapons/Guns/Ammunition/Boxes/cartonka.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: open + - state: bb + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: BallisticAmmoProvider + proto: CartridgeRifleLight556UEGAP + +- type: entity + parent: MagazinePacketRifle556UEG + id: MagazinePacketRifle762UEG + name: ammunition packet (7,62 UEG) + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleLight762UEG + +- type: entity + parent: MagazinePacketRifle556UEGIncendiary + id: MagazinePacketRifle762UEGIncendiary + name: ammunition packet Incendiary (7,62 UEG) + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleLight762UEGIncendiary + +- type: entity + parent: MagazinePacketRifle556UEGAP + id: MagazinePacketRifle762UEGAP + name: ammunition packet (7,62 UEG AP) + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleLight762UEGAP + +- type: entity + parent: MagazinePacketRifle556UEG + id: MagazinePacketRifle762x39 + name: ammunition packet (7,62x39) + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleLight762x39 + +- type: entity + parent: MagazinePacketRifle556UEGIncendiary + id: MagazinePacketRifle762x39Incendiary + name: ammunition packet Incendiary (7,62x39) + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleLight762x39Incendiary + +- type: entity + parent: MagazinePacketRifle556UEGAP + id: MagazinePacketRifle762x39AP + name: ammunition packet (7,62x39 AP) + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleLight762x39AP + +- type: entity + parent: MagazinePacketRifle556UEG + id: MagazinePacketPistol9x17 + name: ammunition packet (9x17 mm) + components: + - type: BallisticAmmoProvider + proto: CartridgePistol9x17 + +- type: entity + parent: MagazinePacketRifle556UEGIncendiary + id: MagazinePacketPistol9x17Incendiary + name: ammunition packet Incendiary (9x17 mm) + components: + - type: BallisticAmmoProvider + proto: CartridgePistol9x17Incendiary + +- type: entity + parent: MagazinePacketRifle556UEG + id: MagazinePacketPistolACP + name: ammunition packet (.45 auto) + components: + - type: BallisticAmmoProvider + proto: CartridgePistolACP + +- type: entity + parent: MagazinePacketRifle556UEGIncendiary + id: MagazinePacketPistolACPIncendiary + name: ammunition packet Incendiary (.45 auto) + components: + - type: BallisticAmmoProvider + proto: CartridgePistolACPIncendiary + +- type: entity + parent: MagazinePacketRifle556UEG + id: MagazinePacketPistol57x28 + name: ammunition packet (5,7x28) + components: + - type: BallisticAmmoProvider + proto: CartridgePistol57x28 + +- type: entity + parent: MagazinePacketRifle556UEGIncendiary + id: MagazinePacketPistol57x28Incendiary + name: ammunition packet Incendiary (5,7x28) + components: + - type: BallisticAmmoProvider + proto: CartridgePistol57x28Incendiary + +- type: entity + parent: MagazinePacketRifle556UEG + id: MagazinePacketPistol50AE + name: ammunition packet (.50 AE) + components: + - type: BallisticAmmoProvider + proto: CartridgePistol50AE + +- type: entity + parent: MagazinePacketRifle556UEGAP + id: MagazinePacketPistol50AEAP + name: ammunition packet (.50 AE AP) + components: + - type: BallisticAmmoProvider + proto: CartridgePistol50AEAP + +- type: entity + parent: MagazineBoxHeavyRifle50BMG + id: MagazinePacketHeavyRifle50BMG + name: ammunition packet (.50 BMG) + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 4 + zeroVisible: false + - type: BallisticAmmoProvider + proto: BaseCartridgeRifleLightSniper + capacity: 10 diff --git a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml index bcf33b85c79..3293cb925e2 100644 --- a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml +++ b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml @@ -34,3 +34,117 @@ state: 45fast - type: CartridgeAmmo proto: BulletMagnum345 + +- type: entity + id: CartridgePistol9x17 + name: cartridge (9x17 mm) + parent: BaseCartridgePistol + components: + - type: Tag + tags: + - CartridgePistol9x17 + - type: CartridgeAmmo + proto: BulletPistol9x17 + - type: Sprite + sprite: Backmen/Objects/Weapons/Gunsx64/Ammunition/Casings/ammo_casing.rsi + layers: + - state: 35combat + map: [ "enum.AmmoVisualLayers.Base" ] + - type: SpentAmmoVisuals + state: 35combat + +- type: entity + id: CartridgePistol9x17Incendiary + name: cartridge incendiary (9x17 mm) + parent: CartridgePistol9x17 + components: + - type: CartridgeAmmo + proto: BulletPistol9x17Incendiary + +- type: entity + id: CartridgePistolACP + name: cartridge (.45 Auto) + parent: BaseCartridgePistol + components: + - type: Tag + tags: + - CartridgePistol45ACP + - type: CartridgeAmmo + proto: BulletPistolACP + - type: Sprite + sprite: Backmen/Objects/Weapons/Gunsx64/Ammunition/Casings/ammo_casing.rsi + scale: 0.75, 0.75 + layers: + - state: 45combat + map: [ "enum.AmmoVisualLayers.Base" ] + - type: SpentAmmoVisuals + state: 45combat + +- type: entity + id: CartridgePistolACPIncendiary + name: cartridge incendiary (.45 Auto) + parent: CartridgePistolACP + components: + - type: CartridgeAmmo + proto: BulletPistolACPIncendiary + +- type: entity + id: CartridgePistol57x28 + name: cartridge (5,7x28) + parent: BaseCartridgePistol + components: + - type: Tag + tags: + - CartridgePistol57x28 + - type: CartridgeAmmo + proto: BulletPistol57x28 + - type: Sprite + sprite: Backmen/Objects/Weapons/Gunsx64/Ammunition/Casings/ammo_casing.rsi + scale: 0.6, 0.6 + layers: + - state: 20combat + map: [ "enum.AmmoVisualLayers.Base" ] + - type: SpentAmmoVisuals + state: 20combat + +- type: entity + id: CartridgePistol57x28Incendiary + name: cartridge incendiary (5,7x28) + parent: CartridgePistol57x28 + components: + - type: CartridgeAmmo + proto: BulletPistol57x28Incendiary + +- type: entity + id: CartridgePistol50AE + name: cartridge (.50 AE) + parent: BaseCartridgePistol + components: + - type: Tag + tags: + - CartridgePistol50AE + - type: CartridgeAmmo + proto: BulletPistol50AE + - type: Sprite + sprite: Backmen/Objects/Weapons/Gunsx64/Ammunition/Casings/ammo_casing.rsi + layers: + - state: 45combat + map: [ "enum.AmmoVisualLayers.Base" ] + - type: SpentAmmoVisuals + state: 45combat + +- type: entity + id: CartridgePistol50AEAP + name: cartridge (.50 AE AP) + parent: CartridgePistol50AE + components: + - type: CartridgeAmmo + proto: BulletPistol50AEAP + +- type: entity + id: CartridgePistol50AEIncendiary + name: cartridge incendiary (.50 AE) + parent: CartridgePistol50AE + components: + - type: CartridgeAmmo + proto: BulletPistol50AEIncendiary diff --git a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml index f453f4942b6..4c0b5a9f59d 100644 --- a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml +++ b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml @@ -33,6 +33,7 @@ id: CartridgeRifleHeavy name: cartridge (.62 rifle) parent: BaseCartridgeRifleHeavy + categories: [ HideSpawnMenu ] components: - type: Sprite layers: @@ -103,11 +104,184 @@ - type: StaticPrice price: 10 +- type: entity + id: CartridgeRifleLight762x39 + name: cartridge (7,62x39) + parent: BaseCartridgeRifleLightSniper + components: + - type: Sprite + scale: 0.8, 0.8 + layers: + - state: 30combat + map: ["enum.AmmoVisualLayers.Base"] + - type: SpentAmmoVisuals + state: 30combat + - type: CartridgeAmmo + proto: BulletRifle762x39 + - type: Tag + tags: + - Cartridge + - CartridgeRifle762x39 + +- type: entity + id: CartridgeRifleLight762x39Incendiary + name: cartridge incendiary (7,62x39) + parent: CartridgeRifleLight762x39 + components: + - type: CartridgeAmmo + proto: BulletRifle762x39Incendiary + +- type: entity + id: CartridgeRifleLight762x39AP + name: cartridge (7,62x39 AP) + parent: CartridgeRifleLight762x39 + components: + - type: CartridgeAmmo + proto: BulletRifle762x39AP + +- type: entity + id: CartridgeRifleLight762UEG + name: cartridge (7,62 UEG) + parent: BaseCartridgeRifleLightSniper + components: + - type: Sprite + scale: 0.75, 0.75 + layers: + - state: 20combat + map: ["enum.AmmoVisualLayers.Base"] + - type: SpentAmmoVisuals + state: 20combat + - type: CartridgeAmmo + proto: BulletRifle762UEG + - type: Tag + tags: + - Cartridge + - CartridgeRifle762UEG + +- type: entity + id: CartridgeRifleLight762UEGIncendiary + name: cartridge incendiary (7,62 UEG) + parent: CartridgeRifleLight762UEG + components: + - type: CartridgeAmmo + proto: BulletRifle762UEGIncendiary + +- type: entity + id: CartridgeRifleLight762UEGAP + name: cartridge (7,62 UEG AP) + parent: CartridgeRifleLight762UEG + components: + - type: CartridgeAmmo + proto: BulletRifle762UEGAP + +- type: entity + id: CartridgeRifleLight556UEG + name: cartridge (5.56 UEG) + parent: BaseCartridgeRifleLightSniper + components: + - type: Sprite + scale: 0.8, 0.8 + layers: + - state: 20combat + map: ["enum.AmmoVisualLayers.Base"] + - type: SpentAmmoVisuals + state: 20combat + - type: CartridgeAmmo + proto: BulletRifle556UEG + - type: Tag + tags: + - Cartridge + - CartridgeRifle556UEG + +- type: entity + id: CartridgeRifleLight556UEGIncendiary + name: cartridge incendiary (5.56 UEG) + parent: CartridgeRifleLight556UEG + components: + - type: CartridgeAmmo + proto: BulletRifle556UEGIncendiary + +- type: entity + id: CartridgeRifleLight556UEGAP + name: cartridge (5.56 UEG AP) + parent: CartridgeRifleLight556UEG + components: + - type: CartridgeAmmo + proto: BulletRifle556UEGAP + +- type: entity + parent: BaseCartridgeRifleLightSniper + id: Cartridge50BMG + name: cartridge (.50 BMG) + components: + - type: Tag + tags: + - Cartridge + - CartridgeRifle50BMG + - type: CartridgeAmmo + proto: Bullet50BMG + - type: Sprite + sprite: Backmen/Objects/Weapons/Gunsx64/Ammunition/Casings/large_casing.rsi + layers: + - state: 50combat + map: ["enum.AmmoVisualLayers.Base"] + - type: Appearance + - type: SpentAmmoVisuals + state: 50combat + - type: StaticPrice + price: 20 + +- type: entity + parent: Cartridge50BMG + id: Cartridge50BMGAP + name: cartridge (.50 BMG AP) + components: + - type: CartridgeAmmo + proto: Bullet50BMGAP + +- type: entity + parent: BaseCartridgeRifleLightSniper + id: Cartridge308win + name: cartridge (.308 win) + components: + - type: Tag + tags: + - Cartridge + - CartridgeRifle300win + - type: CartridgeAmmo + proto: Bullet308win + - type: Sprite + layers: + - state: 20combat + map: ["enum.AmmoVisualLayers.Base"] + - type: SpentAmmoVisuals + state: 20combat + +- type: entity + parent: Cartridge308win + id: Cartridge308winAP + name: cartridge (.308 win AP) + components: + - type: CartridgeAmmo + proto: Bullet308winAP + +- type: entity + parent: Cartridge308win + id: Cartridge308winIncendiary + name: cartridge incendiary (.308 win) + components: + - type: CartridgeAmmo + proto: Bullet308winIncendiary + - type: entity id: CartridgeRifleLight762 - name: cartridge (7,62 rifle) + name: cartridge (7,62x52) parent: BaseCartridgeRifleLightSniper components: + - type: Tag + tags: + - Cartridge + - CartridgeRifle762 - type: Sprite layers: - state: 30combat @@ -116,3 +290,11 @@ state: 30combat - type: CartridgeAmmo proto: BulletLight762 + +- type: entity + id: CartridgeRifleLight762AP + name: cartridge (7,62x52 AP) + parent: CartridgeRifleLight762 + components: + - type: CartridgeAmmo + proto: BulletLight762AP diff --git a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/SMG.yml b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/SMG.yml new file mode 100644 index 00000000000..6272f48b43b --- /dev/null +++ b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/SMG.yml @@ -0,0 +1,228 @@ +- type: entity + id: MagazinePistolSubMachineGun9x17 + name: SMG magazine (9x17 mm) + parent: BaseMagazinePistolSubMachineGun + components: + - type: Tag + tags: + - MagazineSMG9x17 + - type: BallisticAmmoProvider + proto: CartridgePistol9x17 + capacity: 30 + whitelist: + tags: + - CartridgePistol9x17 + soundInsert: + path: /Audio/Weapons/Guns/MagIn/bullet_insert.ogg + - type: Sprite + sprite: Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 3 + zeroVisible: false + +- type: entity + id: MagazinePistolSubMachineGun57x28 + name: MP7 magazine (5,7x28) + parent: BaseMagazinePistolSubMachineGun + components: + - type: Tag + tags: + - MagazineSMG57x28 + - type: BallisticAmmoProvider + proto: CartridgePistol57x28 + capacity: 30 + whitelist: + tags: + - CartridgePistol57x28 + soundInsert: + path: /Audio/Weapons/Guns/MagIn/bullet_insert.ogg + - type: Sprite + sprite: Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_mp7.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 3 + zeroVisible: false + +- type: entity + id: MagazinePistolSubMachineGunVector9x17 + name: Vector magazine (9x17 mm) + parent: BaseMagazinePistolSubMachineGun + components: + - type: Tag + tags: + - MagazineSMGVector9x17 + - type: BallisticAmmoProvider + proto: CartridgePistol9x17 + capacity: 20 + whitelist: + tags: + - CartridgePistol9x17 + soundInsert: + path: /Audio/Weapons/Guns/MagIn/bullet_insert.ogg + - type: Sprite + sprite: Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_vector.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 3 + zeroVisible: false + +- type: entity + id: MagazinePistolSubMachineGunVector9x17Ext + name: Vector magazine Extended (9x17 mm) + parent: MagazinePistolSubMachineGunVector9x17 + components: + - type: BallisticAmmoProvider + capacity: 40 + - type: Sprite + layers: + - state: base_extended + map: ["enum.GunVisualLayers.Base"] + - state: mag_extended-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag_extended + steps: 3 + zeroVisible: false + +- type: entity + id: MagazinePistolSubMachineGunScorpion9x17 + name: Scorpion magazine (9x17 mm) + parent: BaseMagazinePistolSubMachineGun + components: + - type: Tag + tags: + - MagazineSMGScorpion9x17 + - type: BallisticAmmoProvider + proto: CartridgePistol9x17 + capacity: 20 + whitelist: + tags: + - CartridgePistol9x17 + soundInsert: + path: /Audio/Weapons/Guns/MagIn/bullet_insert.ogg + - type: Sprite + sprite: Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_scorpion.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 3 + zeroVisible: false + +- type: entity + id: MagazinePistolBoxSubMachineGun + name: SMG box magazine (9x17 mm) + parent: BaseItem + components: + - type: Tag + tags: + - MagazinePistolBoxSubMachineGun + - type: BallisticAmmoProvider + mayTransfer: true + proto: CartridgePistol9x17 + whitelist: + tags: + - CartridgePistol9x17 + capacity: 45 + - type: Item + size: Small + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_boxmag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 3 + zeroVisible: false + - type: Appearance + +- type: entity + id: MagazinePistolDrumSubMachineGun + name: SMG Drum magazine (9x17 mm) + parent: BaseItem + components: + - type: Tag + tags: + - MagazinePistolDrumSubMachineGun + - type: BallisticAmmoProvider + mayTransfer: true + proto: CartridgePistol9x17 + whitelist: + tags: + - CartridgePistol9x17 + capacity: 71 + - type: Item + size: Small + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_drummag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 3 + zeroVisible: false + - type: Appearance + +- type: entity + id: MagazinePistolTopSubMachineGun + name: SMG top mounted magazine (9x17 mm) + parent: BaseItem + components: + - type: Tag + tags: + - MagazinePistolTopSubMachineGun + - type: BallisticAmmoProvider + mayTransfer: true + proto: CartridgePistol9x17 + whitelist: + tags: + - CartridgePistol9x17 + capacity: 50 + - type: Item + size: Small + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_top_moumted_mag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 6 + zeroVisible: false + - type: Appearance diff --git a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/heavy.yml b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/heavy.yml index 75e6c478357..9bcf95b2ba7 100644 --- a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/heavy.yml +++ b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/heavy.yml @@ -14,7 +14,7 @@ capacity: 200 whitelist: tags: - - CartridgeAntiMateriel + - CartridgeRifle50BMG - type: ContainerContainer containers: ballistic-ammo: !type:Container @@ -26,7 +26,7 @@ map: ["enum.GunVisualLayers.Mag"] - type: MagazineVisuals magState: mag - steps: 2 + steps: 3 zeroVisible: false - type: Appearance @@ -36,7 +36,7 @@ parent: BaseMagazineHeavyRifle50 components: - type: BallisticAmmoProvider - proto: CartridgeAntiMateriel + proto: Cartridge50BMG - type: Sprite sprite: Backmen/Objects/Weapons/Gunsx64/Magazines/Heavy/v41.rsi layers: @@ -47,15 +47,15 @@ - type: entity id: MagazineHeavyRifleV41 - name: "magazine (.20 rifle)" + name: "magazine (5.56 UEG)" parent: BaseMagazineHeavyRifle50 components: - type: BallisticAmmoProvider - proto: CartridgeRifle + proto: CartridgeRifleLight556UEG capacity: 200 whitelist: tags: - - CartridgeRifle + - CartridgeRifle556UEG - type: Sprite sprite: Backmen/Objects/Weapons/Gunsx64/Magazines/Heavy/v41.rsi layers: @@ -93,13 +93,13 @@ map: ["enum.GunVisualLayers.Mag"] - type: MagazineVisuals magState: mag - steps: 2 + steps: 3 zeroVisible: false - type: Appearance - type: entity id: MagazineLightMachineGunDrum - name: Drum magazine (.20 винтовочный) + name: Drum magazine (5.56 UEG) parent: BaseItem components: - type: Tag @@ -107,10 +107,10 @@ - MagazineLightMachineGunDrum - type: BallisticAmmoProvider mayTransfer: true - proto: CartridgeRifle + proto: CartridgeRifleLight556UEG whitelist: tags: - - CartridgeRifle + - CartridgeRifle556UEG capacity: 250 - type: Item size: Small @@ -126,6 +126,39 @@ map: ["enum.GunVisualLayers.Mag"] - type: MagazineVisuals magState: mag - steps: 2 + steps: 3 + zeroVisible: false + - type: Appearance + +- type: entity + id: MagazineLightMachineGun762x39 + name: RPD magazine (7,62x39) + parent: BaseItem + components: + - type: Tag + tags: + - MagazineLightMachineGunRPD + - type: BallisticAmmoProvider + mayTransfer: true + proto: CartridgeRifleLight762x39 + whitelist: + tags: + - CartridgeRifle762x39 + capacity: 80 + - type: Item + size: Small + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: Backmen/Objects/Weapons/Gunsx64/Magazines/Heavy/rpd.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 3 zeroVisible: false - type: Appearance diff --git a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/pistol.yml b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/pistol.yml index 836ec7fe269..85af79ab72d 100644 --- a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/pistol.yml +++ b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/pistol.yml @@ -1,6 +1,6 @@ - type: entity id: MagazineMagnumPistolAP - name: pistol magazine (.50AE AP) + name: pistol magazine (.45 Magnum AP) parent: MagazineMagnumPistol components: - type: BallisticAmmoProvider @@ -12,7 +12,7 @@ - type: entity id: MagazineMagnumPistol - name: pistol magazine (.50AE) + name: pistol magazine (.45 Magnum) parent: BaseItem components: - type: Tag @@ -71,32 +71,26 @@ map: ["enum.GunVisualLayers.Mag"] - type: MagazineVisuals magState: mag - steps: 2 + steps: 3 zeroVisible: false - type: Appearance - type: entity - id: MagazinePistolBoxSubMachineGun - name: SMG box magazine (.9×19mm parabellum) - parent: BaseItem + id: MagazinePistol45ACP + name: pistol magazine (.45 Auto) + parent: BaseMagazinePistol components: - type: Tag tags: - - MagazinePistolBoxSubMachineGun + - MagazinePistol45ACP - type: BallisticAmmoProvider - mayTransfer: true - proto: CartridgePistol + proto: CartridgePistolACP + capacity: 12 whitelist: tags: - - CartridgePistol - capacity: 45 - - type: Item - size: Small - - type: ContainerContainer - containers: - ballistic-ammo: !type:Container + - CartridgePistol45ACP - type: Sprite - sprite: Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_boxmag.rsi + sprite: Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_45acp.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] @@ -104,32 +98,49 @@ map: ["enum.GunVisualLayers.Mag"] - type: MagazineVisuals magState: mag - steps: 2 + steps: 5 zeroVisible: false - - type: Appearance - type: entity - id: MagazinePistolDrumSubMachineGun - name: SMG Drum magazine (.9×19mm parabellum) - parent: BaseItem + id: MagazinePistol45ACPuranium + name: pistol magazine uranium (.45 Auto) + parent: MagazinePistol45ACP + components: + - type: BallisticAmmoProvider + proto: BulletPistolACPUranium + +- type: entity + id: MagazinePistol45ACPpractice + name: pistol magazine practice (.45 Auto) + parent: MagazinePistol45ACP + components: + - type: BallisticAmmoProvider + proto: BulletPistolACPPractice + +- type: entity + id: MagazinePistol45ACPincendiary + name: pistol magazine incendiary (.45 Auto) + parent: MagazinePistol45ACP + components: + - type: BallisticAmmoProvider + proto: BulletPistolACPIncendiary + +- type: entity + id: MagazinePistol57x28 + name: pistol magazine (5,7x28) + parent: BaseMagazinePistol components: - type: Tag tags: - - MagazinePistolDrumSubMachineGun + - MagazinePistol57x28 - type: BallisticAmmoProvider - mayTransfer: true - proto: CartridgePistol + proto: CartridgePistol57x28 + capacity: 10 whitelist: tags: - - CartridgePistol - capacity: 71 - - type: Item - size: Small - - type: ContainerContainer - containers: - ballistic-ammo: !type:Container + - CartridgePistol57x28 - type: Sprite - sprite: Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_drummag.rsi + sprite: Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_545.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] @@ -137,32 +148,81 @@ map: ["enum.GunVisualLayers.Mag"] - type: MagazineVisuals magState: mag - steps: 2 + steps: 5 zeroVisible: false - - type: Appearance - type: entity - id: MagazinePistolTopSubMachineGun - name: SMG top mounted magazine (.9×19mm parabellum) + id: MagazinePistol57x28Uranium + name: pistol magazine uranium (5,7x28) + parent: MagazinePistol57x28 + components: + - type: BallisticAmmoProvider + proto: BulletPistol57x28Uranium + +- type: entity + id: MagazinePistol57x28Practice + name: pistol magazine practice (5,7x28) + parent: MagazinePistol57x28 + components: + - type: BallisticAmmoProvider + proto: BulletPistol57x28Practice + +- type: entity + id: MagazinePistol57x28Incendiary + name: pistol magazine incendiary (5,7x28) + parent: MagazinePistol57x28 + components: + - type: BallisticAmmoProvider + proto: BulletPistol57x28Incendiary + +- type: entity + id: MagazinePistol57x28Extd + name: pistol magazine extended (5,7x28) + parent: BaseMagazinePistol + components: + - type: Tag + tags: + - MagazinePistol57x28 + - type: BallisticAmmoProvider + proto: CartridgePistol57x28 + capacity: 19 + whitelist: + tags: + - CartridgePistol57x28 + - type: Sprite + sprite: Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag_545.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: false + +- type: entity + id: MagazinePistol50AE + name: pistol magazine (.50 AE) parent: BaseItem components: - type: Tag tags: - - MagazinePistolTopSubMachineGun + - MagazinePistol50AE - type: BallisticAmmoProvider mayTransfer: true - proto: CartridgePistol + proto: CartridgePistol50AE whitelist: tags: - - CartridgePistol - capacity: 50 + - CartridgePistol50AE + capacity: 7 - type: Item size: Small - type: ContainerContainer containers: ballistic-ammo: !type:Container - type: Sprite - sprite: Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/submachinegun_top_moumted_mag.rsi + sprite: Backmen/Objects/Weapons/Gunsx64/Magazines/Magnum/magnum_pistol_mag.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] @@ -173,3 +233,45 @@ steps: 6 zeroVisible: false - type: Appearance + +- type: entity + id: MagazinePistol50AEAP + name: pistol magazine (.50 AE AP) + parent: MagazinePistol50AE + components: + - type: BallisticAmmoProvider + proto: BulletPistol50AEAP + +- type: entity + id: MagazinePistol9x17 + name: pistol magazine (9x17 mm) + parent: BaseMagazinePistol + components: + - type: Tag + tags: + - MagazinePistol9x17 + - type: BallisticAmmoProvider + proto: CartridgePistol9x17 + capacity: 17 + whitelist: + tags: + - CartridgePistol9x17 + - type: Sprite + sprite: Backmen/Objects/Weapons/Gunsx64/Magazines/Pistol/pistol_mag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 3 + zeroVisible: false + +- type: entity + id: MagazinePistol9x17Incendiary + name: pistol magazine incendiary (9x17 mm) + parent: MagazinePistol9x17 + components: + - type: BallisticAmmoProvider + proto: CartridgePistol9x17Incendiary diff --git a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/rifle.yml b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/rifle.yml index b1ddf802444..2bb6a199c17 100644 --- a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/rifle.yml +++ b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/rifle.yml @@ -10,12 +10,15 @@ - type: entity id: MagazineRiflePan - name: "дисковый магазин (.20 винтовочные)" + name: "дисковый магазин (5.56 UEG)" parent: BaseMagazineRifle components: - type: BallisticAmmoProvider - proto: CartridgeRifle + proto: CartridgeRifleLight556UEG capacity: 96 + whitelist: + tags: + - CartridgeRifle556UEG - type: Sprite sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/maxim.rsi @@ -35,7 +38,7 @@ - type: entity id: MagazineAntiMaterielRifleSR - name: rifle magazine (.60 anti-material) + name: rifle magazine (.50 BMG) description: Standart EarthGov type of heavy magazines. parent: BaseItem components: @@ -45,10 +48,10 @@ - type: BallisticAmmoProvider mayTransfer: true capacity: 10 - proto: CartridgeAntiMateriel + proto: Cartridge50BMG whitelist: tags: - - CartridgeAntiMateriel + - CartridgeRifle50BMG - type: ContainerContainer containers: ballistic-ammo: !type:Container @@ -65,35 +68,44 @@ map: ["enum.GunVisualLayers.Mag"] - type: MagazineVisuals magState: mag - steps: 2 + steps: 3 zeroVisible: false - type: Appearance +- type: entity + id: MagazineAntiMaterielRifleSRAP + name: rifle magazine (.50 BMG AP) + parent: MagazineAntiMaterielRifleSR + components: + - type: BallisticAmmoProvider + proto: Cartridge50BMGAP + - type: entity id: MagazineHeavyRifleBR64 - name: rifle magazine (.62 rifle) + name: rifle magazine (.308 win) description: Standart EarthGov type of heavy magazines. parent: BaseItem components: - type: Tag tags: - MagazineHeavyRifle62 + - MagazineRifle - type: BallisticAmmoProvider mayTransfer: true - capacity: 20 - proto: CartridgeRifleHeavy + capacity: 18 + proto: Cartridge308win whitelist: tags: - - CartridgeRifle62 + - CartridgeRifle300win - type: ContainerContainer containers: ballistic-ammo: !type:Container - type: Item size: Small - sprite: Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/m16_mag.rsi + sprite: Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/big_mag.rsi - type: Sprite netsync: false - sprite: Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/m16_mag.rsi + sprite: Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/big_mag.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] @@ -101,10 +113,18 @@ map: ["enum.GunVisualLayers.Mag"] - type: MagazineVisuals magState: mag - steps: 2 + steps: 3 zeroVisible: false - type: Appearance +- type: entity + id: MagazineHeavyRifleBR64AP + name: rifle magazine (.308 win AP) + parent: MagazineHeavyRifleBR64 + components: + - type: BallisticAmmoProvider + proto: Cartridge308winAP + - type: entity id: MagazineRifleRocket20 name: rifle magazine (рельсотрон) @@ -143,13 +163,14 @@ - type: entity id: MagazineRifleLightSniper - name: rifle magazine (7,62 rifle) + name: rifle magazine (7,62x52) description: Standart USSP type of heavy magazines. parent: BaseItem components: - type: Tag tags: - MagazineRifleLightSniper + - MagazineLightRifle - type: BallisticAmmoProvider mayTransfer: true capacity: 20 @@ -173,6 +194,214 @@ map: ["enum.GunVisualLayers.Mag"] - type: MagazineVisuals magState: mag - steps: 2 + steps: 3 zeroVisible: false - type: Appearance + +- type: entity + id: MagazineRifleLightSniperAP + name: rifle magazine (7,62x52 AP) + parent: MagazineRifleLightSniper + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleLight762AP + +- type: entity + id: MagazineRifleLight762x39 + name: магазин АК (7,62x39) + parent: BaseMagazineRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleLight762x39 + capacity: 30 + whitelist: + tags: + - CartridgeRifle762x39 + - type: Sprite + sprite: Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/ak_mag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 3 + zeroVisible: false + - type: Tag + tags: + - MagazineRifleLight762x39 + - MagazineLightRifle + +- type: entity + id: MagazineRifleLight762x39Incendiary + name: магазин АК incendiary (7,62x39) + parent: MagazineRifleLight762x39 + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleLight762x39Incendiary + +- type: entity + id: MagazineRifleLight762x39AP + name: магазин АК (7,62x39 AP) + parent: MagazineRifleLight762x39 + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleLight762x39AP + +- type: entity + id: MagazineRifleLight762x39Ext + name: магазин АК extended (7,62x39) + parent: BaseMagazineRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleLight762x39 + capacity: 50 + whitelist: + tags: + - CartridgeRifle762x39 + - type: Sprite + sprite: Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/ak_long_mag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 3 + zeroVisible: false + - type: Tag + tags: + - MagazineRifleLight762x39 + - MagazineLightRifle + +- type: entity + id: MagazineRifle556UEG + name: магазин AR (5.56 UEG) + parent: BaseMagazineRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleLight556UEG + capacity: 30 + whitelist: + tags: + - CartridgeRifle556UEG + - type: Sprite + sprite: Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/m16_mag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 3 + zeroVisible: false + - type: Tag + tags: + - MagazineRifle556UEG + - MagazineRifle + +- type: entity + id: MagazineRifle556UEGIncendiary + name: магазин AR incendiary (5.56 UEG) + parent: MagazineRifle556UEG + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleLight556UEGIncendiary + +- type: entity + id: MagazineRifle556UEGAP + name: магазин AR (5.56 UEG AP) + parent: MagazineRifle556UEG + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleLight556UEGAP + +- type: entity + id: MagazineRifle762UEG + name: магазин AR (7,62 UEG) + parent: BaseMagazineRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleLight762UEG + capacity: 30 + whitelist: + tags: + - CartridgeRifle762UEG + - type: Sprite + sprite: Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/ar_mag.rsi + scale: 0.7, 0.7 + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 3 + zeroVisible: false + - type: Tag + tags: + - MagazineRifle762UEG + - MagazineRifle + +- type: entity + id: MagazineRifle762UEGAP + name: магазин AR (7,62 UEG AP) + parent: MagazineRifle762UEG + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleLight762UEGAP + +- type: entity + id: MagazineRifle762UEGIncendiary + name: магазин AR incendiary (7,62 UEG) + parent: MagazineRifle762UEG + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleLight762UEGIncendiary + +- type: entity + id: MagazineRifleFamas556UEG + name: магазин Famas (5.56 UEG) + parent: BaseMagazineRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleLight556UEG + capacity: 20 + whitelist: + tags: + - CartridgeRifle556UEG + - type: Sprite + sprite: Backmen/Objects/Weapons/Gunsx64/Magazines/Rifle/famas_mag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 3 + zeroVisible: false + - type: Tag + tags: + - MagazineRifleFamas556UEG + - MagazineRifle + +- type: entity + id: MagazineRifleFamas556UEGAP + name: магазин Famas (5.56 UEG AP) + parent: BaseMagazineRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleLight556UEGAP + +- type: entity + id: MagazineRifleFamas556UEGIncendiary + name: магазин Famas incendiary (5.56 UEG) + parent: BaseMagazineRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleLight556UEGIncendiary diff --git a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml new file mode 100644 index 00000000000..b8f50189f50 --- /dev/null +++ b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml @@ -0,0 +1,202 @@ +- type: entity + id: BulletPistol57x28 + name: bullet (5,7x28) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 4 + ArmorPiercing: 3 + +- type: entity + id: BulletPistol57x28Uranium + parent: BaseBulletUranium + name: bullet (5,7x28 uranium) + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Radiation: 2 + Piercing: 2 + ArmorPiercing: 3 + +- type: entity + id: BulletPistol57x28Practice + name: bullet (5,7x28 practice) + parent: BaseBulletPractice + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Blunt: 2 + +- type: entity + id: BulletPistol57x28Incendiary + parent: BaseBulletIncendiary + name: bullet (5,7x28 incendiary) + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + ArmorPiercing: 2 + Heat: 4 + +- type: entity + id: BulletPistol9x17 + name: bullet (9x17 mm) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 9 + +- type: entity + id: BulletPistol9x17Uranium + parent: BaseBulletUranium + name: bullet (9x17 mm uranium) + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Radiation: 5 + Piercing: 5 + +- type: entity + id: BulletPistol9x17Practice + name: bullet (9x17 practice) + parent: BaseBulletPractice + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Blunt: 2 + +- type: entity + id: BulletPistol9x17Incendiary + parent: BaseBulletIncendiary + name: bullet (9x17 incendiary) + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Blunt: 2 + Heat: 7 + +- type: entity + id: BulletPistolACP + name: bullet (.45 Auto) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 7 + Blunt: 5 + +- type: entity + id: BulletPistolACPUranium + parent: BaseBulletUranium + name: bullet (.45 Auto uranium) + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Radiation: 5 + Piercing: 2 + Blunt: 5 + +- type: entity + id: BulletPistolACPPractice + name: bullet (.45 Auto practice) + parent: BaseBulletPractice + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Blunt: 5 + +- type: entity + id: BulletPistolACPIncendiary + parent: BaseBulletIncendiary + name: bullet (.45 Auto incendiary) + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Blunt: 5 + Heat: 7 + +- type: entity + id: BulletPistol50AE + name: bullet (.50 AE) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 30 + Blunt: 10 + +- type: entity + id: BulletPistol50AEAP + name: bullet (.50 AE AP) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + ArmorPiercing: 15 + Piercing: 20 + +- type: entity + id: BulletPistol50AEUranium + parent: BaseBulletUranium + name: bullet (.50 AE uranium) + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Radiation: 20 + Piercing: 10 + Blunt: 10 + +- type: entity + id: BulletPistol50AEPractice + name: bullet (.50 AE practice) + parent: BaseBulletPractice + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Blunt: 10 + +- type: entity + id: BulletPistol50AEIncendiary + parent: BaseBulletIncendiary + name: bullet (.50 AE incendiary) + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 10 + Blunt: 10 + Heat: 25 diff --git a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml new file mode 100644 index 00000000000..6de5f2606fb --- /dev/null +++ b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml @@ -0,0 +1,287 @@ +- type: entity + id: BulletRifle762x39 + name: bullet (7,62x39) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 12 + ArmorPiercing: 7 + +- type: entity + id: BulletRifle762x39AP + name: bullet (7,62x39 AP) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + ArmorPiercing: 15 + Piercing: 5 + +- type: entity + id: BulletRifle762x39Uranium + parent: BaseBulletUranium + name: bullet (7,62x39 uranium) + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Radiation: 12 + Piercing: 7 + +- type: entity + id: BulletRifle762x39Practice + name: bullet (7,62x39 practice) + parent: BaseBulletPractice + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Blunt: 7 + +- type: entity + id: BulletRifle762x39Incendiary + parent: BaseBulletIncendiary + name: bullet (7,62x39 incendiary) + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 4 + Heat: 15 + +- type: entity + id: BulletRifle762UEG + name: bullet (7,62 UEG) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 9 + ArmorPiercing: 5 + +- type: entity + id: BulletRifle762UEGAP + name: bullet (7,62 UEG AP) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + ArmorPiercing: 10 + Piercing: 4 + +- type: entity + id: BulletRifle762UEGUranium + parent: BaseBulletUranium + name: bullet (7,62 UEG uranium) + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Radiation: 10 + Piercing: 4 + +- type: entity + id: BulletRifle762UEGPractice + name: bullet (7,62 UEG practice) + parent: BaseBulletPractice + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Blunt: 3 + +- type: entity + id: BulletRifle762UEGIncendiary + parent: BaseBulletIncendiary + name: bullet (7,62 UEG incendiary) + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 4 + Heat: 10 + +- type: entity + id: BulletRifle556UEG + name: bullet (5.56 UEG) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 15 + ArmorPiercing: 2 + +- type: entity + id: BulletRifle556UEGAP + name: bullet (5.56 UEG AP) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + ArmorPiercing: 15 + Piercing: 2 + +- type: entity + id: BulletRifle556UEGUranium + parent: BaseBulletUranium + name: bullet (5.56 UEG uranium) + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Radiation: 12 + Piercing: 5 + +- type: entity + id: BulletRifle556UEGPractice + name: bullet (5.56 UEG practice) + parent: BaseBulletPractice + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Blunt: 4 + +- type: entity + id: BulletRifle556UEGIncendiary + parent: BaseBulletIncendiary + name: bullet (5.56 UEG incendiary) + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 2 + Heat: 15 + +- type: entity + categories: [ HideSpawnMenu ] + parent: BaseBullet + id: Bullet308win + name: bullet (.308 win) + components: + - type: Projectile + damage: + types: + Piercing: 20 + ArmorPiercing: 10 + +- type: entity + id: Bullet308winAP + name: bullet (.308 win AP) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + ArmorPiercing: 20 + Piercing: 10 + +- type: entity + id: Bullet308winUranium + parent: BaseBulletUranium + name: bullet (.308 win uranium) + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Radiation: 20 + Piercing: 10 + +- type: entity + id: Bullet308winPractice + name: bullet (.308 win practice) + parent: BaseBulletPractice + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Blunt: 5 + +- type: entity + id: Bullet308winIncendiary + parent: BaseBulletIncendiary + name: bullet (.308 win incendiary) + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 10 + Heat: 20 + +- type: entity + parent: BaseBullet + id: BulletLight762 + name: bullet (7,62x52 rifle) + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 29 + ArmorPiercing: 10 + +- type: entity + id: BulletLight762AP + name: bullet (.308 win AP) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + ArmorPiercing: 29 + Piercing: 10 + +- type: entity + categories: [ HideSpawnMenu ] + parent: BaseBullet + id: Bullet50BMG + name: bullet (.50 BMG) + components: + - type: Projectile + damage: + types: + Piercing: 40 + ArmorPiercing: 20 + Structural: 80 + - type: StaminaDamageOnCollide + damage: 85 + +- type: entity + id: Bullet50BMGAP + name: bullet (.50 BMG AP) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 20 + ArmorPiercing: 60 + Structural: 160 From f5915af4ed410846da37ff0a621486814e08ff09 Mon Sep 17 00:00:00 2001 From: no_mad Date: Thu, 6 Feb 2025 00:35:50 +0900 Subject: [PATCH 04/16] replace to new pulki --- .../Catalog/Fills/Boxes/ammunition.yml | 10 +- .../Catalog/Fills/Crates/armory.yml | 6 +- .../Catalog/Fills/Lockers/security.yml | 7 ++ .../Prototypes/Catalog/uplink_catalog.yml | 6 +- .../Guns/Ammunition/Boxes/antimateriel.yml | 2 + .../Guns/Ammunition/Boxes/light_rifle.yml | 5 + .../Weapons/Guns/Ammunition/Boxes/pistol.yml | 4 + .../Weapons/Guns/Ammunition/Boxes/rifle.yml | 5 + .../Ammunition/Cartridges/antimateriel.yml | 1 + .../Ammunition/Cartridges/light_rifle.yml | 4 + .../Guns/Ammunition/Cartridges/pistol.yml | 4 + .../Guns/Ammunition/Cartridges/rifle.yml | 4 + .../Guns/Ammunition/Magazines/light_rifle.yml | 8 ++ .../Guns/Ammunition/Magazines/pistol.yml | 15 +++ .../Guns/Ammunition/Magazines/rifle.yml | 5 + .../Catalog/Fills/Backpacks/backpack.yml | 6 +- .../Catalog/Fills/Items/Belts/belts.yml | 8 +- .../Catalog/Fills/Lockers/security.yml | 6 +- .../VendingMachines/Inventories/ammo_nt.yml | 7 +- .../_Backmen/Catalog/uplink_nomad.yml | 34 +++--- .../Objects/Misc/entities_lodauts.yml | 6 +- .../Objects/Weapons/Guns/LMGs/lmgs.yml | 8 +- .../Objects/Weapons/Guns/Pistols/Pistols.yml | 86 ++++++--------- .../Weapons/Guns/Projectiles/projectiles.yml | 11 -- .../Objects/Weapons/Guns/Rifles/rifles.yml | 104 ++++++++---------- .../Objects/Weapons/Guns/SMGs/SMGs.yml | 76 ++++++------- Resources/migration.yml | 58 +++++++++- 27 files changed, 282 insertions(+), 214 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml index b51d37491e2..98490e78ee1 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml @@ -42,7 +42,7 @@ components: - type: StorageFill contents: - - id: MagazineLightRifle + - id: MagazineRifleLight762x39 amount: 4 - type: entity @@ -98,7 +98,7 @@ components: - type: StorageFill contents: - - id: MagazinePistol + - id: MagazinePistol9x17 amount: 4 - type: entity @@ -120,7 +120,7 @@ components: - type: StorageFill contents: - - id: MagazinePistolHighCapacity + - id: MagazinePistol57x28Extd amount: 4 - type: entity @@ -142,7 +142,7 @@ components: - type: StorageFill contents: - - id: MagazinePistolSubMachineGun + - id: MagazinePistolSubMachineGun9x17 amount: 3 - type: entity @@ -210,7 +210,7 @@ components: - type: StorageFill contents: - - id: MagazineRifle + - id: MagazineRifle556UEG amount: 4 - type: entity diff --git a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml index eb1d4c064bc..8c5b273df77 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml @@ -8,7 +8,7 @@ contents: - id: WeaponSubMachineGunMP5 amount: 2 - - id: MagazinePistolSubMachineGun + - id: MagazinePistolSubMachineGun9x17 amount: 4 - type: entity @@ -65,9 +65,9 @@ components: - type: StorageFill contents: - - id: WeaponPistolACP14 + - id: WeaponPistolG22 amount: 2 - - id: MagazinePistol + - id: MagazinePistol9x17 amount: 4 - type: entity diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 4400f23a908..afe78950655 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -185,6 +185,7 @@ parent: [GunSafeBaseSecure, BaseRestrictedContraband] id: GunSafePistolMk58 name: mk58 safe + categories: [ HideSpawnMenu ] components: - type: StorageFill contents: @@ -197,6 +198,7 @@ parent: [GunSafeBaseSecure, BaseRestrictedContraband] id: GunSafeRifleLecter name: lecter safe + categories: [ HideSpawnMenu ] components: - type: StorageFill contents: @@ -209,6 +211,7 @@ parent: [GunSafeBaseSecure, BaseRestrictedContraband] id: GunSafeSubMachineGunDrozd name: drozd safe + categories: [ HideSpawnMenu ] components: - type: StorageFill contents: @@ -221,6 +224,7 @@ parent: [GunSafeBaseSecure, BaseRestrictedContraband] id: GunSafeShotgunEnforcer name: enforcer safe + categories: [ HideSpawnMenu ] components: - type: StorageFill contents: @@ -233,6 +237,7 @@ parent: [GunSafeBaseSecure, BaseRestrictedContraband] id: GunSafeShotgunKammerer name: kammerer safe + categories: [ HideSpawnMenu ] components: - type: StorageFill contents: @@ -246,6 +251,7 @@ suffix: Wt550 parent: [GunSafeBaseSecure, BaseRestrictedContraband] name: wt550 safe + categories: [ HideSpawnMenu ] components: - type: StorageFill contents: @@ -258,6 +264,7 @@ parent: [GunSafeBaseSecure, BaseRestrictedContraband] id: GunSafeLaserCarbine name: laser safe + categories: [ HideSpawnMenu ] components: - type: StorageFill contents: diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 95fe3729ea8..6b514a3a6bb 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -467,7 +467,7 @@ name: uplink-pistol-magazine-name description: uplink-pistol-magazine-desc icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi, state: red-icon } - productEntity: MagazinePistol + productEntity: MagazinePistol9x17 #backmen-ammonation cost: Telecrystal: 1 categories: @@ -479,7 +479,7 @@ name: uplink-pistol-magazine-c20r-name description: uplink-pistol-magazine-c20r-desc icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi, state: red-icon } - productEntity: MagazinePistolSubMachineGun + productEntity: MagazinePistolSubMachineGun9x17 #backmen-ammonation cost: Telecrystal: 2 categories: @@ -525,7 +525,7 @@ id: UplinkHristovAmmo name: uplink-sniper-ammo-name description: uplink-sniper-ammo-desc - productEntity: MagazineBoxAntiMateriel + productEntity: MagazinePacketHeavyRifle50BMG #backmen-ammonation cost: Telecrystal: 2 categories: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml index 8fe03f3c6e1..e0e446bb50d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml @@ -29,6 +29,7 @@ parent: BaseMagazineBoxAntiMateriel id: MagazineBoxAntiMaterielBig name: ammunition box (.60 anti-materiel) + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider capacity: 30 @@ -49,6 +50,7 @@ parent: BaseMagazineBoxAntiMateriel id: MagazineBoxAntiMateriel name: ammunition box (.60 anti-materiel) + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: CartridgeAntiMateriel diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml index bcd56c1d64a..79dff93f131 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml @@ -29,6 +29,7 @@ parent: BaseMagazineBoxLightRifle id: MagazineBoxLightRifleBig name: ammunition box (.30 rifle) + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider capacity: 200 @@ -49,6 +50,7 @@ parent: BaseMagazineBoxLightRifle id: MagazineBoxLightRifle name: ammunition box (.30 rifle) + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: CartridgeLightRifle @@ -63,6 +65,7 @@ parent: BaseMagazineBoxLightRifle id: MagazineBoxLightRiflePractice name: ammunition box (.30 rifle practice) + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: CartridgeLightRiflePractice @@ -78,6 +81,7 @@ id: MagazineBoxLightRifleIncendiary parent: BaseMagazineBoxLightRifle name: ammunition box (.30 rifle incendiary) + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: CartridgeLightRifleIncendiary @@ -93,6 +97,7 @@ parent: BaseMagazineBoxLightRifle id: MagazineBoxLightRifleUranium name: ammunition box (.30 rifle uranium) + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: CartridgeLightRifleUranium diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml index e081d574d7a..9889ef0cbe8 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml @@ -29,6 +29,7 @@ parent: BaseMagazineBoxPistol id: MagazineBoxPistol name: ammunition box (.35 auto) + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: CartridgePistol @@ -43,6 +44,7 @@ parent: BaseMagazineBoxPistol id: MagazineBoxPistolPractice name: ammunition box (.35 auto practice) + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: CartridgePistolPractice @@ -58,6 +60,7 @@ id: MagazineBoxPistolIncendiary parent: BaseMagazineBoxPistol name: ammunition box (.35 auto incendiary) + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: CartridgePistolIncendiary @@ -73,6 +76,7 @@ id: MagazineBoxPistolUranium parent: BaseMagazineBoxPistol name: ammunition box (.35 auto uranium) + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: CartridgePistolUranium diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml index 98e063e297f..31d18067b0d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml @@ -28,6 +28,7 @@ parent: BaseMagazineBoxRifle id: MagazineBoxRifleBig name: ammunition box (.20 rifle) + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider capacity: 200 @@ -48,6 +49,7 @@ parent: BaseMagazineBoxRifle id: MagazineBoxRifle name: ammunition box (.20 rifle) + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: CartridgeRifle @@ -62,6 +64,7 @@ parent: BaseMagazineBoxRifle id: MagazineBoxRiflePractice name: ammunition box (.20 rifle practice) + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: CartridgeRiflePractice @@ -77,6 +80,7 @@ id: MagazineBoxRifleIncendiary parent: BaseMagazineBoxRifle name: ammunition box (.20 rifle incendiary) + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: CartridgeRifleIncendiary @@ -92,6 +96,7 @@ id: MagazineBoxRifleUranium parent: BaseMagazineBoxRifle name: ammunition box (.20 rifle uranium) + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: CartridgeRifleUranium diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml index e622952b3ff..2167c71d4e3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml @@ -2,6 +2,7 @@ parent: [ BaseCartridge, BaseMajorContraband ] id: CartridgeAntiMateriel name: cartridge (.60 anti-materiel) + categories: [ HideSpawnMenu ] components: - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml index 4cf3c759bbe..b795196167c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml @@ -22,6 +22,7 @@ id: CartridgeLightRifle name: cartridge (.30 rifle) parent: BaseCartridgeLightRifle + categories: [ HideSpawnMenu ] components: - type: CartridgeAmmo proto: BulletLightRifle @@ -30,6 +31,7 @@ id: CartridgeLightRiflePractice name: cartridge (.30 rifle practice) parent: BaseCartridgeLightRifle + categories: [ HideSpawnMenu ] components: - type: CartridgeAmmo proto: BulletLightRiflePractice @@ -45,6 +47,7 @@ id: CartridgeLightRifleIncendiary name: cartridge (.30 rifle incendiary) parent: BaseCartridgeLightRifle + categories: [ HideSpawnMenu ] components: - type: CartridgeAmmo proto: BulletLightRifleIncendiary @@ -60,6 +63,7 @@ id: CartridgeLightRifleUranium name: cartridge (.30 rifle uranium) parent: BaseCartridgeLightRifle + categories: [ HideSpawnMenu ] components: - type: CartridgeAmmo proto: BulletLightRifleUranium diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml index 3635b00f366..57deb552c9c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml @@ -22,6 +22,7 @@ id: CartridgePistol name: cartridge (.35 auto) parent: BaseCartridgePistol + categories: [ HideSpawnMenu ] components: - type: CartridgeAmmo proto: BulletPistol @@ -30,6 +31,7 @@ id: CartridgePistolPractice name: cartridge (.35 auto practice) parent: BaseCartridgePistol + categories: [ HideSpawnMenu ] components: - type: CartridgeAmmo proto: BulletPistolPractice @@ -45,6 +47,7 @@ id: CartridgePistolIncendiary name: cartridge (.35 auto incendiary) parent: BaseCartridgePistol + categories: [ HideSpawnMenu ] components: - type: CartridgeAmmo proto: BulletPistolIncendiary @@ -60,6 +63,7 @@ id: CartridgePistolUranium name: cartridge (.35 auto uranium) parent: BaseCartridgePistol + categories: [ HideSpawnMenu ] components: - type: CartridgeAmmo proto: BulletPistolUranium diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml index 30976744e01..77928b51506 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml @@ -22,6 +22,7 @@ id: CartridgeRifle name: cartridge (.20 rifle) parent: BaseCartridgeRifle + categories: [ HideSpawnMenu ] components: - type: CartridgeAmmo proto: BulletRifle @@ -30,6 +31,7 @@ id: CartridgeRiflePractice name: cartridge (.20 rifle practice) parent: BaseCartridgeRifle + categories: [ HideSpawnMenu ] components: - type: CartridgeAmmo proto: BulletRiflePractice @@ -45,6 +47,7 @@ id: CartridgeRifleIncendiary name: cartridge (.20 rifle incendiary) parent: BaseCartridgeRifle + categories: [ HideSpawnMenu ] components: - type: CartridgeAmmo proto: BulletRifleIncendiary @@ -60,6 +63,7 @@ id: CartridgeRifleUranium name: cartridge (.20 rifle uranium) parent: BaseCartridgeRifle + categories: [ HideSpawnMenu ] components: - type: CartridgeAmmo proto: BulletRifleUranium diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml index 57845643782..4aaf28c142e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml @@ -38,6 +38,7 @@ id: MagazineLightRifleBox name: "L6 SAW magazine box (.30 rifle)" parent: BaseMagazineLightRifle + categories: [ HideSpawnMenu ] components: - type: Tag tags: @@ -58,6 +59,7 @@ id: MagazineLightRifle name: "magazine (.30 rifle)" parent: BaseMagazineLightRifle + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: CartridgeLightRifle @@ -73,6 +75,7 @@ name: "magazine (.30 rifle any)" suffix: empty parent: MagazineLightRifle + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: null @@ -85,6 +88,7 @@ id: MagazineLightRiflePractice name: "magazine (.30 rifle practice)" parent: BaseMagazineLightRifle + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: CartridgeLightRiflePractice @@ -99,6 +103,7 @@ id: MagazineLightRifleUranium name: "magazine (.30 rifle uranium)" parent: BaseMagazineLightRifle + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: CartridgeLightRifleUranium @@ -113,6 +118,7 @@ id: MagazineLightRifleIncendiary name: "magazine (.30 rifle incendiary)" parent: MagazineLightRifle + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: CartridgeLightRifleIncendiary @@ -121,6 +127,7 @@ id: MagazineLightRifleMaxim name: "pan magazine (.30 rifle)" parent: BaseMagazineLightRifle + categories: [ HideSpawnMenu ] components: - type: Tag tags: @@ -135,6 +142,7 @@ id: MagazineLightRiflePkBox name: "PK munitions box (.30 rifle)" parent: BaseMagazineLightRifle + categories: [ HideSpawnMenu ] components: - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml index bd85e2691b9..59178f4f34d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -101,6 +101,7 @@ id: MagazinePistolSubMachineGunTopMounted name: WT550 magazine (.35 auto top-mounted) parent: [ BaseItem, BaseRestrictedContraband ] + categories: [ HideSpawnMenu ] components: - type: Tag tags: @@ -132,6 +133,7 @@ id: MagazinePistolSubMachineGunTopMountedEmpty name: WT550 magazine (.35 auto top-mounted any) parent: MagazinePistolSubMachineGunTopMounted + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: null @@ -140,6 +142,7 @@ id: MagazinePistol name: pistol magazine (.35 auto) parent: BaseMagazinePistol + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: CartridgePistol @@ -155,6 +158,7 @@ name: pistol magazine (.35 auto any) suffix: empty parent: MagazinePistol + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: null @@ -168,6 +172,7 @@ id: MagazinePistolIncendiary name: pistol magazine (.35 auto incendiary) parent: MagazinePistol + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: CartridgePistolIncendiary @@ -176,6 +181,7 @@ id: MagazinePistolPractice name: pistol magazine (.35 auto practice) parent: BaseMagazinePistol + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: CartridgePistolPractice @@ -190,6 +196,7 @@ id: MagazinePistolUranium name: pistol magazine (.35 auto uranium) parent: BaseMagazinePistol + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: CartridgePistolUranium @@ -205,6 +212,7 @@ name: machine pistol magazine (.35 auto any) suffix: empty parent: BaseMagazinePistolHighCapacity + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: null @@ -217,6 +225,7 @@ id: MagazinePistolHighCapacity name: machine pistol magazine (.35 auto) parent: BaseMagazinePistolHighCapacity + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: CartridgePistol @@ -231,6 +240,7 @@ id: MagazinePistolHighCapacityPractice name: machine pistol magazine (.35 auto practice) parent: BaseMagazinePistolHighCapacity + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: CartridgePistol @@ -245,6 +255,7 @@ id: MagazinePistolHighCapacityRubber name: machine pistol magazine (.35 auto rubber) parent: BaseMagazinePistolHighCapacity + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: CartridgePistol @@ -259,6 +270,7 @@ id: MagazinePistolSubMachineGun name: SMG magazine (.35 auto) parent: BaseMagazinePistolSubMachineGun + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider capacity: 30 @@ -280,6 +292,7 @@ name: SMG magazine (.35 auto any) suffix: empty parent: BaseMagazinePistolSubMachineGun + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: null @@ -292,6 +305,7 @@ id: MagazinePistolSubMachineGunPractice name: SMG magazine (.35 auto practice) parent: BaseMagazinePistolSubMachineGun + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: CartridgePistolPractice @@ -306,6 +320,7 @@ id: MagazinePistolSubMachineGunUranium name: SMG magazine (.35 auto uranium) parent: BaseMagazinePistolSubMachineGun + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: CartridgePistolUranium diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml index c882a3b2f17..8778996dd57 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml @@ -37,6 +37,7 @@ id: MagazineRifle name: "magazine (.20 rifle)" parent: BaseMagazineRifle + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: CartridgeRifle @@ -52,6 +53,7 @@ name: "magazine (.20 rifle any)" suffix: empty parent: MagazineRifle + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: null @@ -64,6 +66,7 @@ id: MagazineRifleIncendiary name: "magazine (.20 rifle incendiary)" parent: MagazineRifle + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: CartridgeRifleIncendiary @@ -72,6 +75,7 @@ id: MagazineRiflePractice name: "magazine (.20 rifle practice)" parent: BaseMagazineRifle + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: CartridgeRiflePractice @@ -86,6 +90,7 @@ id: MagazineRifleUranium name: "magazine (.20 rifle uranium)" parent: BaseMagazineRifle + categories: [ HideSpawnMenu ] components: - type: BallisticAmmoProvider proto: CartridgeRifleUranium diff --git a/Resources/Prototypes/_Backmen/Catalog/Fills/Backpacks/backpack.yml b/Resources/Prototypes/_Backmen/Catalog/Fills/Backpacks/backpack.yml index 41aaf9ae434..5a76271ecec 100644 --- a/Resources/Prototypes/_Backmen/Catalog/Fills/Backpacks/backpack.yml +++ b/Resources/Prototypes/_Backmen/Catalog/Fills/Backpacks/backpack.yml @@ -33,7 +33,7 @@ - id: MagazinePistol amount: 2 - id: WeaponRifleM28Tactical - - id: MagazineRifle + - id: MagazineRifle762UEG amount: 5 - id: BoxHandcuff @@ -85,7 +85,7 @@ - id: MagazinePistol amount: 2 - id: WeaponRifleG36Tactical - - id: MagazineRifle + - id: MagazineRifle556UEG amount: 5 - id: BoxHandcuff @@ -104,7 +104,7 @@ - id: MagazinePistol amount: 2 - id: WeaponSubMachineGunMP5Tactical - - id: MagazinePistolSubMachineGun + - id: MagazinePistolSubMachineGun9x17 amount: 6 - id: MedkitFilled - id: SyringeInaprovaline diff --git a/Resources/Prototypes/_Backmen/Catalog/Fills/Items/Belts/belts.yml b/Resources/Prototypes/_Backmen/Catalog/Fills/Items/Belts/belts.yml index fafc398e08a..033e5097866 100644 --- a/Resources/Prototypes/_Backmen/Catalog/Fills/Items/Belts/belts.yml +++ b/Resources/Prototypes/_Backmen/Catalog/Fills/Items/Belts/belts.yml @@ -62,7 +62,7 @@ components: - type: StorageFill contents: - - id: MagazineRifle + - id: MagazineRifle556UEG amount: 3 - id: MagazinePistol amount: 2 @@ -78,7 +78,7 @@ amount: 2 - id: BattleSpaceMedipen amount: 2 - - id: MagazineRifle + - id: MagazineRifle556UEG amount: 4 - type: entity @@ -216,7 +216,7 @@ components: - type: StorageFill contents: - - id: MagazinePistolSubMachineGun + - id: MagazinePistolSubMachineGun9x17 amount: 6 - type: entity @@ -226,7 +226,7 @@ components: - type: StorageFill contents: - - id: MagazineRifle + - id: MagazineRifle556UEG amount: 6 - type: entity diff --git a/Resources/Prototypes/_Backmen/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/_Backmen/Catalog/Fills/Lockers/security.yml index 70190cacdc0..c82128330b9 100644 --- a/Resources/Prototypes/_Backmen/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/_Backmen/Catalog/Fills/Lockers/security.yml @@ -7,7 +7,7 @@ contents: - id: WeaponRifleAR18 amount: 2 - - id: MagazineRifle + - id: MagazineRifle556UEG amount: 4 - type: entity @@ -19,7 +19,7 @@ contents: - id: WeaponSubMachineGunVectorSpecial amount: 2 - - id: MagazinePistolSubMachineGun + - id: MagazinePistolSubMachineGunVector9x17 amount: 4 - type: entity @@ -55,7 +55,7 @@ contents: - id: WeaponSubMachineGunMP5 amount: 2 - - id: MagazinePistolSubMachineGun + - id: MagazinePistolSubMachineGun9x17 amount: 4 - type: entity diff --git a/Resources/Prototypes/_Backmen/Catalog/VendingMachines/Inventories/ammo_nt.yml b/Resources/Prototypes/_Backmen/Catalog/VendingMachines/Inventories/ammo_nt.yml index f2df258683e..a371f83842b 100644 --- a/Resources/Prototypes/_Backmen/Catalog/VendingMachines/Inventories/ammo_nt.yml +++ b/Resources/Prototypes/_Backmen/Catalog/VendingMachines/Inventories/ammo_nt.yml @@ -2,9 +2,10 @@ id: AmmoVendAdsNanoTrasen startingInventory: BattleMedipen: 20 - MagazinePistol: 20 - MagazinePistolSubMachineGun: 20 - MagazineRifle: 20 + MagazinePistol45ACP: 20 + MagazinePistolSubMachineGun9x17: 20 + MagazinePistolSubMachineGunVector9x17: 20 + MagazineRifle556UEG: 20 SpeedLoaderMagnum: 20 BoxLethalshot: 20 WeaponSubMachineGunVectorSpecial: 5 diff --git a/Resources/Prototypes/_Backmen/Catalog/uplink_nomad.yml b/Resources/Prototypes/_Backmen/Catalog/uplink_nomad.yml index 3f7522cc0ae..caee6ea6c7b 100644 --- a/Resources/Prototypes/_Backmen/Catalog/uplink_nomad.yml +++ b/Resources/Prototypes/_Backmen/Catalog/uplink_nomad.yml @@ -41,8 +41,8 @@ - type: StorageFill contents: - id: WeaponAKMSRifle - - id: MagazineLightRifle - - id: MagazineLightRifle + - id: MagazineRifleLight762x39 + - id: MagazineRifleLight762x39 #- type: listing # id: UplinkV31Bundle @@ -85,8 +85,8 @@ - type: StorageFill contents: - id: WeaponRifleAKSU - - id: MagazineLightRifle - - id: MagazineLightRifle + - id: MagazineRifleLight762x39 + - id: MagazineRifleLight762x39 - type: listing id: UplinkStG44Bundle @@ -107,8 +107,8 @@ - type: StorageFill contents: - id: WeaponRifleSTG44 - - id: MagazineLightRifle - - id: MagazineLightRifle + - id: MagazineRifleLight762x39 + - id: MagazineRifleLight762x39 - type: listing id: UplinkVectorBundle @@ -129,8 +129,8 @@ - type: StorageFill contents: - id: WeaponSubMachineGunVectorSpecial - - id: MagazinePistolSubMachineGun - - id: MagazinePistolSubMachineGun + - id: MagazinePistolSubMachineGunVector9x17Ext + - id: MagazinePistolSubMachineGunVector9x17Ext - type: entity parent: ClothingBackpackDuffelSyndicate @@ -140,8 +140,8 @@ - type: StorageFill contents: - id: WeaponSubMachineGunMP7 - - id: MagazinePistolSubMachineGun - - id: MagazinePistolSubMachineGun + - id: MagazinePistolSubMachineGun57x28 + - id: MagazinePistolSubMachineGun57x28 - type: listing id: UplinkMP38Bundle @@ -202,7 +202,7 @@ name: магазин (.45 магнум) description: Магазин для того самого пустынного орла. icon: { sprite: Backmen/Objects/Weapons/Gunsx64/Magazines/Magnum/magnum_pistol_mag.rsi, state: base } - productEntity: MagazineMagnumPistol + productEntity: MagazinePistol50AE cost: Telecrystal: 1 categories: @@ -300,7 +300,7 @@ - type: StorageFill contents: - id: WeaponLightMachineGunRPD - - id: MagazineLightRiflePkBox + - id: MagazineLightMachineGun762x39 amount: 2 - type: listing @@ -491,11 +491,13 @@ amount: 1 - id: MagazinePistolTopSubMachineGun # For P90 amount: 1 - - id: MagazineLightRiflePkBox # For RPD + - id: MagazineLightMachineGun762x39 # For RPD amount: 2 - - id: MagazinePistolSubMachineGun - amount: 4 - - id: MagazineLightRifle # For AKMS, AKSU and STG44 + - id: MagazinePistolSubMachineGun57x28 + amount: 2 + - id: MagazinePistolSubMachineGunVector9x17 + amount: 2 + - id: MagazineRifleLight762x39 # For AKMS, AKSU and STG44 amount: 3 - id: MagazineRifleLightSniper # For Dragunov amount: 1 diff --git a/Resources/Prototypes/_Backmen/Entities/Objects/Misc/entities_lodauts.yml b/Resources/Prototypes/_Backmen/Entities/Objects/Misc/entities_lodauts.yml index 08baa80d88c..4c7f99a0397 100644 --- a/Resources/Prototypes/_Backmen/Entities/Objects/Misc/entities_lodauts.yml +++ b/Resources/Prototypes/_Backmen/Entities/Objects/Misc/entities_lodauts.yml @@ -240,9 +240,9 @@ state: icon content: - WeaponRifleUTAPM1 - - MagazineRifle - - MagazineRifle - - MagazineRifle + - MagazineRifle762UEG + - MagazineRifle762UEG + - MagazineRifle762UEG - type: thiefBackpackSet id: ShotgunGuardian17Set diff --git a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml index 3291c3b5c32..cd9019eda24 100644 --- a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml +++ b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml @@ -33,20 +33,20 @@ slots: gun_magazine: name: Magazine - startingItem: MagazineLightRiflePkBox + startingItem: MagazineLightMachineGun762x39 insertSound: /Audio/Weapons/Guns64/Rifles/ak47_reload.ogg ejectSound: /Audio/Weapons/Guns64/Rifles/ak47_unload.ogg priority: 2 whitelist: tags: - - MagazineLightRifleBox + - MagazineLightMachineGunRPD gun_chamber: name: Chamber - startingItem: CartridgeLightRifle + startingItem: CartridgeRifleLight762x39 priority: 1 whitelist: tags: - - CartridgeLightRifle + - CartridgeRifle762x39 - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot diff --git a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Pistols/Pistols.yml b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Pistols/Pistols.yml index 49d957c0de0..b020947150a 100644 --- a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Pistols/Pistols.yml +++ b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Pistols/Pistols.yml @@ -37,9 +37,9 @@ - type: Item sprite: Backmen/Objects/Weapons/Gunsx64/Pistols/acp14/tiny.rsi - type: Gun - angleIncrease: 2 + angleIncrease: 8 angleDecay: 10 - cameraRecoilScalar: 0.5 + cameraRecoilScalar: 1 maxAngle: 15 minAngle: 1 selectedMode: SemiAuto @@ -52,21 +52,20 @@ slots: gun_magazine: name: Magazine - startingItem: MagazinePistol + startingItem: MagazinePistol45ACP insertSound: /Audio/Weapons/Guns64/Pistols/acp14_reload.ogg ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg priority: 2 whitelist: tags: - - MagazinePistol - - MagazinePistolHighCapacity + - MagazinePistol45ACP gun_chamber: name: Chamber - startingItem: CartridgePistol + startingItem: CartridgePistolACP priority: 1 whitelist: tags: - - CartridgePistol + - CartridgePistol45ACP - type: MagazineVisuals magState: mag steps: 1 @@ -104,21 +103,20 @@ slots: gun_magazine: name: Magazine - startingItem: MagazinePistolHighCapacity + startingItem: MagazinePistol57x28Extd insertSound: /Audio/Weapons/Guns64/Pistols/vp70_reload.ogg ejectSound: /Audio/Weapons/Guns64/Pistols/vp70_unload.ogg priority: 2 whitelist: tags: - - MagazinePistol - - MagazinePistolHighCapacity + - MagazinePistol57x28 gun_chamber: name: Chamber - startingItem: CartridgePistol + startingItem: CartridgePistol57x28 priority: 1 whitelist: tags: - - CartridgePistol + - CartridgePistol57x28 - type: MagazineVisuals magState: mag steps: 1 @@ -157,20 +155,20 @@ slots: gun_magazine: name: Magazine - startingItem: MagazineMagnumPistol + startingItem: MagazinePistol50AE insertSound: /Audio/Weapons/Guns64/Pistols/deagle_reload.ogg ejectSound: /Audio/Weapons/Guns64/Pistols/deagle_unload.ogg priority: 2 whitelist: tags: - - MagazineMagnumPistol + - MagazinePistol50AE gun_chamber: name: Chamber - startingItem: CartridgeMagnum + startingItem: CartridgePistol50AE priority: 1 whitelist: tags: - - CartridgeMagnum + - CartridgePistol50AE - type: MagazineVisuals magState: mag steps: 1 @@ -205,21 +203,20 @@ slots: gun_magazine: name: Magazine - startingItem: MagazinePistol + startingItem: MagazinePistol9x17 insertSound: /Audio/Weapons/Guns64/Pistols/beretta_reload.ogg ejectSound: /Audio/Weapons/Guns64/Pistols/beretta_unload.ogg priority: 2 whitelist: tags: - - MagazinePistol - - MagazinePistolHighCapacity + - MagazinePistol9x17 gun_chamber: name: Chamber - startingItem: CartridgePistol + startingItem: CartridgePistol9x17 priority: 1 whitelist: tags: - - CartridgePistol + - CartridgePistol9x17 - type: MagazineVisuals magState: mag steps: 1 @@ -233,19 +230,6 @@ parent: WeaponPistolG22 id: WeaponPistolG22NonLethal suffix: Пистолет [Non-lethal] - components: - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: MagazinePistol - insertSound: /Audio/Weapons/Guns64/Pistols/beretta_reload.ogg - ejectSound: /Audio/Weapons/Guns64/Pistols/beretta_unload.ogg - priority: 2 - whitelist: - tags: - - MagazinePistol - - MagazinePistolHighCapacity - type: entity name: HI Browning-88 M4 @@ -272,21 +256,20 @@ slots: gun_magazine: name: Magazine - startingItem: MagazinePistol + startingItem: MagazinePistol57x28 insertSound: /Audio/Weapons/Guns64/Pistols/vp70_reload.ogg ejectSound: /Audio/Weapons/Guns64/Pistols/vp70_unload.ogg priority: 2 whitelist: tags: - - MagazinePistol - - MagazinePistolHighCapacity + - MagazinePistol57x28 gun_chamber: name: Chamber - startingItem: CartridgePistol + startingItem: CartridgePistol57x28 priority: 1 whitelist: tags: - - CartridgePistol + - CartridgePistol57x28 - type: MagazineVisuals magState: mag steps: 1 @@ -321,21 +304,20 @@ slots: gun_magazine: name: Magazine - startingItem: MagazinePistol + startingItem: MagazinePistol9x17 insertSound: /Audio/Weapons/Guns64/Pistols/colt_reload.ogg ejectSound: /Audio/Weapons/Guns64/Pistols/colt_unload.ogg priority: 2 whitelist: tags: - - MagazinePistol - - MagazinePistolHighCapacity + - MagazinePistol9x17 gun_chamber: name: Chamber - startingItem: CartridgePistol + startingItem: CartridgePistol9x17 priority: 1 whitelist: tags: - - CartridgePistol + - CartridgePistol9x17 - type: MagazineVisuals magState: mag steps: 1 @@ -377,21 +359,20 @@ slots: gun_magazine: name: Magazine - startingItem: MagazinePistol + startingItem: MagazinePistol57x28 insertSound: /Audio/Weapons/Guns64/Pistols/colt_reload.ogg ejectSound: /Audio/Weapons/Guns64/Pistols/colt_unload.ogg priority: 2 whitelist: tags: - - MagazinePistol - - MagazinePistolHighCapacity + - MagazinePistol57x28 gun_chamber: name: Chamber - startingItem: CartridgePistol + startingItem: CartridgePistol57x28 priority: 1 whitelist: tags: - - CartridgePistol + - CartridgePistol57x28 - type: MagazineVisuals magState: mag steps: 1 @@ -485,20 +466,19 @@ slots: gun_magazine: name: Magazine - startingItem: MagazinePistolHighCapacity + startingItem: MagazinePistol57x28Extd insertSound: /Audio/Weapons/Guns64/SMGs/uzi_reload.ogg ejectSound: /Audio/Weapons/Guns64/SMGs/uzi_unload.ogg priority: 2 whitelist: tags: - - MagazinePistol - - MagazinePistolHighCapacity + - MagazinePistol57x28 gun_chamber: name: Chamber priority: 1 whitelist: tags: - - CartridgePistol + - CartridgePistol57x28 - type: Gun fireRate: 6 cameraRecoilScalar: 0.5 diff --git a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index ab6700d3826..8b89e5b47bc 100644 --- a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -103,17 +103,6 @@ tileBreakScale: 0 canCreateVacuum: false -- type: entity - categories: [ HideSpawnMenu ] - parent: BaseBullet - id: BulletLight762 - name: bullet (7,62 rifle) - components: - - type: Projectile - damage: - types: - Piercing: 39 - - type: entity id: BulletGrenadeTearGas name: tear gas grenade diff --git a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index dc8db403f75..287abb2acec 100644 --- a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -36,20 +36,20 @@ slots: gun_magazine: name: Magazine - startingItem: MagazineLightRifle + startingItem: MagazineRifleLight762x39 insertSound: /Audio/Weapons/Guns64/Rifles/ak47_reload.ogg ejectSound: /Audio/Weapons/Guns64/Rifles/ak47_unload.ogg priority: 2 whitelist: tags: - - MagazineLightRifle + - MagazineRifleLight762x39 gun_chamber: name: Chamber - startingItem: CartridgeLightRifle + startingItem: CartridgeRifleLight762x39 priority: 1 whitelist: tags: - - CartridgeLightRifle + - CartridgeRifle762x39 - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot @@ -105,20 +105,20 @@ slots: gun_magazine: name: Magazine - startingItem: MagazineLightRifle + startingItem: MagazineRifleLight762x39 insertSound: /Audio/Weapons/Guns64/Rifles/ak47_reload.ogg ejectSound: /Audio/Weapons/Guns64/Rifles/ak47_unload.ogg priority: 2 whitelist: tags: - - MagazineLightRifle + - MagazineRifleLight762x39 gun_chamber: name: Chamber - startingItem: CartridgeLightRifle + startingItem: CartridgeRifleLight762x39 priority: 1 whitelist: tags: - - CartridgeLightRifle + - CartridgeRifle762x39 - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot @@ -173,20 +173,20 @@ slots: gun_magazine: name: Magazine - startingItem: MagazineRifle + startingItem: MagazineRifle556UEG insertSound: /Audio/Weapons/Guns64/Rifles/ar18_reload.ogg ejectSound: /Audio/Weapons/Guns64/Rifles/ar18_unload.ogg priority: 2 whitelist: tags: - - MagazineRifle + - MagazineRifle556UEG gun_chamber: name: Chamber - startingItem: CartridgeRifle + startingItem: CartridgeRifleLight556UEG priority: 1 whitelist: tags: - - CartridgeRifle + - CartridgeRifle556UEG - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot @@ -238,20 +238,20 @@ slots: gun_magazine: name: Magazine - startingItem: MagazineRifle + startingItem: MagazineRifle556UEG insertSound: /Audio/Weapons/Guns64/Rifles/ar18_reload.ogg ejectSound: /Audio/Weapons/Guns64/Rifles/ar18_unload.ogg priority: 2 whitelist: tags: - - MagazineRifle + - MagazineRifle556UEG gun_chamber: name: Chamber - startingItem: CartridgeRifle + startingItem: CartridgeRifleLight556UEG priority: 1 whitelist: tags: - - CartridgeRifle + - CartridgeRifle556UEG - type: MagazineVisuals magState: mag steps: 1 @@ -303,20 +303,20 @@ slots: gun_magazine: name: Magazine - startingItem: MagazineRifle + startingItem: MagazineRifle762UEG insertSound: /Audio/Weapons/Guns64/Rifles/m28_reload.ogg ejectSound: /Audio/Weapons/Guns64/Rifles/m28_unload.ogg priority: 2 whitelist: tags: - - MagazineRifle + - MagazineRifle762UEG gun_chamber: name: Chamber - startingItem: CartridgeRifle + startingItem: CartridgeRifleLight762UEG priority: 1 whitelist: tags: - - CartridgeRifle + - CartridgeRifle762UEG - type: MagazineVisuals magState: mag steps: 1 @@ -332,18 +332,6 @@ - type: entity parent: WeaponRifleM28 id: WeaponRifleM28Rubber - components: - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: MagazineRifle - insertSound: /Audio/Weapons/Guns64/Rifles/m28_reload.ogg - ejectSound: /Audio/Weapons/Guns64/Rifles/m28_unload.ogg - priority: 2 - whitelist: - tags: - - MagazineRifle - type: entity name: STG 44 @@ -382,20 +370,20 @@ slots: gun_magazine: name: Magazine - startingItem: MagazineLightRifle + startingItem: MagazineRifleLight762x39 insertSound: /Audio/Weapons/Guns64/Rifles/ak47_reload.ogg ejectSound: /Audio/Weapons/Guns64/Rifles/ak47_unload.ogg priority: 2 whitelist: tags: - - MagazineLightRifle + - MagazineRifleLight762x39 gun_chamber: name: Chamber - startingItem: CartridgeLightRifle + startingItem: CartridgeRifleLight762x39 priority: 1 whitelist: tags: - - CartridgeLightRifle + - CartridgeRifle762x39 - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot @@ -445,20 +433,20 @@ slots: gun_magazine: name: Magazine - startingItem: MagazineRifle + startingItem: MagazineRifle556UEG insertSound: /Audio/Weapons/Guns64/Rifles/m16_reload.ogg ejectSound: /Audio/Weapons/Guns64/Rifles/m16_unload.ogg priority: 2 whitelist: tags: - - MagazineRifle + - MagazineRifle556UEG gun_chamber: name: Chamber - startingItem: CartridgeRifle + startingItem: CartridgeRifleLight556UEG priority: 1 whitelist: tags: - - CartridgeRifle + - CartridgeRifle556UEG - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot @@ -513,20 +501,20 @@ slots: gun_magazine: name: Magazine - startingItem: MagazineRifle + startingItem: MagazineRifleFamas556UEG insertSound: /Audio/Weapons/Guns64/Rifles/m16_reload.ogg ejectSound: /Audio/Weapons/Guns64/Rifles/m16_unload.ogg priority: 2 whitelist: tags: - - MagazineRifle + - MagazineRifleFamas556UEG gun_chamber: name: Chamber - startingItem: CartridgeRifle + startingItem: CartridgeRifleLight556UEG priority: 1 whitelist: tags: - - CartridgeRifle + - CartridgeRifle556UEG - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot @@ -712,11 +700,11 @@ - MagazineRifle gun_chamber: name: Chamber - startingItem: CartridgeRifle + startingItem: CartridgeRifleLight556UEG priority: 1 whitelist: tags: - - CartridgeRifle + - CartridgeRifle556UEG - type: entity suffix: Зажигательные @@ -778,20 +766,20 @@ slots: gun_magazine: name: Magazine - startingItem: MagazineRifle + startingItem: MagazineRifle556UEG insertSound: /Audio/Weapons/Guns64/Rifles/m16_reload.ogg ejectSound: /Audio/Weapons/Guns64/Rifles/m16_unload.ogg priority: 2 whitelist: tags: - - MagazineRifle + - MagazineRifle556UEG gun_chamber: name: Chamber - startingItem: CartridgeRifle + startingItem: CartridgeRifleLight556UEG priority: 1 whitelist: tags: - - CartridgeRifle + - CartridgeRifle556UEG - type: MagazineVisuals magState: mag steps: 1 @@ -839,20 +827,20 @@ slots: gun_magazine: name: Magazine - startingItem: MagazineRifle + startingItem: MagazineRifle762UEG insertSound: /Audio/Weapons/Guns64/Rifles/m4ra_reload.ogg ejectSound: /Audio/Weapons/Guns64/Rifles/m4ra_unload.ogg priority: 2 whitelist: tags: - - MagazineRifle + - MagazineRifle762UEG gun_chamber: name: Chamber - startingItem: CartridgeRifle + startingItem: CartridgeRifleLight762UEG priority: 1 whitelist: tags: - - CartridgeRifle + - CartridgeRifle762UEG - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot @@ -903,20 +891,20 @@ slots: gun_magazine: name: Magazine - startingItem: MagazineRifle + startingItem: MagazineRifle762UEG insertSound: /Audio/Weapons/Guns64/Rifles/m4ra_reload.ogg ejectSound: /Audio/Weapons/Guns64/Rifles/m4ra_unload.ogg priority: 2 whitelist: tags: - - MagazineRifle + - MagazineRifle762UEG gun_chamber: name: Chamber - startingItem: CartridgeRifle + startingItem: CartridgeRifleLight762UEG priority: 1 whitelist: tags: - - CartridgeRifle + - CartridgeRifle762UEG - type: MagazineVisuals magState: mag steps: 1 diff --git a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/SMGs/SMGs.yml b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/SMGs/SMGs.yml index 8a3ec4ded16..58c0f1e9690 100644 --- a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/SMGs/SMGs.yml +++ b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/SMGs/SMGs.yml @@ -35,20 +35,20 @@ slots: gun_magazine: name: Magazine - startingItem: MagazinePistolSubMachineGun + startingItem: MagazinePistolSubMachineGun9x17 insertSound: /Audio/Weapons/Guns64/SMGs/mp5_reload.ogg ejectSound: /Audio/Weapons/Guns64/SMGs/mp5_unload.ogg priority: 2 whitelist: tags: - - MagazinePistolSubMachineGun + - MagazineSMG9x17 gun_chamber: name: Chamber - startingItem: CartridgePistol + startingItem: CartridgePistol9x17 priority: 1 whitelist: tags: - - CartridgePistol + - CartridgePistol9x17 - type: MagazineVisuals magState: mag steps: 1 @@ -65,18 +65,6 @@ parent: WeaponSubMachineGunMP5 id: WeaponSubMachineGunMP5NonLethal suffix: Пистолет-пулемёт [Non Lethal] - components: - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: MagazinePistolSubMachineGun - insertSound: /Audio/Weapons/Guns64/SMGs/mp5_reload.ogg - ejectSound: /Audio/Weapons/Guns64/SMGs/mp5_unload.ogg - priority: 2 - whitelist: - tags: - - MagazinePistolSubMachineGun - type: entity name: MP7 @@ -97,7 +85,7 @@ - type: Item sprite: Backmen/Objects/Weapons/Gunsx64/SMGs/mp7/tiny.rsi - type: BkmGunWieldBonus - cameraRecoilScalar: -4 + cameraRecoilScalar: -2 - type: GunWieldBonus minAngle: -10 maxAngle: 0 @@ -105,7 +93,7 @@ - type: Gun angleDecay: 20 angleIncrease: 4 - cameraRecoilScalar: 5 + cameraRecoilScalar: 3 minAngle: 14 maxAngle: 35 fireRate: 8 @@ -115,20 +103,20 @@ slots: gun_magazine: name: Magazine - startingItem: MagazinePistolSubMachineGun + startingItem: MagazinePistolSubMachineGun57x28 insertSound: /Audio/Weapons/Guns64/SMGs/smg_reload.ogg ejectSound: /Audio/Weapons/Guns64/SMGs/smg_unload.ogg priority: 2 whitelist: tags: - - MagazinePistolSubMachineGun + - MagazineSMG57x28 gun_chamber: name: Chamber - startingItem: CartridgePistol + startingItem: CartridgePistol57x28 priority: 1 whitelist: tags: - - CartridgePistol + - CartridgePistol57x28 - type: MagazineVisuals magState: mag steps: 1 @@ -175,20 +163,20 @@ slots: gun_magazine: name: Magazine - startingItem: MagazinePistolSubMachineGun + startingItem: MagazinePistolSubMachineGunVector9x17 insertSound: /Audio/Weapons/Guns64/SMGs/smg_reload.ogg ejectSound: /Audio/Weapons/Guns64/SMGs/smg_unload.ogg priority: 2 whitelist: tags: - - MagazinePistolSubMachineGun + - MagazineSMGVector9x17 gun_chamber: name: Chamber - startingItem: CartridgePistol + startingItem: CartridgePistol9x17 priority: 1 whitelist: tags: - - CartridgePistol + - CartridgePistol9x17 - type: Construction graph: VectorTactical node: start @@ -230,20 +218,20 @@ slots: gun_magazine: name: Magazine - startingItem: MagazinePistolSubMachineGun + startingItem: MagazinePistolSubMachineGunScorpion9x17 insertSound: /Audio/Weapons/Guns64/SMGs/skorpion_reload.ogg ejectSound: /Audio/Weapons/Guns64/SMGs/skorpion_unload.ogg priority: 2 whitelist: tags: - - MagazinePistolSubMachineGun + - MagazineSMGScorpion9x17 gun_chamber: name: Chamber - startingItem: CartridgePistol + startingItem: CartridgePistol9x17 priority: 1 whitelist: tags: - - CartridgePistol + - CartridgePistol9x17 - type: MagazineVisuals magState: mag steps: 1 @@ -296,11 +284,11 @@ - MagazinePistolBoxSubMachineGun gun_chamber: name: Chamber - startingItem: CartridgePistol + startingItem: CartridgePistol9x17 priority: 1 whitelist: tags: - - CartridgePistol + - CartridgePistol9x17 - type: MagazineVisuals magState: mag steps: 1 @@ -329,7 +317,7 @@ maxAngle: 46 angleDecay: 40 angleIncrease: 7 - fireRate: 12 + fireRate: 8 soundGunshot: path: /Audio/Weapons/Guns64/SMGs/uzi.ogg - type: Clothing @@ -348,11 +336,11 @@ - MagazinePistolBoxSubMachineGun gun_chamber: name: Chamber - startingItem: CartridgePistol + startingItem: CartridgePistol9x17 priority: 1 whitelist: tags: - - CartridgePistol + - CartridgePistol9x17 - type: MagazineVisuals magState: mag steps: 1 @@ -407,11 +395,11 @@ - MagazinePistolDrumSubMachineGun gun_chamber: name: Chamber - startingItem: CartridgePistol + startingItem: CartridgePistol9x17 priority: 1 whitelist: tags: - - CartridgePistol + - CartridgePistol9x17 - type: MagazineVisuals magState: mag steps: 1 @@ -447,7 +435,7 @@ angleIncrease: -3 - type: Gun angleDecay: 40 - angleIncrease: 7 + angleIncrease: 6 cameraRecoilScalar: 5 minAngle: 24 maxAngle: 45 @@ -467,11 +455,11 @@ - MagazinePistolTopSubMachineGun gun_chamber: name: Chamber - startingItem: CartridgePistol + startingItem: CartridgePistol9x17 priority: 1 whitelist: tags: - - CartridgePistol + - CartridgePistol9x17 - type: MagazineVisuals magState: mag steps: 6 @@ -506,20 +494,20 @@ slots: gun_magazine: name: Magazine - startingItem: MagazineRifle + startingItem: MagazineRifleLight762x39 insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg priority: 2 whitelist: tags: - - MagazineRifle + - MagazineRifleLight762x39 gun_chamber: name: Chamber - startingItem: CartridgeRifle + startingItem: CartridgeRifleLight762x39 priority: 1 whitelist: tags: - - CartridgeRifle + - CartridgeRifle762x39 - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot diff --git a/Resources/migration.yml b/Resources/migration.yml index 542b9b6d5ed..224ee239316 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -206,7 +206,6 @@ WeaponShotgunBulldog: WeaponShotgunZauer # 2023-11-26 WeaponSniperHristov: WeaponRifleSR127 -MagazineBoxAntiMateriel: MagazineAntiMaterielRifleSR # 2023-12-10 SpawnPointSeniorResearcher: null @@ -722,3 +721,60 @@ DrinkIrishCarBomb: DrinkIrishSlammer #2025-01-06 ClothingMaskSexyClown: ClothingMaskBlushingClown ClothingMaskSexyMime: ClothingMaskBlushingMime + +# 2025-02-05 backmen +MagazineRifle: MagazineRifle556UEG +MagazineRifleEmpty: null +MagazineRifleIncendiary: MagazineRifle556UEGIncendiary +MagazineRiflePractice: MagazineRifle556UEG +MagazineRifleUranium: MagazineRifle556UEG +MagazinePistolSubMachineGunTopMountedEmpty: null +MagazinePistol: MagazinePistol9x17 +MagazinePistolEmpty: null +MagazinePistolIncendiary: MagazinePistol9x17Incendiary +MagazinePistolPractice: MagazinePistol9x17 +MagazinePistolUranium: MagazinePistol9x17 +MagazinePistolHighCapacityEmpty: null +MagazinePistolHighCapacity: MagazinePistol57x28Extd +MagazinePistolHighCapacityPractice: MagazinePistol57x28Extd +MagazinePistolHighCapacityRubber: MagazinePistol57x28Extd +MagazinePistolSubMachineGun: MagazinePistolSubMachineGun9x17 +MagazinePistolSubMachineGunEmpty: null +MagazinePistolSubMachineGunPractice: MagazinePistolSubMachineGun9x17 +MagazinePistolSubMachineGunUranium: MagazinePistolSubMachineGun9x17 +MagazineLightRifleBox: MagazineLightMachineGun762x39 +MagazineLightRifle: MagazineRifleLight762x39 +MagazineLightRifleEmpty: null +MagazineLightRiflePractice: MagazineRifleLight762x39 +MagazineLightRifleUranium: MagazineRifleLight762x39 +MagazineLightRifleIncendiary: MagazineRifleLight762x39Incendiary +MagazineLightRiflePkBox: MagazineLightMachineGun762x39 +CartridgeRifle: CartridgeRifleLight556UEG +CartridgeRiflePractice: CartridgeRifleLight556UEG +CartridgeRifleIncendiary: CartridgeRifleLight556UEGIncendiary +CartridgeRifleUranium: CartridgeRifleLight556UEG +CartridgePistol: CartridgePistol9x17 +CartridgePistolPractice: CartridgePistol9x17 +CartridgePistolIncendiary: CartridgePistol9x17Incendiary +CartridgePistolUranium: CartridgePistol9x17 +CartridgeLightRifle: CartridgeRifleLight762x39 +CartridgeLightRiflePractice: CartridgeRifleLight762x39 +CartridgeLightRifleIncendiary: CartridgeRifleLight762x39Incendiary +CartridgeLightRifleUranium: CartridgeRifleLight762x39 +CartridgeAntiMateriel: Cartridge50BMG +MagazineBoxRifleBig: MagazineBoxRifle556UEG +MagazineBoxRifle: MagazinePacketRifle556UEG +MagazineBoxRiflePractice: MagazinePacketRifle556UEG +MagazineBoxRifleIncendiary: MagazinePacketRifle556UEGIncendiary +MagazineBoxRifleUranium: MagazinePacketRifle556UEG +MagazineBoxPistol: MagazinePacketPistol9x17 +MagazineBoxPistolPractice: MagazinePacketPistol9x17 +MagazineBoxPistolIncendiary: MagazinePacketPistol9x17Incendiary +MagazineBoxPistolUranium: MagazinePacketPistol9x17 +MagazineBoxLightRifleBig: MagazineBoxRifle762x39 +MagazineBoxLightRifle: MagazinePacketRifle762x39 +MagazineBoxLightRiflePractice: MagazinePacketRifle762x39 +MagazineBoxLightRifleIncendiary: MagazinePacketRifle762x39Incendiary +MagazineBoxLightRifleUranium: MagazinePacketRifle762x39 +MagazineBoxAntiMaterielBig: MagazineBoxHeavyRifle50BMG +MagazineBoxAntiMateriel: MagazinePacketHeavyRifle50BMG From c5c90dfcf66e164bd2c4edb4996ffe884e198fbd Mon Sep 17 00:00:00 2001 From: no_mad Date: Thu, 6 Feb 2025 00:36:18 +0900 Subject: [PATCH 05/16] recearches --- .../Entities/Structures/Machines/lathe.yml | 152 +++++++++++++---- .../Prototypes/Recipes/Lathes/security.yml | 26 +-- Resources/Prototypes/Research/arsenal.yml | 18 +- .../_Backmen/Recipes/Lathes/security.yml | 159 ++++++++++++++++++ .../Prototypes/_Backmen/Research/arsenal.yml | 15 ++ 5 files changed, 313 insertions(+), 57 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 373e09f0c48..b85bc79ef59 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -213,21 +213,40 @@ - MagazineBoxPistol - MagazineBoxRifle - MagazineLightRifle - - MagazineLightRifleEmpty +# - MagazineLightRifleEmpty - MagazinePistol - - MagazinePistolEmpty +# - MagazinePistolEmpty - MagazinePistolSubMachineGun - - MagazinePistolSubMachineGunEmpty +# - MagazinePistolSubMachineGunEmpty - MagazinePistolSubMachineGunTopMounted - - MagazinePistolSubMachineGunTopMountedEmpty +# - MagazinePistolSubMachineGunTopMountedEmpty - MagazineRifle - - MagazineRifleEmpty +# - MagazineRifleEmpty + # Backmen-ammonation-start + - MagazinePistolSubMachineGun57x28 + - MagazinePistolSubMachineGunVector9x17 + - MagazineRifleFamas556UEG + - MagazineRifle762UEG + - MagazineRifle762UEGIncendiary + - MagazineRifleFamas556UEGIncendiary + - MagazinePistol45ACP + - MagazinePistol45ACPincendiary + - MagazinePistol57x28 + - MagazinePistol57x28Incendiary + - MagazinePistol57x28Extd + - MagazineBoxHeavyRifle + - MagazinePacketRifle762x39 + - MagazinePacketRifle762UEG + - MagazinePacketPistolACP + - MagazinePacketPistol57x28 + - MagazinePacketPistol50AE + # Backmen-ammonation-end - MagazineShotgun - - MagazineShotgunEmpty +# - MagazineShotgunEmpty - MagazineShotgunSlug - RiotShield - SpeedLoaderMagnum - - SpeedLoaderMagnumEmpty +# - SpeedLoaderMagnumEmpty - type: BlueprintReceiver whitelist: tags: @@ -405,20 +424,39 @@ - GrenadeFlash - HoloprojectorSecurity - MagazineBoxLightRifleIncendiary - - MagazineBoxLightRifleUranium +# - MagazineBoxLightRifleUranium - MagazineBoxMagnumIncendiary - - MagazineBoxMagnumUranium +# - MagazineBoxMagnumUranium - MagazineBoxPistolIncendiary - - MagazineBoxPistolUranium +# - MagazineBoxPistolUranium - MagazineBoxRifleIncendiary - - MagazineBoxRifleUranium +# - MagazineBoxRifleUranium - MagazineGrenadeEmpty - MagazineLightRifleIncendiary - - MagazineLightRifleUranium +# - MagazineLightRifleUranium - MagazinePistolIncendiary - - MagazinePistolUranium +# - MagazinePistolUranium - MagazineRifleIncendiary - - MagazineRifleUranium +# - MagazineRifleUranium + # Backmen-ammonation-start + - MagazinePistolSubMachineGun57x28 + - MagazinePistolSubMachineGunVector9x17 + - MagazineRifleFamas556UEG + - MagazineRifle762UEG + - MagazineRifle762UEGIncendiary + - MagazineRifleFamas556UEGIncendiary + - MagazinePistol45ACP + - MagazinePistol45ACPincendiary + - MagazinePistol57x28 + - MagazinePistol57x28Incendiary + - MagazinePistol57x28Extd + - MagazineBoxHeavyRifle + - MagazinePacketRifle762x39 + - MagazinePacketRifle762UEG + - MagazinePacketPistolACP + - MagazinePacketPistol57x28 + - MagazinePacketPistol50AE + # Backmen-ammonation-end - MagazineShotgunBeanbag - MagazineShotgunIncendiary - MagazineShotgunIncendiary @@ -755,29 +793,44 @@ - ForensicPad - Handcuffs - MagazineBoxLightRifle - - MagazineBoxLightRiflePractice +# - MagazineBoxLightRiflePractice - MagazineBoxMagnum - - MagazineBoxMagnumPractice +# - MagazineBoxMagnumPractice - MagazineBoxPistol - - MagazineBoxPistolPractice +# - MagazineBoxPistolPractice - MagazineBoxRifle - - MagazineBoxRiflePractice +# - MagazineBoxRiflePractice - MagazineLightRifle - - MagazineLightRifleEmpty +# - MagazineLightRifleEmpty - MagazinePistol - - MagazinePistolEmpty +# - MagazinePistolEmpty - MagazinePistolSubMachineGun - - MagazinePistolSubMachineGunEmpty +# - MagazinePistolSubMachineGunEmpty - MagazinePistolSubMachineGunTopMounted - - MagazinePistolSubMachineGunTopMountedEmpty +# - MagazinePistolSubMachineGunTopMountedEmpty - MagazineRifle - - MagazineRifleEmpty +# - MagazineRifleEmpty - MagazineShotgun - - MagazineShotgunEmpty +# - MagazineShotgunEmpty - MagazineShotgunSlug - RiotShield - SpeedLoaderMagnum - - SpeedLoaderMagnumEmpty +# - SpeedLoaderMagnumEmpty + # Backmen-ammonation-start + - MagazinePistolSubMachineGun57x28 + - MagazinePistolSubMachineGunVector9x17 + - MagazineRifleFamas556UEG + - MagazineRifle762UEG + - MagazinePistol45ACP + - MagazinePistol57x28 + - MagazinePistol57x28Extd + - MagazineBoxHeavyRifle + - MagazinePacketRifle762x39 + - MagazinePacketRifle762UEG + - MagazinePacketPistolACP + - MagazinePacketPistol57x28 + - MagazinePacketPistol50AE + # Backmen-ammonation-end - Stunbaton - TargetClown - TargetHuman @@ -800,20 +853,30 @@ - GrenadeFlash - HoloprojectorSecurity - MagazineBoxLightRifleIncendiary - - MagazineBoxLightRifleUranium +# - MagazineBoxLightRifleUranium - MagazineBoxMagnumIncendiary - - MagazineBoxMagnumUranium +# - MagazineBoxMagnumUranium - MagazineBoxPistolIncendiary - - MagazineBoxPistolUranium +# - MagazineBoxPistolUranium - MagazineBoxRifleIncendiary - - MagazineBoxRifleUranium +# - MagazineBoxRifleUranium - MagazineGrenadeEmpty - MagazineLightRifleIncendiary - - MagazineLightRifleUranium +# - MagazineLightRifleUranium - MagazinePistolIncendiary - - MagazinePistolUranium +# - MagazinePistolUranium - MagazineRifleIncendiary - - MagazineRifleUranium +# - MagazineRifleUranium + # Backmen-ammonation-start + - MagazineRifle762UEGIncendiary + - MagazineRifleFamas556UEGIncendiary + - MagazinePistol45ACPincendiary + - MagazinePistol57x28Incendiary + - MagazinePacketPistol50AEAP + - MagazinePacketRifle762x39AP + - MagazinePacketRifle762x39AP + - MagazinePacketRifle762UEGAP + # Backmen-ammonation-end - MagazineShotgunBeanbag - MagazineShotgunIncendiary - PortableRecharger @@ -886,16 +949,31 @@ - MagazineBoxPistol - MagazineBoxRifle - MagazineLightRifle - - MagazineLightRifleEmpty +# - MagazineLightRifleEmpty - MagazinePistol - - MagazinePistolEmpty +# - MagazinePistolEmpty - MagazineRifle - - MagazineRifleEmpty +# - MagazineRifleEmpty - MagazineShotgun - - MagazineShotgunEmpty +# - MagazineShotgunEmpty - MagazineShotgunSlug - SpeedLoaderMagnum - - SpeedLoaderMagnumEmpty +# - SpeedLoaderMagnumEmpty + # Backmen-ammonation-start + - MagazinePistolSubMachineGun57x28 + - MagazinePistolSubMachineGunVector9x17 + - MagazineRifleFamas556UEG + - MagazineRifle762UEG + - MagazinePistol45ACP + - MagazinePistol57x28 + - MagazinePistol57x28Extd + - MagazineBoxHeavyRifle + - MagazinePacketRifle762x39 + - MagazinePacketRifle762UEG + - MagazinePacketPistolACP + - MagazinePacketPistol57x28 + - MagazinePacketPistol50AE + # Backmen-ammonation-end - type: MaterialStorage whitelist: tags: diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index 86de081b708..d19eab6a038 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -216,7 +216,7 @@ - type: latheRecipe parent: BaseAmmoRecipe id: MagazinePistol - result: MagazinePistol + result: MagazinePistol9x17 materials: Steel: 145 @@ -239,7 +239,7 @@ - type: latheRecipe parent: BaseAmmoRecipe id: MagazinePistolIncendiary - result: MagazinePistolIncendiary + result: MagazinePistol9x17Incendiary materials: Steel: 25 Plastic: 120 @@ -254,7 +254,7 @@ - type: latheRecipe parent: BaseAmmoRecipe id: MagazinePistolSubMachineGun - result: MagazinePistolSubMachineGun + result: MagazinePistolSubMachineGun9x17 materials: Steel: 300 @@ -275,7 +275,7 @@ - type: latheRecipe parent: BaseAmmoRecipe id: MagazineBoxPistol - result: MagazineBoxPistol + result: MagazinePacketPistol9x17 materials: Steel: 600 @@ -296,7 +296,7 @@ - type: latheRecipe parent: BaseAmmoRecipe id: MagazineRifle - result: MagazineRifle + result: MagazineRifle556UEG materials: Steel: 475 @@ -320,7 +320,7 @@ - type: latheRecipe parent: BaseAmmoRecipe id: MagazineRifleIncendiary - result: MagazineRifleIncendiary + result: MagazineRifle556UEGIncendiary materials: Steel: 25 Plastic: 450 @@ -335,7 +335,7 @@ - type: latheRecipe parent: BaseAmmoRecipe id: MagazineLightRifle - result: MagazineLightRifle + result: MagazineRifleLight762x39 materials: Steel: 565 @@ -359,7 +359,7 @@ - type: latheRecipe parent: BaseAmmoRecipe id: MagazineLightRifleIncendiary - result: MagazineLightRifleIncendiary + result: MagazineRifleLight762x39Incendiary materials: Steel: 25 Plastic: 540 @@ -367,14 +367,14 @@ - type: latheRecipe parent: BaseAmmoRecipe id: MagazineBoxRifle - result: MagazineBoxRifle + result: MagazinePacketRifle556UEG materials: Steel: 750 - type: latheRecipe parent: BaseAmmoRecipe id: MagazineBoxLightRifle - result: MagazineBoxLightRifle + result: MagazinePacketRifle762x39 materials: Steel: 900 @@ -480,7 +480,7 @@ - type: latheRecipe parent: BaseAmmoRecipe id: MagazineBoxPistolIncendiary - result: MagazineBoxPistolIncendiary + result: MagazinePacketPistol9x17Incendiary materials: Plastic: 600 @@ -494,14 +494,14 @@ - type: latheRecipe parent: BaseAmmoRecipe id: MagazineBoxLightRifleIncendiary - result: MagazineBoxLightRifleIncendiary + result: MagazinePacketRifle762x39Incendiary materials: Plastic: 900 - type: latheRecipe parent: BaseAmmoRecipe id: MagazineBoxRifleIncendiary - result: MagazineBoxRifleIncendiary + result: MagazinePacketRifle556UEGIncendiary materials: Plastic: 750 diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index a2bf1e6ed8e..1bedb7d3ac6 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -28,6 +28,10 @@ - MagazineRifleIncendiary - MagazinePistolIncendiary - MagazineLightRifleIncendiary + - MagazineRifle762UEGIncendiary + - MagazineRifleFamas556UEGIncendiary + - MagazinePistol45ACPincendiary + - MagazinePistol57x28Incendiary - SpeedLoaderMagnumIncendiary - MagazineShotgunIncendiary - MagazineBoxPistolIncendiary @@ -73,14 +77,14 @@ tier: 1 cost: 7500 recipeUnlocks: - - MagazineRifleUranium - - MagazinePistolUranium - - MagazineLightRifleUranium +# - MagazineRifleUranium +# - MagazinePistolUranium +# - MagazineLightRifleUranium - SpeedLoaderMagnumUranium - - MagazineBoxPistolUranium - - MagazineBoxMagnumUranium - - MagazineBoxLightRifleUranium - - MagazineBoxRifleUranium +# - MagazineBoxPistolUranium +# - MagazineBoxMagnumUranium +# - MagazineBoxLightRifleUranium +# - MagazineBoxRifleUranium - BoxShotgunUranium - type: technology diff --git a/Resources/Prototypes/_Backmen/Recipes/Lathes/security.yml b/Resources/Prototypes/_Backmen/Recipes/Lathes/security.yml index 2e04b730461..d69f6ab085f 100644 --- a/Resources/Prototypes/_Backmen/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/_Backmen/Recipes/Lathes/security.yml @@ -51,3 +51,162 @@ Plastic: 500 Gold: 300 Silver: 300 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazinePistolSubMachineGun57x28 + result: MagazinePistolSubMachineGun57x28 + materials: + Steel: 350 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazinePistolSubMachineGunVector9x17 + result: MagazinePistolSubMachineGunVector9x17 + materials: + Steel: 300 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineRifleFamas556UEG + result: MagazineRifleFamas556UEG + materials: + Steel: 475 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineRifle762UEG + result: MagazineRifle762UEG + materials: + Steel: 475 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineRifle762UEGIncendiary + result: MagazineRifle762UEGIncendiary + materials: + Steel: 25 + Plastic: 450 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineRifleFamas556UEGIncendiary + result: MagazineRifleFamas556UEGIncendiary + materials: + Steel: 25 + Plastic: 450 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazinePistol45ACP + result: MagazinePistol45ACP + materials: + Steel: 150 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazinePistol45ACPincendiary + result: MagazinePistol45ACPincendiary + materials: + Steel: 25 + Plastic: 120 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazinePistol57x28 + result: MagazinePistol57x28 + materials: + Steel: 150 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazinePistol57x28Incendiary + result: MagazinePistol57x28Incendiary + materials: + Steel: 25 + Plastic: 120 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazinePistol57x28Extd + result: MagazinePistol57x28Extd + materials: + Steel: 200 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineBoxHeavyRifle + result: MagazineBoxHeavyRifle + materials: + Steel: 900 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazinePacketRifle762x39 + result: MagazinePacketRifle762x39 + materials: + Steel: 900 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazinePacketRifle762UEG + result: MagazinePacketRifle762UEG + materials: + Steel: 750 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazinePacketPistolACP + result: MagazinePacketPistolACP + materials: + Steel: 600 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazinePacketPistol57x28 + result: MagazinePacketPistol57x28 + materials: + Steel: 600 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazinePacketPistol50AE + result: MagazinePacketPistol50AE + materials: + Steel: 1000 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazinePacketPistol50AEAP + result: MagazinePacketPistol50AEAP + materials: + Steel: 2000 + Plasteel: 1000 + Diamond: 500 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazinePacketRifle762x39AP + result: MagazinePacketRifle762x39AP + materials: + Steel: 3000 + Plasteel: 1500 + Diamond: 500 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazinePacketRifle556UEGAP + result: MagazinePacketRifle556UEGAP + materials: + Steel: 2000 + Plasteel: 1200 + Diamond: 500 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazinePacketRifle762UEGAP + result: MagazinePacketRifle762UEGAP + materials: + Steel: 1500 + Plasteel: 1100 + Diamond: 500 diff --git a/Resources/Prototypes/_Backmen/Research/arsenal.yml b/Resources/Prototypes/_Backmen/Research/arsenal.yml index ba008486aa7..e6d920ff217 100644 --- a/Resources/Prototypes/_Backmen/Research/arsenal.yml +++ b/Resources/Prototypes/_Backmen/Research/arsenal.yml @@ -9,3 +9,18 @@ cost: 6000 recipeUnlocks: - EnergyDomeDirectionalTurtle + +- type: technology + id: ArmorPiercingAmmo + name: research-technology-armorpiercingammo + icon: + sprite: Backmen/Objects/Weapons/Gunsx64/Ammunition/Casings/large_casing.rsi + state: base + discipline: Arsenal + tier: 3 + cost: 150000 + recipeUnlocks: + - MagazinePacketPistol50AEAP + - MagazinePacketRifle762x39AP + - MagazinePacketRifle556UEGAP + - MagazinePacketRifle762UEGAP From d97b737a3c190d6a114737f642501fdefd0d1ec7 Mon Sep 17 00:00:00 2001 From: no_mad Date: Thu, 6 Feb 2025 00:36:25 +0900 Subject: [PATCH 06/16] ftlka --- .../backmen/entities/weapons/guns/guns64.ftl | 34 ------------------- 1 file changed, 34 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/weapons/guns/guns64.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/weapons/guns/guns64.ftl index 5012384fc27..1475b780478 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/weapons/guns/guns64.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/weapons/guns/guns64.ftl @@ -17,10 +17,6 @@ ent-WeaponEarthGovLaserPistol = лазерный пистолет правите ent-WeaponRifleMaDeuce = М60 MaDeuce .desc = M60 - это крупногабаритная переносная машина для человека, обеспечивающая устойчивую и точную подавляющую огневую мощь за счет мобильности и управляемости. Часто встречается там, где их предпочтительная тактика быстрой, мобильной агрессии плохо подходит. .suffix = Адмем -ent-BaseMagazineHeavyRifle50 = магазин (.60 крупнокалиберный) - .desc = { ent-BaseItem.desc } -ent-MagazineHeavyRifleMaDeuse = магазин (.60 крупнокалиберный) - .desc = { ent-BaseMagazineHeavyRifle50.desc } ent-WeaponPistolACP14 = ACP-14 .desc = ACP-14 производства Earth Armories. Надежное боковое оружие, заряжаемое патронами .35 авто. .suffix = Пистолет @@ -30,10 +26,6 @@ ent-WeaponPistolVP78 = боевой пистолет VP-78 ent-WeaponPistolDEagle = Пустынный Орел .desc = "Магнум" под патрон 45-го калибра, который наносит серьезный удар. На этом выгравировано: "Мир благодаря превосходящей огневой мощи". .suffix = Пистолет -ent-MagazineMagnumPistolAP = пистолетный магазин (.45 магнум AP) - .desc = { ent-MagazineMagnumPistol.desc } -ent-MagazineMagnumPistol = пистолетный магазин (.45 магнум) - .desc = { ent-BaseItem.desc } ent-WeaponPistolG22 = G-22 .desc = Популярное полицейское огнестрельное оружие в наши дни. Патрон .35 авто. .suffix = Пистолет @@ -82,12 +74,6 @@ ent-WeaponSubMachineGunSkorpion = Скорпион VZ-61 ent-WeaponSubMachineGunMP38 = MP-38 .desc = MP-38 - старый и дешевый пистолет-пулемет, используемый повстанцами, он обладает хорошими характеристиками на больших дистанциях в компактном корпусе, хотя и страдает из-за низкой для своего класса скорострельности. .suffix = Пистолет-пулемёт -ent-MagazinePistolBoxSubMachineGun = Коробчатый магазин SMG (.35 авто) - .desc = { ent-BaseItem.desc } -ent-MagazinePistolDrumSubMachineGun = Барабанный магазин SMG (.35 авто) - .desc = { ent-BaseItem.desc } -ent-MagazinePistolTopSubMachineGun = Магазин SMG, установленный сверху (.35 авто) - .desc = { ent-BaseItem.desc } ent-WeaponSubMachineGunUzi = Узи .desc = Дешевая, надежная конструкция и производство делают этот вездесущий пистолет-пулемет полезным, несмотря на возраст. Переведите переключатель огня в режим "Авто" для достижения максимальной огневой мощи. Используйте два, если вы действительно хотите поджарить ветчину. .suffix = Пистолет-пулемёт @@ -112,8 +98,6 @@ ent-WeaponShotgunZauer = Зауэр ent-WeaponRifleBR64 = BR-64 .desc = San Cristo Arms BR-64 - основная боевая винтовка Корпуса морской пехоты. Он известен своей стабильной способностью хорошо работать на большинстве дистанций и убойной силой на близком расстоянии. В основном им пользуются люди, которые предпочитают круглую форму побольше средней. .suffix = Винтовка -ent-MagazineHeavyRifleBR64 = винтовочный магазин (.62 винтовка) - .desc = Стандартные тяжелые магазины земного типа. ent-BaseCartridgeRifleHeavy = патрон (.62 винтовочный) .desc = { ent-BaseCartridge.desc } ent-CartridgeRifleHeavy = патрон (.62 винтовочный) @@ -123,8 +107,6 @@ ent-BulletHeavy62 = Пуля (.62 винтовочный) ent-WeaponRifleSR127 = Затворная винтовка Bauer SR-127 .desc = Bauer SR-127 - это стандартная винтовка с затвором, используемая Объединенным правительством Земли. Известен своей точностью на дальних дистанциях и используется стрелками, несмотря на свой возраст и отсутствие IFF. У него несъемный прицел. Использует магазины 60-го калибра, защищающие от материалов." .suffix = Винтовка -ent-MagazineAntiMaterielRifleSR = магазин для винтовки (.60 крупнокалиберный) - .desc = Стандартные тяжелые магазины земного типа. ent-WeaponLauncherGL70 = GL-79 .desc = GL-70 - это стандартный гранатомет, используемый армией Земли для зачистки территорий и проведения крупных взрывов. .suffix = Гранатомёт @@ -164,32 +146,18 @@ ent-WeaponShotguntrenchgun4034 = Тренчган L-4034 ent-WeaponRifleDragunov = Драгунов .desc = Полуавтоматическая снайперская винтовка, известная своей меткостью, полностью предназначена для стрельбы на дальние дистанции. .suffix = Винтовка -ent-MagazineRifleLightSniper = магазин для винтовки (7,62 винтовка) - .desc = Стандартный тяжёлый магазин типа USSP. -ent-BaseCartridgeRifleLightSniper = патрон (7,62 винтовка) - .desc = { ent-BaseCartridge.desc } -ent-CartridgeRifleLight762 = патрон (7,62 винтовка) - .desc = { ent-BaseCartridgeRifleLightSniper.desc } -ent-BulletLight762 = пуля (7,62 винтовка) - .desc = { ent-BaseBullet.desc } ent-WeaponLightMachineGunRPD = RPD .desc = Дешёвый и надёжный пулемёт, иногда более известный как 'RPD'. Несмотря на отсутствие точек крепления, кроме подствольного, остаётся популярным продуктом на черном рынке благодаря своей низкой стоимости, большой ёмкости и повышенному калибру патронов. .suffix = Пулемёт ent-WeaponLightMachineGunMG42 = MG-42 .desc = Пулемёт ОПЗ периода Второй мировой войны. Разработан фирмой Metall-und Lackwarenfabrik Johannes Großfuß в 1942 году. После войны поставки данного пулемета возобновили в 2342 году. .suffix = Пулемёт -ent-MagazineHeavyMachineGunDrum = Барабанный магазин (.25 безгильзовый) - .desc = { ent-BaseItem.desc } ent-WeaponLightMachineGunMG60 = MG-60 .desc = Универсальный пулемёт MG-60 фирмы Raummetall — стандартное ГПМГ армии EarthGov. Хотя обычно устанавливается на транспортные средства, иногда используется пехотой для блокирования проходов, подавления противников или, в редких случаях, для стрельбы на ходу. .suffix = Пулемёт ent-WeaponRifleM41 = M-41 .desc = M-41 — это крупнокалиберный переносной пулемёт, обеспечивающий устойчивый, точный подавляющий огонь за счёт ухудшенной подвижности и управляемости. Часто используется там, где предпочтительная тактика быстрого, мобильного наступления не подходит. .suffix = Пулемёт -ent-MagazineHeavyRifleV41 = магазин (.20 винтовочный) - .desc = { ent-BaseMagazineHeavyRifle50.desc } -ent-MagazineLightMachineGunDrum = Барабанный магазин (.20 винтовочный) - .desc = { ent-BaseItem.desc } ent-WeaponShotgun12 = Спас-12 .desc = Дробовик, используемый морским корпусом EarthGov. Используется для ближнего боя, когда нужно что-то более подходящее для близкой дистанции, чем у большинства людей, или как странный запасной пистолет на спине для чрезвычайных ситуаций. Использует гильзы калибра 50. .suffix = Дробовик @@ -213,8 +181,6 @@ ent-ParticlesFireNRF = струя реактивного пламени ent-ParticlesFireNRFHELL = струя реактивного пламени .desc = Очень горячо! .suffix = Адское Пламя -ent-MagazineBoxRifleLightSniper = пакет патронов (7,62 винтовка) -ent-MagazineBoxHeavyRifle = коробка патронов (.62 винтовочный) ent-CartridgeAntitank = Патрон (14,5 Противотанковая) ent-WeaponSniperPtrd-m = ПТРД-М .desc = Переносная противотанковая винтовка Драгунова модифицированя. Стреляет аналоговыми бронебойными снарядами калибра 14,5 мм. Использует противотанковые боеприпасы From b09563f2dae3991d7448a0d3e28733ce72dab792 Mon Sep 17 00:00:00 2001 From: no_mad Date: Thu, 6 Feb 2025 01:16:08 +0900 Subject: [PATCH 07/16] ftlki2 --- Resources/Locale/en-US/armor/armor-examine.ftl | 1 + Resources/Locale/en-US/damage/damage-types.ftl | 1 + Resources/Locale/ru-RU/armor/armor-examine.ftl | 1 + 3 files changed, 3 insertions(+) diff --git a/Resources/Locale/en-US/armor/armor-examine.ftl b/Resources/Locale/en-US/armor/armor-examine.ftl index 849b5258acd..9c571dcaa91 100644 --- a/Resources/Locale/en-US/armor/armor-examine.ftl +++ b/Resources/Locale/en-US/armor/armor-examine.ftl @@ -11,6 +11,7 @@ armor-damage-type-heat = Heat armor-damage-type-radiation = Radiation armor-damage-type-caustic = Caustic armor-damage-type-stun = Stunic +armor-damage-type-armor-piercing = Punching armor-damage-type-bloodloss = Bloodloss armor-damage-type-asphyxiation = Asphyxiation armor-damage-type-cellular = Cellular diff --git a/Resources/Locale/en-US/damage/damage-types.ftl b/Resources/Locale/en-US/damage/damage-types.ftl index 1251f2fc2b3..0441015ee64 100644 --- a/Resources/Locale/en-US/damage/damage-types.ftl +++ b/Resources/Locale/en-US/damage/damage-types.ftl @@ -15,3 +15,4 @@ damage-type-holy = Holy #backmen damage-type-stun = Stun +damage-type-armor-piercing = Punching diff --git a/Resources/Locale/ru-RU/armor/armor-examine.ftl b/Resources/Locale/ru-RU/armor/armor-examine.ftl index 60c3a7d0c69..60a57e8a313 100644 --- a/Resources/Locale/ru-RU/armor/armor-examine.ftl +++ b/Resources/Locale/ru-RU/armor/armor-examine.ftl @@ -11,6 +11,7 @@ armor-damage-type-heat = Высокотемпературный armor-damage-type-radiation = Радиационный armor-damage-type-caustic = Кислотный armor-damage-type-stun = Оглушающий +armor-damage-type-armor-piercing = Пробивающий armor-damage-type-bloodloss = От кровопотери armor-damage-type-asphyxiation = От удушения armor-damage-type-cellular = Клеточный From c3d21d5baed77fe35a9f24f448c8e6a65ecc74f2 Mon Sep 17 00:00:00 2001 From: no_mad Date: Thu, 6 Feb 2025 01:16:51 +0900 Subject: [PATCH 08/16] heal --- Resources/Prototypes/Entities/Objects/Materials/materials.yml | 1 + .../Prototypes/Entities/Objects/Specific/Medical/healing.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml index e16044b2826..2d156851ab2 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml @@ -90,6 +90,7 @@ types: Slash: -0.5 Piercing: -0.5 + ArmorPiercing: -0.5 bloodlossModifier: -4 healingBeginSound: path: "/Audio/Items/Medical/brutepack_begin.ogg" diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml index 46410a01643..f72707b7633 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml @@ -278,6 +278,7 @@ types: Slash: -5 Piercing: -10 + ArmorPiercing: -10 bloodlossModifier: -10 healingBeginSound: path: "/Audio/Items/Medical/brutepack_begin.ogg" From 925eac7c656dac491b40760cc32734f582f3479e Mon Sep 17 00:00:00 2001 From: no_mad Date: Thu, 6 Feb 2025 01:17:01 +0900 Subject: [PATCH 09/16] shields up! --- .../Entities/Objects/Shields/shields.yml | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml index 777959675a9..c739264e63d 100644 --- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml +++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml @@ -36,13 +36,13 @@ thresholds: - trigger: !type:DamageTrigger - damage: 140 + damage: 240 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] - trigger: !type:DamageTrigger - damage: 100 #This is probably enough damage before it breaks + damage: 200 #This is probably enough damage before it breaks behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] @@ -73,15 +73,15 @@ - type: Blocking passiveBlockModifier: coefficients: - Blunt: 0.7 - Slash: 0.7 + Blunt: 0.6 + Slash: 0.6 activeBlockModifier: coefficients: - Blunt: 0.5 - Slash: 0.5 + Blunt: 0.4 + Slash: 0.4 flatReductions: - Blunt: 1 - Slash: 1 + Blunt: 2 + Slash: 2 - type: entity name: riot laser shield @@ -96,12 +96,12 @@ - type: Blocking passiveBlockModifier: coefficients: - Heat: 0.7 + Heat: 0.6 activeBlockModifier: coefficients: - Heat: 0.5 + Heat: 0.4 flatReductions: - Heat: 1 + Heat: 3 - type: entity name: riot bullet shield @@ -116,12 +116,14 @@ - type: Blocking passiveBlockModifier: coefficients: - Piercing: 0.7 + Piercing: 0.5 + ArmorPiercing: 0.6 activeBlockModifier: coefficients: - Piercing: 0.5 + Piercing: 0.4 + ArmorPiercing: 0.5 flatReductions: - Piercing: 1 + Piercing: 3 #Craftable shields @@ -427,12 +429,14 @@ Blunt: 1.0 Slash: 0.9 Piercing: 0.85 + ArmorPiercing: 0.8 Heat: 0.6 activeBlockModifier: coefficients: Blunt: 1.2 Slash: 0.85 Piercing: 0.5 + ArmorPiercing: 0.6 Heat: 0.4 flatReductions: Heat: 1 @@ -444,13 +448,13 @@ thresholds: - trigger: !type:DamageTrigger - damage: 180 + damage: 280 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] - trigger: !type:DamageTrigger - damage: 100 + damage: 200 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] From e78f2a0d5efe35eca948d4a89ba8fbd33acf38d9 Mon Sep 17 00:00:00 2001 From: no_mad Date: Thu, 6 Feb 2025 01:17:14 +0900 Subject: [PATCH 10/16] armor armoires --- .../Entities/Clothing/OuterClothing/armor.yml | 1 + .../Entities/Clothing/OuterClothing/coats.yml | 11 ++++++++++ .../Clothing/OuterClothing/hardsuits.yml | 1 + .../Entities/Clothing/Head/helmets.yml | 1 + .../Entities/Clothing/Masks/specific.yml | 1 + .../Entities/Clothing/OuterClothing/armor.yml | 15 ++++++++++--- .../Entities/Clothing/OuterClothing/bio.yml | 1 + .../Entities/Clothing/OuterClothing/coats.yml | 11 +++++++--- .../Clothing/OuterClothing/hardsuits.yml | 22 +++++++++++++++++++ .../Entities/Clothing/OuterClothing/suits.yml | 6 +++-- .../Entities/Clothing/OuterClothing/vests.yml | 2 ++ .../Entities/Clothing/Head/helmets.yml | 1 + .../Entities/Clothing/OuterClothing/armor.yml | 9 +++++++- .../Entities/Clothing/OuterClothing/coat.yml | 1 + .../Clothing/OuterClothing/hardsuits.yml | 7 ++++++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 1 + .../_Backmen/Entities/Mobs/NPCs/TGMC_xeno.yml | 2 ++ .../Entities/Mobs/NPCs/nanotrasen.yml | 1 + .../Entities/Objects/Shields/shields.yml | 2 ++ 19 files changed, 87 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/armor.yml index 98511c9eb35..ee89e12515f 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/armor.yml @@ -14,6 +14,7 @@ Blunt: 0.5 Slash: 0.5 Piercing: 0.6 + ArmorPiercing: 0.8 Heat: 0.5 - type: ExplosionResistance damageCoefficient: 0.65 diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml index 126847d5938..bcc317852f6 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml @@ -14,7 +14,9 @@ Blunt: 0.7 Slash: 0.7 Piercing: 0.4 + ArmorPiercing: 0.8 Heat: 0.7 + Stun: 0.6 - type: entity parent: ClothingOuterCoatDetectiveLoadout @@ -32,7 +34,9 @@ Blunt: 0.8 Slash: 0.8 Piercing: 0.6 + ArmorPiercing: 0.9 Heat: 0.9 + Stun: 0.6 - type: entity parent: ClothingOuterCoatWarden @@ -50,7 +54,9 @@ Blunt: 0.8 Slash: 0.8 Piercing: 0.4 + ArmorPiercing: 0.8 Heat: 0.8 + Stun: 0.6 - type: entity parent: ClothingOuterStorageBase @@ -68,7 +74,9 @@ Blunt: 0.8 Slash: 0.8 Piercing: 0.6 + ArmorPiercing: 0.9 Heat: 0.9 + Stun: 0.6 - type: entity parent: ClothingOuterStorageBase @@ -101,7 +109,9 @@ Blunt: 0.5 Slash: 0.5 Piercing: 0.6 + ArmorPiercing: 0.7 Heat: 0.5 + Stun: 0.6 - type: entity parent: ClothingOuterStorageBase @@ -119,3 +129,4 @@ Blunt: 0.9 Slash: 0.9 Piercing: 0.8 + ArmorPiercing: 0.99 diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/hardsuits.yml index 00cb41bdc30..c1eac76db51 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/hardsuits.yml @@ -23,6 +23,7 @@ Blunt: 0.7 Slash: 0.7 Piercing: 0.6 + ArmorPiercing: 0.9 Heat: 0.05 Cold: 0.1 Shock: 0.1 diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index 65ad2d523e8..2925262142e 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -308,6 +308,7 @@ Blunt: 0.5 Slash: 0.5 Piercing: 0.5 + ArmorPiercing: 0.8 Heat: 0.9 #ERT HELMETS diff --git a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml index 986a91a0f29..aeebaceeb0a 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml @@ -112,6 +112,7 @@ Blunt: 0.6 Slash: 0.6 Piercing: 0.4 + ArmorPiercing: 0.7 - type: HideLayerClothing slots: - Snout diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index ecfe3177383..ad9b80e8b9c 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -18,8 +18,9 @@ coefficients: Blunt: 0.70 Slash: 0.70 - Piercing: 0.70 #Can save you, but bullets will still hurt. Will take about 10 shots from a Viper before critting, as opposed to 7 while unarmored and 16~ with a bulletproof vest. + Piercing: 0.60 #Can save you, but bullets will still hurt. Will take about 10 shots from a Viper before critting, as opposed to 7 while unarmored and 16~ with a bulletproof vest. Heat: 0.80 + ArmorPiercing: 0.90 - type: ExplosionResistance damageCoefficient: 0.90 @@ -78,7 +79,8 @@ coefficients: Blunt: 0.9 Slash: 0.9 - Piercing: 0.4 + Piercing: 0.3 + ArmorPiercing: 0.70 Heat: 0.9 - type: ExplosionResistance damageCoefficient: 0.80 @@ -125,9 +127,11 @@ coefficients: Blunt: 0.35 Slash: 0.35 - Piercing: 0.35 + Piercing: 0.30 + ArmorPiercing: 0.60 Heat: 0.35 Caustic: 0.5 + Stun: 0.3 - type: ExplosionResistance damageCoefficient: 0.35 - type: ClothingSpeedModifier @@ -193,6 +197,7 @@ Blunt: 0.5 Slash: 0.5 Piercing: 0.6 + ArmorPiercing: 0.9 Heat: 0.5 - type: GroupExamine @@ -212,6 +217,7 @@ Blunt: 0.2 Slash: 0.2 Piercing: 0.2 + ArmorPiercing: 0.6 Heat: 0.5 Radiation: 0 Caustic: 0.75 @@ -282,6 +288,7 @@ Blunt: 0.5 Slash: 0.5 Piercing: 0.6 + ArmorPiercing: 0.9 Heat: 0.5 Caustic: 0.9 - type: ClothingSpeedModifier @@ -308,6 +315,7 @@ Blunt: 0.5 Slash: 0.5 Piercing: 0.5 + ArmorPiercing: 0.6 Heat: 0.9 Radiation: 0.8 - type: ClothingSpeedModifier @@ -341,6 +349,7 @@ Blunt: 0.5 Slash: 0.5 Piercing: 0.4 + ArmorPiercing: 0.8 Heat: 0.5 - type: ClothingSpeedModifier walkModifier: 0.9 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml index ea22d5ceb91..26211c81bb5 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml @@ -75,6 +75,7 @@ Blunt: 0.75 Slash: 0.75 Piercing: 0.70 + ArmorPiercing: 0.90 Heat: 0.80 - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index e2db7ebd94c..5497de7c7aa 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -68,7 +68,9 @@ coefficients: Blunt: 0.7 Slash: 0.7 - Piercing: 0.7 + Piercing: 0.4 + ArmorPiercing: 0.8 + Stun: 0.6 Heat: 0.7 Caustic: 0.75 # not the full 90% from ss13 because of the head - type: ExplosionResistance @@ -84,8 +86,10 @@ coefficients: Blunt: 0.7 Slash: 0.7 - Piercing: 0.7 - Heat: 0.7 + Piercing: 0.4 + ArmorPiercing: 0.8 + Heat: 0.8 + Stun: 0.6 - type: ExplosionResistance damageCoefficient: 0.9 @@ -413,6 +417,7 @@ Blunt: 0.8 Slash: 0.85 Piercing: 0.65 + ArmorPiercing: 0.9 Heat: 0.85 Caustic: 0.75 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 86717e30172..9c8be3a4819 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -20,6 +20,7 @@ Blunt: 0.9 Slash: 0.9 Piercing: 0.9 + ArmorPiercing: 0.9 Caustic: 0.9 Stun: 0.9 - type: ClothingSpeedModifier @@ -56,6 +57,7 @@ Blunt: 0.9 Slash: 0.9 Piercing: 0.9 + ArmorPiercing: 0.9 Heat: 0.8 Radiation: 0.5 Caustic: 0.5 @@ -89,6 +91,7 @@ Blunt: 0.9 Slash: 0.9 Piercing: 0.9 + ArmorPiercing: 0.9 Shock: 0.8 Caustic: 0.5 Radiation: 0.2 @@ -120,6 +123,7 @@ Blunt: 0.9 Slash: 0.9 Piercing: 0.9 + ArmorPiercing: 0.9 Radiation: 0.3 #salv is supposed to have radiation hazards in the future Caustic: 0.8 Stun: 0.8 @@ -152,6 +156,7 @@ Blunt: 0.7 Slash: 0.7 Piercing: 0.5 + ArmorPiercing: 0.6 Radiation: 0.3 Caustic: 0.7 Stun: 0.7 @@ -184,6 +189,7 @@ Blunt: 0.6 Slash: 0.6 Piercing: 0.5 + ArmorPiercing: 0.6 Heat: 0.3 Radiation: 0.1 - type: ExplosionResistance @@ -216,6 +222,7 @@ Blunt: 0.6 Slash: 0.6 Piercing: 0.6 + ArmorPiercing: 0.6 Caustic: 0.7 Stun: 0.5 - type: ClothingSpeedModifier @@ -245,6 +252,7 @@ Blunt: 0.7 Slash: 0.8 Piercing: 0.7 + ArmorPiercing: 0.7 Heat: 0.8 Caustic: 0.5 Stun: 0.7 @@ -277,6 +285,7 @@ Blunt: 0.5 Slash: 0.6 Piercing: 0.6 + ArmorPiercing: 0.6 Caustic: 0.7 Stun: 0.5 - type: ClothingSpeedModifier @@ -308,6 +317,7 @@ Blunt: 0.8 Slash: 0.8 Piercing: 0.6 + ArmorPiercing: 0.6 Heat: 0.5 Radiation: 0.5 Caustic: 0.6 @@ -343,6 +353,7 @@ Blunt: 0.8 Slash: 0.8 Piercing: 0.8 + ArmorPiercing: 0.8 Heat: 0.4 Radiation: 0.0 Caustic: 0.7 @@ -399,6 +410,7 @@ Blunt: 0.6 Slash: 0.8 Piercing: 0.9 + ArmorPiercing: 0.8 Heat: 0.3 Radiation: 0.1 Caustic: 0.2 @@ -446,6 +458,7 @@ Blunt: 0.6 Slash: 0.5 Piercing: 0.5 + ArmorPiercing: 0.6 Radiation: 0.5 Caustic: 0.6 Stun: 0.5 @@ -478,6 +491,7 @@ Blunt: 0.9 Slash: 0.9 Piercing: 0.8 + ArmorPiercing: 0.8 Radiation: 0.5 Caustic: 0.8 Stun: 0.5 @@ -513,6 +527,7 @@ Blunt: 0.5 Slash: 0.5 Piercing: 0.5 + ArmorPiercing: 0.7 Heat: 0.5 Radiation: 0.5 Caustic: 0.5 @@ -574,6 +589,7 @@ Blunt: 0.6 Slash: 0.6 Piercing: 0.6 + ArmorPiercing: 0.3 Heat: 0.2 Radiation: 0.01 Caustic: 0.5 @@ -609,6 +625,7 @@ Blunt: 0.4 Slash: 0.4 Piercing: 0.3 + ArmorPiercing: 0.4 Heat: 0.5 Radiation: 0.25 Caustic: 0.4 @@ -642,6 +659,7 @@ Blunt: 0.2 Slash: 0.2 Piercing: 0.2 + ArmorPiercing: 0.35 Heat: 0.2 Radiation: 0.2 Caustic: 0.2 @@ -675,6 +693,7 @@ Blunt: 0.6 Slash: 0.6 Piercing: 0.4 + ArmorPiercing: 0.7 Heat: 0.25 Radiation: 0.25 Caustic: 0.75 @@ -772,6 +791,7 @@ Blunt: 0.7 Slash: 0.8 Piercing: 0.85 + ArmorPiercing: 0.9 Heat: 0.4 Caustic: 0.75 Stun: 0.4 @@ -901,6 +921,7 @@ Blunt: 0.1 #best armor in the game Slash: 0.1 Piercing: 0.1 + ArmorPiercing: 0.3 Heat: 0.1 Radiation: 0.1 Caustic: 0.1 @@ -939,6 +960,7 @@ Blunt: 0.7 Slash: 0.7 Piercing: 0.6 + ArmorPiercing: 0.9 Heat: 0.1 Cold: 0.1 Shock: 0.1 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml index 4b1a31a6375..ce276e13015 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml @@ -16,8 +16,9 @@ coefficients: Blunt: 0.9 Slash: 0.9 - Piercing: 0.9 - Heat: 0.75 + Piercing: 0.7 + ArmorPiercing: 0.7 + Heat: 0.55 - type: ExplosionResistance damageCoefficient: 0.15 - type: GroupExamine @@ -157,6 +158,7 @@ Blunt: 0.8 Slash: 0.8 Piercing: 0.8 + ArmorPiercing: 0.9 Heat: 0.8 # phase cloak - type: ToggleClothing diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml index accd24dd3cc..15bef7c8b60 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml @@ -15,6 +15,7 @@ Blunt: 0.6 #ballistic plates = better protection Slash: 0.6 Piercing: 0.3 + ArmorPiercing: 0.6 Heat: 0.9 - type: ExplosionResistance damageCoefficient: 0.9 @@ -36,6 +37,7 @@ Blunt: 0.7 #slightly better overall protection but slightly worse than bulletproof armor against bullets seems sensible Slash: 0.7 Piercing: 0.5 + ArmorPiercing: 0.7 Heat: 0.9 - type: ExplosionResistance damageCoefficient: 0.9 diff --git a/Resources/Prototypes/_Backmen/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_Backmen/Entities/Clothing/Head/helmets.yml index a41d5888aca..e580116472e 100644 --- a/Resources/Prototypes/_Backmen/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/_Backmen/Entities/Clothing/Head/helmets.yml @@ -225,6 +225,7 @@ Blunt: 0.7 Slash: 0.7 Piercing: 0.6 + ArmorPiercing: 0.95 Heat: 0.8 Radiation: 0.8 Caustic: 0.95 diff --git a/Resources/Prototypes/_Backmen/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/_Backmen/Entities/Clothing/OuterClothing/armor.yml index 9ede748ff71..bf4dd4da142 100644 --- a/Resources/Prototypes/_Backmen/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/_Backmen/Entities/Clothing/OuterClothing/armor.yml @@ -102,6 +102,7 @@ Blunt: 0.9 Slash: 0.9 Piercing: 0.4 + ArmorPiercing: 0.8 Heat: 0.9 - type: ExplosionResistance damageCoefficient: 0.80 @@ -122,6 +123,7 @@ Blunt: 0.6 Slash: 0.6 Piercing: 0.5 + ArmorPiercing: 0.9 Heat: 0.8 - type: entity @@ -140,6 +142,7 @@ Blunt: 0.5 Slash: 0.5 Piercing: 0.5 + ArmorPiercing: 0.9 Heat: 0.8 - type: entity @@ -158,6 +161,7 @@ Blunt: 0.7 Slash: 0.7 Piercing: 0.4 + ArmorPiercing: 0.8 Heat: 0.7 - type: ExplosionResistance damageCoefficient: 0.8 @@ -203,6 +207,7 @@ Blunt: 0.2 Slash: 0.2 Piercing: 0.2 + ArmorPiercing: 0.7 Heat: 0.3 - type: ExplosionResistance damageCoefficient: 0.5 @@ -251,6 +256,7 @@ Blunt: 0.9 Slash: 0.9 Piercing: 0.4 + ArmorPiercing: 0.8 Heat: 0.9 - type: ExplosionResistance damageCoefficient: 0.80 @@ -295,12 +301,13 @@ sprite: Backmen/Clothing/OuterClothing/Armor/centcom_sec_armor.rsi - type: Clothing sprite: Backmen/Clothing/OuterClothing/Armor/centcom_sec_armor.rsi - - type: Armor + - type: Armor modifiers: coefficients: Blunt: 0.55 Slash: 0.55 Piercing: 0.55 + ArmorPiercing: 0.85 Heat: 0.55 - type: ExplosionResistance damageCoefficient: 0.80 diff --git a/Resources/Prototypes/_Backmen/Entities/Clothing/OuterClothing/coat.yml b/Resources/Prototypes/_Backmen/Entities/Clothing/OuterClothing/coat.yml index 0c1d7950856..3a3f944c12d 100644 --- a/Resources/Prototypes/_Backmen/Entities/Clothing/OuterClothing/coat.yml +++ b/Resources/Prototypes/_Backmen/Entities/Clothing/OuterClothing/coat.yml @@ -168,6 +168,7 @@ Blunt: 0.7 Slash: 0.7 Piercing: 0.7 + ArmorPiercing: 0.85 Heat: 0.7 Caustic: 0.75 Stun: 0.4 diff --git a/Resources/Prototypes/_Backmen/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_Backmen/Entities/Clothing/OuterClothing/hardsuits.yml index 0e029362818..dc4f5155d0d 100644 --- a/Resources/Prototypes/_Backmen/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/_Backmen/Entities/Clothing/OuterClothing/hardsuits.yml @@ -20,6 +20,7 @@ Blunt: 0.60 Slash: 0.6 Piercing: 0.4 + ArmorPiercing: 0.8 Heat: 0.3 Radiation: 0.25 Caustic: 0.75 @@ -54,6 +55,7 @@ Blunt: 0.15 Slash: 0.15 Piercing: 0.20 + ArmorPiercing: 0.8 Heat: 0.30 Radiation: 0.1 Caustic: 0.15 @@ -123,6 +125,7 @@ Blunt: 0.4 Slash: 0.5 Piercing: 0.5 + ArmorPiercing: 0.8 Radiation: 0.6 Caustic: 0.6 Heat: 0.4 @@ -154,6 +157,7 @@ Blunt: 0.4 Slash: 0.4 Piercing: 0.4 + ArmorPiercing: 0.8 Radiation: 0.6 Caustic: 0.6 Heat: 0.4 @@ -181,6 +185,7 @@ Blunt: 0.3 Slash: 0.2 Piercing: 0.3 + ArmorPiercing: 0.6 Heat: 0.3 Radiation: 0.3 Stun: 0.2 @@ -284,6 +289,7 @@ Blunt: 0.8 Slash: 0.8 Piercing: 0.7 + ArmorPiercing: 0.9 Heat: 0.2 Radiation: 0.01 Caustic: 0.5 @@ -409,6 +415,7 @@ Blunt: 0.2 Slash: 0.2 Piercing: 0.2 + ArmorPiercing: 0.3 Heat: 0.1 Radiation: 0 Caustic: 0.2 diff --git a/Resources/Prototypes/_Backmen/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_Backmen/Entities/Clothing/Uniforms/jumpsuits.yml index 03da75db208..cb67a26701a 100644 --- a/Resources/Prototypes/_Backmen/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_Backmen/Entities/Clothing/Uniforms/jumpsuits.yml @@ -538,6 +538,7 @@ Blunt: 0.80 Slash: 0.80 Piercing: 0.70 + ArmorPiercing: 0.95 Heat: 0.90 - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/color.rsi diff --git a/Resources/Prototypes/_Backmen/Entities/Mobs/NPCs/TGMC_xeno.yml b/Resources/Prototypes/_Backmen/Entities/Mobs/NPCs/TGMC_xeno.yml index 25ecb4968ed..6c15ec35781 100644 --- a/Resources/Prototypes/_Backmen/Entities/Mobs/NPCs/TGMC_xeno.yml +++ b/Resources/Prototypes/_Backmen/Entities/Mobs/NPCs/TGMC_xeno.yml @@ -101,6 +101,7 @@ Blunt: 0.7 Slash: 0.5 Piercing: 0.7 + ArmorPiercing: 0.9 Heat: 1.8 Shock: 1.8 Poison: 0.0 @@ -115,6 +116,7 @@ Blunt: 0.5 Slash: 0.3 Piercing: 0.4 + ArmorPiercing: 0.7 Heat: 1.8 Shock: 1.8 Poison: 0.0 diff --git a/Resources/Prototypes/_Backmen/Entities/Mobs/NPCs/nanotrasen.yml b/Resources/Prototypes/_Backmen/Entities/Mobs/NPCs/nanotrasen.yml index 17cab3c249f..9cbaa094591 100644 --- a/Resources/Prototypes/_Backmen/Entities/Mobs/NPCs/nanotrasen.yml +++ b/Resources/Prototypes/_Backmen/Entities/Mobs/NPCs/nanotrasen.yml @@ -188,6 +188,7 @@ Blunt: 0.6 Slash: 0.6 Piercing: 0.5 + ArmorPiercing: 0.9 Shock: 0.8 Heat: 0.8 diff --git a/Resources/Prototypes/_Backmen/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/_Backmen/Entities/Objects/Shields/shields.yml index 190365cc130..37df53dd4c5 100644 --- a/Resources/Prototypes/_Backmen/Entities/Objects/Shields/shields.yml +++ b/Resources/Prototypes/_Backmen/Entities/Objects/Shields/shields.yml @@ -19,12 +19,14 @@ Blunt: 0.7 Slash: 0.7 Piercing: 0.7 + ArmorPiercing: 0.9 Heat: 0.7 activeBlockModifier: coefficients: Blunt: 0.5 Slash: 0.5 Piercing: 0.5 + ArmorPiercing: 0.8 Heat: 0.5 flatReductions: Blunt: 5 From 75deac99953f7b73c35e8af4dccc9209ea2ed30d Mon Sep 17 00:00:00 2001 From: no_mad Date: Thu, 6 Feb 2025 09:32:16 +0900 Subject: [PATCH 11/16] some issues --- .../Prototypes/Catalog/Cargo/cargo_security.yml | 2 +- .../Prototypes/Catalog/Fills/Crates/cargo.yml | 2 +- .../Prototypes/Catalog/Fills/Lockers/misc.yml | 2 +- .../Markers/Spawners/Random/contraband.yml | 2 +- .../Entities/Structures/Machines/lathe.yml | 8 ++++---- .../LootTables/suspicion_loot_table.yml | 2 +- Resources/Prototypes/Magic/event_spells.yml | 4 ++-- .../_Backmen/Catalog/Fills/Lockers/security.yml | 2 +- .../VendingMachines/Inventories/ammo_nt.yml | 2 +- .../Prototypes/_Backmen/Catalog/uplink_nomad.yml | 6 +++--- .../Weapons/Guns/Ammunition/Boxes/boxes.yml | 4 ++-- .../Weapons/Guns/Ammunition/Cartridges/rifle.yml | 4 ++-- .../Weapons/Guns/Ammunition/Magazine/SMG.yml | 16 ++++++++-------- .../Weapons/Guns/Ammunition/Magazine/rifle.yml | 4 ++-- .../Guns/Ammunition/Projectiles/rifle.yml | 4 ++-- .../Entities/Objects/Weapons/Guns/SMGs/SMGs.yml | 4 ++-- .../Objects/Weapons/Guns/Snipers/snipers.yml | 13 +++++++++++++ .../_Backmen/Recipes/Lathes/security.yml | 4 ++-- Resources/Prototypes/_Backmen/tags.yml | 2 +- 19 files changed, 50 insertions(+), 37 deletions(-) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml index 3006cd1ce8c..aa3154bb8b1 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml @@ -4,7 +4,7 @@ sprite: Clothing/OuterClothing/Armor/bulletproof.rsi state: icon product: CrateSecurityArmor - cost: 725 + cost: 925 category: cargoproduct-category-name-security group: market diff --git a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml index 78ec1e838e7..f25711f70b4 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml @@ -116,7 +116,7 @@ - id: WeaponPistolCHIMP prob: 0.001 orGroup: Weapons - - id: WeaponSniperMosin + - id: WeaponSniperMosinNew prob: 0.01 orGroup: Weapons - id: WeaponMakeshiftLaser diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index 4b612666636..131a829f49d 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -125,7 +125,7 @@ - id: ClothingShoesBootsCombatFilled - id: ToolboxSyndicateFilled - id: BalloonSyn - - id: WeaponSniperMosin + - id: WeaponSniperMosinNew weight: 2 - type: entityTable diff --git a/Resources/Prototypes/Corvax/Entities/Markers/Spawners/Random/contraband.yml b/Resources/Prototypes/Corvax/Entities/Markers/Spawners/Random/contraband.yml index b2c8a78de32..52712adf556 100644 --- a/Resources/Prototypes/Corvax/Entities/Markers/Spawners/Random/contraband.yml +++ b/Resources/Prototypes/Corvax/Entities/Markers/Spawners/Random/contraband.yml @@ -88,7 +88,7 @@ - SupermatterGrenade - WhiteholeGrenade - HotPotato - - WeaponSniperMosin + - WeaponSniperMosinNew - SpeedLoaderMagnumAP rareChance: 0.2 prototypes: diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index c393f417d71..15e963a3607 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -224,7 +224,7 @@ # - MagazineRifleEmpty # Backmen-ammonation-start - MagazinePistolSubMachineGun57x28 - - MagazinePistolSubMachineGunVector9x17 + - MagazinePistolSubMachineGunVector45ACP - MagazineRifleFamas556UEG - MagazineRifle762UEG - MagazineRifle762UEGIncendiary @@ -441,7 +441,7 @@ # - MagazineRifleUranium # Backmen-ammonation-start - MagazinePistolSubMachineGun57x28 - - MagazinePistolSubMachineGunVector9x17 + - MagazinePistolSubMachineGunVector45ACP - MagazineRifleFamas556UEG - MagazineRifle762UEG - MagazineRifle762UEGIncendiary @@ -819,7 +819,7 @@ # - SpeedLoaderMagnumEmpty # Backmen-ammonation-start - MagazinePistolSubMachineGun57x28 - - MagazinePistolSubMachineGunVector9x17 + - MagazinePistolSubMachineGunVector45ACP - MagazineRifleFamas556UEG - MagazineRifle762UEG - MagazinePistol45ACP @@ -962,7 +962,7 @@ # - SpeedLoaderMagnumEmpty # Backmen-ammonation-start - MagazinePistolSubMachineGun57x28 - - MagazinePistolSubMachineGunVector9x17 + - MagazinePistolSubMachineGunVector45ACP - MagazineRifleFamas556UEG - MagazineRifle762UEG - MagazinePistol45ACP diff --git a/Resources/Prototypes/LootTables/suspicion_loot_table.yml b/Resources/Prototypes/LootTables/suspicion_loot_table.yml index c2b00488a8b..f338bbaadb7 100644 --- a/Resources/Prototypes/LootTables/suspicion_loot_table.yml +++ b/Resources/Prototypes/LootTables/suspicion_loot_table.yml @@ -75,7 +75,7 @@ amount: 0 maxAmount: 5 - - id: WeaponSniperMosin + - id: WeaponSniperMosinNew amount: 0 maxAmount: 5 - id: WeaponSniperHristov diff --git a/Resources/Prototypes/Magic/event_spells.yml b/Resources/Prototypes/Magic/event_spells.yml index 5aad8925a60..00d663688cb 100644 --- a/Resources/Prototypes/Magic/event_spells.yml +++ b/Resources/Prototypes/Magic/event_spells.yml @@ -75,7 +75,7 @@ orGroup: Guns - id: WeaponSubMachineGunWt550 orGroup: Guns - - id: WeaponSniperMosin + - id: WeaponSniperMosinNew orGroup: Guns - id: WeaponSniperHristov orGroup: Guns @@ -158,7 +158,7 @@ - id: RevolverCapGunFake orGroup: Guns speech: action-speech-spell-summon-guns - + - type: entity id: ActionSummonMagic name: Summon Magic diff --git a/Resources/Prototypes/_Backmen/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/_Backmen/Catalog/Fills/Lockers/security.yml index c82128330b9..bc6081620c0 100644 --- a/Resources/Prototypes/_Backmen/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/_Backmen/Catalog/Fills/Lockers/security.yml @@ -19,7 +19,7 @@ contents: - id: WeaponSubMachineGunVectorSpecial amount: 2 - - id: MagazinePistolSubMachineGunVector9x17 + - id: MagazinePistolSubMachineGunVector45ACP amount: 4 - type: entity diff --git a/Resources/Prototypes/_Backmen/Catalog/VendingMachines/Inventories/ammo_nt.yml b/Resources/Prototypes/_Backmen/Catalog/VendingMachines/Inventories/ammo_nt.yml index a371f83842b..f0ec9f431bb 100644 --- a/Resources/Prototypes/_Backmen/Catalog/VendingMachines/Inventories/ammo_nt.yml +++ b/Resources/Prototypes/_Backmen/Catalog/VendingMachines/Inventories/ammo_nt.yml @@ -4,7 +4,7 @@ BattleMedipen: 20 MagazinePistol45ACP: 20 MagazinePistolSubMachineGun9x17: 20 - MagazinePistolSubMachineGunVector9x17: 20 + MagazinePistolSubMachineGunVector45ACP: 20 MagazineRifle556UEG: 20 SpeedLoaderMagnum: 20 BoxLethalshot: 20 diff --git a/Resources/Prototypes/_Backmen/Catalog/uplink_nomad.yml b/Resources/Prototypes/_Backmen/Catalog/uplink_nomad.yml index caee6ea6c7b..1421056e6ee 100644 --- a/Resources/Prototypes/_Backmen/Catalog/uplink_nomad.yml +++ b/Resources/Prototypes/_Backmen/Catalog/uplink_nomad.yml @@ -129,8 +129,8 @@ - type: StorageFill contents: - id: WeaponSubMachineGunVectorSpecial - - id: MagazinePistolSubMachineGunVector9x17Ext - - id: MagazinePistolSubMachineGunVector9x17Ext + - id: MagazinePistolSubMachineGunVector45ACPExt + - id: MagazinePistolSubMachineGunVector45ACPExt - type: entity parent: ClothingBackpackDuffelSyndicate @@ -495,7 +495,7 @@ amount: 2 - id: MagazinePistolSubMachineGun57x28 amount: 2 - - id: MagazinePistolSubMachineGunVector9x17 + - id: MagazinePistolSubMachineGunVector45ACP amount: 2 - id: MagazineRifleLight762x39 # For AKMS, AKSU and STG44 amount: 3 diff --git a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Boxes/boxes.yml b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Boxes/boxes.yml index bd17b5021be..cde06c92943 100644 --- a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Boxes/boxes.yml +++ b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Boxes/boxes.yml @@ -70,7 +70,7 @@ - type: entity parent: BaseMagazineBoxRifleLightSniper id: MagazineBoxRifleLightSniper - name: ammunition packet (7,62x52) + name: ammunition packet (7,62x54) components: - type: Sprite layers: @@ -131,7 +131,7 @@ - type: entity parent: BaseMagazineBoxHeavyRifle id: MagazineBoxHeavyRifle762 - name: ammunition box (7,62x52) + name: ammunition box (7,62x54) components: - type: BallisticAmmoProvider proto: CartridgeRifleLight762 diff --git a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml index 4c0b5a9f59d..725dccc02a5 100644 --- a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml +++ b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml @@ -275,7 +275,7 @@ - type: entity id: CartridgeRifleLight762 - name: cartridge (7,62x52) + name: cartridge (7,62x54) parent: BaseCartridgeRifleLightSniper components: - type: Tag @@ -293,7 +293,7 @@ - type: entity id: CartridgeRifleLight762AP - name: cartridge (7,62x52 AP) + name: cartridge (7,62x54 AP) parent: CartridgeRifleLight762 components: - type: CartridgeAmmo diff --git a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/SMG.yml b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/SMG.yml index 6272f48b43b..bfc8a902e3e 100644 --- a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/SMG.yml +++ b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/SMG.yml @@ -55,19 +55,19 @@ zeroVisible: false - type: entity - id: MagazinePistolSubMachineGunVector9x17 - name: Vector magazine (9x17 mm) + id: MagazinePistolSubMachineGunVector45ACP + name: Vector magazine (.45 Auto) parent: BaseMagazinePistolSubMachineGun components: - type: Tag tags: - - MagazineSMGVector9x17 + - MagazineSMGVector45ACP - type: BallisticAmmoProvider - proto: CartridgePistol9x17 + proto: CartridgePistolACP capacity: 20 whitelist: tags: - - CartridgePistol9x17 + - CartridgePistol45ACP soundInsert: path: /Audio/Weapons/Guns/MagIn/bullet_insert.ogg - type: Sprite @@ -83,9 +83,9 @@ zeroVisible: false - type: entity - id: MagazinePistolSubMachineGunVector9x17Ext - name: Vector magazine Extended (9x17 mm) - parent: MagazinePistolSubMachineGunVector9x17 + id: MagazinePistolSubMachineGunVector45ACPExt + name: Vector magazine Extended (.45 Auto) + parent: MagazinePistolSubMachineGunVector45ACP components: - type: BallisticAmmoProvider capacity: 40 diff --git a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/rifle.yml b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/rifle.yml index 2bb6a199c17..7ef9ade06e4 100644 --- a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/rifle.yml +++ b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/rifle.yml @@ -163,7 +163,7 @@ - type: entity id: MagazineRifleLightSniper - name: rifle magazine (7,62x52) + name: rifle magazine (7,62x54) description: Standart USSP type of heavy magazines. parent: BaseItem components: @@ -200,7 +200,7 @@ - type: entity id: MagazineRifleLightSniperAP - name: rifle magazine (7,62x52 AP) + name: rifle magazine (7,62x54 AP) parent: MagazineRifleLightSniper components: - type: BallisticAmmoProvider diff --git a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml index 6de5f2606fb..6c705b5762e 100644 --- a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml +++ b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml @@ -237,7 +237,7 @@ - type: entity parent: BaseBullet id: BulletLight762 - name: bullet (7,62x52 rifle) + name: bullet (7,62x54 rifle) categories: [ HideSpawnMenu ] components: - type: Projectile @@ -248,7 +248,7 @@ - type: entity id: BulletLight762AP - name: bullet (.308 win AP) + name: bullet (7,62x54 AP) parent: BaseBullet categories: [ HideSpawnMenu ] components: diff --git a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/SMGs/SMGs.yml b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/SMGs/SMGs.yml index 58c0f1e9690..b1f36e1bf0d 100644 --- a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/SMGs/SMGs.yml +++ b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/SMGs/SMGs.yml @@ -163,13 +163,13 @@ slots: gun_magazine: name: Magazine - startingItem: MagazinePistolSubMachineGunVector9x17 + startingItem: MagazinePistolSubMachineGunVector45ACP insertSound: /Audio/Weapons/Guns64/SMGs/smg_reload.ogg ejectSound: /Audio/Weapons/Guns64/SMGs/smg_unload.ogg priority: 2 whitelist: tags: - - MagazineSMGVector9x17 + - MagazineSMGVector45ACP gun_chamber: name: Chamber startingItem: CartridgePistol9x17 diff --git a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 55713f46eff..e2693e47048 100644 --- a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -148,6 +148,13 @@ sprite: Backmen/Objects/Weapons/Gunsx64/Snipers/mosin/tiny.rsi - type: Item sprite: Backmen/Objects/Weapons/Gunsx64/Snipers/mosin/tiny.rsi + - type: BallisticAmmoProvider + capacity: 10 + proto: CartridgeRifleLight762 + cycleable: false + whitelist: + tags: + - CartridgeRifle762 - type: Gun fireRate: 0.8 - type: Wieldable @@ -169,6 +176,12 @@ sprite: Backmen/Objects/Weapons/Gunsx64/Snipers/garand/tiny.rsi - type: Item sprite: Backmen/Objects/Weapons/Gunsx64/Snipers/garand/tiny.rsi + - type: BallisticAmmoProvider + capacity: 10 + proto: CartridgeRifleLight762UEG + whitelist: + tags: + - CartridgeRifle762UEG - type: Gun fireRate: 0.8 soundGunshot: diff --git a/Resources/Prototypes/_Backmen/Recipes/Lathes/security.yml b/Resources/Prototypes/_Backmen/Recipes/Lathes/security.yml index d69f6ab085f..93bfee0d2ba 100644 --- a/Resources/Prototypes/_Backmen/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/_Backmen/Recipes/Lathes/security.yml @@ -61,8 +61,8 @@ - type: latheRecipe parent: BaseAmmoRecipe - id: MagazinePistolSubMachineGunVector9x17 - result: MagazinePistolSubMachineGunVector9x17 + id: MagazinePistolSubMachineGunVector45ACP + result: MagazinePistolSubMachineGunVector45ACP materials: Steel: 300 diff --git a/Resources/Prototypes/_Backmen/tags.yml b/Resources/Prototypes/_Backmen/tags.yml index a9ba22a5ab1..e7ff9b6e173 100644 --- a/Resources/Prototypes/_Backmen/tags.yml +++ b/Resources/Prototypes/_Backmen/tags.yml @@ -194,7 +194,7 @@ id: MagazineSMG9x17 - type: Tag - id: MagazineSMGVector9x17 + id: MagazineSMGVector45ACP - type: Tag id: MagazineSMGScorpion9x17 From 93fbb76324006ddb692468f7fc007566321fa236 Mon Sep 17 00:00:00 2001 From: no_mad Date: Thu, 6 Feb 2025 17:50:22 +0900 Subject: [PATCH 12/16] rubber not rubbed --- .../Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml index 59178f4f34d..e9bb3acab37 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -259,12 +259,6 @@ components: - type: BallisticAmmoProvider proto: CartridgePistol - - type: Sprite - layers: - - state: rubber - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - type: entity id: MagazinePistolSubMachineGun From 6c92639cb74b59656a5eadd86233faf9b9be1fe9 Mon Sep 17 00:00:00 2001 From: no_mad Date: Thu, 6 Feb 2025 17:56:53 +0900 Subject: [PATCH 13/16] b --- .../Objects/Weapons/Guns/Ammunition/Boxes/boxes.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Boxes/boxes.yml b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Boxes/boxes.yml index cde06c92943..cbc5a95c6fe 100644 --- a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Boxes/boxes.yml +++ b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Ammunition/Boxes/boxes.yml @@ -113,17 +113,6 @@ id: MagazineBoxHeavyRifle50BMG name: ammunition box (.50 BMG) components: - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi - layers: - - state: base-b - map: ["enum.GunVisualLayers.Base"] - - state: magb-1 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: magb - steps: 4 - zeroVisible: false - type: BallisticAmmoProvider proto: BaseCartridgeRifleLightSniper capacity: 60 From be697d129c997ab8c20ef003f8685e9c36249b23 Mon Sep 17 00:00:00 2001 From: no_mad Date: Thu, 6 Feb 2025 18:03:51 +0900 Subject: [PATCH 14/16] Update antimateriel.yml --- .../Guns/Ammunition/Boxes/antimateriel.yml | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml index e0e446bb50d..63dbb32c228 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml @@ -25,27 +25,6 @@ - type: Appearance # Boxes -- type: entity - parent: BaseMagazineBoxAntiMateriel - id: MagazineBoxAntiMaterielBig - name: ammunition box (.60 anti-materiel) - categories: [ HideSpawnMenu ] - components: - - type: BallisticAmmoProvider - capacity: 30 - proto: CartridgeAntiMateriel - - type: Sprite - layers: - - state: base-b - map: ["enum.GunVisualLayers.Base"] - - state: magb-1 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: magb - steps: 4 - zeroVisible: false - - type: Appearance - - type: entity parent: BaseMagazineBoxAntiMateriel id: MagazineBoxAntiMateriel From 818844571700ecb27df88e2c213b4e7d9a0742a5 Mon Sep 17 00:00:00 2001 From: no_mad Date: Thu, 6 Feb 2025 21:12:09 +0900 Subject: [PATCH 15/16] lokalizacia --- Resources/Locale/en-US/armor/armor-examine.ftl | 2 +- Resources/Locale/en-US/damage/damage-types.ftl | 2 +- Resources/Locale/ru-RU/armor/armor-examine.ftl | 2 +- Resources/Locale/ru-RU/damage/damage-types.ftl | 1 + Resources/Prototypes/_Backmen/Damage/types.yml | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/en-US/armor/armor-examine.ftl b/Resources/Locale/en-US/armor/armor-examine.ftl index 9c571dcaa91..8a9447f7163 100644 --- a/Resources/Locale/en-US/armor/armor-examine.ftl +++ b/Resources/Locale/en-US/armor/armor-examine.ftl @@ -11,7 +11,7 @@ armor-damage-type-heat = Heat armor-damage-type-radiation = Radiation armor-damage-type-caustic = Caustic armor-damage-type-stun = Stunic -armor-damage-type-armor-piercing = Punching +armor-damage-type-armorpiercing = Punching armor-damage-type-bloodloss = Bloodloss armor-damage-type-asphyxiation = Asphyxiation armor-damage-type-cellular = Cellular diff --git a/Resources/Locale/en-US/damage/damage-types.ftl b/Resources/Locale/en-US/damage/damage-types.ftl index 0441015ee64..3a22706606b 100644 --- a/Resources/Locale/en-US/damage/damage-types.ftl +++ b/Resources/Locale/en-US/damage/damage-types.ftl @@ -15,4 +15,4 @@ damage-type-holy = Holy #backmen damage-type-stun = Stun -damage-type-armor-piercing = Punching +damage-type-armorpiercing = Punching diff --git a/Resources/Locale/ru-RU/armor/armor-examine.ftl b/Resources/Locale/ru-RU/armor/armor-examine.ftl index 60a57e8a313..75dbbdcbedc 100644 --- a/Resources/Locale/ru-RU/armor/armor-examine.ftl +++ b/Resources/Locale/ru-RU/armor/armor-examine.ftl @@ -11,7 +11,7 @@ armor-damage-type-heat = Высокотемпературный armor-damage-type-radiation = Радиационный armor-damage-type-caustic = Кислотный armor-damage-type-stun = Оглушающий -armor-damage-type-armor-piercing = Пробивающий +armor-damage-type-armorpiercing = Пробивающий armor-damage-type-bloodloss = От кровопотери armor-damage-type-asphyxiation = От удушения armor-damage-type-cellular = Клеточный diff --git a/Resources/Locale/ru-RU/damage/damage-types.ftl b/Resources/Locale/ru-RU/damage/damage-types.ftl index af05445becb..936726ccbd9 100644 --- a/Resources/Locale/ru-RU/damage/damage-types.ftl +++ b/Resources/Locale/ru-RU/damage/damage-types.ftl @@ -12,3 +12,4 @@ damage-type-shock = Электрические damage-type-slash = Порезы damage-type-structural = Структурные damage-type-holy = Святые +damage-type-armorpiercing = Пробивающий diff --git a/Resources/Prototypes/_Backmen/Damage/types.yml b/Resources/Prototypes/_Backmen/Damage/types.yml index 2b65794cb45..cdace8b8de3 100644 --- a/Resources/Prototypes/_Backmen/Damage/types.yml +++ b/Resources/Prototypes/_Backmen/Damage/types.yml @@ -1,5 +1,5 @@ - type: damageType id: ArmorPiercing - name: damage-type-armor-piercing + name: damage-type-armorpiercing armorCoefficientPrice: 2 armorFlatPrice: 10 From dd80e4924b76685e27c06e94a288f4284a2b5963 Mon Sep 17 00:00:00 2001 From: no_mad Date: Thu, 6 Feb 2025 21:12:25 +0900 Subject: [PATCH 16/16] offofskie pistoleti --- .../Objects/Weapons/Guns/Pistols/pistols.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 167e21e15f2..638e26d36e2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -40,21 +40,21 @@ slots: gun_magazine: name: Magazine - startingItem: MagazinePistol + startingItem: MagazinePistol9x17 insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg priority: 2 whitelist: tags: - - MagazinePistol + - MagazinePistol9x17 whitelistFailPopup: gun-magazine-whitelist-fail gun_chamber: name: Chamber - startingItem: CartridgePistol + startingItem: CartridgePistol9x17 priority: 1 whitelist: tags: - - CartridgePistol + - CartridgePistol9x17 - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot @@ -80,22 +80,21 @@ slots: gun_magazine: name: Magazine - startingItem: MagazinePistol + startingItem: MagazinePistol57x28 insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg priority: 2 whitelist: tags: - - MagazinePistol - - MagazinePistolHighCapacity + - MagazinePistol57x28 whitelistFailPopup: gun-magazine-whitelist-fail gun_chamber: name: Chamber - startingItem: CartridgePistol + startingItem: CartridgePistol57x28 priority: 1 whitelist: tags: - - CartridgePistol + - CartridgePistol57x28 - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot