Yaml8

Resources/Maps/Test/dev_map.yml

@@ -24859,13 +24859,13 @@ entities:
     - type: Transform
       pos: 67.5,41.5
       parent: 1
-- proto: WeaponShotgunCombat
-  entities:
-  - uid: 3506
-    components:
-    - type: Transform
-      pos: 73.5,49.5
-      parent: 1
+#- proto: WeaponShotgunCombat
+#  entities:
+#  - uid: 3506
+#    components:
+#    - type: Transform
+#      pos: 73.5,49.5
+#      parent: 1
 - proto: WeaponShotgunEnforcer
   entities:
   - uid: 2159

Resources/Maps/_Omu/Shuttles/CC-557.yml

@@ -10460,50 +10460,50 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: WeaponShotgunCombat
-  entities:
-  - uid: 263
-    components:
-    - type: Transform
-      parent: 258
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 264
-    components:
-    - type: Transform
-      parent: 258
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 265
-    components:
-    - type: Transform
-      parent: 258
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 268
-    components:
-    - type: Transform
-      parent: 258
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 269
-    components:
-    - type: Transform
-      parent: 258
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 270
-    components:
-    - type: Transform
-      parent: 258
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
+#- proto: WeaponShotgunCombat
+#  entities:
+#  - uid: 263
+#    components:
+#    - type: Transform
+#      parent: 258
+#    - type: Physics
+#      canCollide: False
+#    - type: InsideEntityStorage
+#  - uid: 264
+#    components:
+#    - type: Transform
+#      parent: 258
+#    - type: Physics
+#      canCollide: False
+#    - type: InsideEntityStorage
+#  - uid: 265
+#    components:
+#    - type: Transform
+#      parent: 258
+#    - type: Physics
+#      canCollide: False
+#    - type: InsideEntityStorage
+#  - uid: 268
+#    components:
+#    - type: Transform
+#      parent: 258
+#    - type: Physics
+#      canCollide: False
+#    - type: InsideEntityStorage
+#  - uid: 269
+#    components:
+#    - type: Transform
+#      parent: 258
+#    - type: Physics
+#      canCollide: False
+#    - type: InsideEntityStorage
+#  - uid: 270
+#    components:
+ #   - type: Transform
+ #     parent: 258
+#    - type: Physics
+#      canCollide: False
+#    - type: InsideEntityStorage
 - proto: WindoorSecureChemistryLocked
   entities:
   - uid: 77

Resources/Maps/_Omu/Shuttles/CC-800X.yml

@@ -20677,50 +20677,50 @@ entities:
       - CentralCommand
       severity: Restricted
     - type: InsideEntityStorage
-- proto: WeaponShotgunCombat
-  entities:
-  - uid: 491
-    components:
-    - type: Transform
-      parent: 490
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 493
-    components:
-    - type: Transform
-      parent: 490
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 495
-    components:
-    - type: Transform
-      parent: 490
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 506
-    components:
-    - type: Transform
-      parent: 490
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 507
-    components:
-    - type: Transform
-      parent: 490
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 508
-    components:
-    - type: Transform
-      parent: 490
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
+#- proto: WeaponShotgunCombat
+#  entities:
+#  - uid: 491
+#    components:
+#    - type: Transform
+#      parent: 490
+#    - type: Physics
+#      canCollide: False
+#    - type: InsideEntityStorage
+#  - uid: 493
+#    components:
+#    - type: Transform
+#      parent: 490
+#    - type: Physics
+#      canCollide: False
+#    - type: InsideEntityStorage
+#  - uid: 495
+#    components:
+#    - type: Transform
+#      parent: 490
+#    - type: Physics
+#      canCollide: False
+#    - type: InsideEntityStorage
+#  - uid: 506
+#    components:
+#    - type: Transform
+#      parent: 490
+#    - type: Physics
+#      canCollide: False
+#    - type: InsideEntityStorage
+#  - uid: 507
+#    components:
+#    - type: Transform
+#      parent: 490
+#    - type: Physics
+#      canCollide: False
+#    - type: InsideEntityStorage
+#  - uid: 508
+#    components:
+#    - type: Transform
+#      parent: 490
+#    - type: Physics
+#      canCollide: False
+#    - type: InsideEntityStorage
 - proto: WindoorSecureCentralCommandLocked
   entities:
   - uid: 208

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml

@@ -41,7 +41,7 @@
     damage:
       types:
         Piercing: 19
-      armorPenetration: 0.4 # Goobstation
+#      armorPenetration: 0.4 # Omu removed AP on .30
 
 - type: entity
   id: BulletLightRiflePractice

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -447,7 +447,7 @@
     - SecurityAmmoStaticOmu # Omu
     # Goobstation
     - SecurityWeaponsStaticGoob
-    - SecurityAmmoStaticGoob
+    #- SecurityAmmoStaticGoob Omu removed with 8 gauge
     - SyndicateAmmoLightStatic
     - ScienceExplosives
   - type: BlueprintReceiver
@@ -762,7 +762,7 @@
     - SecurityAmmoStatic
     - SecurityWeaponsStatic
     # Goobstation
-    - SecurityAmmoStaticGoob
+    #- SecurityAmmoStaticGoob Omu removed with 8 gauge
     - SecurityEquipmentStaticGoob
     - SecurityHypoStatic
     - MechWeaponsSecurityStatic
@@ -832,7 +832,7 @@
       staticPacks:
       - SecurityAmmoStatic
       # Goobstation Packs
-      - SecurityAmmoStaticGoob
+      #- SecurityAmmoStaticGoob Omu removed with 8 gauge
       - SecurityAmmoStaticOmu # Omu
     - type: EmagLatheRecipes # Goobstation Packs
       emagStaticPacks:

Resources/Prototypes/Research/arsenal.yml

@@ -111,7 +111,7 @@
   - MagazineRifleIncendiary
   - MagazinePistolIncendiary
   - MagazinePistolSubMachineGunIncendiary
-  - MagazineBoxShotgunIncendiaryHighCaliber # Goobstation
+#  - MagazineBoxShotgunIncendiaryHighCaliber # Goobstation
   - MagazineLightRifleIncendiary
   - SpeedLoaderMagnumIncendiary
   - MagazineShotgunIncendiary
@@ -163,7 +163,7 @@
   - MagazineShotgunBeanbag
   - BoxShellTranquilizer
   - BoxBeanbag
-  - MagazineBoxShotgunBeanbagHighCaliber # Goobstation
+#  - MagazineBoxShotgunBeanbagHighCaliber # Goobstation
   - WeaponDisabler
   - WeaponMechCombatDisabler # Goobstation
   # Goobstation R&D Console rework start
@@ -194,7 +194,7 @@
   - MagazineBoxLightRifleUranium
   - MagazineBoxRifleUranium
   - BoxShotgunUranium
-  - MagazineBoxShotgunUraniumHighCaliber # Goobstation
+#  - MagazineBoxShotgunUraniumHighCaliber # Goobstation
   # Goobstation R&D Console rework start
   position: 3,2
   technologyPrerequisites: