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
This commit is contained in:
Plykiya
2024-08-12 01:17:26 -07:00
committed by GitHub
parent 7e17063b86
commit 883dc998e6
35 changed files with 84 additions and 69 deletions

View File

@@ -1,6 +1,7 @@
contraband-examine-text-Minor = [color=yellow]This item is considered minor contraband.[/color] 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 = [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-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-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] contraband-examine-text-Syndicate = [color=crimson]This item is highly illegal Syndicate contraband![/color]

View File

@@ -340,7 +340,7 @@
- type: entity - type: entity
name: syndicate encryption key box name: syndicate encryption key box
parent: [BoxEncryptionKeyPassenger, BaseRestrictedContraband] parent: [BoxEncryptionKeyPassenger, BaseSyndicateContraband]
id: BoxEncryptionKeySyndie id: BoxEncryptionKeySyndie
description: Two syndicate encryption keys for the price of one. Miniaturized for ease of use. description: Two syndicate encryption keys for the price of one. Miniaturized for ease of use.
components: components:
@@ -445,4 +445,4 @@
- type: StorageFill - type: StorageFill
contents: contents:
- id: Envelope - id: Envelope
amount: 9 amount: 9

View File

@@ -1,6 +1,6 @@
- type: entity - type: entity
id: CrateArmorySMG id: CrateArmorySMG
parent: CrateWeaponSecure parent: [ CrateWeaponSecure, BaseRestrictedContraband ]
name: SMG crate name: SMG crate
description: Contains two high-powered, semiautomatic rifles with four mags. Requires Armory access to open. description: Contains two high-powered, semiautomatic rifles with four mags. Requires Armory access to open.
components: components:
@@ -13,7 +13,7 @@
- type: entity - type: entity
id: CrateArmoryShotgun id: CrateArmoryShotgun
parent: CrateWeaponSecure parent: [ CrateWeaponSecure, BaseRestrictedContraband ]
name: shotgun crate 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. 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: components:
@@ -26,7 +26,7 @@
- type: entity - type: entity
id: CrateTrackingImplants id: CrateTrackingImplants
parent: CrateWeaponSecure parent: [ CrateWeaponSecure, BaseRestrictedContraband ]
name: tracking implants name: tracking implants
description: Contains a handful of tracking implanters. Good for prisoners you'd like to release but still keep track of. description: Contains a handful of tracking implanters. Good for prisoners you'd like to release but still keep track of.
components: components:
@@ -36,7 +36,7 @@
amount: 5 amount: 5
- type: entity - type: entity
parent: CrateWeaponSecure parent: [ CrateWeaponSecure, BaseRestrictedContraband ]
id: CrateTrainingBombs id: CrateTrainingBombs
name: training bombs 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. 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 - type: entity
id: CrateArmoryLaser id: CrateArmoryLaser
parent: CrateWeaponSecure parent: [ CrateWeaponSecure, BaseRestrictedContraband ]
name: lasers crate name: lasers crate
description: Contains three standard-issue laser rifles. Requires Armory access to open. description: Contains three standard-issue laser rifles. Requires Armory access to open.
components: components:
@@ -59,7 +59,7 @@
- type: entity - type: entity
id: CrateArmoryPistols id: CrateArmoryPistols
parent: CrateWeaponSecure parent: [ CrateWeaponSecure, BaseRestrictedContraband ]
name: pistols crate name: pistols crate
description: Contains two standard NT pistols with four mags. Requires Armory access to open. description: Contains two standard NT pistols with four mags. Requires Armory access to open.
components: components:

View File

@@ -1,6 +1,6 @@
- type: entity - type: entity
id: CrateSyndicateSurplusBundle id: CrateSyndicateSurplusBundle
parent: [ CrateSyndicate, StorePresetUplink ] parent: [ CrateSyndicate, StorePresetUplink, BaseSyndicateContraband ]
name: Syndicate surplus crate name: Syndicate surplus crate
description: Contains 50 telecrystals worth of completely random Syndicate items. It can be useless junk or really good. description: Contains 50 telecrystals worth of completely random Syndicate items. It can be useless junk or really good.
components: components:
@@ -24,7 +24,7 @@
- type: entity - type: entity
id: CrateSyndicateSuperSurplusBundle id: CrateSyndicateSuperSurplusBundle
parent: [ CrateSyndicate, StorePresetUplink ] parent: [ CrateSyndicate, StorePresetUplink, BaseSyndicateContraband ]
name: Syndicate super surplus crate name: Syndicate super surplus crate
description: Contains 125 telecrystals worth of completely random Syndicate items. description: Contains 125 telecrystals worth of completely random Syndicate items.
components: components:

