From 883dc998e6ccbb1a27e93d0ac372f8a6ee75aab8 Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Mon, 12 Aug 2024 01:17:26 -0700 Subject: [PATCH] First Review Pass Contraband Fixes (#30930) * First pass contra fix * bam * More * Security crates are now marked as security restricted * Syndicate raid suit is contra * damn I forgot gatfruit --- .../en-US/contraband/contraband-severity.ftl | 1 + .../Catalog/Fills/Boxes/general.yml | 4 ++-- .../Catalog/Fills/Crates/armory.yml | 12 +++++------ .../Catalog/Fills/Crates/syndicate.yml | 4 ++-- .../Catalog/Fills/Items/briefcases.yml | 2 +- .../Entities/Clothing/Belt/belts.yml | 2 +- .../Entities/Clothing/Hands/gloves.yml | 2 +- .../Entities/Clothing/Head/eva-helmets.yml | 2 +- .../Entities/Clothing/Head/helmets.yml | 2 +- .../Entities/Clothing/Head/misc.yml | 2 +- .../Entities/Clothing/OuterClothing/armor.yml | 2 +- .../Clothing/OuterClothing/softsuits.yml | 2 +- .../Objects/Consumable/Food/produce.yml | 20 +++++++++---------- .../Objects/Devices/encryption_keys.yml | 2 +- .../Entities/Objects/Devices/radio.yml | 2 +- .../Prototypes/Entities/Objects/Fun/darts.yml | 2 +- .../Prototypes/Entities/Objects/Fun/pai.yml | 2 +- .../Prototypes/Entities/Objects/Fun/toys.yml | 2 +- .../Entities/Objects/Misc/briefcases.yml | 2 +- .../Entities/Objects/Misc/implanters.yml | 6 +++--- .../Entities/Objects/Shields/shields.yml | 6 +++--- .../Objects/Specific/Medical/hypospray.yml | 2 +- .../Entities/Objects/Tools/lantern.yml | 2 +- .../Entities/Objects/Tools/tools.yml | 2 +- .../Weapons/Guns/Battery/battery_guns.yml | 10 +++++----- .../Objects/Weapons/Guns/HMGs/hmgs.yml | 2 +- .../Weapons/Guns/Launchers/launchers.yml | 2 +- .../Objects/Weapons/Guns/Pistols/pistols.yml | 4 ++-- .../Weapons/Guns/Revolvers/revolvers.yml | 4 ++-- .../Objects/Weapons/Guns/SMGs/smgs.yml | 6 +++--- .../Entities/Objects/Weapons/Melee/mining.yml | 4 ++-- .../Objects/Weapons/Throwable/grenades.yml | 4 ++-- .../Entities/Objects/base_contraband.yml | 9 +++++++++ .../Structures/Storage/Crates/crates.yml | 16 +++++++-------- .../Prototypes/contraband_severities.yml | 5 +++++ 35 files changed, 84 insertions(+), 69 deletions(-) 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 15b187cd15..bc20d4a7cd 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -340,7 +340,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: @@ -445,4 +445,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 d5aab23717..bc5377fe81 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 ba97af3925..1b191d90f7 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: @@ -24,7 +24,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 f47cb49ea6..6764cb8496 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 66b601b8c7..0613ec9726 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -643,7 +643,7 @@ sprite: Clothing/Belt/salvagewebbing.rsi - type: entity - parent: [ClothingBeltStorageBase, ContentsExplosionResistanceBase] + parent: [ClothingBeltStorageBase, ContentsExplosionResistanceBase, BaseSyndicateContraband] id: ClothingBeltMilitaryWebbing name: chest rig description: A set of tactical webbing worn by Syndicate boarding parties. diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index 1bd858b4f7..684ef791ec 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 dd1bfd91bc..827d28265a 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 b2ae5b294e..47fb4ad451 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -358,7 +358,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 cdd6ee894e..1fb47c0439 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 101190faf3..80588ba493 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -100,7 +100,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 8e90efafc1..27ee1d5a6a 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml @@ -17,7 +17,7 @@ #Syndicate EVA - type: entity - parent: ClothingOuterEVASuitBase + parent: [ ClothingOuterEVASuitBase, BaseSyndicateContraband ] id: ClothingOuterHardsuitSyndicate # TODO: rename to ClothingOuterEVASuitSyndicate name: syndicate EVA suit 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 d980db0ca1..76256bb81e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -261,7 +261,7 @@ flavors: - banana - type: Food - trash: + trash: - TrashBananaPeel - type: SolutionContainerManager solutions: @@ -304,7 +304,7 @@ - banana - nothing - type: Food - trash: + trash: - TrashMimanaPeel - type: SolutionContainerManager solutions: @@ -1091,7 +1091,7 @@ flavors: - corn - type: Food - trash: + trash: - FoodCornTrash - type: SolutionContainerManager solutions: @@ -1714,12 +1714,12 @@ name: glasstle parent: FoodProduceBase id: FoodGlasstle - description: A fragile crystal plant with lot of spiky thorns. + description: A fragile crystal plant with lot of spiky thorns. components: - type: Item size: Small sprite: Objects/Specific/Hydroponics/glasstle.rsi - heldPrefix: produce + heldPrefix: produce - type: FlavorProfile flavors: - sharp @@ -1736,7 +1736,7 @@ seedId: glasstle - type: Extractable grindableSolutionName: food - - type: Damageable + - type: Damageable damageContainer: Inorganic - type: ToolRefinable refineResult: @@ -1759,7 +1759,7 @@ max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] - - type: DamageOnHit + - type: DamageOnHit damage: types: Blunt: 10 @@ -1816,7 +1816,7 @@ - type: entity name: gatfruit - parent: FoodProduceBase + parent: [ FoodProduceBase, BaseSyndicateContraband ] id: FoodGatfruit description: A delicious, gun-shaped fruit with a thick wooden stem. components: @@ -1837,7 +1837,7 @@ - type: Produce seedId: gatfruit - type: Food - trash: + trash: - WeaponRevolverPython - type: Tag tags: @@ -2152,7 +2152,7 @@ flavors: - bungo - type: Food - trash: + trash: - FoodBungoPit - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml index 66b40d0b40..d7b059f3d8 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml @@ -215,7 +215,7 @@ - state: synd_label - 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 77b6cac2d3..e750e4dbc1 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 + 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 dfcb0c68f1..a127930fea 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/darts.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/darts.yml @@ -191,7 +191,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 77f16fcd41..4695f1c125 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml @@ -75,7 +75,7 @@ - type: StationMap - 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 92baa1f86f..e7fa993474 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -215,7 +215,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 9a4ec3b592..762204701c 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml @@ -25,7 +25,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 a93472658e..4f92bcc265 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 @@ -247,7 +247,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 71598a7ff9..e0e7eb1171 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 + parent: [ BaseShield, BaseRestrictedContraband ] id: RiotShield description: A large tower shield. Good for controlling crowds. components: @@ -85,7 +85,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: @@ -105,7 +105,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 eb18893791..c81af6e128 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -436,7 +436,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 269e480c1d..83cfb331be 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -284,7 +284,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 2f7aa653e7..e60c955f4e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -104,7 +104,7 @@ - type: entity name: svalinn laser pistol - parent: BaseWeaponPowerCellSmall + parent: [ BaseWeaponPowerCellSmall, BaseRestrictedContraband ] id: WeaponLaserSvalinn description: A cheap and widely used laser pistol. components: @@ -125,7 +125,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. components: @@ -200,7 +200,7 @@ - type: entity name: laser rifle - parent: [BaseWeaponBattery, BaseGunWieldable] + parent: [BaseWeaponBattery, BaseGunWieldable, BaseRestrictedContraband] id: WeaponLaserCarbine description: Favoured by Nanotrasen Security for being cheap and easy to use. components: @@ -325,7 +325,7 @@ - type: entity name: laser cannon - parent: [BaseWeaponBattery, BaseGunWieldable] + parent: [BaseWeaponBattery, BaseGunWieldable, BaseRestrictedContraband] id: WeaponLaserCannon description: A heavy duty, high powered laser weapon. components: @@ -588,7 +588,7 @@ - type: entity name: advanced laser pistol - parent: BaseWeaponBatterySmall + parent: [ BaseWeaponBatterySmall, BaseRestrictedContraband] 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/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml index aa1e7ec84d..ebcba7d5e4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml @@ -24,7 +24,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 696d507a63..3abb32a37f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -55,7 +55,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 e778393710..167e21e15f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -103,7 +103,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: @@ -138,7 +138,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 8a6e027b12..309c2c502d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -52,7 +52,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: @@ -95,7 +95,7 @@ - type: entity name: Mateba - parent: [BaseWeaponRevolver, BaseMinorContraband] + parent: [BaseWeaponRevolver, BaseMajorContraband] id: WeaponRevolverMateba description: The iconic sidearm of the dreaded death squads. 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 cf1d77d94b..a22be1da04 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -58,7 +58,7 @@ - type: entity name: Atreides - parent: [BaseWeaponSubMachineGun, BaseMinorContraband] + parent: [BaseWeaponSubMachineGun, BaseMajorContraband] id: WeaponSubMachineGunAtreides description: Pla-ket-ket-ket-ket! Uses .35 auto ammo. components: @@ -119,7 +119,7 @@ - type: entity name: Drozd - parent: BaseWeaponSubMachineGun + parent: [BaseWeaponSubMachineGun, BaseRestrictedContraband] id: WeaponSubMachineGunDrozd description: An excellent fully automatic Heavy SMG. components: @@ -221,7 +221,7 @@ - type: entity name: WT550 - parent: BaseWeaponSubMachineGun + parent: [ BaseWeaponSubMachineGun, BaseRestrictedContraband ] 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 faebcaa734..337c7f07f7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml @@ -153,7 +153,7 @@ - type: Prying - 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. @@ -174,7 +174,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 97b9edf7a4..e5627ea88d 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 + parent: [ GrenadeBase, BaseRestrictedContraband ] id: GrenadeFlashBang components: - type: Sprite @@ -373,7 +373,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 171b664c83..9b0558a411 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml @@ -140,7 +140,7 @@ map: ["enum.StorageVisualLayers.Door"] - state: paper sprite: Structures/Storage/Crates/labels.rsi - map: ["enum.PaperLabelVisuals.Layer"] + map: ["enum.PaperLabelVisuals.Layer"] - type: Construction graph: WebStructures node: crate @@ -171,7 +171,7 @@ # Secure Crates - type: entity - parent: CrateBaseSecure + parent: [ CrateBaseSecure, BaseRestrictedContraband ] id: CrateSecgear name: secgear crate components: @@ -287,7 +287,7 @@ access: [["Armory"]] - type: entity - parent: CrateBaseSecure + parent: [ CrateBaseSecure, BaseRestrictedContraband ] suffix: Armory, Secure id: CrateContrabandStorageSecure name: contraband storage crate @@ -326,7 +326,7 @@ - state: paper sprite: Structures/Storage/Crates/labels.rsi offset: "-0.25,0.625" - map: ["enum.PaperLabelVisuals.Layer"] + map: ["enum.PaperLabelVisuals.Layer"] - type: Icon sprite: Structures/Storage/Crates/livestock.rsi state: base @@ -381,7 +381,7 @@ - state: paper sprite: Structures/Storage/Crates/labels.rsi offset: "0.0,0.125" - map: ["enum.PaperLabelVisuals.Layer"] + map: ["enum.PaperLabelVisuals.Layer"] - type: Icon sprite: Structures/Storage/Crates/cage.rsi - type: Destructible @@ -483,7 +483,7 @@ - state: closed map: ["enum.StorageVisualLayers.Door"] - state: paper - map: ["enum.PaperLabelVisuals.Layer"] + map: ["enum.PaperLabelVisuals.Layer"] - type: Icon sprite: Structures/Storage/Crates/coffin.rsi state: base @@ -525,7 +525,7 @@ - state: paper sprite: Structures/Storage/Crates/labels.rsi offset: "-0.28125,0.625" - map: ["enum.PaperLabelVisuals.Layer"] + map: ["enum.PaperLabelVisuals.Layer"] - type: Icon sprite: Structures/Storage/Crates/wooden_grave.rsi state: base @@ -573,7 +573,7 @@ - state: paper sprite: Structures/Storage/Crates/labels.rsi offset: "-0.3125,0.5625" - map: ["enum.PaperLabelVisuals.Layer"] + map: ["enum.PaperLabelVisuals.Layer"] - type: Icon sprite: Structures/Storage/Crates/stone_grave.rsi state: base 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