Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ namespace Content.Shared._Triad.Shipyard;
public sealed partial class SavingContrabandComponent : Component
{
[DataField]
public LocId ExamineText;
public LocId? ExamineText;
}
2 changes: 2 additions & 0 deletions Content.Shared/_Triad/Shipyard/SavingContrabandSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ public override void Initialize()

private void OnExamined(Entity<SavingContrabandComponent> ent, ref ExaminedEvent args)
{
if (ent.Comp.ExamineText == null)
return;
args.PushMarkup(Loc.GetString(ent.Comp.ExamineText));
}
}
4 changes: 4 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Back/duffel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -273,3 +273,7 @@
walkModifier: 1
sprintModifier: 1
- type: HeldSpeedModifier
# Triad add start
- type: SavingContraband
examineText: ship-saving-contraband-2-text
# Triad end
3 changes: 3 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
state: icon_alt
- type: Clothing
equippedPrefix: alt
# Triad add start
- type: SavingContraband
# Triad end

- type: entity
parent: ClothingHeadsetAlt
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Masks/masks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Entities/Mobs/Player/silicon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,9 @@
Empty: { state: empty }
Occupied: { state: full }
- type: Intellicard
# Triad add start
- type: SavingContraband
# Triad end

- type: entity
id: PlayerStationAiPreview
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@
- type: ComputerTabletopBoard # Frontier
prototype: ComputerTabletopCargoOrders # Frontier
- type: SavingContraband
examineText: ship-saving-contraband-1-text

- type: entity
parent: BaseComputerCircuitboard
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -567,3 +578,7 @@
state: cpu_rogue
- type: ComputerBoard
prototype: RogueComputerComms
# Triad add start
- type: SavingContraband
examineText: ship-saving-contraband-2-text
# Triad end
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
- type: DoorRemote
- type: StealTarget
stealGroup: DoorRemote
- type: SavingContraband

- type: entity
parent: DoorRemoteDefault
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Entities/Objects/Devices/pda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
name: PDA
description: Personal Data Assistant.
components:
# Triad add start
- type: SavingContraband
# Triad end
- type: Appearance
appearanceDataInit:
enum.PdaVisuals.PdaType:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@
params:
volume: -5
# Goobstation edit end
# Triad add start
- type: SavingContraband
# Triad end

#IDs with layers

Expand Down Expand Up @@ -688,6 +691,7 @@
tags:
- NuclearOperative
- SyndicateAgent
- type: SavingContraband

- type: entity
parent: IDCardStandard
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,6 @@
repairTime: 4
repairCost: 8
- type: SavingContraband
examineText: ship-saving-contraband-1-text

- type: entity
parent: BaseComputerAiAccess
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,3 @@
- BluespaceLifelineImplanter # Stops stealing of their gear
- RadioImplanterCentcomm # Headset theft means nothing!
- HandHeldMassScannerBorg # Just for the infiniste battery

Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,3 +136,7 @@
autoRechargeRate: 50
autoRechargePause: true
autoRechargePauseTime: 5
# Triad add start
- type: SavingContraband
examineText: ship-saving-contraband-2-text
# Triad end
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
table: !type:GroupSelector
children:
- id: TechDiskSpeedBoots
- id: TechDiskBluespaceBags
# - id: TechDiskBluespaceBags // Triad, remove bluespace bag
- id: TechDiskShields
- id: TechDiskFtl
- id: TechDiskTranslationPreFracture
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,7 @@
autoRechargeRate: 24
- type: GunSpreadModifier
spread: 0.8
# Triad add start
- type: SavingContraband
examineText: ship-saving-contraband-2-text
# Triad end
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,7 @@
- type: EmitSoundOnLand
sound:
collection: RiflesDrop
# Triad add start
- type: SavingContraband
examineText: ship-saving-contraband-2-text
# Triad end
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,7 @@
- type: Damageable
damageContainer: StructuralInorganic
damageModifierSet: StructuralMetallicStrong
# Triad add start
- type: SavingContraband
examineText: ship-saving-contraband-2-text
# Triad end
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,6 @@
components:
- type: ShuttleRecordsConsole
account: Frontier
# Triad add start
- type: SavingContraband
# Triad end
Loading
Loading