View File

@@ -10,7 +10,7 @@
- type: entity - type: entity
id: BriefcaseSyndieSniperBundleFilled id: BriefcaseSyndieSniperBundleFilled
parent: [BriefcaseSyndie, BaseSyndicateContraband] parent: BriefcaseSyndie
suffix: Syndicate, Sniper Bundle suffix: Syndicate, Sniper Bundle
components: components:
- type: Item - type: Item

View File

@@ -643,7 +643,7 @@
sprite: Clothing/Belt/salvagewebbing.rsi sprite: Clothing/Belt/salvagewebbing.rsi
- type: entity - type: entity
parent: [ClothingBeltStorageBase, ContentsExplosionResistanceBase] parent: [ClothingBeltStorageBase, ContentsExplosionResistanceBase, BaseSyndicateContraband]
id: ClothingBeltMilitaryWebbing id: ClothingBeltMilitaryWebbing
name: chest rig name: chest rig
description: A set of tactical webbing worn by Syndicate boarding parties. description: A set of tactical webbing worn by Syndicate boarding parties.

View File

@@ -79,7 +79,7 @@
- type: FingerprintMask - type: FingerprintMask
- type: entity - type: entity
parent: [ClothingHandsGlovesBoxingBlue, BaseSyndicateContraband] parent: ClothingHandsGlovesBoxingBlue
id: ClothingHandsGlovesBoxingRigged id: ClothingHandsGlovesBoxingRigged
suffix: Rigged suffix: Rigged
components: components:

View File

@@ -28,7 +28,7 @@
#Syndicate EVA Helmet #Syndicate EVA Helmet
- type: entity - type: entity
parent: ClothingHeadEVAHelmetBase parent: [ ClothingHeadEVAHelmetBase, BaseSyndicateContraband ]
id: ClothingHeadHelmetSyndicate id: ClothingHeadHelmetSyndicate
name: syndicate EVA helmet name: syndicate EVA helmet
description: A simple, stylish EVA helmet. Designed for maximum humble space-badassery. description: A simple, stylish EVA helmet. Designed for maximum humble space-badassery.

View File

@@ -358,7 +358,7 @@
sprite: Clothing/Head/Helmets/ert_janitor.rsi sprite: Clothing/Head/Helmets/ert_janitor.rsi
- type: entity - type: entity
parent: ClothingHeadHelmetBasic parent: [ ClothingHeadHelmetBasic, BaseSyndicateContraband ]
id: ClothingHeadHelmetRaid id: ClothingHeadHelmetRaid
name: syndicate raid helmet name: syndicate raid helmet
description: An armored helmet for use with the syndicate raid suit. Very stylish. description: An armored helmet for use with the syndicate raid suit. Very stylish.

View File

@@ -170,7 +170,7 @@
accent: MobsterAccent accent: MobsterAccent
- type: entity - type: entity
parent: ClothingHeadBase parent: [ ClothingHeadBase, BaseSyndicateContraband ]
id: ClothingHeadHatCatEars id: ClothingHeadHatCatEars
name: cat ears name: cat ears
description: "NYAH!" description: "NYAH!"

View File

@@ -100,7 +100,7 @@
- Energy - Energy
- type: entity - type: entity
parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing] parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseSyndicateContraband ]
id: ClothingOuterArmorRaid id: ClothingOuterArmorRaid
name: syndicate raid suit 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. 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.

View File

@@ -17,7 +17,7 @@
#Syndicate EVA #Syndicate EVA
- type: entity - type: entity
parent: ClothingOuterEVASuitBase parent: [ ClothingOuterEVASuitBase, BaseSyndicateContraband ]
id: ClothingOuterHardsuitSyndicate # TODO: rename to ClothingOuterEVASuitSyndicate id: ClothingOuterHardsuitSyndicate # TODO: rename to ClothingOuterEVASuitSyndicate
name: syndicate EVA suit name: syndicate EVA suit
description: "Has a tag on the back that reads: 'Totally not property of an enemy corporation, honest!'" description: "Has a tag on the back that reads: 'Totally not property of an enemy corporation, honest!'"

