Merge pull request #281 from Corvax-Frontier/NewNew

Обновление ДСБФ
Corvax-Frontier · Jun 11, 2024 · f7b6eb0 · f7b6eb0
2 parents 82e8687 + 90de8df
commit f7b6eb0
Show file tree

Hide file tree

Showing 202 changed files with 398 additions and 43 deletions.
diff --git a/Resources/Audio/Corvax/Weapons/Guns/Gunshots/enforser.ogg b/Resources/Audio/Corvax/Weapons/Guns/Gunshots/enforser.ogg
diff --git a/Resources/Audio/Corvax/Weapons/Guns/Gunshots/taser.ogg b/Resources/Audio/Corvax/Weapons/Guns/Gunshots/taser.ogg
diff --git a/Resources/Locale/ru-RU/corvax/_NF/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/corvax/_NF/store/uplink-catalog.ftl
@@ -1,3 +1,7 @@
+uplink-security-enforser-name = Енфорсер
+uplink-security-enforser-desc = Табельное оружие закрепленное за сотрудниками ДСБФ.
+uplink-security-dominator-name = Доминатор
+uplink-security-dominator-desc = Продвинутая версия обычного станнера, хранящая больший заряд и наносящая больше оглушения при попаданиях.
 uplink-security-vector-magazines-name = Магазины для Вектора .45
 uplink-security-vector-magazines-desc = Заводские магазины со стандартными патронами для Вектора .45ACP.
 uplink-security-vector-name = Вектор (.45)

diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/lockers/security.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/lockers/security.ftl
@@ -0,0 +1,6 @@
+ent-GunSafePistolEnforser = оружейный сейф Енфорсеров
+    .suffix = Енфорсер
+    .desc = { ent-GunSafe.desc }
+ent-GunSafeDominator = оружейный сейф Доминаторов
+    .suffix = Доминатор
+    .desc = { ent-GunSafe.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/neck/pins.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/neck/pins.ftl
@@ -16,3 +16,9 @@ ent-ClothingNeckSyndicakePin = значок Синдикекса
     .desc = Значок Синдикексов, на обратной стороне можно разглядеть ряд цифр "2559".
 ent-ClothingNeckVitezstviPin = значок Vitezstvi
     .desc = Значок корпорации Vitezstvi.
+ent-ClothingNeckStarBronzeBadge = бронзовый значок
+    .desc = Бронзовый знак отличия.
+ent-ClothingNeckStarSilverBadge = серебряный значок
+    .desc = Серебряный знак отличия.
+ent-ClothingNeckStarGoldBadge = золотой значок
+    .desc = Золотой знак отличия.
diff --git a/...le/ru-RU/ss14-ru/prototypes/corvax/entities/objects/weapons/guns/battery/battery_guns.ftl b/...le/ru-RU/ss14-ru/prototypes/corvax/entities/objects/weapons/guns/battery/battery_guns.ftl
@@ -0,0 +1,3 @@
+ent-WeaponDominator = доминатор
+    .desc = Продвинутая версия обычного станнера, хранящая больший заряд и наносящая больше оглушения при попаданиях.
+    .suffix = Пистолет
diff --git a/.../Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/weapons/guns/pistols/pistols.ftl b/.../Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/weapons/guns/pistols/pistols.ftl
@@ -0,0 +1,3 @@
+ent-WeaponPistolEnforser = Енфорсер
+    .desc = Табельное оружие закрепленное за сотрудниками департамента ДСБФ.
+    .suffix = Пистолет
diff --git a/Resources/Prototypes/Corvax/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Corvax/Catalog/Fills/Lockers/security.yml
@@ -0,0 +1,23 @@
+- type: entity
+  parent: GunSafe
+  id: GunSafePistolEnforser
+  name: enforser safe
+  suffix: Enforser
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponPistolEnforser
+      amount: 4
+    - id: MagazinePistol
+      amount: 8
+
+- type: entity
+  parent: GunSafe
+  id: GunSafeDominator
+  name: dominator safe
+  suffix: Dominator
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponDominator
+      amount: 4
diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Neck/pins.yml
@@ -141,3 +141,58 @@
     clothingVisuals:
       neck:
       - state: vit-equipped
+
+- type: entity
+  parent: ClothingNeckPinBase
+  id: BaseClothingNeckStarBadge
+  name: bronze badge
+  description: "Bronze badge of distinction."
+  abstract: true
+  components:
+  - type: CargoSellBlacklist
+
+- type: entity
+  parent: BaseClothingNeckStarBadge
+  id: ClothingNeckStarBronzeBadge
+  components:
+  - type: Sprite
+    sprite: Corvax/Clothing/Neck/Misc/pins.rsi
+    layers:
+    - state: bronze
+  - type: Clothing
+    sprite: Corvax/Clothing/Neck/Misc/pins.rsi
+    clothingVisuals:
+      neck:
+      - state: bronze-equipped
+
+- type: entity
+  parent: BaseClothingNeckStarBadge
+  id: ClothingNeckStarSilverBadge
+  name: silver badge
+  description: "Silver badge of distinction."
+  components:
+  - type: Sprite
+    sprite: Corvax/Clothing/Neck/Misc/pins.rsi
+    layers:
+    - state: silver
+  - type: Clothing
+    sprite: Corvax/Clothing/Neck/Misc/pins.rsi
+    clothingVisuals:
+      neck:
+      - state: silver-equipped
+
+- type: entity
+  parent: BaseClothingNeckStarBadge
+  id: ClothingNeckStarGoldBadge
+  name: gold badge
+  description: "Golden badge of distinction."
+  components:
+  - type: Sprite
+    sprite: Corvax/Clothing/Neck/Misc/pins.rsi
+    layers:
+    - state: gold
+  - type: Clothing
+    sprite: Corvax/Clothing/Neck/Misc/pins.rsi
+    clothingVisuals:
+      neck:
+      - state: gold-equipped
diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -0,0 +1,40 @@
+- type: entity
+  name: dominator
+  parent: BaseWeaponBatterySmall
+  id: WeaponDominator
+  description: "An advanced version of a conventional disabler that stores a larger charge and causes more stun when hit."
+  suffix: Pistol
+  components:
+  - type: Tag
+    tags:
+      - Taser
+      - Sidearm
+  - type: Sprite
+    sprite: Corvax/Objects/Weapons/Guns/Battery/dominator.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-unshaded-0
+        map: ["enum.GunVisualLayers.MagUnshaded"]
+        shader: unshaded
+  - type: Clothing
+    sprite: Corvax/Objects/Weapons/Guns/Battery/dominator.rsi
+    quickEquip: false
+    slots:
+      - suitStorage
+      - Belt
+  - type: Gun
+    fireRate: 2
+    soundGunshot:
+      path: /Audio/Corvax/Weapons/Guns/Gunshots/taser.ogg
+  - type: ProjectileBatteryAmmoProvider
+    proto: BulletDominator
+    fireCost: 50
+  - type: MagazineVisuals
+    magState: mag
+    steps: 4
+    zeroVisible: true
+  - type: Appearance
+  - type: GuideHelp
+    guides:
+    - Security
diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -0,0 +1,23 @@
+- type: entity
+  parent: BaseWeaponPistol
+  id: WeaponPistolEnforser
+  name: enforser
+  description: "Service weapons assigned to employees of the NFSD department."
+  suffix: Pistol
+  components:
+  - type: Sprite
+    sprite: Corvax/Objects/Weapons/Guns/Pistols/enforser.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-0
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Clothing
+    sprite: Corvax/Objects/Weapons/Guns/Pistols/enforser.rsi
+  - type: Gun
+    fireRate: 5
+    availableModes:
+    - SemiAuto
+    - FullAuto
+    soundGunshot:
+      path: /Audio/Corvax/Weapons/Guns/Gunshots/enforser.ogg
diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -0,0 +1,8 @@
+- type: entity
+  name : disabler bolt
+  id: BulletDominator
+  parent: BulletDisabler
+  noSpawn: true
+  components:
+  - type: StaminaDamageOnCollide
+    damage: 40
diff --git a/Resources/Prototypes/Corvax/_NF/Catalog/security_uplink_catalog.yml b/Resources/Prototypes/Corvax/_NF/Catalog/security_uplink_catalog.yml
@@ -1,3 +1,35 @@
+- type: listing
+  id: UplinkSecurityEnforser
+  name:  uplink-security-enforser-name
+  description: uplink-security-enforser-desc
+  productEntity: WeaponPistolEnforser
+  icon: { sprite: Corvax/Objects/Weapons/Guns/Pistols/enforser.rsi, state: icon }
+  cost:
+    FrontierUplinkCoin: 2
+  categories:
+    - UplinkSecurityWeapons
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - SecurityUplink
+
+- type: listing
+  id: UplinkSecurityDominator
+  name:  uplink-security-dominator-name
+  description: uplink-security-dominator-desc
+  productEntity: WeaponDominator
+  icon: { sprite: Corvax/Objects/Weapons/Guns/Battery/dominator.rsi, state: icon }
+  cost:
+    FrontierUplinkCoin: 3
+  categories:
+    - UplinkSecurityWeapons
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - SecurityUplink
+
 - type: listing
   id: UplinkSecurityVectorMagazines45
   name: uplink-security-vector-magazines-name

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -93,4 +93,5 @@
       - id: DoorRemoteNfsd
       - id: NfsdTechFabFlatpack
       - id: BaseSecurityUplinkRadioSheriff
-      - id: ClothingNeckNfsdBadgeSheriff
+      #- id: ClothingNeckNfsdBadgeSheriff Shit
+      - id: WeaponEnergyGunMultiphase # Corvax-Frontier
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -74,4 +74,5 @@
       - id: DoorRemoteNfsd
       - id: NfsdTechFabFlatpack
       - id: BaseSecurityUplinkRadioSheriff
-      - id: ClothingNeckNfsdBadgeSheriff
+      #- id: ClothingNeckNfsdBadgeSheriff Shit
+      - id: WeaponEnergyGunMultiphase # Corvax-Frontier
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -74,4 +74,5 @@
       - id: DoorRemoteNfsd
       - id: NfsdTechFabFlatpack
       - id: BaseSecurityUplinkRadioSheriff
-      - id: ClothingNeckNfsdBadgeSheriff
+      #- id: ClothingNeckNfsdBadgeSheriff Shit
+      - id: WeaponEnergyGunMultiphase # Corvax-Frontier
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsdarmory.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsdarmory.yml
@@ -65,7 +65,7 @@
   components:
   - type: StorageFill
     contents:
-    - id: WeaponPistolMk58
+    - id: WeaponPistolEnforser # Corvax-Frontier
       amount: 2
     - id: MagazinePistol
       amount: 4
@@ -88,7 +88,7 @@
       amount: 4
     - id: WeaponEnergyGun
       amount: 4
-    - id: WeaponPistolMk58
+    - id: WeaponPistolEnforser # Corvax-Frontier
       amount: 4
     - id: WeaponRevolverInspector
       amount: 4

diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots.yml
@@ -20,6 +20,11 @@
     sprite: _NF/Clothing/Shoes/Boots/nfsd_brown_boots.rsi
   - type: Clothing
     sprite: _NF/Clothing/Shoes/Boots/nfsd_brown_boots.rsi
+  - type: FootstepModifier # Corvax-Frontier
+    footstepSoundCollection:
+      collection: FootstepHeavy
+      params:
+        variation: 0.08
 
 - type: entity
   parent: ClothingShoesBootsCombat
@@ -30,4 +35,9 @@
   - type: Sprite
     sprite: _NF/Clothing/Shoes/Boots/nfsd_cream_boots.rsi
   - type: Clothing
-    sprite: _NF/Clothing/Shoes/Boots/nfsd_cream_boots.rsi
+    sprite: _NF/Clothing/Shoes/Boots/nfsd_cream_boots.rsi
+  - type: FootstepModifier # Corvax-Frontier
+    footstepSoundCollection:
+      collection: FootstepHeavy
+      params:
+        variation: 0.08
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml
@@ -27,6 +27,11 @@
     sprite: _NF/Clothing/Shoes/Boots/magboots-nfsd.rsi
   - type: Magboots
     toggleAction: ActionToggleMagbootsNfsd
+  - type: FootstepModifier # Corvax-Frontier
+    footstepSoundCollection:
+      collection: FootstepHeavy
+      params:
+        variation: 0.08
 
 - type: entity
   parent: ClothingShoesBootsMagCombat

diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/bailiff.yml b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/bailiff.yml
@@ -33,5 +33,6 @@
   id: BailiffGear
   equipment:
     ears: ClothingHeadsetAltNfsdGreen # Frontier
-    pocket1: WeaponPistolMk58 #WeaponPistolMk58Nonlethal
+    pocket1: WeaponPistolEnforser # Corvax-Frontier
     pocket2: HoloprojectorNfsd # Frontier
+    neck: ClothingNeckStarGoldBadge # Corvax-Frontier
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/brigmedic.yml b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/brigmedic.yml
@@ -23,4 +23,5 @@
   id: BrigmedicGear
   equipment:
     ears: ClothingHeadsetNfsdCreamMed # Frontier
-    pocket1: WeaponPistolMk58 #WeaponPistolMk58Nonlethal
+    pocket1: WeaponPistolEnforser # Corvax-Frontier
+    neck: ClothingNeckStarSilverBadge # Corvax-Frontier
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/cadet.yml b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/cadet.yml
@@ -24,5 +24,6 @@
   id: CadetGear
   equipment:
     ears: ClothingHeadsetNfsdBrown # Frontier
-    pocket1: WeaponPistolMk58 #WeaponPistolMk58Nonlethal
+    pocket1: WeaponPistolEnforser # Corvax-Frontier
     pocket2: BookSecurity
+    neck: ClothingNeckStarBronzeBadge # Corvax-Frontier
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/deputy.yml b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/deputy.yml
@@ -23,4 +23,5 @@
   id: DeputyGear
   equipment:
     ears: ClothingHeadsetNfsdBrown # Frontier
-    pocket1: WeaponPistolMk58 #WeaponPistolMk58Nonlethal
+    pocket1: WeaponPistolEnforser # Corvax-Frontier
+    neck: ClothingNeckStarSilverBadge # Corvax-Frontier
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/detectivenf.yml b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/detectivenf.yml
@@ -32,3 +32,4 @@
     ears: ClothingHeadsetNfsdCream
     pocket1: WeaponRevolverInspector
     pocket2: SpeedLoaderMagnum
+    neck: ClothingNeckStarSilverBadge # Corvax-Frontier
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/senior_officer.yml b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/senior_officer.yml
@@ -26,4 +26,5 @@
   id: SeniorOfficerGear
   equipment:
     ears: ClothingHeadsetAltNfsdBrown # Frontier
-    pocket1: WeaponPistolMk58 #WeaponPistolMk58Nonlethal
+    pocket1: WeaponPistolEnforser # Corvax-Frontier
+    neck: ClothingNeckStarGoldBadge # Corvax-Frontier
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/sheriff.yml b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/sheriff.yml
@@ -37,6 +37,6 @@
   id: SheriffGear
   equipment:
     ears: ClothingHeadsetAltNfsdCreamandBrown # Frontier
-    pocket1: WeaponPistolMk58 #WeaponPistolMk58Nonlethal
+    pocket1: ClothingNeckStarGoldBadge # Corvax-Frontier
     pocket2: HoloprojectorNfsd # Frontier
-    suitstorage: WeaponEnergyGunMultiphase # Frontier - DeltaV gun
+    suitstorage: WeaponPistolEnforser # Corvax-Frontier
diff --git a/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/bronze-equipped.png b/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/bronze-equipped.png
diff --git a/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/bronze.png b/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/bronze.png
diff --git a/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/gold-equipped.png b/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/gold-equipped.png
diff --git a/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/gold.png b/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/gold.png
diff --git a/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/meta.json b/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "This pixels made by @no_mad#0260",
+  "copyright": "Pixels made by @no_mad#0260, Bronze and Silver pins copyright by https://github.com/Aurorastation/Aurora.3, Gold resprite created by zekins3366",
   "size": {
     "x": 32,
     "y": 32
@@ -69,6 +69,27 @@
     {
       "name": "vit-equipped",
       "directions": 4
+    },
+    {
+      "name": "bronze"
+    },
+    {
+      "name": "bronze-equipped",
+      "directions": 4
+    },
+    {
+      "name": "silver"
+    },
+    {
+      "name": "silver-equipped",
+      "directions": 4
+    },
+    {
+      "name": "gold"
+    },
+    {
+      "name": "gold-equipped",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/silver-equipped.png b/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/silver-equipped.png
diff --git a/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/silver.png b/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/silver.png
diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Battery/dominator.rsi/base.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Battery/dominator.rsi/base.png
diff --git a/...es/Textures/Corvax/Objects/Weapons/Guns/Battery/dominator.rsi/equipped-BELT.png b/...es/Textures/Corvax/Objects/Weapons/Guns/Battery/dominator.rsi/equipped-BELT.png
diff --git a/...ures/Corvax/Objects/Weapons/Guns/Battery/dominator.rsi/equipped-SUITSTORAGE.png b/...ures/Corvax/Objects/Weapons/Guns/Battery/dominator.rsi/equipped-SUITSTORAGE.png
diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Battery/dominator.rsi/icon.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Battery/dominator.rsi/icon.png
diff --git a/...rces/Textures/Corvax/Objects/Weapons/Guns/Battery/dominator.rsi/inhand-left.png b/...rces/Textures/Corvax/Objects/Weapons/Guns/Battery/dominator.rsi/inhand-left.png
diff --git a/...ces/Textures/Corvax/Objects/Weapons/Guns/Battery/dominator.rsi/inhand-right.png b/...ces/Textures/Corvax/Objects/Weapons/Guns/Battery/dominator.rsi/inhand-right.png
diff --git a/...s/Textures/Corvax/Objects/Weapons/Guns/Battery/dominator.rsi/mag-unshaded-0.png b/...s/Textures/Corvax/Objects/Weapons/Guns/Battery/dominator.rsi/mag-unshaded-0.png
diff --git a/...s/Textures/Corvax/Objects/Weapons/Guns/Battery/dominator.rsi/mag-unshaded-1.png b/...s/Textures/Corvax/Objects/Weapons/Guns/Battery/dominator.rsi/mag-unshaded-1.png
diff --git a/...s/Textures/Corvax/Objects/Weapons/Guns/Battery/dominator.rsi/mag-unshaded-2.png b/...s/Textures/Corvax/Objects/Weapons/Guns/Battery/dominator.rsi/mag-unshaded-2.png
diff --git a/...s/Textures/Corvax/Objects/Weapons/Guns/Battery/dominator.rsi/mag-unshaded-3.png b/...s/Textures/Corvax/Objects/Weapons/Guns/Battery/dominator.rsi/mag-unshaded-3.png