diff --git a/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl b/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl index f800aa2c8d..83e2e0c1ac 100644 --- a/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl +++ b/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl @@ -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 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index cf5297220c..2b4c5c9b36 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -308,7 +308,7 @@ id: LockerFillHeadOfSecurityNoHardsuit table: !type:AllSelector children: - - id: WeaponEnergyShotgun + - id: WeaponEnergyMagnum - id: BookSpaceLaw - id: BoxEncryptionKeySecurity - id: CigarGoldCase diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index a6add7f4b7..48bed23bc9 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -46,6 +46,7 @@ amount: 2 - id: NetworkConfigurator - id: Binoculars + - id: WeaponEnergyShotgun - type: entityTable id: FillLockerWardenHarduit diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 30967200d7..008c177aa5 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -815,7 +815,7 @@ - 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: @@ -853,20 +853,57 @@ 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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 2134ac0cbf..080f73bdb7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -1325,3 +1325,52 @@ 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 diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index 7cfbd2761e..a24e0f5dd3 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -22,7 +22,7 @@ CaptainGunStealObjective: 0.5 CaptainJetpackStealObjective: 0.5 HandTeleporterStealObjective: 0.5 - EnergyShotgunStealObjective: 0.5 + EnergyMagnumStealObjective: 0.5 - type: weightedRandom id: TraitorObjectiveGroupKill diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml index d25908d154..0a223bd97c 100644 --- a/Resources/Prototypes/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml @@ -85,11 +85,11 @@ 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 diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml index 5f3b22c30d..26a4db42a0 100644 --- a/Resources/Prototypes/Objectives/traitor.yml +++ b/Resources/Prototypes/Objectives/traitor.yml @@ -243,7 +243,7 @@ - type: entity parent: BaseTraitorStealObjective - id: EnergyShotgunStealObjective + id: EnergyMagnumStealObjective components: - type: Objective # HoS will have this on them a lot of the time so.. @@ -251,7 +251,7 @@ - type: NotJobRequirement job: HeadOfSecurity - type: StealCondition - stealGroup: WeaponEnergyShotgun + stealGroup: WeaponEnergyMagnum owner: job-name-hos ## ce diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml index 5dc1310be3..c7a2c9e983 100644 --- a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml +++ b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml @@ -91,9 +91,9 @@ - - 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]. - + - Stealing the [color=#f39f27]Chief Engineer[/color]'s [bold]advanced magboots[/bold]. 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 index 0000000000..56ff3c1509 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 index 0000000000..3f83ef42eb 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 index 0000000000..3f83ef42eb 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 index 0000000000..b5c9f8a1f7 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 index 0000000000..9384a6a861 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 index 0000000000..c2172122ea 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 index 0000000000..e1e5161e0a 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 index 0000000000..8f2e879b02 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 index 0000000000..6b863defb7 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 index 0000000000..7976821be1 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 index 0000000000..293dcbdcbd --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/meta.json @@ -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 index 0000000000..4f9199b2bc 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 index 0000000000..d35cd0a852 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 index 0000000000..73f61cbb15 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/meta.json @@ -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" + } + ] +}