View File

@@ -261,7 +261,7 @@
flavors: flavors:
- banana - banana
- type: Food - type: Food
trash: trash:
- TrashBananaPeel - TrashBananaPeel
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
@@ -304,7 +304,7 @@
- banana - banana
- nothing - nothing
- type: Food - type: Food
trash: trash:
- TrashMimanaPeel - TrashMimanaPeel
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
@@ -1091,7 +1091,7 @@
flavors: flavors:
- corn - corn
- type: Food - type: Food
trash: trash:
- FoodCornTrash - FoodCornTrash
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
@@ -1714,12 +1714,12 @@
name: glasstle name: glasstle
parent: FoodProduceBase parent: FoodProduceBase
id: FoodGlasstle id: FoodGlasstle
description: A fragile crystal plant with lot of spiky thorns. description: A fragile crystal plant with lot of spiky thorns.
components: components:
- type: Item - type: Item
size: Small size: Small
sprite: Objects/Specific/Hydroponics/glasstle.rsi sprite: Objects/Specific/Hydroponics/glasstle.rsi
heldPrefix: produce heldPrefix: produce
- type: FlavorProfile - type: FlavorProfile
flavors: flavors:
- sharp - sharp
@@ -1736,7 +1736,7 @@
seedId: glasstle seedId: glasstle
- type: Extractable - type: Extractable
grindableSolutionName: food grindableSolutionName: food
- type: Damageable - type: Damageable
damageContainer: Inorganic damageContainer: Inorganic
- type: ToolRefinable - type: ToolRefinable
refineResult: refineResult:
@@ -1759,7 +1759,7 @@
max: 1 max: 1
- !type:DoActsBehavior - !type:DoActsBehavior
acts: [ "Destruction" ] acts: [ "Destruction" ]
- type: DamageOnHit - type: DamageOnHit
damage: damage:
types: types:
Blunt: 10 Blunt: 10
@@ -1816,7 +1816,7 @@
- type: entity - type: entity
name: gatfruit name: gatfruit
parent: FoodProduceBase parent: [ FoodProduceBase, BaseSyndicateContraband ]
id: FoodGatfruit id: FoodGatfruit
description: A delicious, gun-shaped fruit with a thick wooden stem. description: A delicious, gun-shaped fruit with a thick wooden stem.
components: components:
@@ -1837,7 +1837,7 @@
- type: Produce - type: Produce
seedId: gatfruit seedId: gatfruit
- type: Food - type: Food
trash: trash:
- WeaponRevolverPython - WeaponRevolverPython
- type: Tag - type: Tag
tags: tags:
@@ -2152,7 +2152,7 @@
flavors: flavors:
- bungo - bungo
- type: Food - type: Food
trash: trash:
- FoodBungoPit - FoodBungoPit
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:

View File

@@ -215,7 +215,7 @@
- state: synd_label - state: synd_label
- type: entity - type: entity
parent: [EncryptionKey, BaseSyndicateContraband] parent: [ EncryptionKey, BaseScienceContraband ]
id: EncryptionKeyBinary id: EncryptionKeyBinary
name: binary translator key name: binary translator key
description: An encryption key that translates binary signals used by silicons. description: An encryption key that translates binary signals used by silicons.

View File

@@ -28,7 +28,7 @@
- type: entity - type: entity
name: security radio name: security radio
description: A handy security radio. description: A handy security radio.
parent: RadioHandheld parent: [ RadioHandheld, BaseRestrictedContraband ]
id: RadioHandheldSecurity id: RadioHandheldSecurity
components: components:
- type: RadioMicrophone - type: RadioMicrophone

View File

@@ -191,7 +191,7 @@
acts: [ "Destruction" ] acts: [ "Destruction" ]
- type: entity - type: entity
parent: BaseItem parent: [ BaseItem, BaseSyndicateContraband ]
id: HypoDartBox id: HypoDartBox
name: hypodart box name: hypodart box
suffix: HypoDart suffix: HypoDart

View File

@@ -75,7 +75,7 @@
- type: StationMap - type: StationMap
- type: entity - type: entity
parent: PersonalAI parent: [ PersonalAI, BaseSyndicateContraband]
id: SyndicatePersonalAI id: SyndicatePersonalAI
name: syndicate personal ai device name: syndicate personal ai device
description: Your Syndicate pal who's fun to be with! description: Your Syndicate pal who's fun to be with!

