]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
First Review Pass Contraband Fixes (#30930)
authorPlykiya <58439124+Plykiya@users.noreply.github.com>
Mon, 12 Aug 2024 08:17:26 +0000 (01:17 -0700)
committerGitHub <noreply@github.com>
Mon, 12 Aug 2024 08:17:26 +0000 (02:17 -0600)
* First pass contra fix

* bam

* More

* Security crates are now marked as security restricted

* Syndicate raid suit is contra

* damn I forgot gatfruit

35 files changed:
Resources/Locale/en-US/contraband/contraband-severity.ftl
Resources/Prototypes/Catalog/Fills/Boxes/general.yml
Resources/Prototypes/Catalog/Fills/Crates/armory.yml
Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml
Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
Resources/Prototypes/Entities/Clothing/Belt/belts.yml
Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
Resources/Prototypes/Entities/Clothing/Head/helmets.yml
Resources/Prototypes/Entities/Clothing/Head/misc.yml
Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
Resources/Prototypes/Entities/Objects/Devices/radio.yml
Resources/Prototypes/Entities/Objects/Fun/darts.yml
Resources/Prototypes/Entities/Objects/Fun/pai.yml
Resources/Prototypes/Entities/Objects/Fun/toys.yml
Resources/Prototypes/Entities/Objects/Misc/briefcases.yml
Resources/Prototypes/Entities/Objects/Misc/implanters.yml
Resources/Prototypes/Entities/Objects/Shields/shields.yml
Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
Resources/Prototypes/Entities/Objects/Tools/lantern.yml
Resources/Prototypes/Entities/Objects/Tools/tools.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
Resources/Prototypes/Entities/Objects/base_contraband.yml
Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
Resources/Prototypes/contraband_severities.yml

index 594a64f8b755ca99d1dbbdc0a19eef86bce5b3d3..37d83c4575a33af06462ae758f4ca8959385a6b6 100644 (file)
@@ -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]
 
index 15b187cd15f1b1e373bf39ad76150ab0e3638df3..bc20d4a7cd0b2952f0d8b8ace3782476f7e1929d 100644 (file)
 
 - 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:
   - type: StorageFill
     contents:
       - id: Envelope
-        amount: 9
\ No newline at end of file
+        amount: 9
index d5aab237170bd8578118910014609d6de8bee8d2..bc5377fe81f27af1e5389447d259344533f82a43 100644 (file)
@@ -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:
index ba97af39250742633cf232d47a9d1097a4db6745..1b191d90f7f64650c0d523f33b0a79cdb15b4fb1 100644 (file)
@@ -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:
index f47cb49ea6fe94be5219ee56fa860bd768a827ea..6764cb8496aa0aa3caff391e446bec14356e6b87 100644 (file)
@@ -10,7 +10,7 @@
 
 - type: entity
   id: BriefcaseSyndieSniperBundleFilled
-  parent: [BriefcaseSyndie, BaseSyndicateContraband]
+  parent: BriefcaseSyndie
   suffix: Syndicate, Sniper Bundle
   components:
   - type: Item
index 66b601b8c76866a08becbf342da4174b86ae9619..0613ec972697e6f7b8dc6c37ab9ad0a69f13ec15 100644 (file)
     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.
index 1bd858b4f78f418724abfc88023d81ca5b0756ab..684ef791ec02aad73d79aa834657efe48406464c 100644 (file)
@@ -79,7 +79,7 @@
   - type: FingerprintMask
 
 - type: entity
-  parent: [ClothingHandsGlovesBoxingBlue, BaseSyndicateContraband]
+  parent: ClothingHandsGlovesBoxingBlue
   id: ClothingHandsGlovesBoxingRigged
   suffix: Rigged
   components:
index dd1bfd91bc6a5dc77246fad009b21836c45e9e72..827d28265a03053fa029c8512a58ce4af49debbf 100644 (file)
@@ -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.
index b2ae5b294e35640719eacc81839c91e9e3819fd4..47fb4ad451ff0b0bbdf13c7f6cd6734f783ac679 100644 (file)
     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.
index cdd6ee894ef93a266eb50c96975b446bac5a082a..1fb47c043930f562b6cfef08a6dbcd9f7aa27b97 100644 (file)
     accent: MobsterAccent
 
 - type: entity
-  parent: ClothingHeadBase
+  parent: [ ClothingHeadBase, BaseSyndicateContraband ]
   id: ClothingHeadHatCatEars
   name: cat ears
   description: "NYAH!"
index 101190faf3ea1ff532ba80e3c9438dedf4217ef1..80588ba493bc9fb580dd3b3d810a9fcbd4b36ee6 100644 (file)
       - 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.
