]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
New head of security weapon:Energy Shotgun (#30643)
authorBoaz1111 <149967078+Boaz1111@users.noreply.github.com>
Mon, 19 Aug 2024 11:14:30 +0000 (13:14 +0200)
committerGitHub <noreply@github.com>
Mon, 19 Aug 2024 11:14:30 +0000 (21:14 +1000)
* Reset hopefully?

* removes the emergency security orders

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

Rewrites the description based on review

Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com>
* 7 shots, recharge taking 42 seconds

* minor renaming :godo:

* please work

* Revert "please work"

This reverts commit e84a2618d95ec17f5fd608331176df2ab8b0966c.

* please fix

---------

Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com>
24 files changed:
Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Resources/Prototypes/Entities/Objects/Misc/secret_documents.yml [deleted file]
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_shotgun.rsi/base.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-BACKPACK.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-SUITSTORAGE.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-1.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-2.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-3.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-4.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/heavylaser.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/meta.json

index a56c31566c85b64e5184985e7bbd90fce15a9647..45935be0acb9266ca80f0c02870ec8186b88e555 100644 (file)
   id: LockerFillHeadOfSecurityNoHardsuit
   table: !type:AllSelector
     children:
-    - id: BookSecretDocuments
+    - id: WeaponEnergyShotgun
     - id: BookSpaceLaw
     - id: BoxEncryptionKeySecurity
     - id: CigarGoldCase
     - 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 (file)
index 257aea8..0000000
+++ /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
index 5b8130567b3b2b8cca707c04cdfa875e5287f10b..3ae9a2302dd3c1dc2c9a74a183f83335d90f6e23 100644 (file)
   - 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
index 42217a88bbacc8a12e6f16e82a06940c23ebcd7c..57eb672848f2ef665982cebdfa1c053583eee36b 100644 (file)
   - 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
index fe1d8e352856d7d17738ba16c0760775956729fa..b6d727f880a3b05b858769c43d6a1f07bb15c0c3 100644 (file)
@@ -21,7 +21,7 @@
     CaptainGunStealObjective: 0.5
     CaptainJetpackStealObjective: 0.5
     HandTeleporterStealObjective: 0.5
-    SecretDocumentsStealObjective: 0.5
+    EnergyShotgunStealObjective: 0.5
 
 - type: weightedRandom
   id: TraitorObjectiveGroupKill
index 08c084027699ee138b00b273e0cec8188855dc38..a912a6ad8e753749cf5866aedda3cc994ac89011 100644 (file)
     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
     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
   sprite:
     sprite: Mobs/Animals/crab.rsi
     state: crab
+
+
index a686925c33e73ff75a9cafcdf0520b4fe5125165..419e7ac109282edd381c664cea757b7d982d645d 100644 (file)
 ## 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
index 78b950c690caaef65ce67129444419bb9ecce71d..3e48200e88ed141d5c5b8264fe7ab3e965026356 100644 (file)
@@ -86,9 +86,9 @@
     <GuideEntityEmbed Entity="ClothingOuterHardsuitRd" Caption=""/>
     <GuideEntityEmbed Entity="HandTeleporter" Caption=""/>
   </Box>
-  - 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].
   <Box>
-    <GuideEntityEmbed Entity="BookSecretDocuments" Caption=""/>
+    <GuideEntityEmbed Entity="WeaponEnergyShotgun" 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_shotgun.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/base.png
new file mode 100644 (file)
index 0000000..1d7177f
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 (file)
index 0000000..a382ba6
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 (file)
index 0000000..a382ba6
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 (file)
index 0000000..4cdf7dc
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 (file)
index 0000000..4d794f8
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 (file)
index 0000000..35f97fb
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 (file)
index 0000000..2008e39
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 (file)
index 0000000..bd4685d
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 (file)
index 0000000..9ffc003
--- /dev/null
@@ -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 (file)
index 0000000..8f7c40c
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 (file)
index 0000000..9b45368
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 (file)
index 0000000..2fcf294
--- /dev/null
@@ -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 (file)
index 0000000..056e602
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 (file)
index 0000000..d5933b2
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 (file)
index 0000000..4db201c
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/heavylaser.png differ
index f87ad790f69e9e9f3dc83d9131fbf2146a85ecb6..19d8b15dcc2ab2e6403e21dccda5f52d04d3d078 100644 (file)
@@ -46,6 +46,9 @@
           0.05
         ]
       ]
+    },
+    {
+      "name": "heavylaser"
     }
   ]
 }
\ No newline at end of file