View File

@@ -215,7 +215,7 @@
shader: unshaded shader: unshaded
- type: entity - type: entity
parent: BasePlushie parent: [ BasePlushie, BaseSyndicateContraband ]
id: PlushieNuke id: PlushieNuke
name: nukie plushie name: nukie plushie
description: A stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious. description: A stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious.

View File

@@ -25,7 +25,7 @@
sprite: Objects/Storage/Briefcases/briefcase_brown.rsi sprite: Objects/Storage/Briefcases/briefcase_brown.rsi
- type: entity - type: entity
parent: [BriefcaseBrown, BaseSyndicateContraband] parent: BriefcaseBrown
id: BriefcaseSyndie id: BriefcaseSyndie
suffix: Syndicate, Empty suffix: Syndicate, Empty
components: components:

View File

@@ -4,7 +4,7 @@
name: implanter name: implanter
description: A syringe exclusively designed for the injection and extraction of subdermal implants. description: A syringe exclusively designed for the injection and extraction of subdermal implants.
id: BaseImplanter id: BaseImplanter
parent: [BaseItem, BaseRestrictedContraband] parent: BaseItem
abstract: true abstract: true
components: components:
- type: ItemSlots - type: ItemSlots
@@ -153,7 +153,7 @@
- type: entity - type: entity
id: TrackingImplanter id: TrackingImplanter
name: tracking implanter name: tracking implanter
parent: BaseImplantOnlyImplanter parent: [ BaseImplantOnlyImplanter, BaseRestrictedContraband]
components: components:
- type: Implanter - type: Implanter
implant: TrackingImplant implant: TrackingImplant
@@ -247,7 +247,7 @@
- type: entity - type: entity
id: MindShieldImplanter id: MindShieldImplanter
name: mindshield implanter name: mindshield implanter
parent: BaseImplantOnlyImplanter parent: [ BaseImplantOnlyImplanter, BaseSecurityCommandContraband]
components: components:
- type: Implanter - type: Implanter
implant: MindShieldImplant implant: MindShieldImplant

View File

@@ -64,7 +64,7 @@
- type: entity - type: entity
name: riot shield name: riot shield
parent: BaseShield parent: [ BaseShield, BaseRestrictedContraband ]
id: RiotShield id: RiotShield
description: A large tower shield. Good for controlling crowds. description: A large tower shield. Good for controlling crowds.
components: components:
@@ -85,7 +85,7 @@
- type: entity - type: entity
name: riot laser shield name: riot laser shield
parent: BaseShield parent: [ BaseShield, BaseRestrictedContraband ]
id: RiotLaserShield id: RiotLaserShield
description: A riot shield built for withstanding lasers, but not much else. description: A riot shield built for withstanding lasers, but not much else.
components: components:
@@ -105,7 +105,7 @@
- type: entity - type: entity
name: riot bullet shield name: riot bullet shield
parent: BaseShield parent: [ BaseShield, BaseRestrictedContraband ]
id: RiotBulletShield id: RiotBulletShield
description: A ballistic riot shield built for withstanding bullets, but not much else. description: A ballistic riot shield built for withstanding bullets, but not much else.
components: components:

View File

@@ -436,7 +436,7 @@
handle: false # don't want the sound to stop the self-inject from triggering handle: false # don't want the sound to stop the self-inject from triggering
- type: entity - type: entity
parent: BaseItem parent: [ BaseItem, BaseSyndicateContraband ]
id: HypopenBox id: HypopenBox
name: hypopen box name: hypopen box
description: A small box containing a hypopen. Packaging disintegrates when opened, leaving no evidence behind. description: A small box containing a hypopen. Packaging disintegrates when opened, leaving no evidence behind.

View File

@@ -66,7 +66,7 @@
- Flashlight - Flashlight
- type: entity - type: entity
parent: [Lantern, BaseSyndicateContraband] parent: Lantern
id: LanternFlash id: LanternFlash
suffix: Flash suffix: Flash
components: components:

View File

@@ -284,7 +284,7 @@
- type: entity - type: entity
id: RCD id: RCD
parent: BaseItem parent: [ BaseItem, BaseEngineeringContraband ]
name: RCD 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. description: The rapid construction device can be used to quickly place and remove various station structures and fixtures. Requires compressed matter to function.
components: components:

