From 8ea7dea6b375ce963702a014201a93c4bf7105a5 Mon Sep 17 00:00:00 2001 From: Andrew Malcolm O'Neill <105134723+maland1@users.noreply.github.com> Date: Tue, 8 Jul 2025 12:55:55 +0100 Subject: [PATCH] Contraband category fixes (#38698) * Adding contraband to some items missing it - This includes updating contraband to follow more consistently where items are expected to be used - Fixing the spacing in arrays to be more consistent with other files * Updating PPD to be Eng contra --- .../Weapons/Guns/Battery/battery_guns.yml | 30 +++++++++---------- .../Objects/Weapons/Guns/SMGs/smgs.yml | 2 +- .../Objects/Weapons/Melee/fireaxe.yml | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) 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 560b7bbc2a..d5f4681a9b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -103,7 +103,7 @@ - type: entity name: svalinn laser pistol - parent: [ BaseWeaponPowerCellSmall, BaseSecurityContraband ] + parent: [BaseWeaponPowerCellSmall, BaseSecurityContraband] id: WeaponLaserSvalinn description: A cheap and widely used laser pistol. components: @@ -124,7 +124,7 @@ - type: entity name: retro laser blaster - parent: [ BaseWeaponBatterySmall, BaseMajorContraband ] + parent: [BaseWeaponBatterySmall, BaseMajorContraband] id: WeaponLaserGun description: A weapon using light amplified by the stimulated emission of radiation. components: @@ -147,7 +147,7 @@ - type: entity name: makeshift laser pistol - parent: BaseWeaponBatterySmall + parent: [BaseWeaponBatterySmall, BaseMinorContraband] id: WeaponMakeshiftLaser description: Better pray it won't burn your hands off. components: @@ -175,7 +175,7 @@ - type: entity name: tesla gun - parent: BaseWeaponBattery + parent: [BaseWeaponBattery, BaseMajorContraband] id: WeaponTeslaGun description: The power of the primordial element of lightning in your hands. components: @@ -247,7 +247,7 @@ - type: entity name: pulse pistol - parent: BaseWeaponBatterySmall + parent: [BaseWeaponBatterySmall, BaseCentcommContraband] id: WeaponPulsePistol description: A state of the art energy pistol favoured as a sidearm by the NT operatives. components: @@ -317,7 +317,7 @@ - type: entity name: pulse rifle - parent: [BaseWeaponBattery, BaseGunWieldable] + parent: [BaseWeaponBattery, BaseGunWieldable, BaseCentcommContraband] id: WeaponPulseRifle description: A weapon that is almost as infamous as its users. components: @@ -381,7 +381,7 @@ - type: entity name: portable particle decelerator - parent: BaseWeaponBattery + parent: [BaseWeaponBattery, BaseEngineeringContraband] id: WeaponParticleDecelerator description: A portable particle decelerator capable of decomposing a tesla or singularity. components: @@ -479,7 +479,7 @@ - type: entity name: disabler - parent: [ WeaponDisablerPractice, BaseSecurityCommandContraband ] + parent: [WeaponDisablerPractice, BaseSecurityCommandContraband] id: WeaponDisabler description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. components: @@ -507,7 +507,7 @@ - type: entity name: disabler SMG - parent: [ BaseWeaponBattery, BaseSecurityContraband ] + parent: [BaseWeaponBattery, BaseSecurityContraband] id: WeaponDisablerSMG description: Advanced weapon that exhausts organic targets, weakening them until they collapse. components: @@ -545,7 +545,7 @@ - type: entity name: taser - parent: [ BaseWeaponBatterySmall, BaseSecurityContraband ] + parent: [BaseWeaponBatterySmall, BaseSecurityContraband] id: WeaponTaser description: A low-capacity, energy-based stun gun used by security teams to subdue targets at range. components: @@ -625,7 +625,7 @@ - type: entity name: advanced laser pistol - parent: [ BaseWeaponBatterySmall, BaseSecurityContraband] + parent: [BaseWeaponBatterySmall, BaseSecurityContraband] id: WeaponAdvancedLaser description: An experimental high-energy laser pistol with a self-charging nuclear battery. components: @@ -708,7 +708,7 @@ name: experimental C.H.I.M.P. handcannon parent: [WeaponPistolCHIMP, BaseSyndicateContraband] id: WeaponPistolCHIMPUpgraded - description: This C.H.I.M.P. seems to have a greater punch than is usual... + description: This C.H.I.M.P. seems to have a greater punch than usual... components: - type: BatteryWeaponFireModes fireModes: @@ -806,7 +806,7 @@ - type: entity name: temperature gun - parent: [BaseWeaponBattery, BaseGunWieldable] + parent: [BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband] id: WeaponTemperatureGun description: An advanced gun that shoots body-temperature-changing beams. This probably constitutes as some kind of war crime. components: @@ -850,12 +850,12 @@ - type: entity name: xenoborg laser gun - parent: [ WeaponAdvancedLaser, BaseXenoborgContraband ] + parent: [WeaponAdvancedLaser, BaseXenoborgContraband] id: XenoborgLaserGun - type: entity name: xenoborg heavy laser gun - parent: [ WeaponAdvancedLaser, BaseXenoborgContraband ] + parent: [WeaponAdvancedLaser, BaseXenoborgContraband] id: XenoborgHeavyLaserGun components: - type: HitscanBatteryAmmoProvider diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 2710ee4818..7c9332891b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -182,7 +182,7 @@ - type: entity name: WT550 - parent: [ BaseWeaponSubMachineGun, BaseSecurityContraband ] + parent: [BaseWeaponSubMachineGun, BaseSecurityContraband] id: WeaponSubMachineGunWt550 description: A truly unique firearm, the WT550 was designed by Nanotrasen's Small Arms Division as a compact submachine gun fully controllable with one hand. It contains an exotic internal recoil buffer and feeds from special top-mounted .35 magazines. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml index 204302b395..de75ae4be4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml @@ -53,7 +53,7 @@ - type: entity id: FireAxeFlaming name: fire axe - parent: [ BaseSyndicateContraband, FireAxe ] + parent: [BaseSyndicateContraband, FireAxe] description: Why fight fire with an axe when you can fight with fire and axe? Now featuring rugged rubberized handle! components: - type: MeleeWeapon -- 2.51.2