HOS energy shotgun removal (#1723)

* hos shotgun removal * Update battery_guns.yml fix comment
SerbiaStrong-220 · Sep 2, 2024 · 1023654 · 1023654
1 parent 1bc70e2
commit 1023654
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 26 deletions.
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -323,7 +323,7 @@
   id: LockerFillHeadOfSecurityNoHardsuit
   table: !type:AllSelector
     children:
-    - id: WeaponEnergyShotgun
+    #- id: WeaponEnergyShotgun #SS220 Energy shotgun removal
     - id: BookSpaceLaw
     - id: BoxEncryptionKeySecurity
     - id: CigarGoldCase

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -818,15 +818,17 @@
     - 0,0,3,1
     sprite: Objects/Weapons/Guns/Battery/inhands_64x.rsi
     heldPrefix: energy
-  - type: Tag
-    tags:
-    - HighRiskItem
-  - type: StealTarget
-    stealGroup: WeaponEnergyShotgun
+  #- type: Tag
+    #SS220 HOS shotgun removal begin
+    #tags:
+    #- HighRiskItem
+  #- type: StealTarget
+    #stealGroup: WeaponEnergyShotgun
+    #SS220 HOS shotgun removal end
   - 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
+    autoRechargeRate: 25 #takes 42 seconds to fully recharge, the answer to life, the universe and everything
diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml
@@ -76,13 +76,15 @@
   sprite:
     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
+
+#SS220 HOS shotgun removal begin
+#- type: stealTargetGroup
+  #id: WeaponEnergyShotgun
+  #name: energy shotgun
+  #sprite:
+    #sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi
+    #state: base
+#SS220 HOS shotgun removal end
 
 # Thief Collection
 

diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml
@@ -200,19 +200,21 @@
 
 ## hos
 
-- type: entity
-  noSpawn: true
-  parent: BaseTraitorStealObjective
-  id: EnergyShotgunStealObjective
-  components:
-  - type: Objective
+#SS220 HOS shotgun removal begin
+#- type: entity
+  #noSpawn: true
+  #parent: BaseTraitorStealObjective
+  #id: EnergyShotgunStealObjective
+  #components:
+  #- type: Objective
     # HoS will have this on them a lot of the time so..
-    difficulty: 3
-  - type: NotJobRequirement
-    job: HeadOfSecurity
-  - type: StealCondition
-    stealGroup: WeaponEnergyShotgun
-    owner: job-name-hos
+    #difficulty: 3
+  #- type: NotJobRequirement
+    #job: HeadOfSecurity
+  #- type: StealCondition
+    #stealGroup: WeaponEnergyShotgun
+    #owner: job-name-hos
+##SS220 HOS shotgun removal end
 
 ## ce