View File

@@ -104,7 +104,7 @@
- type: entity - type: entity
name: svalinn laser pistol name: svalinn laser pistol
parent: BaseWeaponPowerCellSmall parent: [ BaseWeaponPowerCellSmall, BaseRestrictedContraband ]
id: WeaponLaserSvalinn id: WeaponLaserSvalinn
description: A cheap and widely used laser pistol. description: A cheap and widely used laser pistol.
components: components:
@@ -125,7 +125,7 @@
- type: entity - type: entity
name: retro laser blaster name: retro laser blaster
parent: BaseWeaponBatterySmall parent: [ BaseWeaponBatterySmall, BaseMajorContraband ]
id: WeaponLaserGun id: WeaponLaserGun
description: A weapon using light amplified by the stimulated emission of radiation. description: A weapon using light amplified by the stimulated emission of radiation.
components: components:
@@ -200,7 +200,7 @@
- type: entity - type: entity
name: laser rifle name: laser rifle
parent: [BaseWeaponBattery, BaseGunWieldable] parent: [BaseWeaponBattery, BaseGunWieldable, BaseRestrictedContraband]
id: WeaponLaserCarbine id: WeaponLaserCarbine
description: Favoured by Nanotrasen Security for being cheap and easy to use. description: Favoured by Nanotrasen Security for being cheap and easy to use.
components: components:
@@ -325,7 +325,7 @@
- type: entity - type: entity
name: laser cannon name: laser cannon
parent: [BaseWeaponBattery, BaseGunWieldable] parent: [BaseWeaponBattery, BaseGunWieldable, BaseRestrictedContraband]
id: WeaponLaserCannon id: WeaponLaserCannon
description: A heavy duty, high powered laser weapon. description: A heavy duty, high powered laser weapon.
components: components:
@@ -588,7 +588,7 @@
- type: entity - type: entity
name: advanced laser pistol name: advanced laser pistol
parent: BaseWeaponBatterySmall parent: [ BaseWeaponBatterySmall, BaseRestrictedContraband]
id: WeaponAdvancedLaser id: WeaponAdvancedLaser
description: An experimental high-energy laser pistol with a self-charging nuclear battery. description: An experimental high-energy laser pistol with a self-charging nuclear battery.
components: components:

View File

@@ -24,7 +24,7 @@
- type: entity - type: entity
name: minigun name: minigun
id: WeaponMinigun id: WeaponMinigun
parent: BaseWeaponHeavyMachineGun parent: [ BaseWeaponHeavyMachineGun, BaseMajorContraband ]
description: Vzzzzzt! Rahrahrahrah! Vrrrrr! Uses .10 rifle ammo. description: Vzzzzzt! Rahrahrahrah! Vrrrrr! Uses .10 rifle ammo.
components: components:
- type: Sprite - type: Sprite

View File

@@ -55,7 +55,7 @@
- type: entity - type: entity
name: RPG-7 name: RPG-7
parent: BaseWeaponLauncher parent: [ BaseWeaponLauncher, BaseMajorContraband ]
id: WeaponLauncherRocket id: WeaponLauncherRocket
description: A modified ancient rocket-propelled grenade launcher. description: A modified ancient rocket-propelled grenade launcher.
components: components:

View File

@@ -103,7 +103,7 @@
- type: entity - type: entity
name: echis name: echis
parent: BaseItem parent: [ BaseItem, BaseSyndicateContraband ]
id: WeaponPistolEchis id: WeaponPistolEchis
description: A viper for use by cyborgs. Creates .35 ammo on the fly from an internal ammo fabricator, which slowly self-charges. description: A viper for use by cyborgs. Creates .35 ammo on the fly from an internal ammo fabricator, which slowly self-charges.
components: components:
@@ -138,7 +138,7 @@
- type: entity - type: entity
name: cobra name: cobra
parent: BaseWeaponPistol parent: [ BaseWeaponPistol, BaseSyndicateContraband ]
id: WeaponPistolCobra id: WeaponPistolCobra
description: A rugged, robust operator handgun with inbuilt silencer. Uses .25 caseless ammo. description: A rugged, robust operator handgun with inbuilt silencer. Uses .25 caseless ammo.
components: components:

View File

