]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Head of Security's Energy Magnum (and Warden's Energy Shotgun) (#40615)
authorSpanky <180730777+spanky-spanky@users.noreply.github.com>
Tue, 7 Oct 2025 15:53:55 +0000 (11:53 -0400)
committerGitHub <noreply@github.com>
Tue, 7 Oct 2025 15:53:55 +0000 (15:53 +0000)
* Energy magnum and projectile protos, locker fills, and traitor objective updates.

* Fix objective

* Objective and .rsi tweaks

* Rewrite item description.

* Remove energy shotgun self charging and decrease magnum disabler cost.

* Bring magnum disabler fire cost in line with regular disabler.

* Bunch of sprite improvements including charge status visuals.

* whoops

* Minor sprite edit for clarity

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
23 files changed:
Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl
Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Resources/Prototypes/Catalog/Fills/Lockers/security.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
Resources/Prototypes/Objectives/objectiveGroups.yml
Resources/Prototypes/Objectives/stealTargetGroups.yml
Resources/Prototypes/Objectives/traitor.yml
Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/base.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/equipped-BELT.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/equipped-SUITSTORAGE.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-0.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-1.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-2.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-3.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/magnum.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/magnum_piercing.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/meta.json [new file with mode: 0644]

index f800aa2c8d046a018cb60991dd4b21d5bf664092..83e2e0c1acba19720e2dea0401bcbbf1b75e2917 100644 (file)
@@ -11,7 +11,7 @@ steal-target-groups-captain-id-card = captain ID card
 steal-target-groups-jetpack-captain-filled = captain's jetpack
 steal-target-groups-weapon-antique-laser = antique laser pistol
 steal-target-groups-nuke-disk = nuclear authentication disk
-steal-target-groups-weapon-energy-shot-gun = energy shotgun
+steal-target-groups-weapon-energy-magnum = energy magnum
 
 # Thief Collection
 steal-target-groups-figurines = figurine
index cf5297220c2fb8015987fbfec871a80d56968e99..2b4c5c9b36eca17b1ac91bbd599332ba16a682a5 100644 (file)
   id: LockerFillHeadOfSecurityNoHardsuit
   table: !type:AllSelector
     children:
-    - id: WeaponEnergyShotgun
+    - id: WeaponEnergyMagnum
     - id: BookSpaceLaw
     - id: BoxEncryptionKeySecurity
     - id: CigarGoldCase
index a6add7f4b7b03b1399b69d8404c83c2e8d9a1cad..48bed23bc9bb834d9d5c0c8e8a1683987d4e9dba 100644 (file)
@@ -46,6 +46,7 @@
       amount: 2
     - id: NetworkConfigurator
     - id: Binoculars
+    - id: WeaponEnergyShotgun
 
 - type: entityTable
   id: FillLockerWardenHarduit
index 30967200d787028151954aff86a947bbc72968b2..008c177aa5f42883bc1dd98bebff69650df9b9d2 100644 (file)
 
 - type: entity
   name: energy shotgun
-  parent: [BaseWeaponBattery, BaseGunWieldable, BaseGrandTheftContraband]
+  parent: [BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband]
   id: WeaponEnergyShotgun
   description: A one-of-a-kind prototype energy weapon that uses various shotgun configurations. It offers the possibility of both lethal and non-lethal shots, making it a versatile weapon.
   components:
     size: Large
     sprite: Objects/Weapons/Guns/Battery/inhands_64x.rsi
     heldPrefix: energy
-  - type: Tag
-    tags:
-    - HighRiskItem
-  - type: StealTarget
-    stealGroup: WeaponEnergyShotgun
   - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
   - type: Battery
     maxCharge: 1200
     startingCharge: 1200
+
+- type: entity
+  name: energy magnum
+  parent: [BaseWeaponBatterySmall, BaseGrandTheftContraband]
+  id: WeaponEnergyMagnum
+  description: A high powered self-charging energy pistol designed for elite security personnel. It has has three firing modes allowing for either high damage, window piercing, or non-lethal disabling.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Battery/energy_magnum.rsi
+    layers:
+    - state: base
+      map: [ "enum.GunVisualLayers.Base" ]
+    - state: mag-unshaded-1
+      visible: false
+      map: [ "enum.GunVisualLayers.MagUnshaded" ]
+      shader: unshaded
+  - type: MagazineVisuals
+    magState: mag
+    steps: 4
+    zeroVisible: true
+  - type: Appearance
+  - type: Clothing
+    sprite: Objects/Weapons/Guns/Battery/energy_magnum.rsi
+  - type: Tag
+    tags:
+    - HighRiskItem
+  - type: StealTarget
+    stealGroup: WeaponEnergyMagnum
+  - type: Gun
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
+  - type: ProjectileBatteryAmmoProvider
+    proto: BulletLaserMagnum
+    fireCost: 150
+  - type: BatteryWeaponFireModes
+    fireModes:
+    - proto: BulletLaserMagnum
+      fireCost: 150
+    - proto: BulletLaserWindowPiercingMagnum
+      fireCost: 150
+    - proto: BulletDisabler
+      fireCost: 62.5
   - type: BatterySelfRecharger
     autoRecharge: true
-    autoRechargeRate: 24
+    autoRechargeRate: 48
     autoRechargePause: true
-    autoRechargePauseTime: 30
+    autoRechargePauseTime: 10
 
 - type: entity
   name: temperature gun
index 2134ac0cbf6e2cecb99b63427e7291b2247c0341..080f73bdb7b4e1e91a09cd50af649bf956b9afa7 100644 (file)
     proto: BulletDisablerSmg
     count: 3 #bit stronger than a disabler if you hit your shots you goober, still not a 2 hit stun though
     spread: 9
+
+- type: entity
+  name: magnum laser bolt
+  id: BulletLaserMagnum
+  categories: [ HideSpawnMenu ]
+  parent: BulletLaser
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi
+    layers:
+    - state: magnum
+      shader: unshaded
+  - type: PointLight
+    enabled: true
+    color: "#ff4300"
+  - type: Projectile
+    impactEffect: BulletImpactEffectOrangeDisabler
+    damage:
+      types:
+        Heat: 30
+
+- type: entity
+  name: magnum window-piercing bolt
+  id: BulletLaserWindowPiercingMagnum
+  categories: [ HideSpawnMenu ]
+  parent: BulletLaser
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi
+    layers:
+    - state: magnum_piercing
+      shader: unshaded
+  - type: PointLight
+    enabled: true
+    color: "#ff4300"
+  - type: Projectile
+    impactEffect: BulletImpactEffectOrangeDisabler
+    damage:
+      types:
+        Heat: 20
+  - type: Fixtures
+    fixtures:
+      projectile:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.1,-0.1,0.1,0.1"
+        hard: false
+        mask:
+        - Opaque
index 7cfbd2761e778a900b152dd59a0ed530aa2f7a18..a24e0f5dd3349559bc5ff6731305d25835d26e4f 100644 (file)
@@ -22,7 +22,7 @@
     CaptainGunStealObjective: 0.5
     CaptainJetpackStealObjective: 0.5
     HandTeleporterStealObjective: 0.5
-    EnergyShotgunStealObjective: 0.5
+    EnergyMagnumStealObjective: 0.5
 
 - type: weightedRandom
   id: TraitorObjectiveGroupKill
index d25908d154fd03cc5e21ef9a6a605f038239457b..0a223bd97c9f733cf586340c302563a24d8f2a81 100644 (file)
     state: icon
 
 - type: stealTargetGroup
-  id: WeaponEnergyShotgun
-  name: steal-target-groups-weapon-energy-shot-gun
+  id: WeaponEnergyMagnum
+  name: steal-target-groups-weapon-energy-magnum
   sprite:
-    sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi
-    state: base
+    sprite: Objects/Weapons/Guns/Battery/energy_magnum.rsi
+    state: icon
 
 # Thief Collection
 
index 5f3b22c30d36210179aacbf000ac8277d1e157e1..26a4db42a07ff663115b4a29269fbf99eafd6409 100644 (file)
 
 - type: entity
   parent: BaseTraitorStealObjective
-  id: EnergyShotgunStealObjective
+  id: EnergyMagnumStealObjective
   components:
   - type: Objective
     # HoS will have this on them a lot of the time so..
   - type: NotJobRequirement
     job: HeadOfSecurity
   - type: StealCondition
-    stealGroup: WeaponEnergyShotgun
+    stealGroup: WeaponEnergyMagnum
     owner: job-name-hos
 
 ## ce
index 5dc1310be3bd95a7c3c0b154a1f17b1814dfee82..c7a2c9e983c3317998b76a1bd04e8c288f4db2fd 100644 (file)
@@ -91,9 +91,9 @@
     <GuideEntityEmbed Entity="ClothingOuterHardsuitRd" Caption=""/>
     <GuideEntityEmbed Entity="HandTeleporter" Caption=""/>
   </Box>
-  - Stealing the [color=#cb0000]Head of Security[/color]'s [bold]energy shotgun[/bold].
+  - Stealing the [color=#cb0000]Head of Security[/color]'s [bold]energy magnum[/bold].
   <Box>
-    <GuideEntityEmbed Entity="WeaponEnergyShotgun" Caption=""/>
+    <GuideEntityEmbed Entity="WeaponEnergyMagnum" Caption=""/>
   </Box>
   - Stealing the [color=#f39f27]Chief Engineer[/color]'s [bold]advanced magboots[/bold].
   <Box>
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/base.png
new file mode 100644 (file)
index 0000000..56ff3c1
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/equipped-BELT.png
new file mode 100644 (file)
index 0000000..3f83ef4
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/equipped-SUITSTORAGE.png
new file mode 100644 (file)
index 0000000..3f83ef4
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/icon.png
new file mode 100644 (file)
index 0000000..b5c9f8a
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..9384a6a
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..c217212
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-0.png
new file mode 100644 (file)
index 0000000..e1e5161
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-0.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-1.png
new file mode 100644 (file)
index 0000000..8f2e879
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-2.png
new file mode 100644 (file)
index 0000000..6b863de
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-2.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-3.png
new file mode 100644 (file)
index 0000000..7976821
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-3.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/meta.json
new file mode 100644 (file)
index 0000000..293dcbd
--- /dev/null
@@ -0,0 +1,53 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-SA-3.0",
+    "copyright": "Created by BoskiYourk (GitHub), edited by spanky-spanky (GitHub)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-3"
+        },
+        {
+            "name": "mag-unshaded-2"
+        },
+        {
+            "name": "mag-unshaded-1"
+        },
+        {
+            "name": "mag-unshaded-0",
+            "delays": [
+                [
+                    0.35,
+                    0.35,
+                    0.35,
+                    0.35
+                ]
+            ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/magnum.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/magnum.png
new file mode 100644 (file)
index 0000000..4f9199b
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/magnum.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/magnum_piercing.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/magnum_piercing.png
new file mode 100644 (file)
index 0000000..d35cd0a
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/magnum_piercing.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/meta.json
new file mode 100644 (file)
index 0000000..73f61cb
--- /dev/null
@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Created by BoskiYourk (GitHub)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "magnum"
+    },
+    {
+      "name": "magnum_piercing"
+    }
+  ]
+}