Add the N1984 pistol (#23775)

diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
index 429f4c20250f50a20550d9d866f5d6b53029e4cf..b961659c0825103f06272e569775b7ddda872e17 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -252,7 +252,7 @@
         - id: RegenerativeMesh
         - id: BoxZiptie
         - id: CrowbarRed
-        - id: MagazinePistol
+        - id: MagazineMagnum
 
 - type: entity
   noSpawn: true

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
index b65dac5d15a8c62ea6d5f382fd22ceb176a702ee..bd7cd11e5c273990b60e9c853412309946a86cf0 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
@@ -1,3 +1,19 @@
+- type: entity
+  id: BaseMagazineMagnum
+  name: pistol magazine (.45 magnum)
+  parent: BaseMagazinePistol
+  abstract: true
+  components:
+  - type: Tag
+    tags:
+      - MagazineMagnum
+  - type: BallisticAmmoProvider
+    mayTransfer: true
+    whitelist:
+      tags:
+        - CartridgeMagnum
+    capacity: 7
+
 - type: entity
   id: BaseMagazineMagnumSubMachineGun
   name: "Vector magazine (.45 magnum)"
@@ -31,6 +47,48 @@
     zeroVisible: false
   - type: Appearance
 
+- type: entity
+  id: MagazineMagnum
+  name: pistol magazine (.45 magnum)
+  parent: BaseMagazineMagnum
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnum
+  - type: Sprite
+    layers:
+    - state: red
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: MagazineMagnumPractice
+  name: pistol magazine (.45 magnum practice)
+  parent: BaseMagazineMagnum
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnum
+  - type: Sprite
+    layers:
+    - state: practice
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: MagazineMagnumRubber
+  name: pistol magazine (.45 magnum rubber)
+  parent: BaseMagazineMagnum
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnum
+  - type: Sprite
+    layers:
+    - state: rubber
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
 - type: entity
   id: MagazineMagnumSubMachineGun
   name: "Vector magazine (.45 magnum)"

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
index 806b1762b1a84d81616f88ab595f9b7f1df6104a..3addaad731c3d32b71b7a061aec92bda4097e4cb 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -194,3 +194,71 @@
         whitelist:
           tags:
             - CartridgePistol
+
+- type: entity
+  name: N1984
+  parent: BaseWeaponPistol
+  id: WeaponPistolN1984 # the spaces in description are for formatting.
+  description: The sidearm of any self respecting officer.     Comes in .45 magnum, the lord's caliber. 
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Pistols/N1984.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-0
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Clothing
+    sprite: Objects/Weapons/Guns/Pistols/N1984.rsi
+  - type: Gun
+    minAngle: 1
+    maxAngle: 20
+    angleIncrease: 8
+    angleDecay: 4
+    fireRate: 4
+    availableModes:
+    - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/mk58.ogg
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazineMagnum
+        insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazineMagnum
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgeMagnum
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgeMagnum
+
+- type: entity
+  name: N1984
+  parent: WeaponPistolN1984
+  id: WeaponPistolN1984Nonlethal
+  components:
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazineMagnumRubber
+        insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazineMagnum
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgeMagnumRubber
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgeMagnum

diff --git a/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml b/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml
index e712b943d54e2cc8cb3506d6381fadf51b0f0453..37c73f38e02c74feb57b72e916b74b0972c514f9 100644 (file)
--- a/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml
@@ -24,5 +24,6 @@
     outerClothing: ClothingOuterArmorBasic
     id: CentcomPDA
     ears: ClothingHeadsetAltCentCom
+    belt: WeaponPistolN1984
     pocket1: BoxFolderBlack
     pocket2: PenCentcom

diff --git a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
index c7f08e0af78b5eabf775e6a3dc2d23e7b99cc100..01eb7a5f88a02b28cbfe141d51dcfb801089c302 100644 (file)
--- a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
@@ -27,7 +27,7 @@
     id: ERTLeaderPDA
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58Nonlethal
+    pocket1: WeaponPistolN1984Nonlethal
     pocket2: FlashlightSeclite
 
 - type: startingGear
@@ -44,7 +44,7 @@
     id: ERTLeaderPDA
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58Nonlethal
+    pocket1: WeaponPistolN1984Nonlethal
     pocket2: FlashlightSeclite
 
 - type: startingGear

diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/base.png
new file mode 100644 (file)
index 0000000..984060b
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/base.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/bolt-open.png
new file mode 100644 (file)
index 0000000..92f2c6e
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/bolt-open.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/equipped-BELT.png
new file mode 100644 (file)
index 0000000..ab0d0a8
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/equipped-BELT.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/icon.png
new file mode 100644 (file)
index 0000000..bbe6128
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..73e6d63
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..443e6d2
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/mag-0.png
new file mode 100644 (file)
index 0000000..c661c6d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/mag-0.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/meta.json
new file mode 100644 (file)
index 0000000..9ca4968
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Created by IProduceWidgets (github) to make the style of desertrose at https://github.com/DesertRose2/desertrose/commit/120961e254d7f83a6e00a02c76e734f9e5019345, https://github.com/DesertRose2/desertrose/blob/master/icons/obj/guns/projectile.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        }
+    ]
+}