index 8e90efafc15ad46d320e705852737df25cd8aaa9..27ee1d5a6a1b05611392a0cf3e7868849ce46f65 100644 (file)
@@ -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!'"
index d980db0ca12e1f9ef8abbbef2359da454927ea4c..76256bb81e17d1e4c2ce1d0f6e4425f6d0f6a2b2 100644 (file)
     flavors:
       - banana
   - type: Food
-    trash: 
+    trash:
     - TrashBananaPeel
   - type: SolutionContainerManager
     solutions:
       - banana
       - nothing
   - type: Food
-    trash: 
+    trash:
     - TrashMimanaPeel
   - type: SolutionContainerManager
     solutions:
     flavors:
       - corn
   - type: Food
-    trash: 
+    trash:
     - FoodCornTrash
   - type: SolutionContainerManager
     solutions:
   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
     seedId: glasstle
   - type: Extractable
     grindableSolutionName: food
-  - type: Damageable 
+  - type: Damageable
     damageContainer: Inorganic
   - type: ToolRefinable
     refineResult:
             max: 1
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
-  - type: DamageOnHit 
+  - type: DamageOnHit
     damage:
       types:
         Blunt: 10
 
 - type: entity
   name: gatfruit
-  parent: FoodProduceBase
+  parent: [ FoodProduceBase, BaseSyndicateContraband ]
   id: FoodGatfruit
   description: A delicious, gun-shaped fruit with a thick wooden stem.
   components:
   - type: Produce
     seedId: gatfruit
   - type: Food
-    trash: 
+    trash:
     - WeaponRevolverPython
   - type: Tag
     tags:
     flavors:
       - bungo
   - type: Food
-    trash: 
+    trash:
     - FoodBungoPit
   - type: SolutionContainerManager
     solutions:
index 66b40d0b40717bde9de025e3be07245a5b4305ff..d7b059f3d85d253586b574b6ff65372aa65e1377 100644 (file)
     - 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.
index 77b6cac2d375c74ec41ed28373987b81428066e0..e750e4dbc1e5d749ba696103384b8de769f9bdd1 100644 (file)
@@ -28,7 +28,7 @@
 - type: entity
   name: security radio
   description: A handy security radio.
-  parent: RadioHandheld
+  parent: [ RadioHandheld, BaseRestrictedContraband ]
   id: RadioHandheldSecurity
   components:
   - type: RadioMicrophone
index dfcb0c68f1e1c501bb666deb01b46c4fd89671dd..a127930feafee04113cd163c3ec80ad247a2cfca 100644 (file)
         acts: [ "Destruction" ]
 
 - type: entity
-  parent: BaseItem
+  parent: [ BaseItem, BaseSyndicateContraband ]
   id: HypoDartBox
   name: hypodart box
   suffix: HypoDart
index 77f16fcd412e87394d71217fad3fca40e21061c9..4695f1c125d2583b8cfd00f3338e1398762678a3 100644 (file)
@@ -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!
index 92baa1f86ffe78cfd84812b14dc791c4e8cf1ef2..e7fa9934745202422fdc415b8bda6dbb8ac725a7 100644 (file)
         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.
index 9a4ec3b59266f0f0e18d372491956fca00e6ed3f..762204701cb6e3e4592b06b27fc59a32792e13e4 100644 (file)
@@ -25,7 +25,7 @@
     sprite: Objects/Storage/Briefcases/briefcase_brown.rsi
 
 - type: entity
-  parent: [BriefcaseBrown, BaseSyndicateContraband]
+  parent: BriefcaseBrown
   id: BriefcaseSyndie
   suffix: Syndicate, Empty
   components:
index a93472658ed26c6fc781c6dbe1ad97b6d2417e0a..4f92bcc26520e6aead6dcea7556c57ffb09c19ba 100644 (file)
@@ -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
 - type: entity
   id: TrackingImplanter
   name: tracking implanter
-  parent: BaseImplantOnlyImplanter
+  parent: [ BaseImplantOnlyImplanter, BaseRestrictedContraband]
   components:
     - type: Implanter
       implant: TrackingImplant
 - type: entity
   id: MindShieldImplanter
   name: mindshield implanter
-  parent: BaseImplantOnlyImplanter
+  parent: [ BaseImplantOnlyImplanter, BaseSecurityCommandContraband]
   components:
     - type: Implanter
       implant: MindShieldImplant
index 71598a7ff9bd4deac46a8b4e70266939e3947945..e0e7eb117108dcfeaf28a34778ad4f783cf61fac 100644 (file)
@@ -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:
 
 - 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:
