Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Blacklists Storage and High Value items from Storage Implant, but reduces cost #2286

Merged
merged 12 commits into from
Jan 5, 2025
Merged

Blacklists Storage and High Value items from Storage Implant, but reduces cost #2286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6188d35
meow
Lyndomen Nov 25, 2024
23610d6
Merge remote-tracking branch 'origin/storageops' into storageops
Lyndomen Nov 25, 2024
9d248d9
Merge branch 'master' into storageops
MilonPL Nov 28, 2024
36e1595
meow
Lyndomen Dec 7, 2024
30fc4ea
Revert "meow"
Lyndomen Dec 7, 2024
3faa428
meow
Lyndomen Dec 7, 2024
69f95bc
Merge branch 'master' into storageops
Lyndomen Dec 7, 2024
e1fc964
Merge branch 'master' into storageops
Lyndomen Dec 8, 2024
2896efc
Merge remote-tracking branch 'origin/storageops' into storageops
Lyndomen Dec 8, 2024
e2e1c3e
meow
Lyndomen Dec 8, 2024
1149150
Update uplink-catalog.ftl
Lyndomen Dec 8, 2024
980ac1e
merge master
Jan 5, 2025
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
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/_DV/store/uplink-catalog.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,5 @@ uplink-explosive-foam-grenade-desc = An explosive grenade disguised as a regular

uplink-appraisal-tool-gun-name = Appraisal Tool Gun
uplink-appraisal-tool-gun-desc = A modified Viper to appear as an appraisal tool, at the cost of slightly slower firerate

uplink-storage-implanter-delta-desc = Hide goodies inside of yourself with new bluespace technology! Budget cuts have resulted in it NOT STORING High Value or storage items.
2 changes: 1 addition & 1 deletion Resources/Prototypes/Actions/types.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
- type: entity
id: ActionOpenStorageImplant
name: Toggle Storage Implant
description: Opens or closes the storage implant embedded under your skin
description: Opens or closes the storage implant embedded under your skin, note that it cannot store high value or storage based items # DeltaV
Lyndomen marked this conversation as resolved.
Show resolved Hide resolved
components:
- type: InstantAction
itemIconStyle: BigAction
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/Catalog/uplink_catalog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1264,14 +1264,14 @@
- type: listing
id: UplinkStorageImplanter
name: uplink-storage-implanter-name
description: uplink-storage-implanter-desc
description: uplink-storage-implanter-delta-desc # DeltaV
icon: { sprite: /Textures/Clothing/Back/Backpacks/backpack.rsi, state: icon }
productEntity: StorageImplanter
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 5 # DeltaV
Telecrystal: 2 # DeltaV
cost:
Telecrystal: 10 # DeltaV - Was 8
Telecrystal: 4 # DeltaV
categories:
- UplinkImplants
conditions:
Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,12 @@
- type: Storage
grid:
- 0,0,2,2
blacklist: # DeltaV
components:
- Storage
- SecretStash
tags:
- HighRiskItem
- type: ContainerContainer
containers:
storagebase: !type:Container
Expand Down
Loading