From 08935eea031751391e3260dbfafbe7de40ea8ca5 Mon Sep 17 00:00:00 2001
From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date: Mon, 16 Jan 2023 18:44:18 +1000
Subject: [PATCH] Merge pull request #14330 from Novacat/nova-basicfixes

Uplink and Pouch Tweaks
---
 code/datums/uplink/tools_vr.dm                | 33 ++++++++++++++++---
 .../objects/items/weapons/storage/pouches.dm  |  4 ++-
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/code/datums/uplink/tools_vr.dm b/code/datums/uplink/tools_vr.dm
index 1cf66457d0..702a8ae37b 100644
--- a/code/datums/uplink/tools_vr.dm
+++ b/code/datums/uplink/tools_vr.dm
@@ -73,10 +73,20 @@
 	item_cost = 15
 	path = /obj/fiftyspawner/glass
 
-/datum/uplink_item/item/tools/holdingpouch
-	name = "Pouch of Holding"
-	item_cost = 20
-	path = /obj/item/weapon/storage/pouch/holding
+/datum/uplink_item/item/tools/smallpouch
+	name = "Small Pouch"
+	item_cost = 5
+	path = /obj/item/weapon/storage/pouch/small
+
+/datum/uplink_item/item/tools/normalpouch
+	name = "Standard Pouch"
+	item_cost = 10
+	path = /obj/item/weapon/storage/pouch
+
+/datum/uplink_item/item/tools/largepouch
+	name = "Large Pouch"
+	item_cost = 15
+	path = /obj/item/weapon/storage/pouch/large
 
 /datum/uplink_item/item/tools/elitelaptop
 	name = "Laptop (Advanced)"
@@ -119,3 +129,18 @@
 	name = "Survival Capsule (Bar)"
 	item_cost = 80
 	path = /obj/item/device/survivalcapsule/luxurybar
+
+/datum/uplink_item/item/tools/capturecrystal
+	name = "Capture Crystal"
+	item_cost = 30
+	path = /obj/item/capture_crystal/basic
+
+/datum/uplink_item/item/tools/capturecrystal/great
+	name = "Capture Crystal (Great)"
+	item_cost = 40
+	path = /obj/item/capture_crystal/great
+
+/datum/uplink_item/item/tools/capturecrystal/ultra
+	name = "Capture Crystal (Ultra)"
+	item_cost = 50
+	path = /obj/item/capture_crystal/ultra
diff --git a/code/game/objects/items/weapons/storage/pouches.dm b/code/game/objects/items/weapons/storage/pouches.dm
index f2a1892fa3..92daef2deb 100644
--- a/code/game/objects/items/weapons/storage/pouches.dm
+++ b/code/game/objects/items/weapons/storage/pouches.dm
@@ -49,12 +49,14 @@
 	desc = "This storage pouch can be used to provide a good amount of additional storage for quick access."
 	icon_state = "large_generic"
 	max_storage_space = ITEMSIZE_COST_SMALL*6
+	remove_delay = 3 SECONDS //VOREStation Add: Slightly more cumbersome
 
 /obj/item/weapon/storage/pouch/small
 	name = "storage pouch (small)"
 	desc = "This storage pouch can be used to provide a small amount of additional storage for quick access."
 	icon_state = "small_generic"
 	max_storage_space = ITEMSIZE_COST_SMALL*2
+	remove_delay = 1 SECOND //VOREStation Add: Slightly less cumbersome
 
 /obj/item/weapon/storage/pouch/ammo
 	name = "storage pouch (ammo)"
@@ -214,6 +216,6 @@
 	name = "storage pouch of holding"
 	desc = "This storage pouch can be used to provide some additional storage for quick access. Seems to use extradimensional storage!"
 	icon_state = "holdingpouch"
-	max_storage_space = INVENTORY_STANDARD_SPACE // Size of a normal backpack, compared to a normal BoH, which is way bigger
+	max_storage_space = INVENTORY_POUCH_SPACE*2 //VOREStation Edit: Consistency with normal bags of holding
 
 #undef INVENTORY_POUCH_SPACE