@@ -52,7 +52,7 @@
- type: entity - type: entity
name: Deckard name: Deckard
parent: [BaseWeaponRevolver, BaseRestrictedContraband] parent: [BaseWeaponRevolver, BaseSecurityCommandContraband]
id: WeaponRevolverDeckard id: WeaponRevolverDeckard
description: A rare, custom-built revolver. Use when there is no time for Voight-Kampff test. Uses .45 magnum ammo. description: A rare, custom-built revolver. Use when there is no time for Voight-Kampff test. Uses .45 magnum ammo.
components: components:
@@ -95,7 +95,7 @@
- type: entity - type: entity
name: Mateba name: Mateba
parent: [BaseWeaponRevolver, BaseMinorContraband] parent: [BaseWeaponRevolver, BaseMajorContraband]
id: WeaponRevolverMateba id: WeaponRevolverMateba
description: The iconic sidearm of the dreaded death squads. Uses .45 magnum ammo. description: The iconic sidearm of the dreaded death squads. Uses .45 magnum ammo.
components: components:

View File

@@ -58,7 +58,7 @@
- type: entity - type: entity
name: Atreides name: Atreides
parent: [BaseWeaponSubMachineGun, BaseMinorContraband] parent: [BaseWeaponSubMachineGun, BaseMajorContraband]
id: WeaponSubMachineGunAtreides id: WeaponSubMachineGunAtreides
description: Pla-ket-ket-ket-ket! Uses .35 auto ammo. description: Pla-ket-ket-ket-ket! Uses .35 auto ammo.
components: components:
@@ -119,7 +119,7 @@
- type: entity - type: entity
name: Drozd name: Drozd
parent: BaseWeaponSubMachineGun parent: [BaseWeaponSubMachineGun, BaseRestrictedContraband]
id: WeaponSubMachineGunDrozd id: WeaponSubMachineGunDrozd
description: An excellent fully automatic Heavy SMG. description: An excellent fully automatic Heavy SMG.
components: components:
@@ -221,7 +221,7 @@
- type: entity - type: entity
name: WT550 name: WT550
parent: BaseWeaponSubMachineGun parent: [ BaseWeaponSubMachineGun, BaseRestrictedContraband ]
id: WeaponSubMachineGunWt550 id: WeaponSubMachineGunWt550
description: An excellent SMG, produced by NanoTrasen's Small Arms Division. Uses .35 auto ammo. description: An excellent SMG, produced by NanoTrasen's Small Arms Division. Uses .35 auto ammo.
components: components:

View File

@@ -153,7 +153,7 @@
- type: Prying - type: Prying
- type: entity - type: entity
parent: BaseWeaponCrusher parent: [ BaseWeaponCrusher, BaseSecurityCargoContraband]
id: WeaponCrusherDagger id: WeaponCrusherDagger
name: crusher dagger name: crusher dagger
description: A scaled down version of a proto-kinetic crusher. Uses kinetic energy to vibrate the blade at high speeds. 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 # Like a crusher... but better
- type: entity - type: entity
parent: WeaponCrusher parent: [ WeaponCrusher, BaseSecurityCargoContraband]
id: WeaponCrusherGlaive id: WeaponCrusherGlaive
name: crusher glaive name: crusher glaive
description: An early design of the proto-kinetic accelerator, in glaive form. description: An early design of the proto-kinetic accelerator, in glaive form.

View File

@@ -60,7 +60,7 @@
- type: entity - type: entity
name: flashbang name: flashbang
description: Eeeeeeeeeeeeeeeeeeeeee. description: Eeeeeeeeeeeeeeeeeeeeee.
parent: GrenadeBase parent: [ GrenadeBase, BaseRestrictedContraband ]
id: GrenadeFlashBang id: GrenadeFlashBang
components: components:
- type: Sprite - type: Sprite
@@ -373,7 +373,7 @@
path: /Audio/Effects/hallelujah.ogg path: /Audio/Effects/hallelujah.ogg
- type: entity - type: entity
parent: GrenadeBase parent: [ GrenadeBase, BaseMinorContraband ]
id: SmokeGrenade id: SmokeGrenade
name: smoke grenade name: smoke grenade
description: A tactical grenade that releases a large, long-lasting cloud of smoke when used. description: A tactical grenade that releases a large, long-lasting cloud of smoke when used.

View File

@@ -18,6 +18,15 @@
# according to space law no dept is authorized to have # according to space law no dept is authorized to have
allowedDepartments: null 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 # minor contraband by default restricted to security only
- type: entity - type: entity
id: BaseRestrictedContraband id: BaseRestrictedContraband

View File

@@ -140,7 +140,7 @@
map: ["enum.StorageVisualLayers.Door"] map: ["enum.StorageVisualLayers.Door"]
- state: paper - state: paper
sprite: Structures/Storage/Crates/labels.rsi sprite: Structures/Storage/Crates/labels.rsi
map: ["enum.PaperLabelVisuals.Layer"] map: ["enum.PaperLabelVisuals.Layer"]
- type: Construction - type: Construction
graph: WebStructures graph: WebStructures
node: crate node: crate
@@ -171,7 +171,7 @@
# Secure Crates # Secure Crates
- type: entity - type: entity
parent: CrateBaseSecure parent: [ CrateBaseSecure, BaseRestrictedContraband ]
id: CrateSecgear id: CrateSecgear
name: secgear crate name: secgear crate
components: components:
@@ -287,7 +287,7 @@
access: [["Armory"]] access: [["Armory"]]
- type: entity - type: entity
parent: CrateBaseSecure parent: [ CrateBaseSecure, BaseRestrictedContraband ]
suffix: Armory, Secure suffix: Armory, Secure
id: CrateContrabandStorageSecure id: CrateContrabandStorageSecure
name: contraband storage crate name: contraband storage crate
@@ -326,7 +326,7 @@
- state: paper - state: paper
sprite: Structures/Storage/Crates/labels.rsi sprite: Structures/Storage/Crates/labels.rsi
offset: "-0.25,0.625" offset: "-0.25,0.625"
map: ["enum.PaperLabelVisuals.Layer"] map: ["enum.PaperLabelVisuals.Layer"]
- type: Icon - type: Icon
sprite: Structures/Storage/Crates/livestock.rsi sprite: Structures/Storage/Crates/livestock.rsi
state: base state: base
@@ -381,7 +381,7 @@
- state: paper - state: paper
sprite: Structures/Storage/Crates/labels.rsi sprite: Structures/Storage/Crates/labels.rsi
offset: "0.0,0.125" offset: "0.0,0.125"
map: ["enum.PaperLabelVisuals.Layer"] map: ["enum.PaperLabelVisuals.Layer"]
- type: Icon - type: Icon
sprite: Structures/Storage/Crates/cage.rsi sprite: Structures/Storage/Crates/cage.rsi
- type: Destructible - type: Destructible
@@ -483,7 +483,7 @@
- state: closed - state: closed
map: ["enum.StorageVisualLayers.Door"] map: ["enum.StorageVisualLayers.Door"]
- state: paper - state: paper
map: ["enum.PaperLabelVisuals.Layer"] map: ["enum.PaperLabelVisuals.Layer"]
- type: Icon - type: Icon
sprite: Structures/Storage/Crates/coffin.rsi sprite: Structures/Storage/Crates/coffin.rsi
state: base state: base
@@ -525,7 +525,7 @@
- state: paper - state: paper
sprite: Structures/Storage/Crates/labels.rsi sprite: Structures/Storage/Crates/labels.rsi
offset: "-0.28125,0.625" offset: "-0.28125,0.625"
map: ["enum.PaperLabelVisuals.Layer"] map: ["enum.PaperLabelVisuals.Layer"]
- type: Icon - type: Icon
sprite: Structures/Storage/Crates/wooden_grave.rsi sprite: Structures/Storage/Crates/wooden_grave.rsi
state: base state: base
@@ -573,7 +573,7 @@
- state: paper - state: paper
sprite: Structures/Storage/Crates/labels.rsi sprite: Structures/Storage/Crates/labels.rsi
offset: "-0.3125,0.5625" offset: "-0.3125,0.5625"
map: ["enum.PaperLabelVisuals.Layer"] map: ["enum.PaperLabelVisuals.Layer"]
- type: Icon - type: Icon
sprite: Structures/Storage/Crates/stone_grave.rsi sprite: Structures/Storage/Crates/stone_grave.rsi
state: base state: base

View File

@@ -4,6 +4,11 @@
id: Minor id: Minor
examineText: contraband-examine-text-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). # 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) # 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 - type: contrabandSeverity