diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index a56c31566c..45935be0ac 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: BookSecretDocuments + - id: WeaponEnergyShotgun - id: BookSpaceLaw - id: BoxEncryptionKeySecurity - id: CigarGoldCase @@ -375,4 +375,4 @@ - id: JetpackBlue - id: SpaceCash1000 - id: BeachBall - - id: BikeHorn + - id: BikeHorn \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Misc/secret_documents.yml b/Resources/Prototypes/Entities/Objects/Misc/secret_documents.yml deleted file mode 100644 index 257aea8268..0000000000 --- a/Resources/Prototypes/Entities/Objects/Misc/secret_documents.yml +++ /dev/null @@ -1,16 +0,0 @@ -- type: entity - parent: [BaseItem, BaseGrandTheftContraband] - id: BookSecretDocuments - name: "emergency security orders" - description: TOP SECRET. These documents specify the Emergency Orders that the HoS must carry out when ordered by Central Command. - components: - - type: Sprite - sprite: Objects/Misc/bureaucracy.rsi - layers: - - state: folder-sec-doc - - type: Tag - tags: - - Book - - HighRiskItem - - type: StealTarget - stealGroup: BookSecretDocuments 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 5b8130567b..3ae9a2302d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -717,3 +717,53 @@ - type: Appearance - type: StaticPrice price: 750 + +- type: entity + name: energy shotgun + parent: [BaseWeaponBattery, BaseGunWieldable] + 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: + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi + - type: Gun + fireRate: 2 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg + - type: ProjectileBatteryAmmoProvider + proto: BulletLaserSpread + fireCost: 150 + - type: BatteryWeaponFireModes + fireModes: + - proto: BulletLaserSpread + fireCost: 150 + - proto: BulletLaserHeavySpread + fireCost: 150 + - proto: BulletDisablerSmgSpread + fireCost: 150 + - type: Item + size: Large + shape: + - 0,0,3,1 + 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: 1050 + startingCharge: 1050 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 25 #takes 42 seconds to fully recharge, the answer to life, the universe and everything \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 42217a88bb..57eb672848 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -981,3 +981,88 @@ - type: Tag tags: - HideContextMenu + +- type: entity + name: laser bolt + id: BulletLaser + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Reflective + reflective: + - Energy + - type: FlyBySound + sound: + collection: EnergyMiss + params: + volume: 5 + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi + layers: + - state: heavylaser + shader: unshaded + - type: Physics + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.15,-0.3,0.15,0.3" + hard: false + mask: + - Impassable + - BulletImpassable + fly-by: *flybyfixture + - type: Ammo + - type: Projectile + impactEffect: BulletImpactEffectOrangeDisabler + damage: + types: + Heat: 10 + soundHit: + collection: WeakHit + forceSound: true + +- type: entity + name: wide laser barrage + id: BulletLaserSpread + noSpawn: true + parent: BulletLaser + components: + - type: ProjectileSpread + proto: BulletLaser + count: 5 #50 heat damage if you hit all your shots, but wide spread + spread: 30 + +- type: entity + name : heavy laser bolt + id: BulletLaserHeavy + parent: BulletLaser + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Heat: 15 + +- type: entity + name: narrow laser barrage + id: BulletLaserHeavySpread + noSpawn: true + parent: BulletLaser + components: + - type: ProjectileSpread + proto: BulletLaser + count: 3 #45 heat damage if you hit all your shots, but narrower spread + spread: 10 + +- type: entity + name: disabling laser barrage + id: BulletDisablerSmgSpread + noSpawn: true + parent: BulletDisablerSmg + components: + - type: ProjectileSpread + 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 \ No newline at end of file diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index fe1d8e3528..b6d727f880 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -21,7 +21,7 @@ CaptainGunStealObjective: 0.5 CaptainJetpackStealObjective: 0.5 HandTeleporterStealObjective: 0.5 - SecretDocumentsStealObjective: 0.5 + EnergyShotgunStealObjective: 0.5 - type: weightedRandom id: TraitorObjectiveGroupKill diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml index 08c0840276..a912a6ad8e 100644 --- a/Resources/Prototypes/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml @@ -28,13 +28,6 @@ sprite: Objects/Devices/hand_teleporter.rsi state: icon -- type: stealTargetGroup - id: BookSecretDocuments - name: "emergency security orders" - sprite: - sprite: Objects/Misc/bureaucracy.rsi - state: folder-sec-doc - - type: stealTargetGroup id: ClothingShoesBootsMagAdv name: advanced magboots @@ -84,6 +77,13 @@ sprite: Objects/Misc/nukedisk.rsi state: icon +- type: stealTargetGroup + id: WeaponEnergyShotgun + name: energy shotgun + sprite: + sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi + state: base + # Thief Collection - type: stealTargetGroup @@ -406,3 +406,5 @@ sprite: sprite: Mobs/Animals/crab.rsi state: crab + + diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml index a686925c33..419e7ac109 100644 --- a/Resources/Prototypes/Objectives/traitor.yml +++ b/Resources/Prototypes/Objectives/traitor.yml @@ -195,16 +195,17 @@ ## hos - type: entity + noSpawn: true parent: BaseTraitorStealObjective - id: SecretDocumentsStealObjective + id: EnergyShotgunStealObjective components: - type: Objective - # hos has a gun ce does not, higher difficulty than most + # HoS will have this on them a lot of the time so.. difficulty: 3 - type: NotJobRequirement job: HeadOfSecurity - type: StealCondition - stealGroup: BookSecretDocuments + stealGroup: WeaponEnergyShotgun owner: job-name-hos ## ce diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml index 78b950c690..3e48200e88 100644 --- a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml +++ b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml @@ -86,9 +86,9 @@ - - Stealing the [color=#cb0000]Head of Security[/color]'s [bold]secret documents[/bold]. + - Stealing the [color=#cb0000]Head of Security[/color]'s [bold]energy shotgun[/bold]. - + - Stealing the [color=#f39f27]Chief Engineer[/color]'s [bold]advanced magboots[/bold]. diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/base.png new file mode 100644 index 0000000000..1d7177f4ea Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..a382ba66ba Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..a382ba66ba Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/icon.png new file mode 100644 index 0000000000..4cdf7dc401 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000..4d794f8013 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000..35f97fbe14 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000..2008e393d1 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000..bd4685d5b0 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/meta.json new file mode 100644 index 0000000000..9ffc003082 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/meta.json @@ -0,0 +1,37 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Icon sprite made by Papermaker48 for SS14, other sprites made by Boaz1111 with that sprite as reference.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-left.png new file mode 100644 index 0000000000..8f7c40c4f9 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-right.png new file mode 100644 index 0000000000..9b45368663 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/meta.json new file mode 100644 index 0000000000..2fcf294bc9 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Energy Shotgun inhands made by Boaz1111 based on the energy shotgun icon sprite made by Papermaker48 for SS14", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "energy-inhand-left", + "directions": 4 + }, + { + "name": "energy-inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..056e6026ac Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..d5933b2f69 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/heavylaser.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/heavylaser.png new file mode 100644 index 0000000000..4db201c77c Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/heavylaser.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/meta.json index f87ad790f6..19d8b15dcc 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/meta.json @@ -46,6 +46,9 @@ 0.05 ] ] + }, + { + "name": "heavylaser" } ] } \ No newline at end of file