index eb18893791dbfa0486eca16304c5c4dbcd4ad38b..c81af6e12801305ae78184be3a261a73af6f7e0a 100644 (file)
     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.
index 801755a7771f6f7269b59268f973bd381a1eb5ed..89101e34ff466884d1aa2b0a54b64dc01069bcfb 100644 (file)
@@ -66,7 +66,7 @@
       - Flashlight
 
 - type: entity
-  parent: [Lantern, BaseSyndicateContraband]
+  parent: Lantern
   id: LanternFlash
   suffix: Flash
   components:
index 269e480c1d43074559e8d9229e48cd1a30af882f..83cfb331be0a58eac464f215e7c39dbf14d6e1f0 100644 (file)
 
 - 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:
index 2f7aa653e7c42359eb4556a8b8d616f521407616..e60c955f4e4d00dbf2190910580beaf7792431db 100644 (file)
 
 - type: entity
   name: svalinn laser pistol
-  parent: BaseWeaponPowerCellSmall
+  parent: [ BaseWeaponPowerCellSmall, BaseRestrictedContraband ]
   id: WeaponLaserSvalinn
   description: A cheap and widely used laser pistol.
   components:
 
 - 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:
 
 - 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:
 
 - type: entity
   name: laser cannon
-  parent: [BaseWeaponBattery, BaseGunWieldable]
+  parent: [BaseWeaponBattery, BaseGunWieldable, BaseRestrictedContraband]
   id: WeaponLaserCannon
   description: A heavy duty, high powered laser weapon.
   components:
 
 - 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:
index aa1e7ec84d62620325608df8b0d1ea4b179980e2..ebcba7d5e4469fba09a0bb91a0c89f6425824eb6 100644 (file)
@@ -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
index 696d507a638438509d7055f1be7d61ebe18ad71a..3abb32a37fbd2bb5d18fa8d756fa296cd8f399ea 100644 (file)
@@ -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:
index e778393710a7422192b65456b9e264fbabba166e..167e21e15f2d5b80125ba9bb68d51cc16a89c9a9 100644 (file)
 
 - 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:
 
 - 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:
index 8a6e027b12842438eb7a85fb23c3998953f8afde..309c2c502d614852731b51bfe30f4e7919b09703 100644 (file)
@@ -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:
index cf1d77d94bc03a63f26e8e77822b8ee14d04707b..a22be1da04203cd342147fac7ffdecb8910a0555 100644 (file)
@@ -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:
 
 - type: entity
   name: Drozd
-  parent: BaseWeaponSubMachineGun
+  parent: [BaseWeaponSubMachineGun, BaseRestrictedContraband]
   id: WeaponSubMachineGunDrozd
   description: An excellent fully automatic Heavy SMG.
   components:
 
 - 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:
index faebcaa734d8eb835f409a5b456b08ac268b0845..337c7f07f7b955bc1ba1130c83a246e4ea557adf 100644 (file)
   - 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.
 
 # 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.
index 97b9edf7a4d6e927e4be84c87d788f4671a4f5fd..e5627ea88d1dcaac184ccb3d23adc07139b7492a 100644 (file)
@@ -60,7 +60,7 @@
 - type: entity
   name: flashbang
   description: Eeeeeeeeeeeeeeeeeeeeee.
-  parent: GrenadeBase
+  parent: [ GrenadeBase, BaseRestrictedContraband ]
   id: GrenadeFlashBang
   components:
   - type: Sprite
       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.
index 051c04b6e272beb389db69a3a48d1e9967b04551..84783ccf7d6737ea9ece2454a73ced57054566ad 100644 (file)
     # 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
index 171b664c83a4df0f13e8b3f7ffc4c05c02aada0f..9b0558a4114c727fa9bffd9f9d80c0ce36ac1db9 100644 (file)
       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
 # Secure Crates
 
 - type: entity
-  parent: CrateBaseSecure
+  parent: [ CrateBaseSecure, BaseRestrictedContraband ]
   id: CrateSecgear
   name: secgear crate
   components:
     access: [["Armory"]]
 
 - type: entity
-  parent: CrateBaseSecure
+  parent: [ CrateBaseSecure, BaseRestrictedContraband ]
   suffix: Armory, Secure
   id: CrateContrabandStorageSecure
   name: contraband storage crate
     - 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
     - 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
     - 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
     - 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
     - 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
index aad9916b257a57810209956894efb191c91f7457..54f5cd62ef6be2aef9565129d534202e2b4ee7f9 100644 (file)
@@ -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