diff --git a/code/datums/uplink/announcements.dm b/code/datums/uplink/announcements.dm
index eca559d35a..21ef121e32 100644
--- a/code/datums/uplink/announcements.dm
+++ b/code/datums/uplink/announcements.dm
@@ -10,7 +10,7 @@
log_and_message_admins("has triggered a falsified [src]", user)
/datum/uplink_item/abstract/announcements/fake_centcom
- item_cost = DEFAULT_TELECRYSTAL_AMOUNT / 2
+ item_cost = DEFAULT_TELECRYSTAL_AMOUNT / 3
/datum/uplink_item/abstract/announcements/fake_centcom/New()
..()
@@ -33,7 +33,7 @@
/datum/uplink_item/abstract/announcements/fake_crew_arrival
name = "Crew Arrival Announcement/Records"
desc = "Creates a fake crew arrival announcement as well as fake crew records, using your current appearance (including held items!) and worn id card. Trigger with care!"
- item_cost = 40
+ item_cost = 30
/datum/uplink_item/abstract/announcements/fake_crew_arrival/get_goods(var/obj/item/device/uplink/U, var/loc, var/mob/user, var/list/args)
if(!user)
@@ -100,7 +100,7 @@
/datum/uplink_item/abstract/announcements/fake_radiation
name = "Radiation Storm Announcement"
desc = "Interferes with the station's radiation sensors. Triggers immediately upon investment."
- item_cost = 30
+ item_cost = 15
/datum/uplink_item/abstract/announcements/fake_radiation/get_goods(var/obj/item/device/uplink/U, var/loc)
var/datum/event_meta/EM = new(EVENT_LEVEL_MUNDANE, "Fake Radiation Storm", add_to_queue = 0)
diff --git a/code/datums/uplink/armor.dm b/code/datums/uplink/armor.dm
index e0bbafdd19..20367f3989 100644
--- a/code/datums/uplink/armor.dm
+++ b/code/datums/uplink/armor.dm
@@ -6,7 +6,7 @@
/datum/uplink_item/item/armor/combat
name = "Combat Armor Set"
- item_cost = 50
+ item_cost = 60
path = /obj/item/weapon/storage/box/syndie_kit/combat_armor
/datum/uplink_item/item/armor/heavy_vest
diff --git a/code/datums/uplink/badassery.dm b/code/datums/uplink/badassery.dm
index d8f8db0fab..425a0ba01b 100644
--- a/code/datums/uplink/badassery.dm
+++ b/code/datums/uplink/badassery.dm
@@ -53,10 +53,25 @@
****************/
/datum/uplink_item/item/badassery/surplus
name = "Surplus Crate"
- item_cost = 400
- var/item_worth = 600
+ item_cost = DEFAULT_TELECRYSTAL_AMOUNT
+ var/item_worth = 240
var/icon
+/datum/uplink_item/item/badassery/surplus/merc2
+ name = "Surplus Crate - 240 TC"
+ item_cost = DEFAULT_TELECRYSTAL_AMOUNT * 2
+ item_worth = 480
+
+/datum/uplink_item/item/badassery/surplus/merc4
+ name = "Surplus Crate - 480 TC"
+ item_cost = DEFAULT_TELECRYSTAL_AMOUNT * 4
+ item_worth = 960
+
+/datum/uplink_item/item/badassery/surplus/merc6
+ name = "Surplus Crate - 720 TC"
+ item_cost = DEFAULT_TELECRYSTAL_AMOUNT * 6
+ item_worth = 1440
+
/datum/uplink_item/item/badassery/surplus/New()
..()
desc = "A crate containing [item_worth] telecrystal\s worth of surplus leftovers."
diff --git a/code/datums/uplink/grenades.dm b/code/datums/uplink/grenades.dm
index e073438bab..83d516633d 100644
--- a/code/datums/uplink/grenades.dm
+++ b/code/datums/uplink/grenades.dm
@@ -5,31 +5,65 @@
category = /datum/uplink_category/grenades
/datum/uplink_item/item/grenades/anti_photon
- name = "5xPhoton Disruption Grenades"
- item_cost = 20
+ name = "7xPhoton Disruption Grenades"
+ item_cost = 10
path = /obj/item/weapon/storage/box/anti_photons
-/datum/uplink_item/item/grenades/emp
- name = "5xEMP Grenades"
- item_cost = 30
- path = /obj/item/weapon/storage/box/emps
+/datum/uplink_item/item/grenades/anti_photon_singular
+ name = "1xPhoton Disruption Grenade"
+ item_cost = 2
+ path = /obj/item/weapon/grenade/anti_photon
+
+/datum/uplink_item/item/grenades/metalfoam
+ name = "7xMetal Foam Grenades"
+ item_cost = 10
+ path = /obj/item/weapon/storage/box/metalfoam
+
+/datum/uplink_item/item/grenades/metalfoam_singular
+ name = "1xMetal Foam Grenade"
+ item_cost = 2
+ path = /obj/item/weapon/grenade/chem_grenade/metalfoam
/datum/uplink_item/item/grenades/smoke
name = "7xSmoke Grenades"
- item_cost = 20
+ item_cost = 10
path = /obj/item/weapon/storage/box/smokes
+/datum/uplink_item/item/grenades/smoke_singular
+ name = "1xSmoke Grenade"
+ item_cost = 2
+ path = /obj/item/weapon/grenade/smokebomb
+
+/datum/uplink_item/item/grenades/emp
+ name = "7xEMP Grenades"
+ item_cost = 50
+ path = /obj/item/weapon/storage/box/emps
+
+/datum/uplink_item/item/grenades/emp_singular
+ name = "1xEMP Grenade"
+ item_cost = 10
+ path = /obj/item/weapon/grenade/empgrenade
+
/datum/uplink_item/item/grenades/frags
- name = "5xFrag Grenades"
- item_cost = 60
+ name = "7xFrag Grenades"
+ item_cost = 80
path = /obj/item/weapon/storage/box/frags
-/datum/uplink_item/item/grenades/flashbnags
+/datum/uplink_item/item/grenades/frags_half
+ name = "4x Frag Grenade"
+ item_cost = 50
+ path = /obj/item/weapon/storage/box/frags_half_box
+
+/datum/uplink_item/item/grenades/frags_singular
+ name = "1x Frag Grenade"
+ item_cost = 15
+ /obj/item/weapon/grenade/explosive
+
+/datum/uplink_item/item/grenades/flashbangs
name = "7xFlashbangs"
item_cost = 40
path = /obj/item/weapon/storage/box/flashbangs
-/datum/uplink_item/item/grenades/metalfoam
- name = "7xMetal Foam Grenades"
- item_cost = 30
- path = /obj/item/weapon/storage/box/metalfoam
\ No newline at end of file
+/datum/uplink_item/item/grenades/flashbangs_singular
+ name = "1xFlashbang"
+ item_cost = 8
\ No newline at end of file
diff --git a/code/datums/uplink/hardsuit_modules.dm b/code/datums/uplink/hardsuit_modules.dm
index c04f479b81..1af24529e0 100644
--- a/code/datums/uplink/hardsuit_modules.dm
+++ b/code/datums/uplink/hardsuit_modules.dm
@@ -6,22 +6,22 @@
/datum/uplink_item/item/hardsuit_modules/thermal
name = "Thermal Scanner"
- item_cost = 20
+ item_cost = 15
path = /obj/item/rig_module/vision/thermal
/datum/uplink_item/item/hardsuit_modules/energy_net
name = "Net Projector"
- item_cost = 30
+ item_cost = 20
path = /obj/item/rig_module/fabricator/energy_net
/datum/uplink_item/item/ewar_voice
name = "Electrowarfare Suite and Voice Synthesiser"
- item_cost = 40
+ item_cost = 30
path = /obj/item/weapon/storage/box/syndie_kit/ewar_voice
/datum/uplink_item/item/hardsuit_modules/maneuvering_jets
name = "Maneuvering Jets"
- item_cost = 40
+ item_cost = 30
path = /obj/item/rig_module/maneuvering_jets
/datum/uplink_item/item/hardsuit_modules/egun
@@ -31,7 +31,7 @@
/datum/uplink_item/item/hardsuit_modules/power_sink
name = "Power Sink"
- item_cost = 60
+ item_cost = 45
path = /obj/item/rig_module/power_sink
/datum/uplink_item/item/hardsuit_modules/laser_canon
diff --git a/code/datums/uplink/implants.dm b/code/datums/uplink/implants.dm
index 3875005481..7e3e2f3005 100644
--- a/code/datums/uplink/implants.dm
+++ b/code/datums/uplink/implants.dm
@@ -11,7 +11,7 @@
/datum/uplink_item/item/implants/imp_compress
name = "Compressed Matter Implant"
- item_cost = 40
+ item_cost = 30
path = /obj/item/weapon/storage/box/syndie_kit/imp_compress
/datum/uplink_item/item/implants/imp_explosive
diff --git a/code/datums/uplink/medical.dm b/code/datums/uplink/medical.dm
index 4d44f5d5c1..27e0ded523 100644
--- a/code/datums/uplink/medical.dm
+++ b/code/datums/uplink/medical.dm
@@ -6,12 +6,12 @@
/datum/uplink_item/item/medical/sinpockets
name = "Box of Sin-Pockets"
- item_cost = 10
+ item_cost = 5
path = /obj/item/weapon/storage/box/sinpockets
/datum/uplink_item/item/medical/surgery
name = "Surgery kit"
- item_cost = 60
+ item_cost = 45
path = /obj/item/weapon/storage/firstaid/surgery
/datum/uplink_item/item/medical/combat
@@ -21,16 +21,16 @@
/datum/uplink_item/item/medical/freezer
name = "Portable Freezer"
- item_cost = 20
+ item_cost = 10
path = /obj/item/weapon/storage/box/freezer
/datum/uplink_item/item/medical/ambrosiaseeds
name = "Box of 7x ambrosia seed packets"
- item_cost = 10
+ item_cost = 5
path = /obj/item/weapon/storage/box/ambrosia
/datum/uplink_item/item/medical/ambrosiadeusseeds
name = "Box of 7x ambrosia deus seed packets"
- item_cost = 20
+ item_cost = 10
path = /obj/item/weapon/storage/box/ambrosiadeus
diff --git a/code/datums/uplink/stealth_items.dm b/code/datums/uplink/stealth_items.dm
index d9eb8e3f25..1da0381390 100644
--- a/code/datums/uplink/stealth_items.dm
+++ b/code/datums/uplink/stealth_items.dm
@@ -6,40 +6,35 @@
/datum/uplink_item/item/stealth_items/id
name = "Agent ID card"
- item_cost = 20
+ item_cost = 10
path = /obj/item/weapon/card/id/syndicate
/datum/uplink_item/item/stealth_items/syndigaloshes
name = "No-Slip Shoes"
- item_cost = 20
+ item_cost = 10
path = /obj/item/clothing/shoes/syndigaloshes
/datum/uplink_item/item/stealth_items/spy
name = "Bug Kit"
- item_cost = 20
+ item_cost = 10
path = /obj/item/weapon/storage/box/syndie_kit/spy
/datum/uplink_item/item/stealth_items/chameleon_kit
name = "Chameleon Kit"
- item_cost = 30
+ item_cost = 15
path = /obj/item/weapon/storage/box/syndie_kit/chameleon
/datum/uplink_item/item/stealth_items/chameleon_projector
name = "Chameleon-Projector"
- item_cost = 40
- path = /obj/item/device/chameleon
-
-/datum/uplink_item/item/stealth_items/chameleon_projector
- name = "Chameleon-Projector"
- item_cost = 40
+ item_cost = 30
path = /obj/item/device/chameleon
/datum/uplink_item/item/stealth_items/voice
name = "Voice Changer"
- item_cost = 40
+ item_cost = 30
path = /obj/item/clothing/mask/gas/voice
/datum/uplink_item/item/stealth_items/camera_floppy
name = "Camera Network Access - Floppy"
- item_cost = 60
+ item_cost = 30
path = /obj/item/weapon/disk/file/cameras/syndicate
diff --git a/code/datums/uplink/stealthy_weapons.dm b/code/datums/uplink/stealthy_weapons.dm
index 67f862fb57..7a60e42e13 100644
--- a/code/datums/uplink/stealthy_weapons.dm
+++ b/code/datums/uplink/stealthy_weapons.dm
@@ -6,7 +6,7 @@
/datum/uplink_item/item/stealthy_weapons/soap
name = "Subversive Soap"
- item_cost = 10
+ item_cost = 5
path = /obj/item/weapon/soap/syndie
/datum/uplink_item/item/stealthy_weapons/concealed_cane
@@ -21,15 +21,15 @@
/datum/uplink_item/item/stealthy_weapons/parapen
name = "Paralysis Pen"
- item_cost = 30
+ item_cost = 40
path = /obj/item/weapon/pen/reagent/paralysis
/datum/uplink_item/item/stealthy_weapons/cigarette_kit
name = "Cigarette Kit"
- item_cost = 30
+ item_cost = 15
path = /obj/item/weapon/storage/box/syndie_kit/cigarette
/datum/uplink_item/item/stealthy_weapons/random_toxin
name = "Random Toxin - Beaker"
- item_cost = 30
+ item_cost = 15
path = /obj/item/weapon/storage/box/syndie_kit/toxin
diff --git a/code/datums/uplink/tools.dm b/code/datums/uplink/tools.dm
index ec9f2f1355..a28ec5694f 100644
--- a/code/datums/uplink/tools.dm
+++ b/code/datums/uplink/tools.dm
@@ -29,7 +29,7 @@
/datum/uplink_item/item/tools/encryptionkey_binary
name = "Binary Translator Key"
- item_cost = 30
+ item_cost = 20
path = /obj/item/device/encryptionkey/binary
/datum/uplink_item/item/tools/emag
@@ -39,18 +39,18 @@
/datum/uplink_item/item/tools/clerical
name = "Morphic Clerical Kit"
- item_cost = 30
+ item_cost = 15
path = /obj/item/weapon/storage/box/syndie_kit/clerical
/datum/uplink_item/item/tools/money
name = "Operations Funding"
- item_cost = 30
+ item_cost = 15
path = /obj/item/weapon/storage/secure/briefcase/money
desc = "A briefcase with 10,000 untraceable thalers for funding your sneaky activities."
/datum/uplink_item/item/tools/space_suit
name = "Space Suit"
- item_cost = 30
+ item_cost = 15
path = /obj/item/weapon/storage/box/syndie_kit/space
/datum/uplink_item/item/tools/thermal
@@ -65,15 +65,15 @@
/datum/uplink_item/item/tools/ai_module
name = "Hacked AI Upload Module"
- item_cost = 70
+ item_cost = 60
path = /obj/item/weapon/aiModule/syndicate
/datum/uplink_item/item/tools/supply_beacon
name = "Hacked Supply Beacon (DANGER!)"
- item_cost = 70
+ item_cost = 60
path = /obj/item/supply_beacon
/datum/uplink_item/item/tools/teleporter
name = "Teleporter Circuit Board"
- item_cost = 200
+ item_cost = DEFAULT_TELECRYSTAL_AMOUNT * 1.5
path = /obj/item/weapon/circuitboard/teleporter
\ No newline at end of file
diff --git a/code/datums/uplink/visible_weapons.dm b/code/datums/uplink/visible_weapons.dm
index e8315d2bcb..211434b4b0 100644
--- a/code/datums/uplink/visible_weapons.dm
+++ b/code/datums/uplink/visible_weapons.dm
@@ -21,17 +21,17 @@
/datum/uplink_item/item/visible_weapons/dartgun
name = "Dart Gun"
- item_cost = 50
+ item_cost = 30
path = /obj/item/weapon/gun/projectile/dartgun
/datum/uplink_item/item/visible_weapons/crossbow
name = "Energy Crossbow"
- item_cost = 50
+ item_cost = 40
path = /obj/item/weapon/gun/energy/crossbow
/datum/uplink_item/item/visible_weapons/silenced_45
name = "Silenced .45"
- item_cost = 50
+ item_cost = 40
path = /obj/item/weapon/gun/projectile/silenced
/datum/uplink_item/item/visible_weapons/riggedlaser
@@ -41,12 +41,12 @@
/datum/uplink_item/item/visible_weapons/revolver
name = "Revolver"
- item_cost = 60
+ item_cost = 70
path = /obj/item/weapon/gun/projectile/revolver
/datum/uplink_item/item/visible_weapons/Derringer
name = ".357 Derringer Pistol"
- item_cost = 50
+ item_cost = 40
path = /obj/item/weapon/gun/projectile/derringer
/datum/uplink_item/item/visible_weapons/heavysniper
@@ -56,7 +56,7 @@
/datum/uplink_item/item/visible_weapons/tommygun
name = "Tommygun (.45)" // We're keeping this because it's CLASSY. -Spades
- item_cost = 70
+ item_cost = 60
path = /obj/item/weapon/gun/projectile/automatic/tommygun
//These are for traitors (or other antags, perhaps) to have the option of purchasing some merc gear.
@@ -67,7 +67,7 @@
/datum/uplink_item/item/visible_weapons/assaultrifle
name = "Assault Rifle (7.62mm)"
- item_cost = 70
+ item_cost = 75
path = /obj/item/weapon/gun/projectile/automatic/sts35
/*/datum/uplink_item/item/visible_weapons/bullpuprifle
@@ -77,12 +77,12 @@
*/
/datum/uplink_item/item/visible_weapons/combatshotgun
name = "Combat Shotgun"
- item_cost = 70
+ item_cost = 75
path = /obj/item/weapon/gun/projectile/shotgun/pump/combat
/datum/uplink_item/item/visible_weapons/egun
name = "Energy Gun"
- item_cost = 50
+ item_cost = 60
path = /obj/item/weapon/gun/energy/gun
/datum/uplink_item/item/visible_weapons/lasercannon
@@ -92,15 +92,15 @@
/datum/uplink_item/item/visible_weapons/lasercarbine
name = "Laser Carbine"
- item_cost = 70
+ item_cost = 65
path = /obj/item/weapon/gun/energy/laser
/datum/uplink_item/item/visible_weapons/ionrifle
name = "Ion Rifle"
- item_cost = 50
+ item_cost = 40
path = /obj/item/weapon/gun/energy/ionrifle
/datum/uplink_item/item/visible_weapons/xray
name = "Xray Gun"
- item_cost = 70
+ item_cost = 80
path = /obj/item/weapon/gun/energy/xray
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index 948faa4afe..07c76358c5 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -224,7 +224,7 @@
/obj/item/weapon/storage/box/emps/New()
..()
- for(var/i = 1 to 5)
+ for(var/i = 1 to 7)
new /obj/item/weapon/grenade/empgrenade(src)
/obj/item/weapon/storage/box/empslite
@@ -234,7 +234,7 @@
/obj/item/weapon/storage/box/empslite/New()
..()
- for(var/i = 1 to 5)
+ for(var/i = 1 to 7)
new /obj/item/weapon/grenade/empgrenade/low_yield(src)
/obj/item/weapon/storage/box/smokes
@@ -249,22 +249,32 @@
/obj/item/weapon/storage/box/anti_photons
name = "box of anti-photon grenades"
- desc = "A box containing 5 experimental photon disruption grenades."
+ desc = "A box containing 7 experimental photon disruption grenades."
icon_state = "flashbang"
/obj/item/weapon/storage/box/anti_photons/New()
..()
- for(var/i = 1 to 5)
+ for(var/i = 1 to 7)
new /obj/item/weapon/grenade/anti_photon(src)
/obj/item/weapon/storage/box/frags
name = "box of fragmentation grenades (WARNING)"
- desc = "A box containing 5 military grade fragmentation grenades.
WARNING: These devices are extremely dangerous and can cause limb loss or death in repeated use."
+ desc = "A box containing 7 military grade fragmentation grenades.
WARNING: These devices are extremely dangerous and can cause limb loss or death in repeated use."
icon_state = "frag"
/obj/item/weapon/storage/box/frags/New()
..()
- for(var/i = 1 to 5)
+ for(var/i = 1 to 7)
+ new /obj/item/weapon/grenade/explosive(src)
+
+/obj/item/weapon/storage/box/frags_half_box
+ name = "box of fragmentation grenades (WARNING)"
+ desc = "A box containing 4 military grade fragmentation grenades.
WARNING: These devices are extremely dangerous and can cause limb loss or death in repeated use."
+ icon_state = "frag"
+
+/obj/item/weapon/storage/box/frags_half_box/New()
+ ..()
+ for(var/i = 1 to 4)
new /obj/item/weapon/grenade/explosive(src)
/obj/item/weapon/storage/box/metalfoam