diff --git a/Resources/Locale/en-US/contraband/contraband-severity.ftl b/Resources/Locale/en-US/contraband/contraband-severity.ftl index 594a64f8b7..37d83c4575 100644 --- a/Resources/Locale/en-US/contraband/contraband-severity.ftl +++ b/Resources/Locale/en-US/contraband/contraband-severity.ftl @@ -1,6 +1,7 @@ contraband-examine-text-Minor = [color=yellow]This item is considered minor contraband.[/color] contraband-examine-text-Restricted = [color=yellow]This item is departmentally restricted.[/color] contraband-examine-text-Restricted-department = [color=yellow]This item is restricted to {$departments}, and may be considered contraband.[/color] +contraband-examine-text-Major = [color=red]This item is considered major contraband.[/color] contraband-examine-text-GrandTheft = [color=red]This item is a highly valuable target for Syndicate agents![/color] contraband-examine-text-Syndicate = [color=crimson]This item is highly illegal Syndicate contraband![/color] diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index 1ec95a8e97..aeb3873a73 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -346,7 +346,7 @@ - type: entity name: syndicate encryption key box - parent: [BoxEncryptionKeyPassenger, BaseRestrictedContraband] + parent: [BoxEncryptionKeyPassenger, BaseSyndicateContraband] id: BoxEncryptionKeySyndie description: Two syndicate encryption keys for the price of one. Miniaturized for ease of use. components: @@ -451,4 +451,4 @@ - type: StorageFill contents: - id: Envelope - amount: 9 \ No newline at end of file + amount: 9 diff --git a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml index c618443998..a76be4c219 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 + parent: [ CrateWeaponSecure, BaseRestrictedContraband ] 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 + parent: [ CrateWeaponSecure, BaseRestrictedContraband ] 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 + parent: [ CrateWeaponSecure, BaseRestrictedContraband ] 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 + parent: [ CrateWeaponSecure, BaseRestrictedContraband ] 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 + parent: [ CrateWeaponSecure, BaseRestrictedContraband ] 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 + parent: [ CrateWeaponSecure, BaseRestrictedContraband ] name: pistols crate description: Contains two standard NT pistols with four mags. Requires Armory access to open. components: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml index 82f5bd6aa6..2791eb13d6 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml @@ -1,6 +1,6 @@ - type: entity id: CrateSyndicateSurplusBundle - parent: [ CrateSyndicate, StorePresetUplink ] + parent: [ CrateSyndicate, StorePresetUplink, BaseSyndicateContraband ] name: Syndicate surplus crate description: Contains 50 telecrystals worth of completely random Syndicate items. It can be useless junk or really good. components: @@ -25,7 +25,7 @@ - type: entity id: CrateSyndicateSuperSurplusBundle - parent: [ CrateSyndicate, StorePresetUplink ] + parent: [ CrateSyndicate, StorePresetUplink, BaseSyndicateContraband ] name: Syndicate super surplus crate description: Contains 125 telecrystals worth of completely random Syndicate items. components: diff --git a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml index 4956898fa9..564cd825d0 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml @@ -10,7 +10,7 @@ - type: entity id: BriefcaseSyndieSniperBundleFilled - parent: [BriefcaseSyndie, BaseSyndicateContraband] + parent: BriefcaseSyndie suffix: Syndicate, Sniper Bundle components: - type: Item diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 0c57c3c29e..aa395a7108 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -746,7 +746,7 @@ # distanceSprinting: 3 - type: entity - parent: [ClothingBaseWebbing, ClothingBeltStorageBase, ContentsExplosionResistanceBase] # WWDP + parent: [ClothingBeltStorageBase, ContentsExplosionResistanceBase, BaseSyndicateContraband, ClothingBaseWebbing] # WD EDIT: ClothingBaseWebbing id: ClothingBeltMilitaryWebbing name: chest rig description: A set of tactical webbing worn by boarding parties. diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index b6daebeafe..dc0e07628f 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -79,7 +79,7 @@ - type: FingerprintMask - type: entity - parent: [ClothingHandsGlovesBoxingBlue, BaseSyndicateContraband] + parent: ClothingHandsGlovesBoxingBlue id: ClothingHandsGlovesBoxingRigged suffix: Rigged components: diff --git a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml index 292ed79364..1ddc4b4c29 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml @@ -28,7 +28,7 @@ #Syndicate EVA Helmet - type: entity - parent: ClothingHeadEVAHelmetBase + parent: [ ClothingHeadEVAHelmetBase, BaseSyndicateContraband ] id: ClothingHeadHelmetSyndicate name: syndicate EVA helmet description: A simple, stylish EVA helmet. Designed for maximum humble space-badassery. diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index d2f92fb0dd..97a4fc545f 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -388,7 +388,7 @@ sprite: Clothing/Head/Helmets/ert_janitor.rsi - type: entity - parent: ClothingHeadHelmetBasic + parent: [ ClothingHeadHelmetBasic, BaseSyndicateContraband ] id: ClothingHeadHelmetRaid name: syndicate raid helmet description: An armored helmet for use with the syndicate raid suit. Very stylish. diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index 41f52fa050..8bcc96fc5f 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -170,7 +170,7 @@ accent: MobsterAccent - type: entity - parent: ClothingHeadBase + parent: [ ClothingHeadBase, BaseSyndicateContraband ] id: ClothingHeadHatCatEars name: cat ears description: "NYAH!" diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index e562a66eef..6b40487595 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -142,7 +142,7 @@ - Energy - type: entity - parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing] + parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseSyndicateContraband ] id: ClothingOuterArmorRaid name: syndicate raid suit description: A somewhat flexible and well-armored suit with a powerful shoulder mounted flashlight manufactured in the Gorlex Marauder's iconic blood-red color scheme, it does not protect its wearer from space. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml index ce9f515024..9049d31457 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml @@ -22,7 +22,7 @@ #Syndicate EVA - type: entity - parent: ClothingOuterEVASuitBase + parent: [ ClothingOuterEVASuitBase, BaseSyndicateContraband ] id: ClothingOuterHardsuitSyndicate # TODO: rename to ClothingOuterEVASuitSyndicate name: syndicate vacsuit description: "Has a tag on the back that reads: 'Totally not property of an enemy corporation, honest!'" diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 56698872f8..1e93c1e8c2 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -1779,7 +1779,7 @@ - type: entity name: gatfruit - parent: FoodProduceBase + parent: [ FoodProduceBase, BaseSyndicateContraband ] id: FoodGatfruit description: A delicious, gun-shaped fruit with a thick wooden stem. components: diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml index f6cf90d813..6b71e5f933 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml @@ -222,7 +222,7 @@ - EncryptionKeySyndie - type: entity - parent: [EncryptionKey, BaseSyndicateContraband] + parent: [ EncryptionKey, BaseScienceContraband ] id: EncryptionKeyBinary name: binary translator key description: An encryption key that translates binary signals used by silicons. diff --git a/Resources/Prototypes/Entities/Objects/Devices/radio.yml b/Resources/Prototypes/Entities/Objects/Devices/radio.yml index 67e4597f0b..497fddda2e 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/radio.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/radio.yml @@ -37,7 +37,7 @@ - type: entity name: security radio description: A handy security radio. - parent: RadioHandheld + parent: [ RadioHandheld, BaseRestrictedContraband ] id: RadioHandheldSecurity components: - type: RadioMicrophone diff --git a/Resources/Prototypes/Entities/Objects/Fun/darts.yml b/Resources/Prototypes/Entities/Objects/Fun/darts.yml index 42574b4154..d744792c0a 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/darts.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/darts.yml @@ -192,7 +192,7 @@ acts: [ "Destruction" ] - type: entity - parent: BaseItem + parent: [ BaseItem, BaseSyndicateContraband ] id: HypoDartBox name: hypodart box suffix: HypoDart diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml index 6b31fdbd49..55b2356fc6 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml @@ -102,7 +102,7 @@ Blunt: 3 - type: entity - parent: PersonalAI + parent: [ PersonalAI, BaseSyndicateContraband] id: SyndicatePersonalAI name: syndicate personal ai device description: Your Syndicate pal who's fun to be with! diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 591eecbec8..013d4c7607 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -220,7 +220,7 @@ shader: unshaded - type: entity - parent: BasePlushie + parent: [ BasePlushie, BaseSyndicateContraband ] id: PlushieNuke name: nukie plushie description: A stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious. diff --git a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml index ec95c5105d..b9c84f1363 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml @@ -37,7 +37,7 @@ sprite: Objects/Storage/Briefcases/briefcase_brown.rsi - type: entity - parent: [BriefcaseBrown, BaseSyndicateContraband] + parent: BriefcaseBrown id: BriefcaseSyndie suffix: Syndicate, Empty components: diff --git a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml index 8fe76caefe..0bab711da4 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml @@ -4,7 +4,7 @@ name: implanter description: A syringe exclusively designed for the injection and extraction of subdermal implants. id: BaseImplanter - parent: [BaseItem, BaseRestrictedContraband] + parent: BaseItem abstract: true components: - type: ItemSlots @@ -153,7 +153,7 @@ - type: entity id: TrackingImplanter name: tracking implanter - parent: BaseImplantOnlyImplanter + parent: [ BaseImplantOnlyImplanter, BaseRestrictedContraband] components: - type: Implanter implant: TrackingImplant @@ -248,7 +248,7 @@ - type: entity id: MindShieldImplanter name: mindshield implanter - parent: BaseImplantOnlyImplanter + parent: [ BaseImplantOnlyImplanter, BaseSecurityCommandContraband] components: - type: Implanter implant: MindShieldImplant diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml index 69c5e35b22..e269b9bd5e 100644 --- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml +++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml @@ -65,7 +65,7 @@ - type: entity name: riot shield - parent: BaseShield + parent: [ BaseShield, BaseRestrictedContraband ] id: RiotShield description: A large tower shield. Good for controlling crowds. components: @@ -86,7 +86,7 @@ - type: entity name: riot laser shield - parent: BaseShield + parent: [ BaseShield, BaseRestrictedContraband ] id: RiotLaserShield description: A riot shield built for withstanding lasers, but not much else. components: @@ -106,7 +106,7 @@ - type: entity name: riot bullet shield - parent: BaseShield + parent: [ BaseShield, BaseRestrictedContraband ] id: RiotBulletShield description: A ballistic riot shield built for withstanding bullets, but not much else. components: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index c34d7ee606..9518a48528 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -532,7 +532,7 @@ handle: false # don't want the sound to stop the self-inject from triggering - type: entity - parent: BaseItem + parent: [ BaseItem, BaseSyndicateContraband ] id: HypopenBox name: hypopen box description: A small box containing a hypopen. Packaging disintegrates when opened, leaving no evidence behind. diff --git a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml index 801755a777..89101e34ff 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml @@ -66,7 +66,7 @@ - Flashlight - type: entity - parent: [Lantern, BaseSyndicateContraband] + parent: Lantern id: LanternFlash suffix: Flash components: diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index b84f38d0f6..09896f2e22 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -477,7 +477,7 @@ - type: entity id: RCD - parent: BaseItem + parent: [ BaseItem, BaseEngineeringContraband ] name: RCD description: The rapid construction device can be used to quickly place and remove various station structures and fixtures. Requires compressed matter to function. components: 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 d97eb32e54..eda3eca73f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -246,7 +246,7 @@ - type: entity name: svalinn laser pistol - parent: BaseWeaponPowerCellSmall + parent: [ BaseWeaponPowerCellSmall, BaseRestrictedContraband ] id: WeaponLaserSvalinn description: A cheap and widely used laser pistol. components: @@ -267,7 +267,7 @@ - type: entity name: retro laser blaster - parent: BaseWeaponBatterySmall + parent: [ BaseWeaponBatterySmall, BaseMajorContraband ] id: WeaponLaserGun description: A weapon using light amplified by the stimulated emission of radiation. Bad design choices have lead to this model having subpar cooling capabilities. # WD EDIT components: @@ -367,7 +367,7 @@ - type: entity name: laser rifle - parent: [BaseWeaponBattery, BaseGunWieldable, BaseWeaponOverheatLamp] # WD EDIT: Overheat + parent: [BaseWeaponBattery, BaseGunWieldable, BaseRestrictedContraband, BaseWeaponOverheatLamp] # WD EDIT: Overheat id: WeaponLaserCarbine description: Favoured by Nanotrasen Security for being cheap and easy to use. components: @@ -449,7 +449,7 @@ fireCost: 100 # WD EDIT END - type: Battery - # WD EDIT START + # WD EDIT START maxCharge: 3000 startingCharge: 3000 - type: GunOverheat # WWDP @@ -557,7 +557,7 @@ - type: entity name: laser cannon - parent: [BaseWeaponBattery, BaseGunWieldable] + parent: [BaseWeaponBattery, BaseGunWieldable, BaseRestrictedContraband] id: WeaponLaserCannon description: A heavy duty, high powered laser weapon. components: @@ -1013,7 +1013,7 @@ - type: entity name: advanced laser pistol - parent: [BaseWeaponBatterySmall, BaseWeaponOverheatLamp] # wwdp edit - overheat + parent: [BaseWeaponBatterySmall, BaseRestrictedContraband, BaseWeaponOverheatLamp] # wwdp edit - overheat id: WeaponAdvancedLaser description: An experimental high-energy laser pistol with a self-charging nuclear battery. components: @@ -1193,7 +1193,7 @@ - type: Tag tags: - HighRiskItem -# - type: GunRequiresWield - WD EDIT + # - type: GunRequiresWield - WD EDIT - type: Battery maxCharge: 1210 # WD EDIT: 1210 -> 1820 startingCharge: 1210 # WD EDIT: 1210 -> 1820 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml index f18262a98f..357bc077ed 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml @@ -49,7 +49,7 @@ - type: entity name: minigun id: WeaponMinigun - parent: BaseWeaponHeavyMachineGun + parent: [ BaseWeaponHeavyMachineGun, BaseMajorContraband ] description: Vzzzzzt! Rahrahrahrah! Vrrrrr! Uses .10 rifle ammo. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 86ef2fa910..53f3ff1d1c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -80,7 +80,7 @@ - type: entity name: RPG-7 - parent: BaseWeaponLauncher + parent: [ BaseWeaponLauncher, BaseMajorContraband ] id: WeaponLauncherRocket description: A modified ancient rocket-propelled grenade launcher. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 1a2db52a66..5f30ed4890 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: echis - parent: BaseItem + parent: [ BaseItem, BaseSyndicateContraband ] id: WeaponPistolEchis description: A viper for use by cyborgs. Creates .35 ammo on the fly from an internal ammo fabricator, which slowly self-charges. components: @@ -222,7 +222,7 @@ - type: entity name: cobra - parent: BaseWeaponPistol + parent: [ BaseWeaponPistol, BaseSyndicateContraband ] id: WeaponPistolCobra description: A rugged, robust operator handgun with inbuilt silencer. Uses .25 caseless ammo. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index a3b2819586..71b064ebd4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -86,7 +86,7 @@ - type: entity name: Deckard - parent: [BaseWeaponRevolver, BaseRestrictedContraband] + parent: [BaseWeaponRevolver, BaseSecurityCommandContraband] id: WeaponRevolverDeckard description: A rare, custom-built revolver. Use when there is no time for Voight-Kampff test. Uses .45 magnum ammo. components: @@ -149,7 +149,7 @@ - type: entity name: Mateba - parent: [BaseWeaponRevolver, BaseMinorContraband] + parent: [BaseWeaponRevolver, BaseMajorContraband] id: WeaponRevolverMateba description: A distinctive revolver of an ancient Sol' design that was once seen as a rare collectible. It is in common manufacture by many companies in the Biesel Republic. Uses .45 magnum 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 44f876f545..c815c019d2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -103,7 +103,7 @@ - type: entity name: Atreides - parent: [BaseWeaponSubMachineGun, BaseMinorContraband, BaseGunWieldable] # WD EDIT: BaseGunWieldable + parent: [BaseWeaponSubMachineGun, BaseMajorContraband, BaseGunWieldable] # WD EDIT: BaseGunWieldable id: WeaponSubMachineGunAtreides description: Pla-ket-ket-ket-ket! Uses .35 auto ammo. components: @@ -215,7 +215,7 @@ - type: entity name: Drozd - parent: [BaseWeaponSubMachineGun, BaseGunWieldable] # WD EDIT: BaseGunWieldable + parent: [BaseWeaponSubMachineGun, BaseRestrictedContraband, BaseGunWieldable] # WD EDIT: BaseGunWieldable id: WeaponSubMachineGunDrozd description: An excellent fully automatic Heavy SMG. components: @@ -332,7 +332,7 @@ - type: entity name: WT550 - parent: [BaseWeaponSubMachineGun, BaseGunWieldable] # WD EDIT: BaseGunWieldable + parent: [BaseWeaponSubMachineGun, BaseRestrictedContraband, BaseGunWieldable] # WD EDIT: BaseGunWieldable 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/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml index b4cb09e539..fc35ee1eef 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml @@ -188,7 +188,7 @@ Slash: 11 - type: entity - parent: BaseWeaponCrusher + parent: [ BaseWeaponCrusher, BaseSecurityCargoContraband] id: WeaponCrusherDagger name: crusher dagger description: A scaled down version of a proto-kinetic crusher. Uses kinetic energy to vibrate the blade at high speeds. @@ -221,7 +221,7 @@ # Like a crusher... but better - type: entity - parent: WeaponCrusher + parent: [ WeaponCrusher, BaseSecurityCargoContraband] id: WeaponCrusherGlaive name: crusher glaive description: An early design of the proto-kinetic accelerator, in glaive form. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml index 8fa4484303..347b48cb1a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml @@ -72,7 +72,7 @@ - type: entity name: flashbang description: Eeeeeeeeeeeeeeeeeeeeee. - parent: GrenadeBase + parent: [ GrenadeBase, BaseRestrictedContraband ] id: GrenadeFlashBang components: - type: Sprite @@ -388,7 +388,7 @@ path: /Audio/Effects/hallelujah.ogg - type: entity - parent: GrenadeBase + parent: [ GrenadeBase, BaseMinorContraband ] 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/base_contraband.yml b/Resources/Prototypes/Entities/Objects/base_contraband.yml index 051c04b6e2..84783ccf7d 100644 --- a/Resources/Prototypes/Entities/Objects/base_contraband.yml +++ b/Resources/Prototypes/Entities/Objects/base_contraband.yml @@ -18,6 +18,15 @@ # according to space law no dept is authorized to have allowedDepartments: null +# major contraband, for things like guns or weaponry that don't belong to any department and aren't syndicate specific +- type: entity + id: BaseMajorContraband + abstract: true + components: + - type: Contraband + severity: Major + allowedDepartments: null + # minor contraband by default restricted to security only - type: entity id: BaseRestrictedContraband diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml index 57c105bb82..f90845696f 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml @@ -181,7 +181,7 @@ # Secure Crates - type: entity - parent: CrateBaseSecure + parent: [ CrateBaseSecure, BaseRestrictedContraband ] id: CrateSecgear name: secgear crate components: @@ -221,12 +221,12 @@ id: CrateChemistrySecure name: secure chemistry crate components: - - type: Icon - sprite: Structures/Storage/Crates/chemcrate_secure.rsi - - type: Sprite - sprite: Structures/Storage/Crates/chemcrate_secure.rsi - - type: AccessReader - access: [["Chemistry"]] + - type: Icon + sprite: Structures/Storage/Crates/chemcrate_secure.rsi + - type: Sprite + sprite: Structures/Storage/Crates/chemcrate_secure.rsi + - type: AccessReader + access: [["Chemistry"]] - type: entity parent: CrateBaseSecure @@ -279,10 +279,10 @@ id: CrateSecure name: secure crate components: - - type: Icon - sprite: Structures/Storage/Crates/secure.rsi - - type: Sprite - sprite: Structures/Storage/Crates/secure.rsi + - type: Icon + sprite: Structures/Storage/Crates/secure.rsi + - type: Sprite + sprite: Structures/Storage/Crates/secure.rsi - type: entity parent: CrateBaseSecure @@ -309,7 +309,7 @@ access: [["Armory"]] - type: entity - parent: CrateBaseSecureReinforced + parent: [ CrateBaseSecureReinforced, BaseRestrictedContraband ] suffix: Armory, Secure, Reinforced id: CrateContrabandStorageSecure name: contraband storage crate diff --git a/Resources/Prototypes/contraband_severities.yml b/Resources/Prototypes/contraband_severities.yml index aad9916b25..54f5cd62ef 100644 --- a/Resources/Prototypes/contraband_severities.yml +++ b/Resources/Prototypes/contraband_severities.yml @@ -4,6 +4,11 @@ id: Minor examineText: contraband-examine-text-Minor +# Dangerous fucking shit that doesn't belong to CyberSun or NanoTrasen, RPGs, retro laser blasters, unholy things +- type: contrabandSeverity + id: Major + examineText: contraband-examine-text-Major + # Having this without a good reason might get you yelled at by security. (spears, shivs, etc). # or, Having this as a regular crew member, not the department it was made for, is considered theft IC. (rcd, sec gear, etc) - type: contrabandSeverity