diff --git a/Resources/Maps/Test/dev_map.yml b/Resources/Maps/Test/dev_map.yml index 23d2078f1d1..037dacc7a19 100644 --- a/Resources/Maps/Test/dev_map.yml +++ b/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 diff --git a/Resources/Maps/_Omu/Shuttles/CC-557.yml b/Resources/Maps/_Omu/Shuttles/CC-557.yml index f76ca61eea5..9b7a2348459 100644 --- a/Resources/Maps/_Omu/Shuttles/CC-557.yml +++ b/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 diff --git a/Resources/Maps/_Omu/Shuttles/CC-800X.yml b/Resources/Maps/_Omu/Shuttles/CC-800X.yml index c58b575f86f..ebb76c8b770 100644 --- a/Resources/Maps/_Omu/Shuttles/CC-800X.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml index 96e5777456c..f4b6d366129 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index a622cbe9dd8..9d0c660328c 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/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: diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 2d234b175b1..a6b96f182bb 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/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: diff --git a/Resources/Prototypes/_Goobstation/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Goobstation/Catalog/uplink_catalog.yml index 73d0166a1b0..7343cc2bb03 100644 --- a/Resources/Prototypes/_Goobstation/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_Goobstation/Catalog/uplink_catalog.yml @@ -334,10 +334,9 @@ - UplinkWeaponry conditions: - !type:StoreWhitelistCondition - blacklist: + whitelist: tags: - - ContractorUplink #cheaper for contractors - - NukeOpsUplink + - SurplusBundle #Omu makes it only appear in surplus - contractors can still buy as normal! - !type:ListingLimitedStockCondition stock: 1 @@ -436,21 +435,21 @@ tags: - ContractorUplink -- type: listing - id: UplinkWeaponShotgunHeavy - name: uplink-weapon-heavy-shotgun-name - description: uplink-weapon-heavy-shotgun-desc - icon: { sprite: /Textures/_Goobstation/Objects/Weapons/Guns/Shotguns/magshot.rsi, state: icon } - productEntity: WeaponShotgunHeavy - cost: - Telecrystal: 200 - categories: - - UplinkWeaponry - conditions: - - !type:StoreWhitelistCondition - blacklist: - tags: - - ContractorUplink +#- type: listing +# id: UplinkWeaponShotgunHeavy +# name: uplink-weapon-heavy-shotgun-name +# description: uplink-weapon-heavy-shotgun-desc +# icon: { sprite: /Textures/_Goobstation/Objects/Weapons/Guns/Shotguns/magshot.rsi, state: icon } +# productEntity: WeaponShotgunHeavy +# cost: +# Telecrystal: 200 +# categories: +# - UplinkWeaponry +# conditions: +# - !type:StoreWhitelistCondition +# blacklist: +# tags: +# - ContractorUplink - type: listing id: UplinkBowHardlight @@ -546,20 +545,20 @@ tags: - ContractorUplink -- type: listing - id: UplinkWeaponCombatShotgun - name: uplink-combat-shotgun-name - description: uplink-combat-shotgun-desc - productEntity: WeaponShotgunCombat - cost: - Telecrystal: 50 - categories: - - UplinkWeaponry - conditions: - - !type:StoreWhitelistCondition - blacklist: - tags: - - ContractorUplink +#- type: listing +# id: UplinkWeaponCombatShotgun +# name: uplink-combat-shotgun-name +# description: uplink-combat-shotgun-desc +# productEntity: WeaponShotgunCombat +# cost: +# Telecrystal: 50 +# categories: +# - UplinkWeaponry +# conditions: +# - !type:StoreWhitelistCondition +# blacklist: +# tags: +# - ContractorUplink # Wearables @@ -910,6 +909,11 @@ Telecrystal: 24 categories: - UplinkChemicals + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - SurplusBundle #Omu makes it only appear in surplus - type: listing id: UplinkSyndicateLollypopBundle @@ -1117,8 +1121,7 @@ - !type:StoreWhitelistCondition whitelist: tags: - - LoneOpsUplink - + - SurplusBundle #Omu makes it only appear in surplus - type: listing id: UplinkClothingOuterDavidsJacketValid @@ -1182,9 +1185,9 @@ - UplinkImplants conditions: - !type:StoreWhitelistCondition - blacklist: + whitelist: tags: - - ContractorUplink + - SurplusBundle #Omu makes it only appear in surplus - type: listing id: UplinkAutosurgeonJumpstarter @@ -1350,37 +1353,37 @@ # categories: # - UplinkAmmo -- type: listing - id: UplinkMagazineShotgunHeavy - name: uplink-heavy-shotgun-magazine-name - description: uplink-heavy-shotgun-magazine-desc - icon: { sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/heavy_shotgun.rsi, state: icon } - productEntity: MagazineShotgunHeavy - cost: - Telecrystal: 30 - categories: - - UplinkAmmo - conditions: - - !type:StoreWhitelistCondition - blacklist: - tags: - - ContractorUplink +#- type: listing +# id: UplinkMagazineShotgunHeavy +# name: uplink-heavy-shotgun-magazine-name +# description: uplink-heavy-shotgun-magazine-desc +# icon: { sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/heavy_shotgun.rsi, state: icon } +# productEntity: MagazineShotgunHeavy +# cost: +# Telecrystal: 30 +# categories: +# - UplinkAmmo +# conditions: +# - !type:StoreWhitelistCondition +# blacklist: +# tags: +# - ContractorUplink -- type: listing - id: UplinkMagazineShotgunHeavySlug - name: uplink-heavy-shotgun-magazine-slug-name - description: uplink-heavy-shotgun-magazine-slug-desc - icon: { sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/heavy_shotgun.rsi, state: icon2 } - productEntity: MagazineShotgunHeavySlug - cost: - Telecrystal: 40 - categories: - - UplinkAmmo - conditions: - - !type:StoreWhitelistCondition - blacklist: - tags: - - ContractorUplink +#- type: listing +# id: UplinkMagazineShotgunHeavySlug +# name: uplink-heavy-shotgun-magazine-slug-name +# description: uplink-heavy-shotgun-magazine-slug-desc +# icon: { sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/heavy_shotgun.rsi, state: icon2 } +# productEntity: MagazineShotgunHeavySlug +# cost: +# Telecrystal: 40 +# categories: +# - UplinkAmmo +# conditions: +# - !type:StoreWhitelistCondition +# blacklist: +# tags: +# - ContractorUplink - type: listing id: UplinkM90Ammo @@ -1456,21 +1459,21 @@ tags: - ContractorUplink -- type: listing - id: UplinkMagazinePistolCaselessRifleSAPHE - name: uplink-pistol-magazine-caseless-saphe-name - description: uplink-pistol-magazine-caseless-saphe-desc - icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi, state: base } - productEntity: MagazinePistolCaselessRifleSAPHE - cost: - Telecrystal: 5 # 23 damage but ~1/3 of a rifle magazine and semi armor piercing, remember the damage is 13 pierce 10.5 explosive - categories: - - UplinkAmmo - conditions: - - !type:StoreWhitelistCondition - blacklist: - tags: - - ContractorUplink +#- type: listing Omu removed. +# id: UplinkMagazinePistolCaselessRifleSAPHE +# name: uplink-pistol-magazine-caseless-saphe-name +# description: uplink-pistol-magazine-caseless-saphe-desc +# icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi, state: base } +# productEntity: MagazinePistolCaselessRifleSAPHE +# cost: +# Telecrystal: 5 # 23 damage but ~1/3 of a rifle magazine and semi armor piercing, remember the damage is 13 pierce 10.5 explosive +# categories: +# - UplinkAmmo +# conditions: +# - !type:StoreWhitelistCondition +# blacklist: +# tags: +# - ContractorUplink - type: listing id: UplinkMagazineM7S @@ -1518,69 +1521,71 @@ tags: - ContractorUplink -- type: listing - id: UplinkBox8Gauge - name: uplink-high-caliber-shotgun-box-name - description: uplink-high-caliber-shotgun-box-desc - icon: { sprite: Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi, state: icon-lethal } - productEntity: MagazineBoxShotgunHighCaliber - cost: - Telecrystal: 10 - categories: - - UplinkAmmo - conditions: - - !type:StoreWhitelistCondition - blacklist: - tags: - - ContractorUplink +#- type: listing Omu commented out - remove 8 gauge +# id: UplinkBox8Gauge +# name: uplink-high-caliber-shotgun-box-name +# description: uplink-high-caliber-shotgun-box-desc +# icon: { sprite: Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi, state: icon-lethal } +# productEntity: MagazineBoxShotgunHighCaliber +# cost: +# Telecrystal: 10 +# categories: +# - UplinkAmmo +# conditions: +# - !type:StoreWhitelistCondition +# blacklist: +# tags: +# - ContractorUplink -- type: listing - id: UplinkBox8GaugeSlug - name: uplink-high-caliber-shotgun-box-slug-name - description: uplink-high-caliber-shotgun-box-slug-desc - icon: { sprite: Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi, state: icon-slug } - productEntity: MagazineBoxShotgunSlugHighCaliber - cost: - Telecrystal: 8 - categories: - - UplinkAmmo - conditions: - - !type:StoreWhitelistCondition - blacklist: - tags: - - ContractorUplink +#- type: listing +# id: UplinkBox8GaugeSlug +# name: uplink-high-caliber-shotgun-box-slug-name +# description: uplink-high-caliber-shotgun-box-slug-desc +# icon: { sprite: Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi, state: icon-slug } +# productEntity: MagazineBoxShotgunSlugHighCaliber +# cost: +# Telecrystal: 8 +# categories: +# - UplinkAmmo +# conditions: +# - !type:StoreWhitelistCondition +# blacklist: +# tags: +# - ContractorUplink -- type: listing - id: UplinkBox8GaugeFlash - name: uplink-high-caliber-shotgun-box-flash-slug-name - description: uplink-high-caliber-shotgun-box-flash-slug-desc - icon: { sprite: Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi, state: icon-incendiary } - productEntity: MagazineBoxShotgunHighCaliberFlash - cost: - Telecrystal: 1 - categories: - - UplinkAmmo - conditions: - - !type:StoreWhitelistCondition - blacklist: - tags: - - ContractorUplink +#- type: listing +# id: UplinkBox8GaugeFlash +# name: uplink-high-caliber-shotgun-box-flash-slug-name +# description: uplink-high-caliber-shotgun-box-flash-slug-desc +# icon: { sprite: Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi, state: icon-incendiary } +# productEntity: MagazineBoxShotgunHighCaliberFlash +# cost: +# Telecrystal: 1 +# categories: +# - UplinkAmmo +# conditions: +# - !type:StoreWhitelistCondition +# blacklist: +# tags: +# - ContractorUplink -- type: listing - id: UplinkBox8GaugeSarin - name: uplink-high-caliber-shotgun-box-sarin-name - description: uplink-high-caliber-shotgun-box-sarin-desc - icon: { sprite: Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi, state: icon-sarin } - productEntity: MagazineBoxShotgunHighCaliberSarin - cost: - Telecrystal: 12 - categories: - - UplinkAmmo - conditions: - - !type:StoreWhitelistCondition - blacklist: - tags: - - ContractorUplink +#- type: listing +# id: UplinkBox8GaugeSarin +# name: uplink-high-caliber-shotgun-box-sarin-name +# description: uplink-high-caliber-shotgun-box-sarin-desc +# icon: { sprite: Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi, state: icon-sarin } +# productEntity: MagazineBoxShotgunHighCaliberSarin +# cost: +# Telecrystal: 12 +# categories: +# - UplinkAmmo +# conditions: +# - !type:StoreWhitelistCondition +# blacklist: +# tags: +# - ContractorUplink + +# Omu end # Mechs diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/CentralCommand/set_selectors.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/CentralCommand/set_selectors.yml index fb10b0e5a91..77defad16ad 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/CentralCommand/set_selectors.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/CentralCommand/set_selectors.yml @@ -65,7 +65,7 @@ possibleSets: - ERTBallisticsSet - ERTPulseSet - - ERTShotgunSet # Omu - ERT Rework + #- ERTShotgunSet # Omu - remove 8 gauge - ERTLightEnergySet # Omu - ERT Hotfix - ERTSMGSet # Omu - ERT Rework maxSelectedSets: 1 diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml index 97e2edd5115..fa0f930754b 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml @@ -16,7 +16,7 @@ proto: null whitelist: tags: - - ShellShotgunHeavy + - ShellShotgun #omu remove 8 gauge - type: Item size: Small @@ -27,7 +27,7 @@ id: MagazineBoxShotgunHighCaliber components: - type: BallisticAmmoProvider - proto: ShellShotgunHighCaliber + proto: ShellShotgun #omu remove 8 gauge - type: Sprite layers: - state: base @@ -36,102 +36,102 @@ map: ["enum.GunVisualLayers.Mag"] - state: lethal -# Normal Slug -- type: entity - name: shell box (8 Gauge slug) - parent: BaseMagazineBoxShotgunHighCaliber - id: MagazineBoxShotgunSlugHighCaliber - components: - - type: BallisticAmmoProvider - proto: ShellShotgunSlugHighCaliber - - type: MagazineVisuals - magState: mag-alt - steps: 5 - zeroVisible: false - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-alt-1 - map: ["enum.GunVisualLayers.Mag"] - - state: slug +# Normal Slug Omu kill 8 gauge +#- type: entity +# name: shell box (8 Gauge slug) +# parent: BaseMagazineBoxShotgunHighCaliber +# id: MagazineBoxShotgunSlugHighCaliber +# components: +# - type: BallisticAmmoProvider +# proto: ShellShotgunSlugHighCaliber +# - type: MagazineVisuals +# magState: mag-alt +# steps: 5 +# zeroVisible: false +# - type: Sprite +# layers: +# - state: base +# map: ["enum.GunVisualLayers.Base"] +# - state: mag-alt-1 +# map: ["enum.GunVisualLayers.Mag"] +# - state: slug # Incendiary -- type: entity - name: shell box (8 Gauge incendiary) - parent: BaseMagazineBoxShotgunHighCaliber - id: MagazineBoxShotgunIncendiaryHighCaliber - components: - - type: BallisticAmmoProvider - proto: ShellShotgunHighCaliberIncendiary - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: incendiary +#- type: entity +# name: shell box (8 Gauge incendiary) +# parent: BaseMagazineBoxShotgunHighCaliber +# id: MagazineBoxShotgunIncendiaryHighCaliber +# components: +# - type: BallisticAmmoProvider +# proto: ShellShotgunHighCaliberIncendiary +# - type: Sprite +# layers: +# - state: base +# map: ["enum.GunVisualLayers.Base"] +# - state: mag-1 +# map: ["enum.GunVisualLayers.Mag"] +# - state: incendiary # Uranium -- type: entity - name: shell box (8 Gauge uranium) - parent: BaseMagazineBoxShotgunHighCaliber - id: MagazineBoxShotgunUraniumHighCaliber - components: - - type: BallisticAmmoProvider - proto: ShellShotgunHighCaliberUranium - - type: MagazineVisuals - magState: mag-alt - steps: 5 - zeroVisible: false - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-alt-1 - map: ["enum.GunVisualLayers.Mag"] - - state: uranium +#- type: entity +# name: shell box (8 Gauge uranium) +# parent: BaseMagazineBoxShotgunHighCaliber +# id: MagazineBoxShotgunUraniumHighCaliber +# components: +# - type: BallisticAmmoProvider +# proto: ShellShotgunHighCaliberUranium +# - type: MagazineVisuals +# magState: mag-alt +# steps: 5 +# zeroVisible: false +# - type: Sprite +# layers: +# - state: base +# map: ["enum.GunVisualLayers.Base"] +# - state: mag-alt-1 +# map: ["enum.GunVisualLayers.Mag"] +# - state: uranium # Beanbag -- type: entity - parent: BaseMagazineBoxShotgunHighCaliber - id: MagazineBoxShotgunBeanbagHighCaliber - name: shell box (8 Gauge beanbag) - components: - - type: BallisticAmmoProvider - proto: ShellShotgunBeanbagHighCaliber - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: beanbag +#- type: entity +# parent: BaseMagazineBoxShotgunHighCaliber +# id: MagazineBoxShotgunBeanbagHighCaliber +# name: shell box (12 Gauge beanbag) # Omu kill 8 gauge +# components: +# - type: BallisticAmmoProvider +# proto: ShellShotgunBeanbag # Omu kill 8 gauge +# - type: Sprite +# layers: +# - state: base +# map: ["enum.GunVisualLayers.Base"] +# - state: mag-1 +# map: ["enum.GunVisualLayers.Mag"] +# - state: beanbag # Practice -- type: entity - name: shell box (8 Gauge practice) - parent: BaseMagazineBoxShotgunHighCaliber - id: MagazineBoxShotgunPracticeHighCaliber - components: - - type: BallisticAmmoProvider - proto: ShellShotgunHighCaliberPractice - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: practice +#- type: entity +# name: shell box (8 Gauge practice) +# parent: BaseMagazineBoxShotgunHighCaliber +# id: MagazineBoxShotgunPracticeHighCaliber +# components: +# - type: BallisticAmmoProvider +# proto: ShellShotgunHighCaliberPractice +# - type: Sprite +# layers: +# - state: base +# map: ["enum.GunVisualLayers.Base"] +# - state: mag-1 +# map: ["enum.GunVisualLayers.Mag"] +# - state: practice # Ensnaring - type: entity id: MagazineBoxShotgunHighCaliberEnsnaring parent: BaseMagazineBoxShotgunHighCaliber - name: shell box (8 Gauge slug ensnaring) + name: shell box (12 Gauge slug ensnaring) # Omu kill 8 gauge components: - type: BallisticAmmoProvider proto: ShellShotgunSlugEnsnaring @@ -148,7 +148,7 @@ - type: entity id: MagazineBoxShotgunHighCaliberEMP parent: BaseMagazineBoxShotgunHighCaliber - name: shell box (8 Gauge slug EMP) + name: shell box (12 Gauge slug EMP) # Omu kill 8 gauge components: - type: BallisticAmmoProvider proto: ShellShotgunSlugEMP @@ -182,7 +182,7 @@ - type: entity id: MagazineBoxShotgunHighCaliberSarin parent: BaseMagazineBoxShotgunHighCaliber - name: shell box (8 Gauge sarin gas) + name: shell box (12 Gauge sarin gas) # Omu kill 8 gauge components: - type: BallisticAmmoProvider proto: ShellShotgunHighCaliberSarin diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml index f25f68581ff..d1eed360abe 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml @@ -8,92 +8,94 @@ ## Buckshot -# Buckshot -- type: entity - id: ShellShotgunHighCaliber - name: shell (8 Gauge carpshot) - parent: BaseShellShotgun - components: - - type: Tag - tags: - - Cartridge - - ShellShotgunHeavy - - type: Sprite - sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Cartridges/highcaliber-shell.rsi - layers: - - state: base - map: [ "enum.AmmoVisualLayers.Base" ] - - type: CartridgeAmmo - proto: HighCaliberPelletShotgunSpread - - type: SpentAmmoVisuals - state: "base" - -- type: entity - id: ShellShotgunHighCaliberIncendiary - name: shell (8 Gauge dragons breath) - parent: ShellShotgunHighCaliber - components: - - type: Tag - tags: - - Cartridge - - ShellShotgunHeavy - - type: Sprite - layers: - - state: incendiary - map: [ "enum.AmmoVisualLayers.Base" ] - - type: CartridgeAmmo - proto: HighCaliberPelletShotgunIncendiarySpread - - type: SpentAmmoVisuals - state: "incendiary" - -- type: entity - id: ShellShotgunHighCaliberPractice - name: shell (8 Gauge practice) - parent: ShellShotgunHighCaliber - components: - - type: Tag - tags: - - Cartridge - - ShellShotgunHeavy - - type: Sprite - layers: - - state: practice - map: [ "enum.AmmoVisualLayers.Base" ] - - type: CartridgeAmmo - proto: HighCaliberPelletShotgunPracticeSpread - - type: SpentAmmoVisuals - state: "practice" - -- type: entity - id: ShellShotgunHighCaliberUranium - name: shell (8 Gauge depleted uranium) - parent: ShellShotgunHighCaliber - components: - - type: Tag - tags: - - Cartridge - - ShellShotgunHeavy - - type: Sprite - layers: - - state: depleted-uranium - map: [ "enum.AmmoVisualLayers.Base" ] - - type: CartridgeAmmo - proto: HighCaliberPelletShotgunUraniumSpread - - type: SpentAmmoVisuals - state: "depleted-uranium" +# Buckshot Omu - Kill eight gauge +#- type: entity +# id: ShellShotgunHighCaliber +# name: shell (12 Gauge) +# parent: BaseShellShotgun +# categories: [ HideSpawnMenu ] +# components: +# - type: Tag +# tags: +# - Cartridge +# - ShellShotgun +# - type: Sprite +# sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Cartridges/highcaliber-shell.rsi +# layers: +# - state: base +# map: [ "enum.AmmoVisualLayers.Base" ] +# - type: CartridgeAmmo +# proto: HighCaliberPelletShotgunSpread +# - type: SpentAmmoVisuals +# state: "base" + +#- type: entity +# id: ShellShotgunHighCaliberIncendiary +# name: shell (8 Gauge dragons breath) +# parent: ShellShotgunHighCaliber +# components: +# - type: Tag +# tags: +# - Cartridge +# - ShellShotgunHeavy +# - type: Sprite +# layers: +# - state: incendiary +# map: [ "enum.AmmoVisualLayers.Base" ] +# - type: CartridgeAmmo +# proto: HighCaliberPelletShotgunIncendiarySpread +# - type: SpentAmmoVisuals +# state: "incendiary" + +#- type: entity +# id: ShellShotgunHighCaliberPractice +# name: shell (8 Gauge practice) +# parent: ShellShotgunHighCaliber +# components: +# - type: Tag +# tags: +# - Cartridge +# - ShellShotgunHeavy +# - type: Sprite +# layers: +# - state: practice +# map: [ "enum.AmmoVisualLayers.Base" ] +# - type: CartridgeAmmo +# proto: HighCaliberPelletShotgunPracticeSpread +# - type: SpentAmmoVisuals +# state: "practice" + +#- type: entity +# id: ShellShotgunHighCaliberUranium +# name: shell (8 Gauge depleted uranium) +# parent: ShellShotgunHighCaliber +# components: +# - type: Tag +# tags: +# - Cartridge +# - ShellShotgunHeavy +# - type: Sprite +# layers: +# - state: depleted-uranium +# map: [ "enum.AmmoVisualLayers.Base" ] +# - type: CartridgeAmmo +# proto: HighCaliberPelletShotgunUraniumSpread +# - type: SpentAmmoVisuals +# state: "depleted-uranium" ## Slugs # Slug - type: entity id: ShellShotgunSlugHighCaliber - name: shell (8 Gauge slug) + name: shell (8 Gauge slug) #never gonna appear parent: BaseShellShotgun + categories: [ HideSpawnMenu ] components: - type: Tag tags: - Cartridge - - ShellShotgunHeavy + - ShellShotgun #Omu kill 8 gauge - type: Sprite sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Cartridges/highcaliber-shell.rsi layers: @@ -107,13 +109,13 @@ # Ensnaring - type: entity id: ShellShotgunSlugEnsnaring - name: cartridge (8 Gauge caliber ensnaring slug) + name: cartridge (12 Gauge caliber ensnaring slug) #omu kill 8 gauge parent: ShellShotgunSlugHighCaliber components: - type: Tag tags: - Cartridge - - ShellShotgunHeavy + - ShellShotgun - type: CartridgeAmmo proto: BulletSlugEnsnaring - type: Sprite @@ -126,13 +128,13 @@ # EMP - type: entity id: ShellShotgunSlugEMP - name: cartridge (8 Gauge caliber EMP slug) + name: cartridge (12 Gauge caliber EMP slug) # Omu kill 8 gauge parent: ShellShotgunSlugHighCaliber components: - type: Tag tags: - Cartridge - - ShellShotgunHeavy + - ShellShotgun # Omu kill 8 gauge - type: CartridgeAmmo proto: BulletSlugEMP - type: Sprite @@ -145,13 +147,13 @@ # Flash - type: entity id: ShellShotgunSlugFlash - name: cartridge (8 Gauge caliber flash slug) + name: cartridge (12 Gauge caliber flash slug) # Omu kill 8 gauge parent: ShellShotgunSlugHighCaliber components: - type: Tag tags: - Cartridge - - ShellShotgunHeavy + - ShellShotgun # Omu kill 8 gauge - type: CartridgeAmmo proto: BulletSlugFlash - type: Sprite @@ -162,33 +164,33 @@ state: "flash" # Beanbag -- type: entity - id: ShellShotgunBeanbagHighCaliber - name: shell (8 Gauge beanbag) - parent: ShellShotgunSlugHighCaliber - components: - - type: Tag - tags: - - Cartridge - - ShellShotgunHeavy - - type: Sprite - layers: - - state: beanbag - map: [ "enum.AmmoVisualLayers.Base" ] - - type: CartridgeAmmo - proto: BulletSlugBeanbagHighCaliber - - type: SpentAmmoVisuals - state: "beanbag" +#- type: entity +# id: ShellShotgunBeanbagHighCaliber +# name: shell (12 Gauge beanbag) # Omu kill 8 gauge +# parent: ShellShotgunSlugHighCaliber +# components: +# - type: Tag +# tags: +# - Cartridge +# - ShellShotgun # Omu kill 8 gauge +# - type: Sprite +# layers: +# - state: beanbag +# map: [ "enum.AmmoVisualLayers.Base" ] +# - type: CartridgeAmmo +# proto: BulletSlugBeanbagHighCaliber +# - type: SpentAmmoVisuals +# state: "beanbag" - type: entity id: ShellShotgunHighCaliberSarin - name: shell (8 Gauge sarin gas) + name: shell (12 Gauge sarin gas) # Omu kill 8 gauge parent: ShellShotgunSlugHighCaliber components: - type: Tag tags: - Cartridge - - ShellShotgunHeavy + - ShellShotgun # Omu kill 8 gauge - type: Sprite layers: - state: practice @@ -201,42 +203,43 @@ # Heavy shotgun -# Pellet -- type: entity - id: ShellShotgunHeavyHighExplosive - name: shell (2 Gauge pellet) - parent: BaseShellShotgun - components: - - type: Tag - tags: - - Cartridge - - ShellShotgunHeavier - - type: Sprite - sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Cartridges/magshot.rsi - layers: - - state: gshell - map: [ "enum.AmmoVisualLayers.Base" ] - - type: CartridgeAmmo - proto: HeavyPelletShotgunSpread - - type: SpentAmmoVisuals - state: "gshell" +# Pellet Omu - killed +#- type: entity +# id: ShellShotgunHeavyHighExplosive +# name: shell (2 Gauge pellet) +# parent: BaseShellShotgun +# components: +# - type: Tag +# tags: +# - Cartridge +# - ShellShotgunHeavier +# - type: Sprite +# sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Cartridges/magshot.rsi +# layers: +# - state: gshell +# map: [ "enum.AmmoVisualLayers.Base" ] +# - type: CartridgeAmmo +# proto: HeavyPelletShotgunSpread +# - type: SpentAmmoVisuals +# state: "gshell" # Slug -- type: entity - id: ShellShotgunSlugHeavyHighExplosive - name: shell (2 Gauge slug) - parent: BaseShellShotgun - components: - - type: Tag - tags: - - Cartridge - - ShellShotgunHeavier - - type: Sprite - sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Cartridges/magshot.rsi - layers: - - state: fshell - map: [ "enum.AmmoVisualLayers.Base" ] - - type: CartridgeAmmo - proto: BulletSlugHeavyHighExplosive - - type: SpentAmmoVisuals - state: "fshell" +#- type: entity +# id: ShellShotgunSlugHeavyHighExplosive +# name: shell (2 Gauge slug) +# parent: BaseShellShotgun +# components: +# - type: Tag +# tags: +# - Cartridge +# - ShellShotgunHeavier +# - type: Sprite +# sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Cartridges/magshot.rsi +# layers: +# - state: fshell +# map: [ "enum.AmmoVisualLayers.Base" ] +# - type: CartridgeAmmo +# proto: BulletSlugHeavyHighExplosive +# - type: SpentAmmoVisuals +# state: "fshell" +# Omu end diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_shotgun.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_shotgun.yml index 5510df3a9f6..596361c0842 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_shotgun.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_shotgun.yml @@ -6,59 +6,60 @@ # # SPDX-License-Identifier: AGPL-3.0-or-later -- type: entity - id: BaseMagazineShotgunHeavy - name: ammo drum (2 gauge shells) - parent: [ BaseItem, BaseSyndicateContraband ] - abstract: true - components: - - type: Tag - tags: - - MagazineShotgunHeavy - - type: BallisticAmmoProvider - mayTransfer: true - whitelist: - tags: - - ShellShotgunHeavier - capacity: 15 - soundRack: - path: /Audio/Weapons/Guns/Cock/smg_cock.ogg - - type: Item - size: Small - - type: ContainerContainer - containers: - ballistic-ammo: !type:Container - - type: Sprite - sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/heavy_shotgun.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-5 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: mag - steps: 6 - zeroVisible: false - - type: Appearance +#- type: entity Omu start - kill 8 gauge +# id: BaseMagazineShotgunHeavy +# name: ammo drum (2 gauge shells) +# parent: [ BaseItem, BaseSyndicateContraband ] +# abstract: true +# components: +# - type: Tag +# tags: +# - MagazineShotgunHeavy +# - type: BallisticAmmoProvider +# mayTransfer: true +# whitelist: +# tags: +# - ShellShotgunHeavier +# capacity: 15 +# soundRack: +# path: /Audio/Weapons/Guns/Cock/smg_cock.ogg +# - type: Item +# size: Small +# - type: ContainerContainer +# containers: +# ballistic-ammo: !type:Container +# - type: Sprite +# sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/heavy_shotgun.rsi +# layers: +# - state: base +# map: ["enum.GunVisualLayers.Base"] +# - state: mag-5 +# map: ["enum.GunVisualLayers.Mag"] +# - type: MagazineVisuals +# magState: mag +# steps: 6 +# zeroVisible: false +# - type: Appearance -- type: entity - id: MagazineShotgunHeavy - name: ammo drum (2 gauge HE pellet) - parent: BaseMagazineShotgunHeavy - components: - - type: BallisticAmmoProvider - proto: ShellShotgunHeavyHighExplosive +#- type: entity +# id: MagazineShotgunHeavy +# name: ammo drum (2 gauge HE pellet) +# parent: BaseMagazineShotgunHeavy +# components: +# - type: BallisticAmmoProvider +# proto: ShellShotgunHeavyHighExplosive -- type: entity - id: MagazineShotgunHeavySlug - name: ammo drum (2 gauge HE slug) - parent: BaseMagazineShotgunHeavy - components: - - type: BallisticAmmoProvider - proto: ShellShotgunSlugHeavyHighExplosive - - type: Sprite - layers: - - state: base2 - map: ["enum.GunVisualLayers.Base"] - - state: mag-5 - map: ["enum.GunVisualLayers.Mag"] +#- type: entity +# id: MagazineShotgunHeavySlug +# name: ammo drum (2 gauge HE slug) +# parent: BaseMagazineShotgunHeavy +# components: +# - type: BallisticAmmoProvider +# proto: ShellShotgunSlugHeavyHighExplosive +# - type: Sprite +# layers: +# - state: base2 +# map: ["enum.GunVisualLayers.Base"] +# - state: mag-5 +# map: ["enum.GunVisualLayers.Mag"] +# Omu end diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun_lever_magazine.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun_lever_magazine.yml index a3d37446ab1..08c68e8976f 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun_lever_magazine.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun_lever_magazine.yml @@ -14,7 +14,7 @@ # Empty mags - type: entity id: BaseMagazineShotgunLeverRifle - name: "magazine (8 Gauge)" + name: "magazine (12 Gauge)" parent: [ BaseItem, BaseSecurityContraband ] abstract: true components: @@ -25,8 +25,8 @@ mayTransfer: true whitelist: tags: - - ShellShotgunHeavy - proto: ShellShotgunHighCaliber + - ShellShotgun # Omu killed 8 gauge + proto: ShellShotgun # Omu killed 8 gauge capacity: 8 - type: Item size: Small @@ -48,7 +48,7 @@ - type: entity id: MagazineShotgunLeverRifle - name: "lever rifle magazine (8 Gauge)" + name: "lever rifle magazine (12 Gauge)" # Omu kill 8 gauge parent: BaseMagazineShotgunLeverRifle components: - type: Tag @@ -63,4 +63,4 @@ suffix: Empty components: - type: BallisticAmmoProvider - proto: null \ No newline at end of file + proto: null diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml index d4385a11638..69ee202e06a 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml @@ -25,8 +25,8 @@ - type: Projectile damage: types: - Piercing: 15 - Structural: 20 + Piercing: 10 # Omu was 15 - changed in case i fucked up elsewhere + #Structural: 20 - type: entity id: HighCaliberPelletShotgunSpread @@ -34,7 +34,7 @@ parent: HighCaliberPelletShotgun components: - type: ProjectileSpread - proto: HighCaliberPelletShotgun + proto: PelletShotgun count: 6 spread: 15 @@ -52,8 +52,8 @@ - type: Projectile damage: types: - Blunt: 6 - Heat: 6 + Blunt: 3 # Omu changed from 6,6 in case i fucked up + Heat: 3 - type: IgnitionSource ignited: true @@ -63,7 +63,7 @@ parent: HighCaliberPelletShotgunIncendiary components: - type: ProjectileSpread - proto: HighCaliberPelletShotgunIncendiary + proto: PelletShotgunIncendiary # Omu changed to 12 gauge projectile count: 6 spread: 15 @@ -89,8 +89,8 @@ parent: HighCaliberPelletShotgunPractice components: - type: ProjectileSpread - proto: HighCaliberPelletShotgunPractice - count: 8 + proto: PelletShotgunPractice #Omu changed to 12 gauge + count: 6 # Omu changed to 6 from 8 spread: 15 # Depleted Uranium @@ -107,8 +107,8 @@ - type: Projectile damage: types: - Radiation: 8 - Piercing: 8 + Radiation: 5 # Omu changed from 8,8 + Piercing: 5 - type: entity id: HighCaliberPelletShotgunUraniumSpread @@ -116,8 +116,8 @@ parent: HighCaliberPelletShotgunUranium components: - type: ProjectileSpread - proto: HighCaliberPelletShotgunUranium - count: 6 + proto: PelletShotgunUranium #Omu changed to 12 gauge + count: 5 # Omu changed to 5 from 6 spread: 6 ## Slugs @@ -134,7 +134,8 @@ - type: Projectile damage: types: - Piercing: 65 + Piercing: 40 # omu was 65 with no struct + Structural: 15 - type: entity id: BulletSlugEnsnaring @@ -212,7 +213,7 @@ - type: Projectile damage: types: - Piercing: 20 + Piercing: 6 #Omu down from 20 - type: entity id: BulletSlugBeanbagHighCaliber @@ -226,9 +227,9 @@ - type: Projectile damage: types: - Blunt: 20 # ye-OUCH + Blunt: 6 # Omu down from 20 - type: StaminaDamageOnCollide - damage: 80 # ye-OW + damage: 50 # Omu down from 80 - type: entity id: BulletShotgunHeavySlugSarin @@ -250,7 +251,7 @@ - type: Projectile damage: types: - Piercing: 15 + Piercing: 10 #Omu down from 15 # Heavy shotgun diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Lever/lever.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Lever/lever.yml index eb5af8beb06..da9f11383cd 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Lever/lever.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Lever/lever.yml @@ -45,7 +45,7 @@ priority: 1 whitelist: tags: - - ShellShotgunHeavy + - ShellShotgun #Omu removed heavy - type: Gun fireRate: 0.65 soundGunshot: diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 25d6c1bf4e0..b52f8992e87 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -82,104 +82,104 @@ - type: StaticPrice price: 500 -- type: entity - name: Bojevic - parent: [BaseWeaponShotgun, BaseGunWieldable, BaseSyndicateContraband] - id: WeaponShotgunCombat - description: For when you need to repel targets that are behind two plasteel walls, a fridge, and a car door. Pump action and fun as hell to shoot, though not as much for your shoulder. Loads 5 rounds of 8 Gauge. - components: - - type: Item - size: Large - - type: Sprite - sprite: _Goobstation/Objects/Weapons/Guns/Lever/combatshotgun.rsi - - type: Clothing - sprite: _Goobstation/Objects/Weapons/Guns/Lever/combatshotgun.rsi - - type: GunRequiresWield # remove when inaccuracy on spreads is fixed - - type: Gun - fireRate: 2 - - type: GunSpreadModifier - spread: 0.6 - - type: Tag - tags: - - WeaponShotgunKammerer - - type: BallisticAmmoProvider # WYCI internal magazine weapon with bolt - whitelist: - tags: - - ShellShotgunHeavy - capacity: 5 - proto: ShellShotgunHighCaliber - soundRack: - path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg - autoCycle: false +#- type: entity +# name: Bojevic +# parent: [BaseWeaponShotgun, BaseGunWieldable, BaseSyndicateContraband] +# id: WeaponShotgunCombat +# description: For when you need to repel targets that are behind two plasteel walls, a fridge, and a car door. Pump action and fun as hell to shoot, though not as much for your shoulder. Loads 5 rounds of 12 Gauge. +# components: +# - type: Item +# size: Large +# - type: Sprite +# sprite: _Goobstation/Objects/Weapons/Guns/Lever/combatshotgun.rsi +# - type: Clothing +# sprite: _Goobstation/Objects/Weapons/Guns/Lever/combatshotgun.rsi +# - type: GunRequiresWield # remove when inaccuracy on spreads is fixed +# - type: Gun +# fireRate: 2 +# - type: GunSpreadModifier +# spread: 0.6 +# - type: Tag +# tags: +# - WeaponShotgunKammerer +# - type: BallisticAmmoProvider # WYCI internal magazine weapon with bolt +# whitelist: +# tags: +# - ShellShotgun #Omu remove 8 gauge +# capacity: 5 +# proto: ShellShotgunHighCaliber +# soundRack: +# path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg +# autoCycle: false -- type: entity - name: NZ CSG-242 - parent: [BaseItem, BaseGunWieldable, BaseSyndicateContraband] - id: WeaponShotgunHeavy - description: A portable human rights violation. Burst fire, high explosive, and will literally push you back six feet when fired. Feeds from 2 Gauge drum magazines. Holy shit. - components: - - type: Sprite - sprite: _Goobstation/Objects/Weapons/Guns/Shotguns/magshot.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: base-unshaded - map: ["enum.GunVisualLayers.BaseUnshaded"] - shader: unshaded - - state: mag-0 - map: ["enum.GunVisualLayers.Mag"] - - state: mag-unshaded-0 - map: ["enum.GunVisualLayers.MagUnshaded"] - shader: unshaded - - type: Item - size: Huge - shape: - - 0,0,4,3 - - type: Clothing - sprite: _Goobstation/Objects/Weapons/Guns/Shotguns/magshot.rsi - quickEquip: false - slots: - - Back - - suitStorage - - type: AmmoCounter - - type: GunRequiresWield - - type: Gun - fireRate: 1.25 - burstFireRate: 10 - shotsPerBurst: 3 - burstCooldown: 1 - lockOnTargetBurst: true - selectedMode: Burst - availableModes: - - Burst - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg - soundEmpty: - path: /Audio/Weapons/Guns/Empty/empty.ogg - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: MagazineShotgunHeavy - priority: 2 - whitelist: - tags: - - MagazineShotgunHeavy - whitelistFailPopup: gun-magazine-whitelist-fail - insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg - - type: ContainerContainer - containers: - gun_magazine: !type:ContainerSlot - gun_chamber: !type:ContainerSlot - - type: MagazineAmmoProvider - - type: MagazineVisuals - magState: mag - steps: 4 - zeroVisible: true - zeroNoAmmo: true - - type: Appearance - - type: StaticPrice - price: 500 - - type: GunRecoil - refreshKnockdown: false +#- type: entity +# name: NZ CSG-242 +# parent: [BaseItem, BaseGunWieldable, BaseSyndicateContraband] +# id: WeaponShotgunHeavy +# description: A portable human rights violation. Burst fire, high explosive, and will literally push you back six feet when fired. Feeds from 2 Gauge drum magazines. Holy shit. +# components: +# - type: Sprite +# sprite: _Goobstation/Objects/Weapons/Guns/Shotguns/magshot.rsi +# layers: +# - state: base +# map: ["enum.GunVisualLayers.Base"] +# - state: base-unshaded +# map: ["enum.GunVisualLayers.BaseUnshaded"] +# shader: unshaded +# - state: mag-0 +# map: ["enum.GunVisualLayers.Mag"] +# - state: mag-unshaded-0 +# map: ["enum.GunVisualLayers.MagUnshaded"] +# shader: unshaded +# - type: Item +# size: Huge +# shape: +# - 0,0,4,3 +# - type: Clothing +# sprite: _Goobstation/Objects/Weapons/Guns/Shotguns/magshot.rsi +# quickEquip: false +# slots: +# - Back +# - suitStorage +# - type: AmmoCounter +# - type: GunRequiresWield +# - type: Gun +# fireRate: 1.25 +# burstFireRate: 10 +# shotsPerBurst: 3 +# burstCooldown: 1 +# lockOnTargetBurst: true +# selectedMode: Burst +# availableModes: +# - Burst +# soundGunshot: +# path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg +# soundEmpty: +# path: /Audio/Weapons/Guns/Empty/empty.ogg +# - type: ItemSlots +# slots: +# gun_magazine: +# name: Magazine +# startingItem: MagazineShotgunHeavy +# priority: 2 +# whitelist: +# tags: +# - MagazineShotgunHeavy +# whitelistFailPopup: gun-magazine-whitelist-fail +# insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg +# ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg +# - type: ContainerContainer +# containers: +# gun_magazine: !type:ContainerSlot +# gun_chamber: !type:ContainerSlot +# - type: MagazineAmmoProvider +# - type: MagazineVisuals +# magState: mag +# steps: 4 +# zeroVisible: true +# zeroNoAmmo: true +# - type: Appearance +# - type: StaticPrice +# price: 500 +# - type: GunRecoil +# refreshKnockdown: false diff --git a/Resources/Prototypes/_Goobstation/Entities/Specific/ghostbar.yml b/Resources/Prototypes/_Goobstation/Entities/Specific/ghostbar.yml index 8f9f3edba7c..ee2abf07813 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Specific/ghostbar.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Specific/ghostbar.yml @@ -119,7 +119,7 @@ - BasicCybernetics - AdvancedCybernetics # secfab - real guns and mech weapons 1984'd - - SecurityEquipmentStatic + #- SecurityEquipmentStatic Omu removed with 8 gauge - SecurityEquipmentStaticGoob - SecurityBoardsStaticGoob - SecurityPracticeStatic diff --git a/Resources/Prototypes/_Goobstation/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_Goobstation/Entities/Structures/Machines/lathe.yml index 692fda3515b..ff3e7009733 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Structures/Machines/lathe.yml @@ -323,7 +323,7 @@ runningState: icon staticPacks: - SecurityAmmoStatic - - SecurityAmmoStaticGoob + # - SecurityAmmoStaticGoob Omu killed with 8 gauge - ERTAmmoStaticGoob - SecurityHypoStatic - SecurityEquipmentStaticGoob diff --git a/Resources/Prototypes/_Goobstation/Recipes/Lathes/Packs/security.yml b/Resources/Prototypes/_Goobstation/Recipes/Lathes/Packs/security.yml index 88fafe2f50d..8c2898bf08b 100644 --- a/Resources/Prototypes/_Goobstation/Recipes/Lathes/Packs/security.yml +++ b/Resources/Prototypes/_Goobstation/Recipes/Lathes/Packs/security.yml @@ -12,12 +12,12 @@ # # SPDX-License-Identifier: AGPL-3.0-or-later ## Static -- type: latheRecipePack - id: SecurityAmmoStaticGoob - recipes: - - MagazineBoxShotgunHighCaliber - - MagazineBoxShotgunSlugHighCaliber - - MagazineBoxShotgunPracticeHighCaliber +#- type: latheRecipePack +# id: SecurityAmmoStaticGoob +# recipes: +# - MagazineBoxShotgunHighCaliber +# - MagazineBoxShotgunSlugHighCaliber +# - MagazineBoxShotgunPracticeHighCaliber - type: latheRecipePack id: SecurityEquipmentStaticGoob @@ -54,7 +54,7 @@ - MagazineLightRifle - MagazineMagnumEmpty - MagazineMagnum - - MagazineBoxShotgunHighCaliber +# - MagazineBoxShotgunHighCaliber Omu kill 8 gauge ## Dynamic - type: latheRecipePack @@ -76,9 +76,9 @@ - EnergyMagRifleDisabler - EnergyMagRifleLethal - MagazineSmart - - MagazineBoxShotgunIncendiaryHighCaliber - - MagazineBoxShotgunBeanbagHighCaliber - - MagazineBoxShotgunUraniumHighCaliber + # - MagazineBoxShotgunIncendiaryHighCaliber + # - MagazineBoxShotgunBeanbagHighCaliber + # - MagazineBoxShotgunUraniumHighCaliber - PowerCellIRRevolver - PowerCellIonRevolver - PowerCellXrayRevolver diff --git a/Resources/Prototypes/_Goobstation/Recipes/Lathes/security.yml b/Resources/Prototypes/_Goobstation/Recipes/Lathes/security.yml index 29827f0c2c1..2c8a06c2cfa 100644 --- a/Resources/Prototypes/_Goobstation/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/_Goobstation/Recipes/Lathes/security.yml @@ -603,51 +603,51 @@ materials: Steel: 240 -- type: latheRecipe - parent: BaseAmmoRecipe - id: MagazineBoxShotgunHighCaliber - result: MagazineBoxShotgunHighCaliber - materials: - Steel: 480 - -- type: latheRecipe - parent: BaseAmmoRecipe - id: MagazineBoxShotgunSlugHighCaliber - result: MagazineBoxShotgunSlugHighCaliber - materials: - Steel: 480 - Plastic: 160 +#- type: latheRecipe +# parent: BaseAmmoRecipe +# id: MagazineBoxShotgunHighCaliber +# result: MagazineBoxShotgunHighCaliber +# materials: +# Steel: 480 +# +#- type: latheRecipe +# parent: BaseAmmoRecipe +# id: MagazineBoxShotgunSlugHighCaliber +# result: MagazineBoxShotgunSlugHighCaliber +# materials: +# Steel: 480 +# Plastic: 160 -- type: latheRecipe - parent: BaseAmmoRecipe - id: MagazineBoxShotgunIncendiaryHighCaliber - result: MagazineBoxShotgunIncendiaryHighCaliber - materials: - Steel: 160 - Plastic: 320 +#- type: latheRecipe +# parent: BaseAmmoRecipe +# id: MagazineBoxShotgunIncendiaryHighCaliber +# result: MagazineBoxShotgunIncendiaryHighCaliber +# materials: +# Steel: 160 +# Plastic: 320 -- type: latheRecipe - parent: BaseAmmoRecipe - id: MagazineBoxShotgunUraniumHighCaliber - result: MagazineBoxShotgunUraniumHighCaliber - materials: - Plastic: 640 - Uranium: 480 +#- type: latheRecipe +# parent: BaseAmmoRecipe +# id: MagazineBoxShotgunUraniumHighCaliber +# result: MagazineBoxShotgunUraniumHighCaliber +# materials: +# Plastic: 640 +# Uranium: 480 -- type: latheRecipe - parent: BaseAmmoRecipe - id: MagazineBoxShotgunBeanbagHighCaliber - result: MagazineBoxShotgunBeanbagHighCaliber - materials: - Steel: 320 - Plastic: 240 +#- type: latheRecipe +# parent: BaseAmmoRecipe +# id: MagazineBoxShotgunBeanbagHighCaliber +# result: MagazineBoxShotgunBeanbagHighCaliber +# materials: +# Steel: 320 +# Plastic: 240 -- type: latheRecipe - parent: BaseAmmoRecipe - id: MagazineBoxShotgunPracticeHighCaliber - result: MagazineBoxShotgunPracticeHighCaliber - materials: - Steel: 160 +#- type: latheRecipe +# parent: BaseAmmoRecipe +# id: MagazineBoxShotgunPracticeHighCaliber +# result: MagazineBoxShotgunPracticeHighCaliber +# materials: +# Steel: 160 - type: latheRecipe parent: BaseEmptyAmmoRecipe diff --git a/Resources/Prototypes/_Goobstation/Wizard/Random/weapons.yml b/Resources/Prototypes/_Goobstation/Wizard/Random/weapons.yml index 75cb9152c13..24925c24f5d 100644 --- a/Resources/Prototypes/_Goobstation/Wizard/Random/weapons.yml +++ b/Resources/Prototypes/_Goobstation/Wizard/Random/weapons.yml @@ -229,5 +229,5 @@ WeaponLaserCannon: 1 WeaponSubMachineSmart: 1 WeaponLeverChester: 0.25 - WeaponShotgunCombat: 0.25 +# WeaponShotgunCombat: 0.25 WeaponSubMachineGunAtreides: 0.5 diff --git a/Resources/Prototypes/_Omu/Catalog/selectable_sets.yml b/Resources/Prototypes/_Omu/Catalog/selectable_sets.yml index d55b0d8184e..7ad511bc43f 100644 --- a/Resources/Prototypes/_Omu/Catalog/selectable_sets.yml +++ b/Resources/Prototypes/_Omu/Catalog/selectable_sets.yml @@ -178,18 +178,18 @@ # ERT -- type: selectableSet - id: ERTShotgunSet - name: selectable-set-ert-shotgun-name - description: selectable-set-ert-shotgun-description - sprite: - sprite: _Goobstation/Objects/Weapons/Guns/Lever/combatshotgun.rsi - state: icon - content: - - WeaponShotgunCombatCentComm - - MagazineBoxShotgunHighCaliber - - MagazineBoxShotgunHighCaliber - - WeaponPistolAnacondaCentComm +#- type: selectableSet +# id: ERTShotgunSet +# name: selectable-set-ert-shotgun-name +# description: selectable-set-ert-shotgun-description +# sprite: +# sprite: _Goobstation/Objects/Weapons/Guns/Lever/combatshotgun.rsi +# state: icon +# content: +# - WeaponShotgunCombatCentComm +# - MagazineBoxShotgunHighCaliber +# - MagazineBoxShotgunHighCaliber +# - WeaponPistolAnacondaCentComm - type: selectableSet id: ERTSMGSet diff --git a/Resources/Prototypes/_Omu/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/_Omu/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index dd85b275b01..ed98e386cea 100644 --- a/Resources/Prototypes/_Omu/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/_Omu/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -40,7 +40,7 @@ name: R6 "Slammer" trench gun parent: [BaseWeaponRevolver, BaseGunWieldable, BaseGrandTheftContraband] id: WeaponWardenRevolverShotgun - description: The semi-automatic R6 trench gun, designed for clearing corners. It has the punch of a 12 gauge slug while being small enough to fit in your boots! + description: The semi-automatic R6 trench gun, designed for clearing corners with a war zone appropriate amount of 12-gauge-"die now", has become popular as a defensive and breaching option among law enforcement. components: - type: Sprite sprite: _Omu/Objects/Weapons/Guns/Revolvers/R6.rsi @@ -62,8 +62,8 @@ - type: RevolverAmmoProvider whitelist: tags: - - ShellShotgun - proto: ShellShotgunSlug + - ShellShotgun #Omu remove 8 gauge + proto: ShellShotgunSlug #Omu remove 8 gauge capacity: 6 chambers: [True, True, True, True, True, True] ammoSlots: [null, null, null, null, null, null] diff --git a/Resources/Prototypes/_Omu/Entities/Objects/Weapons/Guns/Shotgun/shotguns.yml b/Resources/Prototypes/_Omu/Entities/Objects/Weapons/Guns/Shotgun/shotguns.yml index 3dfb528b907..062c35ee3f7 100644 --- a/Resources/Prototypes/_Omu/Entities/Objects/Weapons/Guns/Shotgun/shotguns.yml +++ b/Resources/Prototypes/_Omu/Entities/Objects/Weapons/Guns/Shotgun/shotguns.yml @@ -1,9 +1,9 @@ -- type: entity - id: WeaponShotgunCombatCentComm - parent: WeaponShotgunCombat - description: An old design with a beefier shell intended to repel boarding parties; this time, you are the boarding party. A Nanotrasen logo is stamped on the barrel. - suffix: CentComm - components: - - type: Contraband - allowedDepartments: [ CentralCommand ] - severity: Restricted +#- type: entity +# id: WeaponShotgunCombatCentComm +# parent: WeaponShotgunCombat +# description: An old design with a beefier shell intended to repel boarding parties; this time, you are the boarding party. A Nanotrasen logo is stamped on the barrel. +# suffix: CentComm +# components: +# - type: Contraband +# allowedDepartments: [ CentralCommand ] +# severity: Restricted