diff --git a/Content.Shared/_Triad/Shipyard/SavingContrabandComponent.cs b/Content.Shared/_Triad/Shipyard/SavingContrabandComponent.cs index ebaee2fbcc8..d031e4a930c 100644 --- a/Content.Shared/_Triad/Shipyard/SavingContrabandComponent.cs +++ b/Content.Shared/_Triad/Shipyard/SavingContrabandComponent.cs @@ -7,5 +7,5 @@ namespace Content.Shared._Triad.Shipyard; public sealed partial class SavingContrabandComponent : Component { [DataField] - public LocId ExamineText; + public LocId? ExamineText; } diff --git a/Content.Shared/_Triad/Shipyard/SavingContrabandSystem.cs b/Content.Shared/_Triad/Shipyard/SavingContrabandSystem.cs index 3b00603ec90..26ebcf2cc12 100644 --- a/Content.Shared/_Triad/Shipyard/SavingContrabandSystem.cs +++ b/Content.Shared/_Triad/Shipyard/SavingContrabandSystem.cs @@ -11,6 +11,8 @@ public override void Initialize() private void OnExamined(Entity ent, ref ExaminedEvent args) { + if (ent.Comp.ExamineText == null) + return; args.PushMarkup(Loc.GetString(ent.Comp.ExamineText)); } } diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index 2c6f61d2e7f..c471ab8715b 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -280,6 +280,10 @@ - type: Storage grid: - 0,0,7,6 + # Triad add start + - type: SavingContraband + examineText: ship-saving-contraband-2-text + # Triad end #Syndicate - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml index 8d9a1194c12..a97aa98fc68 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -273,3 +273,7 @@ walkModifier: 1 sprintModifier: 1 - type: HeldSpeedModifier + # Triad add start + - type: SavingContraband + examineText: ship-saving-contraband-2-text + # Triad end diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml index c0469eb62e6..b7350856ed3 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml @@ -9,6 +9,9 @@ state: icon_alt - type: Clothing equippedPrefix: alt + # Triad add start + - type: SavingContraband + # Triad end - type: entity parent: ClothingHeadsetAlt diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index d8083d99cba..cfcc894f137 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -451,6 +451,10 @@ Slash: 0.80 Piercing: 0.90 Heat: 0.90 + # Triad add start + - type: SavingContraband + examineText: ship-saving-contraband-2-text + # Triad end - type: entity parent: ClothingMaskBase diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index eb27ebb72b7..4dccf42fa21 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -1200,6 +1200,10 @@ head: ClothingHeadHelmetHardsuitDeathsquad helmetcover: ClothingHeadHelmetCoverBlock helmetattachment: ClothingHeadHelmetAttachmentBlock + # Triad add start + - type: SavingContraband + examineText: ship-saving-contraband-2-text + # Triad end #CBURN Hardsuit - type: entity @@ -1245,6 +1249,10 @@ head: ClothingHeadHelmetCBURN helmetcover: ClothingHeadHelmetCoverBlock helmetattachment: ClothingHeadHelmetAttachmentBlock + # Triad add start + - type: SavingContraband + examineText: ship-saving-contraband-2-text + # Triad end #MISC. HARDSUITS #Clown Hardsuit diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 600929c0faf..f477282044c 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -8,6 +8,10 @@ sprite: Clothing/Uniforms/Jumpsuit/deathsquad.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/deathsquad.rsi + # Triad add start + - type: SavingContraband + examineText: ship-saving-contraband-2-text + # Triad end - type: entity parent: ClothingUniformBase diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml index 644dbc217a4..899811d0690 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml @@ -375,6 +375,9 @@ Empty: { state: empty } Occupied: { state: full } - type: Intellicard + # Triad add start + - type: SavingContraband + # Triad end - type: entity id: PlayerStationAiPreview diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml index afdf1e48678..cb448c96524 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml @@ -117,7 +117,6 @@ - type: ComputerTabletopBoard # Frontier prototype: ComputerTabletopCargoOrders # Frontier - type: SavingContraband - examineText: ship-saving-contraband-1-text - type: entity parent: BaseComputerCircuitboard @@ -344,6 +343,10 @@ prototype: SyndicateComputerComms - type: ComputerTabletopBoard # Frontier prototype: SyndicateComputerTabletopComms # Frontier + # Triad add start + - type: SavingContraband + examineText: ship-saving-contraband-2-text + # Triad end - type: entity parent: BaseComputerCircuitboard @@ -355,6 +358,10 @@ state: cpu_wizard - type: ComputerBoard prototype: WizardComputerComms + # Triad add start + - type: SavingContraband + examineText: ship-saving-contraband-2-text + # Triad end - type: entity parent: BaseComputerCircuitboard @@ -366,6 +373,10 @@ state: cpu_centcomm - type: ComputerBoard prototype: CentcommComputerComms + # Triad add start + - type: SavingContraband + examineText: ship-saving-contraband-3-text + # Triad end - type: entity parent: BaseComputerCircuitboard @@ -567,3 +578,7 @@ state: cpu_rogue - type: ComputerBoard prototype: RogueComputerComms + # Triad add start + - type: SavingContraband + examineText: ship-saving-contraband-2-text + # Triad end diff --git a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml index 623efa72769..47efc2f1398 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml @@ -13,6 +13,7 @@ - type: DoorRemote - type: StealTarget stealGroup: DoorRemote + - type: SavingContraband - type: entity parent: DoorRemoteDefault diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index b598d9a5b12..10d215cf08a 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -5,6 +5,9 @@ name: PDA description: Personal Data Assistant. components: + # Triad add start + - type: SavingContraband + # Triad end - type: Appearance appearanceDataInit: enum.PdaVisuals.PdaType: diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index b6cf64178f9..2d52b371541 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -47,6 +47,9 @@ params: volume: -5 # Goobstation edit end + # Triad add start + - type: SavingContraband + # Triad end #IDs with layers @@ -688,6 +691,7 @@ tags: - NuclearOperative - SyndicateAgent + - type: SavingContraband - type: entity parent: IDCardStandard @@ -762,6 +766,10 @@ heldPrefix: blue - type: PresetIdCard job: CBURN + # Triad add start + - type: SavingContraband + examineText: ship-saving-contraband-2-text + # Triad end - type: entity parent: IDCardStandard 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 de1125e14c6..66548a13be1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -338,6 +338,10 @@ autoRechargePause: true autoRechargePauseTime: 30 # End Mono + # Triad Start + - type: SavingContraband + examineText: ship-saving-contraband-2-text + # Triad End - type: entity name: LWC pulse carbine @@ -387,6 +391,10 @@ autoRechargePause: true autoRechargePauseTime: 30 # End Mono + # Triad Start + - type: SavingContraband + examineText: ship-saving-contraband-2-text + # Triad End - type: entity name: NT pulse rifle @@ -434,8 +442,10 @@ walkModifier: 0.90 sprintModifier: 0.85 # End Mono - - # Mono Addition + # Triad Start + - type: SavingContraband + examineText: ship-saving-contraband-2-text + # Triad End - type: entity name: Cyborg pulse rifle diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index a48bdcae71e..f66ddd85358 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -502,7 +502,6 @@ repairTime: 4 repairCost: 8 - type: SavingContraband - examineText: ship-saving-contraband-1-text - type: entity parent: BaseComputerAiAccess @@ -786,6 +785,10 @@ - type: ShipRepairable repairTime: 4 repairCost: 8 + # Triad add start + - type: SavingContraband + examineText: ship-saving-contraband-2-text + # Triad end - type: entity parent: ComputerComms @@ -884,6 +887,10 @@ radius: 1.5 energy: 1.6 color: "#00FF00" + # Triad add start + - type: SavingContraband + examineText: ship-saving-contraband-3-text + # Triad end - type: entity parent: BaseComputerAiAccess @@ -1091,6 +1098,10 @@ - type: ShipRepairable repairTime: 4 repairCost: 8 + # Triad add start + - type: SavingContraband + examineText: ship-saving-contraband-2-text + # Triad end - type: entity id: ComputerCargoBounty diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml b/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml index d649c7a20a6..cb76b5cd877 100644 --- a/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml +++ b/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml @@ -57,4 +57,3 @@ - BluespaceLifelineImplanter # Stops stealing of their gear - RadioImplanterCentcomm # Headset theft means nothing! - HandHeldMassScannerBorg # Just for the infiniste battery - \ No newline at end of file diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/Ears/headsets.yml index 378176c412a..5bb39281d79 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Clothing/Ears/headsets.yml @@ -12,3 +12,7 @@ sprite: _Goobstation/Clothing/Ears/Headsets/deathsquad.rsi - type: Clothing sprite: _Goobstation/Clothing/Ears/Headsets/deathsquad.rsi + # Triad add start + - type: SavingContraband + examineText: ship-saving-contraband-2-text + # Triad end diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/Eyes/glasses.yml index 9f8f78c0c6f..2d724319d98 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Clothing/Eyes/glasses.yml @@ -25,6 +25,10 @@ interfaces: enum.ChameleonUiKey.Key: type: ChameleonBoundUserInterface + # Triad add start + - type: SavingContraband + examineText: ship-saving-contraband-2-text + # Triad end - type: entity parent: [ClothingEyesHudOmni] diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index dbcece26405..8d9a1cee309 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -136,3 +136,7 @@ autoRechargeRate: 50 autoRechargePause: true autoRechargePauseTime: 5 + # Triad add start + - type: SavingContraband + examineText: ship-saving-contraband-2-text + # Triad end diff --git a/Resources/Prototypes/_Mono/Entities/Clothing/Jumpsuit/jumpsuits.yml b/Resources/Prototypes/_Mono/Entities/Clothing/Jumpsuit/jumpsuits.yml index e39390c0cfe..ecc0644e5be 100644 --- a/Resources/Prototypes/_Mono/Entities/Clothing/Jumpsuit/jumpsuits.yml +++ b/Resources/Prototypes/_Mono/Entities/Clothing/Jumpsuit/jumpsuits.yml @@ -80,6 +80,10 @@ - type: SuitSensor randomMode: false mode: SensorVitals + # Triad add start + - type: SavingContraband + examineText: ship-saving-contraband-2-text + # Triad end - type: entity parent: ClothingUniformBase diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Specific/Science/TechDisks/tech_disk_spawners.yml b/Resources/Prototypes/_Mono/Entities/Objects/Specific/Science/TechDisks/tech_disk_spawners.yml index 1353c069be1..7a13fba0728 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Specific/Science/TechDisks/tech_disk_spawners.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Specific/Science/TechDisks/tech_disk_spawners.yml @@ -200,7 +200,7 @@ table: !type:GroupSelector children: - id: TechDiskSpeedBoots - - id: TechDiskBluespaceBags + # - id: TechDiskBluespaceBags // Triad, remove bluespace bag - id: TechDiskShields - id: TechDiskFtl - id: TechDiskTranslationPreFracture diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 2f4ff44c273..0ff3293f75e 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -39,3 +39,7 @@ autoRechargeRate: 24 - type: GunSpreadModifier spread: 0.8 + # Triad add start + - type: SavingContraband + examineText: ship-saving-contraband-2-text + # Triad end diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Battery/magfed_lasers.yml b/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Battery/magfed_lasers.yml index 059e1616c72..bd19505a981 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Battery/magfed_lasers.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Battery/magfed_lasers.yml @@ -143,3 +143,7 @@ sprite: _RMC14/Interface/MousePointer/smartgun_mouse.rsi state: all - type: Appearance + # Triad add start + - type: SavingContraband + examineText: ship-saving-contraband-2-text + # Triad end diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Launchers/metalstorm.yml b/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Launchers/metalstorm.yml index 6b4ac611efe..bc4c8bd41a6 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Launchers/metalstorm.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Launchers/metalstorm.yml @@ -92,3 +92,7 @@ - type: EmitSoundOnLand sound: collection: RiflesDrop + # Triad add start + - type: SavingContraband + examineText: ship-saving-contraband-2-text + # Triad end diff --git a/Resources/Prototypes/_Mono/Entities/Structures/Machines/Computers/tsf_comm_computer.yml b/Resources/Prototypes/_Mono/Entities/Structures/Machines/Computers/tsf_comm_computer.yml index 56060225386..65e02bbba1f 100644 --- a/Resources/Prototypes/_Mono/Entities/Structures/Machines/Computers/tsf_comm_computer.yml +++ b/Resources/Prototypes/_Mono/Entities/Structures/Machines/Computers/tsf_comm_computer.yml @@ -42,3 +42,7 @@ - type: Damageable damageContainer: StructuralInorganic damageModifierSet: StructuralMetallicStrong + # Triad add start + - type: SavingContraband + examineText: ship-saving-contraband-2-text + # Triad end diff --git a/Resources/Prototypes/_Mono/Entities/Structures/Machines/disk_printer.yml b/Resources/Prototypes/_Mono/Entities/Structures/Machines/disk_printer.yml index d34d5977d90..31a5275f521 100644 --- a/Resources/Prototypes/_Mono/Entities/Structures/Machines/disk_printer.yml +++ b/Resources/Prototypes/_Mono/Entities/Structures/Machines/disk_printer.yml @@ -9,7 +9,7 @@ drawRate: 120000 - type: ItemMiner proto: SpawnLootTechDiskPrinter - interval: 1200 # Triad : Change it into 20 minutes + interval: 450 minedSound: /Audio/Machines/circuitprinter.ogg needApcPower: false - type: PowerConsumerMiner diff --git a/Resources/Prototypes/_Mono/Entities/Structures/Machines/laser_drill.yml b/Resources/Prototypes/_Mono/Entities/Structures/Machines/laser_drill.yml index cf99fc4c0a5..677109cd3da 100644 --- a/Resources/Prototypes/_Mono/Entities/Structures/Machines/laser_drill.yml +++ b/Resources/Prototypes/_Mono/Entities/Structures/Machines/laser_drill.yml @@ -55,7 +55,7 @@ !type:CableDeviceNode nodeGroupID: HVPower - type: SavingContraband - examineText: ship-saving-contraband-1-text + examineText: ship-saving-contraband-2-text - type: entity id: LaserDrill diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shuttle_records.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shuttle_records.yml index ca43351f75f..6ceccb54cd1 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shuttle_records.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shuttle_records.yml @@ -49,3 +49,6 @@ components: - type: ShuttleRecordsConsole account: Frontier + # Triad add start + - type: SavingContraband + # Triad end diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_tabletop.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_tabletop.yml index c378d9fbaf5..09a44c06d5b 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_tabletop.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_tabletop.yml @@ -318,6 +318,10 @@ - map: ["computerLayerKeys"] sprite: Structures/Machines/computers.rsi state: syndie_key + # Triad add start + - type: SavingContraband + examineText: ship-saving-contraband-2-text + # Triad end - type: entity parent: [BaseStructureComputerTabletop, ComputerSolarControl] @@ -398,6 +402,10 @@ - map: ["computerLayerKeys"] sprite: Structures/Machines/computers.rsi state: tech_key + # Triad add start + - type: SavingContraband + examineText: ship-saving-contraband-2-text + # Triad end - type: entity parent: [BaseStructureComputerTabletop, ComputerCargoBounty] diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml index fde3081628b..3be6c38064d 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml @@ -156,6 +156,10 @@ Telecrystal: 25 # Mono - type: AccessReader access: [["NuclearOperative"], ["SyndicateAgent"]] + # Triad add start + - type: SavingContraband + examineText: ship-saving-contraband-2-text + # Triad end - type: entity parent: VendingMachine diff --git a/SHIPYARD_SERIALIZATION.md b/SHIPYARD_SERIALIZATION.md deleted file mode 100644 index e69de29bb2d..00000000000