From b85253df014492d5a6a64c1e54ddc7d78c4332ee Mon Sep 17 00:00:00 2001 From: BramvanZijp <56019239+BramvanZijp@users.noreply.github.com> Date: Tue, 18 Feb 2025 14:07:09 +0100 Subject: [PATCH] Fix contraband parenting defaulting to security. (#35281) Fix an issue with contraband parenting that made janitor restricted gear available to security. --- .../Prototypes/Catalog/Fills/Crates/armory.yml | 14 +++++++------- .../Catalog/Fills/Lockers/security.yml | 16 ++++++++-------- .../Entities/Clothing/Back/backpacks.yml | 4 ++-- .../Prototypes/Entities/Clothing/Back/duffel.yml | 4 ++-- .../Entities/Clothing/Back/satchel.yml | 4 ++-- .../Prototypes/Entities/Clothing/Belt/belts.yml | 2 +- .../Entities/Clothing/Ears/headsets.yml | 2 +- .../Entities/Clothing/Eyes/glasses.yml | 4 ++-- .../Prototypes/Entities/Clothing/Eyes/hud.yml | 2 +- .../Entities/Clothing/Hands/gloves.yml | 2 +- .../Entities/Clothing/Head/helmets.yml | 8 ++++---- .../Prototypes/Entities/Clothing/Masks/masks.yml | 6 +++--- .../Entities/Clothing/OuterClothing/armor.yml | 4 ++-- .../Entities/Clothing/OuterClothing/coats.yml | 2 +- .../Clothing/OuterClothing/hardsuits.yml | 6 +++--- .../Entities/Clothing/OuterClothing/vests.yml | 2 +- .../Clothing/OuterClothing/wintercoats.yml | 6 +++--- .../Prototypes/Entities/Clothing/Shoes/boots.yml | 6 +++--- .../Entities/Clothing/Uniforms/jumpskirts.yml | 10 +++++----- .../Entities/Clothing/Uniforms/jumpsuits.yml | 10 +++++----- .../Entities/Objects/Devices/radio.yml | 2 +- .../Entities/Objects/Misc/fluff_lights.yml | 2 +- .../Entities/Objects/Misc/rubber_stamp.yml | 4 ++-- .../Entities/Objects/Shields/shields.yml | 6 +++--- .../Entities/Objects/Tools/flashlights.yml | 2 +- .../Entities/Objects/Tools/jetpacks.yml | 2 +- .../Ammunition/Cartridges/caseless_rifle.yml | 2 +- .../Guns/Ammunition/Cartridges/heavy_rifle.yml | 2 +- .../Guns/Ammunition/Cartridges/light_rifle.yml | 2 +- .../Guns/Ammunition/Cartridges/magnum.yml | 2 +- .../Guns/Ammunition/Cartridges/pistol.yml | 2 +- .../Weapons/Guns/Ammunition/Cartridges/rifle.yml | 2 +- .../Guns/Ammunition/Cartridges/shotgun.yml | 2 +- .../Guns/Ammunition/Magazines/caseless_rifle.yml | 2 +- .../Guns/Ammunition/Magazines/grenade.yml | 2 +- .../Guns/Ammunition/Magazines/heavy_rifle.yml | 2 +- .../Guns/Ammunition/Magazines/light_rifle.yml | 2 +- .../Weapons/Guns/Ammunition/Magazines/magnum.yml | 2 +- .../Weapons/Guns/Ammunition/Magazines/pistol.yml | 6 +++--- .../Weapons/Guns/Ammunition/Magazines/rifle.yml | 2 +- .../Guns/Ammunition/Magazines/shotgun.yml | 2 +- .../Guns/Ammunition/SpeedLoaders/magnum.yml | 2 +- .../Guns/Ammunition/SpeedLoaders/pistol.yml | 2 +- .../Guns/Ammunition/SpeedLoaders/rifle_light.yml | 2 +- .../Weapons/Guns/Battery/battery_guns.yml | 12 ++++++------ .../Objects/Weapons/Guns/Pistols/pistols.yml | 4 ++-- .../Objects/Weapons/Guns/Revolvers/revolvers.yml | 2 +- .../Objects/Weapons/Guns/Rifles/rifles.yml | 4 ++-- .../Entities/Objects/Weapons/Guns/SMGs/smgs.yml | 4 ++-- .../Objects/Weapons/Guns/Shotguns/shotguns.yml | 4 ++-- .../Entities/Objects/Weapons/Melee/knife.yml | 2 +- .../Entities/Objects/Weapons/Throwable/bola.yml | 2 +- .../Objects/Weapons/Throwable/grenades.yml | 4 ++-- .../Weapons/Throwable/projectile_grenades.yml | 2 +- .../Weapons/Throwable/scattering_grenades.yml | 2 +- .../Entities/Objects/Weapons/security.yml | 6 +++--- .../Entities/Objects/base_contraband.yml | 5 +++-- .../Structures/Storage/Crates/crates.yml | 4 ++-- 58 files changed, 115 insertions(+), 114 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml index 82fa54eaba..b1187ecd6c 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml @@ -1,6 +1,6 @@ - type: entity id: CrateArmorySMG - parent: [ CrateWeaponSecure, BaseRestrictedContraband ] + parent: [ CrateWeaponSecure, BaseSecurityContraband ] name: SMG crate description: Contains two high-powered, semiautomatic rifles with four mags. Requires Armory access to open. components: @@ -13,7 +13,7 @@ - type: entity id: CrateArmoryShotgun - parent: [ CrateWeaponSecure, BaseRestrictedContraband ] + parent: [ CrateWeaponSecure, BaseSecurityContraband ] name: shotgun crate description: For when the enemy absolutely needs to be replaced with lead. Contains two Enforcer Combat Shotguns, and some standard shotgun shells. Requires Armory access to open. components: @@ -26,7 +26,7 @@ - type: entity id: CrateTrackingImplants - parent: [ CrateWeaponSecure, BaseRestrictedContraband ] + parent: [ CrateWeaponSecure, BaseSecurityContraband ] name: tracking implants description: Contains a handful of tracking implanters. Good for prisoners you'd like to release but still keep track of. components: @@ -36,7 +36,7 @@ amount: 5 - type: entity - parent: [ CrateWeaponSecure, BaseRestrictedContraband ] + parent: [ CrateWeaponSecure, BaseSecurityContraband ] id: CrateTrainingBombs name: training bombs description: Contains three low-yield training bombs for security to learn defusal and safe ordnance disposal, EOD suit not included. Requires Armory access to open. @@ -48,7 +48,7 @@ - type: entity id: CrateArmoryLaser - parent: [ CrateWeaponSecure, BaseRestrictedContraband ] + parent: [ CrateWeaponSecure, BaseSecurityContraband ] name: lasers crate description: Contains three standard-issue laser rifles. Requires Armory access to open. components: @@ -59,7 +59,7 @@ - type: entity id: CrateArmoryPistols - parent: [ CrateWeaponSecure, BaseRestrictedContraband ] + parent: [ CrateWeaponSecure, BaseSecurityContraband ] name: pistols crate description: Contains two standard NT pistols with four mags. Requires Armory access to open. components: @@ -72,7 +72,7 @@ - type: entity id: CrateSecurityRiot - parent: [ CrateWeaponSecure, BaseRestrictedContraband ] + parent: [ CrateWeaponSecure, BaseSecurityContraband ] name: swat crate description: Contains two sets of riot armor, helmets, shields, and enforcers loaded with beanbags. Extra ammo is included. Requires Armory access to open. components: diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 93ea12404e..aab2a8af9a 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -152,7 +152,7 @@ prob: 0.5 - type: entity - parent: [GunSafeBaseSecure, BaseRestrictedContraband] + parent: [GunSafeBaseSecure, BaseSecurityContraband] id: GunSafeDisabler name: disabler safe components: @@ -162,7 +162,7 @@ amount: 5 - type: entity - parent: [GunSafeBaseSecure, BaseRestrictedContraband] + parent: [GunSafeBaseSecure, BaseSecurityContraband] id: GunSafePistolMk58 name: mk58 safe components: @@ -174,7 +174,7 @@ amount: 8 - type: entity - parent: [GunSafeBaseSecure, BaseRestrictedContraband] + parent: [GunSafeBaseSecure, BaseSecurityContraband] id: GunSafeRifleLecter name: lecter safe components: @@ -186,7 +186,7 @@ amount: 4 - type: entity - parent: [GunSafeBaseSecure, BaseRestrictedContraband] + parent: [GunSafeBaseSecure, BaseSecurityContraband] id: GunSafeSubMachineGunDrozd name: drozd safe components: @@ -198,7 +198,7 @@ amount: 4 - type: entity - parent: [GunSafeBaseSecure, BaseRestrictedContraband] + parent: [GunSafeBaseSecure, BaseSecurityContraband] id: GunSafeShotgunEnforcer name: enforcer safe components: @@ -210,7 +210,7 @@ amount: 4 - type: entity - parent: [GunSafeBaseSecure, BaseRestrictedContraband] + parent: [GunSafeBaseSecure, BaseSecurityContraband] id: GunSafeShotgunKammerer name: kammerer safe components: @@ -224,7 +224,7 @@ - type: entity id: GunSafeSubMachineGunWt550 suffix: Wt550 - parent: [GunSafeBaseSecure, BaseRestrictedContraband] + parent: [GunSafeBaseSecure, BaseSecurityContraband] name: wt550 safe components: - type: StorageFill @@ -235,7 +235,7 @@ amount: 4 - type: entity - parent: [GunSafeBaseSecure, BaseRestrictedContraband] + parent: [GunSafeBaseSecure, BaseSecurityContraband] id: GunSafeLaserCarbine name: laser safe components: diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index 679e1e2a7b..3cb8adde73 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -56,7 +56,7 @@ collection: IanBark - type: entity - parent: [ClothingBackpack, BaseRestrictedContraband] + parent: [ClothingBackpack, BaseSecurityContraband] id: ClothingBackpackSecurity name: security backpack description: It's a very robust backpack. @@ -65,7 +65,7 @@ sprite: Clothing/Back/Backpacks/security.rsi - type: entity - parent: [ClothingBackpack, BaseRestrictedContraband] + parent: [ClothingBackpack, BaseSecurityContraband] id: ClothingBackpackBrigmedic name: brigmedic backpack description: It's a very sterile backpack. diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml index 58e9bea0b4..a4a589fe1c 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -64,7 +64,7 @@ collection: BikeHorn - type: entity - parent: [ClothingBackpackDuffel, BaseRestrictedContraband] + parent: [ClothingBackpackDuffel, BaseSecurityContraband] id: ClothingBackpackDuffelSecurity name: security duffel bag description: A large duffel bag for holding extra security related goods. @@ -73,7 +73,7 @@ sprite: Clothing/Back/Duffels/security.rsi - type: entity - parent: [ClothingBackpackDuffel, BaseRestrictedContraband] + parent: [ClothingBackpackDuffel, BaseSecurityContraband] id: ClothingBackpackDuffelBrigmedic name: brigmedic duffel bag description: A large duffel bag for holding extra medical related goods. diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml index 78fde527d1..5b195f4454 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml @@ -106,7 +106,7 @@ sprite: Clothing/Back/Satchels/science.rsi - type: entity - parent: [ClothingBackpackSatchel, BaseRestrictedContraband] + parent: [ClothingBackpackSatchel, BaseSecurityContraband] id: ClothingBackpackSatchelSecurity name: security satchel description: A robust satchel for security related needs. @@ -115,7 +115,7 @@ sprite: Clothing/Back/Satchels/security.rsi - type: entity - parent: [ClothingBackpackSatchel, BaseRestrictedContraband] + parent: [ClothingBackpackSatchel, BaseSecurityContraband] id: ClothingBackpackSatchelBrigmedic name: brigmedic satchel description: A sterile satchel for medical related needs. diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index a70fe17ed6..1248cd6d68 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -458,7 +458,7 @@ - type: Appearance - type: entity - parent: [ClothingBeltStorageBase, ContentsExplosionResistanceBase, BaseRestrictedContraband] + parent: [ClothingBeltStorageBase, ContentsExplosionResistanceBase, BaseSecurityContraband] id: ClothingBeltSecurity name: security belt description: Can hold security gear like handcuffs and flashes. diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml index ca9d0e89a1..89227387f9 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml @@ -242,7 +242,7 @@ sprite: Clothing/Ears/Headsets/security.rsi - type: entity - parent: [ClothingHeadset, BaseRestrictedContraband] + parent: [ClothingHeadset, BaseSecurityContraband] id: ClothingHeadsetBrigmedic name: brigmedic headset description: A headset that helps to hear the death cries. diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index 467bbf873f..c44d7c94e6 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -158,7 +158,7 @@ - WhitelistChameleon - type: entity - parent: [ClothingEyesBase, ShowSecurityIcons, BaseRestrictedContraband] + parent: [ClothingEyesBase, ShowSecurityIcons, BaseSecurityContraband] id: ClothingEyesGlassesSecurity name: security glasses description: Upgraded sunglasses that provide flash immunity and a security HUD. @@ -188,7 +188,7 @@ parent: [ClothingEyesBase, BaseCommandContraband] id: ClothingEyesGlassesCommand name: administration glasses - description: Upgraded sunglasses that provide flash immunity and show ID card status. + description: Upgraded sunglasses that provide flash immunity and show ID card status. components: - type: Sprite sprite: Clothing/Eyes/Glasses/commandglasses.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml index 300c938bc9..ac8360f31d 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml @@ -45,7 +45,7 @@ - HudMedical - type: entity - parent: [ClothingEyesBase, ShowSecurityIcons, BaseRestrictedContraband] + parent: [ClothingEyesBase, ShowSecurityIcons, BaseSecurityContraband] id: ClothingEyesHudSecurity name: security hud description: A heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records. diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index 4b8646ac9c..20c2488aa7 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -415,7 +415,7 @@ price: 0 - type: entity - parent: [ClothingHandsBase, BaseRestrictedContraband] + parent: [ClothingHandsBase, BaseSecurityContraband] id: ClothingHandsGlovesForensic name: forensic gloves description: Do not leave fibers or fingerprints. If you work without them, you're A TERRIBLE DETECTIVE. diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index 5fc6dd5a56..91cf83d61b 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -23,7 +23,7 @@ #Basic Helmet (Security Helmet) - type: entity - parent: [ClothingHeadHelmetBase, BaseRestrictedContraband] + parent: [ClothingHeadHelmetBase, BaseSecurityContraband] id: ClothingHeadHelmetBasic name: helmet description: Standard security gear. Protects the head from impacts. @@ -51,7 +51,7 @@ #SWAT Helmet - type: entity - parent: [ClothingHeadBase, BaseRestrictedContraband] + parent: [ClothingHeadBase, BaseSecurityContraband] id: ClothingHeadHelmetSwat name: SWAT helmet description: An extremely robust helmet, commonly used by paramilitary forces. This one has the Nanotrasen logo emblazoned on the top. @@ -87,7 +87,7 @@ #Light Riot Helmet - type: entity - parent: [ClothingHeadBase, BaseRestrictedContraband] + parent: [ClothingHeadBase, BaseSecurityContraband] id: ClothingHeadHelmetRiot name: light riot helmet description: It's a helmet specifically designed to protect against close range attacks. @@ -417,7 +417,7 @@ #Justice Helmet - type: entity - parent: [ ClothingHeadHelmetBase, BaseRestrictedContraband ] + parent: [ ClothingHeadHelmetBase, BaseSecurityContraband ] id: ClothingHeadHelmetJustice name: justice helm description: Advanced security gear. Protects the station from ne'er-do-wells. diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 0d97459353..4ba9ecdcaa 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -21,7 +21,7 @@ hideOnToggle: true - type: entity - parent: [ClothingMaskGas, BaseRestrictedContraband] + parent: [ClothingMaskGas, BaseSecurityContraband] id: ClothingMaskGasSecurity name: security gas mask description: A standard issue Security gas mask. @@ -231,7 +231,7 @@ node: mask - type: entity - parent: [ClothingMaskClown, BaseRestrictedContraband] + parent: [ClothingMaskClown, BaseSecurityContraband] id: ClothingMaskClownSecurity name: security clown wig and mask description: A debatably oxymoronic but protective mask and wig. @@ -358,7 +358,7 @@ accent: StutteringAccent - type: entity - parent: [ ClothingMaskGas, BaseRestrictedContraband ] + parent: [ ClothingMaskGas, BaseSecurityContraband ] id: ClothingMaskGasSwat name: swat gas mask description: A elite issue Security gas mask. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index cdb938030d..c28cca5669 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -3,7 +3,7 @@ #Basic armor vest for inheritance - type: entity - parent: [ClothingOuterBaseMedium, AllowSuitStorageClothing, BaseRestrictedContraband] + parent: [ClothingOuterBaseMedium, AllowSuitStorageClothing, BaseSecurityContraband] id: ClothingOuterArmorBase name: armor vest abstract: true @@ -42,7 +42,7 @@ sprite: Clothing/OuterClothing/Armor/security_slim.rsi - type: entity - parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseRestrictedContraband] + parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseSecurityContraband] id: ClothingOuterArmorRiot name: riot suit description: A suit of semi-flexible polycarbonate body armor with heavy padding to protect against melee attacks. Perfect for fighting delinquents around the station. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index e2db7ebd94..c7d8125e3c 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -315,7 +315,7 @@ sprite: Clothing/OuterClothing/Coats/pirate.rsi - type: entity - parent: [ClothingOuterArmorWarden, ClothingOuterStorageBase, BaseRestrictedContraband] + parent: [ClothingOuterArmorWarden, ClothingOuterStorageBase, BaseSecurityContraband] id: ClothingOuterCoatWarden name: warden's armored jacket description: A sturdy, utilitarian jacket designed to protect a warden from any brig-bound threats. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 08ac6f32c0..c120cb04ef 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -231,7 +231,7 @@ #Security Hardsuit - type: entity - parent: [ClothingOuterHardsuitBase, BaseRestrictedContraband] + parent: [ClothingOuterHardsuitBase, BaseSecurityContraband] id: ClothingOuterHardsuitSecurity name: security hardsuit description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor. @@ -261,7 +261,7 @@ #Brigmedic Hardsuit - type: entity - parent: [ClothingOuterHardsuitBase, BaseRestrictedContraband] + parent: [ClothingOuterHardsuitBase, BaseSecurityContraband] id: ClothingOuterHardsuitBrigmedic name: brigmedic hardsuit description: Special hardsuit of the guardian angel of the brig. It is the medical version of the security hardsuit. @@ -288,7 +288,7 @@ #Warden's Hardsuit - type: entity - parent: [ClothingOuterHardsuitBase, BaseRestrictedContraband] + parent: [ClothingOuterHardsuitBase, BaseSecurityContraband] id: ClothingOuterHardsuitWarden name: warden's hardsuit description: A specialized riot suit geared to combat low pressure environments. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml index 16debab47b..42de6bfd02 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml @@ -42,7 +42,7 @@ #Detective's vest - type: entity - parent: [ClothingOuterArmorBase, BaseRestrictedContraband] + parent: [ClothingOuterArmorBase, BaseSecurityContraband] id: ClothingOuterVestDetective name: detective's vest description: A hard-boiled private investigator's armored vest. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 46f96750c0..c141971700 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -664,7 +664,7 @@ clothingPrototype: ClothingHeadHatHoodWinterSci - type: entity - parent: [ClothingOuterWinterCoatToggleable, BaseRestrictedContraband] + parent: [ClothingOuterWinterCoatToggleable, BaseSecurityContraband] id: ClothingOuterWinterSec name: security winter coat components: @@ -718,7 +718,7 @@ ################################################################ - type: entity - parent: [ClothingOuterArmorWarden, ClothingOuterWinterCoatToggleable, BaseRestrictedContraband] + parent: [ClothingOuterArmorWarden, ClothingOuterWinterCoatToggleable, BaseSecurityContraband] id: ClothingOuterWinterWarden name: warden's armored winter coat description: A sturdy, utilitarian winter coat designed to protect a warden from any brig-bound threats and hypothermic events. @@ -732,7 +732,7 @@ ################################################################ - type: entity - parent: [ClothingOuterWinterCoatToggleable, BaseRestrictedContraband] + parent: [ClothingOuterWinterCoatToggleable, BaseSecurityContraband] id: ClothingOuterWinterWardenUnarmored name: warden's winter coat description: A sturdy coat, a warm coat, but not an armored coat. diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml index 86cce59fff..98b869350a 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml @@ -11,7 +11,7 @@ - type: Matchbox - type: entity - parent: [ClothingShoesMilitaryBase, BaseRestrictedContraband] + parent: [ClothingShoesMilitaryBase, BaseSecurityContraband] id: ClothingShoesBootsJack name: jackboots description: Nanotrasen-issue Security combat boots for combat scenarios or combat situations. All combat, all the time. @@ -47,7 +47,7 @@ sprite: Clothing/Shoes/Boots/performer.rsi - type: entity - parent: [ClothingShoesMilitaryBase, BaseRestrictedContraband] + parent: [ClothingShoesMilitaryBase, BaseSecurityContraband] id: ClothingShoesBootsCombat name: combat boots description: Robust combat boots for combat scenarios or combat situations. All combat, all the time. @@ -150,7 +150,7 @@ sprite: Clothing/Shoes/Boots/winterbootssci.rsi - type: entity - parent: [ClothingShoesBaseWinterBoots, ClothingShoesMilitaryBase, BaseRestrictedContraband] + parent: [ClothingShoesBaseWinterBoots, ClothingShoesMilitaryBase, BaseSecurityContraband] id: ClothingShoesBootsWinterSec name: security winter boots components: diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index c4850954cd..92716ae4c8 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -382,7 +382,7 @@ sprite: Clothing/Uniforms/Jumpskirt/roboticist.rsi - type: entity - parent: [ClothingUniformSkirtBase, BaseRestrictedContraband] + parent: [ClothingUniformSkirtBase, BaseSecurityContraband] id: ClothingUniformJumpskirtSec name: security jumpskirt description: A jumpskirt made of strong material, providing robust protection. @@ -408,7 +408,7 @@ - type: entity - parent: [ClothingUniformSkirtBase, BaseRestrictedContraband] + parent: [ClothingUniformSkirtBase, BaseSecurityContraband] id: ClothingUniformJumpskirtWarden name: warden's uniform description: A formal security suit for officers complete with Nanotrasen belt buckle. @@ -680,7 +680,7 @@ sprite: Clothing/Uniforms/Jumpskirt/senior_physician.rsi - type: entity - parent: [ClothingUniformSkirtBase, BaseRestrictedContraband] + parent: [ClothingUniformSkirtBase, BaseSecurityContraband] id: ClothingUniformJumpskirtSeniorOfficer name: senior officer jumpskirt description: A sign of skill and prestige within the security department. @@ -691,7 +691,7 @@ sprite: Clothing/Uniforms/Jumpskirt/senior_officer.rsi - type: entity - parent: [ClothingUniformSkirtBase, BaseRestrictedContraband] + parent: [ClothingUniformSkirtBase, BaseSecurityContraband] id: ClothingUniformJumpskirtSecGrey name: grey security jumpskirt description: A tactical relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood. @@ -898,4 +898,4 @@ - type: Tag tags: - ClownSuit - - WhitelistChameleon \ No newline at end of file + - WhitelistChameleon diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index aed199d9c7..07cbb2dcd0 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -590,7 +590,7 @@ sprite: Clothing/Uniforms/Jumpsuit/roboticist.rsi - type: entity - parent: [ClothingUniformBase, BaseRestrictedContraband] + parent: [ClothingUniformBase, BaseSecurityContraband] id: ClothingUniformJumpsuitSec name: security jumpsuit description: A jumpsuit made of strong material, providing robust protection. @@ -624,7 +624,7 @@ sprite: Clothing/Uniforms/Jumpsuit/security_blue.rsi - type: entity - parent: [ClothingUniformBase, BaseRestrictedContraband] + parent: [ClothingUniformBase, BaseSecurityContraband] id: ClothingUniformJumpsuitSecGrey name: grey security jumpsuit description: A tactical relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood. @@ -635,7 +635,7 @@ sprite: Clothing/Uniforms/Jumpsuit/security_grey.rsi - type: entity - parent: [ClothingUniformBase, BaseRestrictedContraband] + parent: [ClothingUniformBase, BaseSecurityContraband] id: ClothingUniformSecurityTrooper name: trooper uniform description: A formal uniform issued to the Nanotrasen Troopers, usually it comes with a car. @@ -646,7 +646,7 @@ sprite: Clothing/Uniforms/Jumpsuit/security_trooper.rsi - type: entity - parent: [ClothingUniformBase, BaseRestrictedContraband] + parent: [ClothingUniformBase, BaseSecurityContraband] id: ClothingUniformJumpsuitWarden name: warden's uniform description: A formal security suit for officers complete with Nanotrasen belt buckle. @@ -1194,7 +1194,7 @@ sprite: Clothing/Uniforms/Jumpsuit/senior_physician.rsi - type: entity - parent: [ClothingUniformBase, BaseRestrictedContraband] + parent: [ClothingUniformBase, BaseSecurityContraband] id: ClothingUniformJumpsuitSeniorOfficer name: senior officer jumpsuit description: A sign of skill and prestige within the security department. diff --git a/Resources/Prototypes/Entities/Objects/Devices/radio.yml b/Resources/Prototypes/Entities/Objects/Devices/radio.yml index e750e4dbc1..84e15878af 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/radio.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/radio.yml @@ -28,7 +28,7 @@ - type: entity name: security radio description: A handy security radio. - parent: [ RadioHandheld, BaseRestrictedContraband ] + parent: [ RadioHandheld, BaseSecurityContraband ] id: RadioHandheldSecurity components: - type: RadioMicrophone diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml index fdb4e29aea..34263ccdc0 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml @@ -131,7 +131,7 @@ - type: entity name: interrogator lamp id: LampInterrogator - parent: [ BaseLamp, BaseRestrictedContraband ] + parent: [ BaseLamp, BaseSecurityContraband ] description: Ultra-bright lamp for the bad cop. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml index df038d3e2e..c994c1fb10 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml @@ -224,7 +224,7 @@ - type: entity name: warden's rubber stamp - parent: [RubberStampBase, BaseRestrictedContraband] + parent: [RubberStampBase, BaseSecurityContraband] id: RubberStampWarden categories: [ DoNotMap ] components: @@ -261,7 +261,7 @@ - type: entity name: detective's rubber stamp - parent: [RubberStampBase, BaseRestrictedContraband] + parent: [RubberStampBase, BaseSecurityContraband] id: RubberStampDetective categories: [ DoNotMap ] components: diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml index c8b9cf71b6..4889c6dffc 100644 --- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml +++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml @@ -64,7 +64,7 @@ - type: entity name: riot shield - parent: [ BaseShield, BaseRestrictedContraband ] + parent: [ BaseShield, BaseSecurityContraband ] id: RiotShield description: A large tower shield. Good for controlling crowds. components: @@ -85,7 +85,7 @@ - type: entity name: laser shield - parent: [ BaseShield, BaseRestrictedContraband ] + parent: [ BaseShield, BaseSecurityContraband ] id: RiotLaserShield description: A shield built for withstanding lasers, but not much else. components: @@ -105,7 +105,7 @@ - type: entity name: ballistic shield - parent: [ BaseShield, BaseRestrictedContraband ] + parent: [ BaseShield, BaseSecurityContraband ] id: RiotBulletShield description: A shield built for protecting against ballistics, but not much else. components: diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml index 98123b3e0c..1a08f613bb 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml @@ -76,7 +76,7 @@ - type: entity name: seclite - parent: [FlashlightLantern, BaseRestrictedContraband] + parent: [FlashlightLantern, BaseSecurityContraband] id: FlashlightSeclite description: A robust flashlight used by security. components: diff --git a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml index efada99e7c..e77394791e 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml @@ -220,7 +220,7 @@ #Empty security - type: entity id: JetpackSecurity - parent: [BaseJetpack, BaseRestrictedContraband] + parent: [BaseJetpack, BaseSecurityContraband] name: security jetpack suffix: Empty components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml index 21edce2222..649c0d4542 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml @@ -1,7 +1,7 @@ - type: entity id: BaseCartridgeCaselessRifle name: cartridge (.25 rifle) - parent: [ BaseCartridge, BaseRestrictedContraband ] + parent: [ BaseCartridge, BaseSecurityContraband ] abstract: true components: - type: Tag diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml index 719bae8ab4..2054fa7884 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml @@ -1,7 +1,7 @@ - type: entity id: BaseCartridgeHeavyRifle name: cartridge (.20 rifle) - parent: [ BaseCartridge, BaseRestrictedContraband ] + parent: [ BaseCartridge, BaseSecurityContraband ] abstract: true components: - type: Tag diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml index 4cf3c759bb..cedb5e2780 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml @@ -1,7 +1,7 @@ - type: entity id: BaseCartridgeLightRifle name: cartridge (.30 rifle) - parent: [ BaseCartridge, BaseRestrictedContraband ] + parent: [ BaseCartridge, BaseSecurityContraband ] abstract: true components: - type: Tag diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml index 3367fa45a1..383d2adac7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml @@ -1,7 +1,7 @@ - type: entity id: BaseCartridgeMagnum name: cartridge (.45 magnum) - parent: [ BaseCartridge, BaseRestrictedContraband ] + parent: [ BaseCartridge, BaseSecurityContraband ] abstract: true components: - type: Tag diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml index 3635b00f36..bdf61c85e9 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml @@ -1,7 +1,7 @@ - type: entity id: BaseCartridgePistol name: cartridge (.35 auto) - parent: [ BaseCartridge, BaseRestrictedContraband ] + parent: [ BaseCartridge, BaseSecurityContraband ] abstract: true components: - type: Tag diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml index 30976744e0..7e29dbe995 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml @@ -1,7 +1,7 @@ - type: entity id: BaseCartridgeRifle name: cartridge (.20 rifle) - parent: [ BaseCartridge, BaseRestrictedContraband ] + parent: [ BaseCartridge, BaseSecurityContraband ] abstract: true components: - type: Tag diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml index a2b9fb2737..fd6f2b8c3c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml @@ -1,7 +1,7 @@ - type: entity id: BaseShellShotgun name: shell (.50) - parent: [ BaseCartridge, BaseRestrictedContraband ] + parent: [ BaseCartridge, BaseSecurityContraband ] abstract: true components: - type: Tag diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml index b12deec582..7361bc09c7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml @@ -1,7 +1,7 @@ - type: entity id: BaseMagazineCaselessRifle name: "magazine (.25 caseless)" - parent: [ BaseItem, BaseRestrictedContraband ] + parent: [ BaseItem, BaseSecurityContraband ] abstract: true components: - type: Tag diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/grenade.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/grenade.yml index 389a4033cb..c6f98a870a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/grenade.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/grenade.yml @@ -1,7 +1,7 @@ - type: entity id: BaseMagazineGrenade name: grenade cartridge - parent: [ BaseItem, BaseRestrictedContraband ] + parent: [ BaseItem, BaseSecurityContraband ] abstract: true components: - type: Tag diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml index ba5094255c..5aa704231d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml @@ -1,7 +1,7 @@ - type: entity id: BaseMagazineHeavyRifle name: "magazine (.20 rifle)" - parent: [ BaseItem, BaseRestrictedContraband ] + parent: [ BaseItem, BaseSecurityContraband ] abstract: true components: - type: Tag diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml index c2bf5efeff..ab45d91371 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml @@ -2,7 +2,7 @@ - type: entity id: BaseMagazineLightRifle name: "magazine (.30 rifle)" - parent: [ BaseItem, BaseRestrictedContraband ] + parent: [ BaseItem, BaseSecurityContraband ] abstract: true components: - type: Tag diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml index 653ac8c068..91a3e4f360 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml @@ -1,7 +1,7 @@ - type: entity id: BaseMagazineMagnum name: pistol magazine (.45 magnum) - parent: [ BaseMagazinePistol, BaseRestrictedContraband ] + parent: [ BaseMagazinePistol, BaseSecurityContraband ] abstract: true components: - type: Tag diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml index 680ec5d795..df1662a822 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -1,7 +1,7 @@ - type: entity id: BaseMagazinePistol name: pistol magazine (.35 auto) - parent: [ BaseItem, BaseRestrictedContraband ] + parent: [ BaseItem, BaseSecurityContraband ] abstract: true components: - type: Tag @@ -67,7 +67,7 @@ - type: entity id: BaseMagazinePistolSubMachineGun # Yeah it's weird but it's pistol caliber name: SMG magazine (.35 auto) - parent: [ BaseItem, BaseRestrictedContraband ] + parent: [ BaseItem, BaseSecurityContraband ] abstract: true components: - type: Tag @@ -100,7 +100,7 @@ - type: entity id: MagazinePistolSubMachineGunTopMounted name: WT550 magazine (.35 auto top-mounted) - parent: [ BaseItem, BaseRestrictedContraband ] + parent: [ BaseItem, BaseSecurityContraband ] components: - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml index 8e15cb18ba..d7a3571177 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml @@ -2,7 +2,7 @@ - type: entity id: BaseMagazineRifle name: "magazine (.20 rifle)" - parent: [ BaseItem, BaseRestrictedContraband ] + parent: [ BaseItem, BaseSecurityContraband ] abstract: true components: - type: Tag diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml index cc679b12d8..a27ed12304 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml @@ -1,7 +1,7 @@ - type: entity id: BaseMagazineShotgun name: ammo drum (.50 shells) - parent: [ BaseItem, BaseRestrictedContraband ] + parent: [ BaseItem, BaseSecurityContraband ] abstract: true components: - type: Tag diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml index fd02fdf21b..3044b1f9ff 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml @@ -1,7 +1,7 @@ - type: entity id: BaseSpeedLoaderMagnum name: "speed loader (.45 magnum)" - parent: [ BaseItem, BaseRestrictedContraband ] + parent: [ BaseItem, BaseSecurityContraband ] abstract: true components: - type: Tag diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml index 8f3ec37753..512eb88657 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml @@ -1,7 +1,7 @@ - type: entity id: BaseSpeedLoaderPistol name: "speed loader (.35 auto)" - parent: [ BaseItem, BaseRestrictedContraband ] + parent: [ BaseItem, BaseSecurityContraband ] abstract: true components: - type: Tag diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml index 71b1119267..191f0ae22c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml @@ -1,7 +1,7 @@ - type: entity id: SpeedLoaderLightRifle name: "speed loader (.30 rifle)" - parent: [ BaseItem, BaseRestrictedContraband ] + parent: [ BaseItem, BaseSecurityContraband ] components: - type: Tag tags: 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 6426e59bd5..73d06a200c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -99,7 +99,7 @@ - type: entity name: svalinn laser pistol - parent: [ BaseWeaponPowerCellSmall, BaseRestrictedContraband ] + parent: [ BaseWeaponPowerCellSmall, BaseSecurityContraband ] id: WeaponLaserSvalinn description: A cheap and widely used laser pistol. components: @@ -231,7 +231,7 @@ - type: entity name: laser rifle - parent: [WeaponLaserCarbinePractice, BaseGunWieldable, BaseRestrictedContraband] + parent: [WeaponLaserCarbinePractice, BaseGunWieldable, BaseSecurityContraband] id: WeaponLaserCarbine description: Favoured by Nanotrasen Security for being cheap and easy to use. components: @@ -345,7 +345,7 @@ - type: entity name: laser cannon - parent: [BaseWeaponBattery, BaseGunWieldable, BaseRestrictedContraband] + parent: [BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband] id: WeaponLaserCannon description: A heavy duty, high powered laser weapon. components: @@ -500,7 +500,7 @@ - type: entity name: disabler SMG - parent: [ BaseWeaponBattery, BaseRestrictedContraband ] + parent: [ BaseWeaponBattery, BaseSecurityContraband ] id: WeaponDisablerSMG description: Advanced weapon that exhausts organic targets, weakening them until they collapse. components: @@ -538,7 +538,7 @@ - type: entity name: taser - parent: [ BaseWeaponBatterySmall, BaseRestrictedContraband ] + parent: [ BaseWeaponBatterySmall, BaseSecurityContraband ] id: WeaponTaser description: A low-capacity, energy-based stun gun used by security teams to subdue targets at range. components: @@ -618,7 +618,7 @@ - type: entity name: advanced laser pistol - parent: [ BaseWeaponBatterySmall, BaseRestrictedContraband] + parent: [ BaseWeaponBatterySmall, BaseSecurityContraband] id: WeaponAdvancedLaser description: An experimental high-energy laser pistol with a self-charging nuclear battery. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 167e21e15f..2ace44189e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -187,7 +187,7 @@ - type: entity name: mk 58 - parent: [BaseWeaponPistol, BaseRestrictedContraband] + parent: [BaseWeaponPistol, BaseSecurityContraband] id: WeaponPistolMk58 description: A cheap, ubiquitous sidearm, produced by a NanoTrasen subsidiary. Uses .35 auto ammo. components: @@ -209,7 +209,7 @@ - type: entity name: N1984 - parent: [BaseWeaponPistol, BaseRestrictedContraband] + parent: [BaseWeaponPistol, BaseSecurityContraband] id: WeaponPistolN1984 # the spaces in description are for formatting. description: The sidearm of any self respecting officer. Comes in .45 magnum, the lord's caliber. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index b5bc7f6805..564ef7f869 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -80,7 +80,7 @@ - type: entity name: Inspector - parent: [BaseWeaponRevolver, BaseRestrictedContraband] + parent: [BaseWeaponRevolver, BaseSecurityContraband] id: WeaponRevolverInspector description: A detective's best friend. Uses .45 magnum ammo. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index e34433cb56..ffe24fc264 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -53,7 +53,7 @@ - type: entity name: AKMS - parent: [BaseWeaponRifle, BaseRestrictedContraband] + parent: [BaseWeaponRifle, BaseSecurityContraband] id: WeaponRifleAk description: An iconic weapon of war. Uses .30 rifle ammo. components: @@ -146,7 +146,7 @@ - type: entity name: Lecter - parent: [BaseWeaponRifle, BaseRestrictedContraband] + parent: [BaseWeaponRifle, BaseSecurityContraband] id: WeaponRifleLecter description: A high end military grade assault rifle. Uses .20 rifle ammo. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 2fc2fc41e5..90789e01d7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -121,7 +121,7 @@ - type: entity name: Drozd - parent: [BaseWeaponSubMachineGun, BaseRestrictedContraband] + parent: [BaseWeaponSubMachineGun, BaseSecurityContraband] id: WeaponSubMachineGunDrozd description: An excellent fully automatic Heavy SMG. components: @@ -179,7 +179,7 @@ - type: entity name: WT550 - parent: [ BaseWeaponSubMachineGun, BaseRestrictedContraband ] + parent: [ BaseWeaponSubMachineGun, BaseSecurityContraband ] id: WeaponSubMachineGunWt550 description: An excellent SMG, produced by NanoTrasen's Small Arms Division. Uses .35 auto ammo. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index c9748a0b61..0f29a65600 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -136,7 +136,7 @@ - type: entity name: Enforcer - parent: [BaseWeaponShotgun, BaseGunWieldable, BaseRestrictedContraband] + parent: [BaseWeaponShotgun, BaseGunWieldable, BaseSecurityContraband] id: WeaponShotgunEnforcer description: A premium semi-automatic shotgun, and the pride of all security forces. Uses .50 shotgun shells. components: # intend for Enforcer to have wider choke for semi-auto function @@ -159,7 +159,7 @@ - type: entity name: Kammerer - parent: [BaseWeaponShotgun, BaseGunWieldable, BaseRestrictedContraband] + parent: [BaseWeaponShotgun, BaseGunWieldable, BaseSecurityContraband] id: WeaponShotgunKammerer description: An old yet faithful design, and a favorite among irregular forces of many worlds. Uses .50 shotgun shells. components: # intend for Kammerer to have tighter choke for slower fire rate and/or manual cycling diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml index c307d0ffbe..3058721072 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml @@ -77,7 +77,7 @@ - type: entity name: combat knife - parent: [BaseKnife, BaseRestrictedContraband] + parent: [BaseKnife, BaseSecurityContraband] id: CombatKnife description: A deadly knife intended for melee confrontations. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml index f6630adbb3..7e4071b37e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml @@ -1,6 +1,6 @@ - type: entity name: bola - parent: [BaseItem, BaseRestrictedContraband] + parent: [BaseItem, BaseSecurityContraband] id: Bola description: Linked together with some spare cuffs and metal. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml index d3a714445e..041aa0edc2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml @@ -60,7 +60,7 @@ - type: entity name: flashbang description: Eeeeeeeeeeeeeeeeeeeeee. - parent: [ GrenadeBase, BaseRestrictedContraband ] + parent: [ GrenadeBase, BaseSecurityContraband ] id: GrenadeFlashBang components: - type: Sprite @@ -387,7 +387,7 @@ path: /Audio/Effects/hallelujah.ogg - type: entity - parent: [ GrenadeBase, BaseRestrictedContraband ] + parent: [ GrenadeBase, BaseSecurityContraband ] id: SmokeGrenade name: smoke grenade description: A tactical grenade that releases a large, long-lasting cloud of smoke when used. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml index 375d24c29e..9f71158357 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml @@ -27,7 +27,7 @@ Unprimed: { state: icon } - type: entity - parent: [ProjectileGrenadeBase, BaseRestrictedContraband] + parent: [ProjectileGrenadeBase, BaseSecurityContraband] id: GrenadeStinger name: stinger grenade description: Nothing to see here, please disperse. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml index f68498bb51..38fde5c540 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml @@ -20,7 +20,7 @@ - type: ScatteringGrenade - type: entity - parent: [ScatteringGrenadeBase, BaseRestrictedContraband] + parent: [ScatteringGrenadeBase, BaseSecurityContraband] id: ClusterBang name: clusterbang description: Can be used only with flashbangs. Explodes several times. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml index 57550d30ad..cb908acffa 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml @@ -1,6 +1,6 @@ - type: entity name: stun baton - parent: [BaseItem, BaseRestrictedContraband] + parent: [BaseItem, BaseSecurityContraband] id: Stunbaton description: A stun baton for incapacitating people with. Actively harming with this is considered bad tone. components: @@ -91,7 +91,7 @@ - type: entity name: truncheon - parent: [BaseItem, BaseRestrictedContraband] + parent: [BaseItem, BaseSecurityContraband] id: Truncheon description: A rigid, steel-studded baton, meant to harm. components: @@ -184,7 +184,7 @@ - type: entity name: portable flasher - parent: [BaseMachine, BaseRestrictedContraband] + parent: [BaseMachine, BaseSecurityContraband] id: PortableFlasher description: An ultrabright flashbulb with a proximity trigger, useful for making an area security-only. components: diff --git a/Resources/Prototypes/Entities/Objects/base_contraband.yml b/Resources/Prototypes/Entities/Objects/base_contraband.yml index 032218f8c0..ee0e2e8c71 100644 --- a/Resources/Prototypes/Entities/Objects/base_contraband.yml +++ b/Resources/Prototypes/Entities/Objects/base_contraband.yml @@ -30,14 +30,15 @@ - type: Contraband severity: Major -# minor contraband by default restricted to security only +# base department restricted contraband, this should only be used as a parent for other contraband prototypes, not the restricted items themselves. - type: entity id: BaseRestrictedContraband abstract: true components: - type: Contraband severity: Restricted - allowedDepartments: [ Security ] + allowedDepartments: [ ] + allowedJobs: [ ] # one department restricted contraband - type: entity diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml index 628a95831b..74b3fca79f 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml @@ -178,7 +178,7 @@ # Secure Crates - type: entity - parent: [ CrateBaseSecure, BaseRestrictedContraband ] + parent: [ CrateBaseSecure, BaseSecurityContraband ] id: CrateSecgear name: secgear crate components: @@ -294,7 +294,7 @@ access: [["Armory"]] - type: entity - parent: [ CrateBaseSecure, BaseRestrictedContraband ] + parent: [ CrateBaseSecure, BaseSecurityContraband ] suffix: Armory, Secure id: CrateContrabandStorageSecure name: contraband storage crate -- 2.51.2