Merge pull request #2168 from Yoshax/telecrystals

Multiplies all Telecrystal stuff by ten to setup for fine cost adjusting

code/__defines/gamemode.dm

@@ -85,7 +85,7 @@ var/list/be_special_flags = list(
 #define MODE_TRAITOR "traitor"
 #define MODE_AUTOTRAITOR "autotraitor"
 
-#define DEFAULT_TELECRYSTAL_AMOUNT 12
+#define DEFAULT_TELECRYSTAL_AMOUNT 120
 
 /////////////////
 ////WIZARD //////

code/datums/uplink/ammunition.dm

@@ -2,7 +2,7 @@
 * Ammunition *
 *************/
 /datum/uplink_item/item/ammo
-	item_cost = 2
+	item_cost = 20
 	category = /datum/uplink_category/ammunition
 
 /datum/uplink_item/item/ammo/a357
@@ -63,7 +63,7 @@
 /datum/uplink_item/item/ammo/s762
 	name = "10rnd Rifle Magazine (7.62mm)"
 	path = /obj/item/ammo_magazine/s762
-	item_cost = 1 // Half the capacity.
+	item_cost = 10 // Half the capacity.
 
 /datum/uplink_item/item/ammo/s762/ap
 	name = "10rnd Rifle Magazine (7.62mm AP)"
@@ -88,7 +88,7 @@
 /datum/uplink_item/item/ammo/g12/beanbag
 	name = "12g Auto-Shotgun Magazine (Beanbag)"
 	path = /obj/item/ammo_magazine/g12/beanbag
-	item_cost = 1 // Discount due to it being LTL.
+	item_cost = 10 // Discount due to it being LTL.
 
 /datum/uplink_item/item/ammo/g12/pellet
 	name = "12g Auto-Shotgun Magazine (Pellet)"

code/datums/uplink/announcements.dm

@@ -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 = 4
+	item_cost = 40
 
 /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)
@@ -91,7 +91,7 @@
 /datum/uplink_item/abstract/announcements/fake_ion_storm
 	name = "Ion Storm Announcement"
 	desc = "Interferes with the station's ion sensors. Triggers immediately upon investment."
-	item_cost = 1
+	item_cost = 10
 
 /datum/uplink_item/abstract/announcements/fake_ion_storm/get_goods(var/obj/item/device/uplink/U, var/loc)
 	ion_storm_announcement()
@@ -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 = 3
+	item_cost = 30
 
 /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)

code/datums/uplink/armor.dm

@@ -6,10 +6,10 @@
 
 /datum/uplink_item/item/armor/combat
 	name = "Combat Armor Set"
-	item_cost = 5
+	item_cost = 50
 	path = /obj/item/weapon/storage/box/syndie_kit/combat_armor
 
 /datum/uplink_item/item/armor/heavy_vest
 	name = "Heavy Armor Vest"
-	item_cost = 4
+	item_cost = 40
 	path = /obj/item/clothing/suit/storage/vest/heavy/merc

code/datums/uplink/badassery.dm

@@ -53,8 +53,8 @@
 ****************/
 /datum/uplink_item/item/badassery/surplus
 	name = "Surplus Crate"
-	item_cost = 40
+	item_cost = 400
-	var/item_worth = 60
+	var/item_worth = 600
 	var/icon
 
 /datum/uplink_item/item/badassery/surplus/New()

code/datums/uplink/grenades.dm

@@ -6,30 +6,30 @@
 
 /datum/uplink_item/item/grenades/anti_photon
 	name = "5xPhoton Disruption Grenades"
-	item_cost = 2
+	item_cost = 20
 	path = /obj/item/weapon/storage/box/anti_photons
 
 /datum/uplink_item/item/grenades/emp
 	name = "5xEMP Grenades"
-	item_cost = 3
+	item_cost = 30
 	path = /obj/item/weapon/storage/box/emps
 
 /datum/uplink_item/item/grenades/smoke
 	name = "7xSmoke Grenades"
-	item_cost = 2
+	item_cost = 20
 	path = /obj/item/weapon/storage/box/smokes
 
 /datum/uplink_item/item/grenades/frags
 	name = "5xFrag Grenades"
-	item_cost = 6
+	item_cost = 60
 	path = /obj/item/weapon/storage/box/frags
 
 /datum/uplink_item/item/grenades/flashbnags
 	name = "7xFlashbangs"
-	item_cost = 4
+	item_cost = 40
 	path = /obj/item/weapon/storage/box/flashbangs
 
 /datum/uplink_item/item/grenades/metalfoam
 	name = "7xMetal Foam Grenades"
-	item_cost = 3
+	item_cost = 30
 	path = /obj/item/weapon/storage/box/metalfoam

code/datums/uplink/hardsuit_modules.dm

@@ -6,35 +6,35 @@
 
 /datum/uplink_item/item/hardsuit_modules/thermal
 	name = "Thermal Scanner"
-	item_cost = 2
+	item_cost = 20
 	path = /obj/item/rig_module/vision/thermal
 
 /datum/uplink_item/item/hardsuit_modules/energy_net
 	name = "Net Projector"
-	item_cost = 3
+	item_cost = 30
 	path = /obj/item/rig_module/fabricator/energy_net
 
 /datum/uplink_item/item/ewar_voice
 	name = "Electrowarfare Suite and Voice Synthesiser"
-	item_cost = 4
+	item_cost = 40
 	path = /obj/item/weapon/storage/box/syndie_kit/ewar_voice
 
 /datum/uplink_item/item/hardsuit_modules/maneuvering_jets
 	name = "Maneuvering Jets"
-	item_cost = 4
+	item_cost = 40
 	path = /obj/item/rig_module/maneuvering_jets
 
 /datum/uplink_item/item/hardsuit_modules/egun
 	name = "Mounted Energy Gun"
-	item_cost = 6
+	item_cost = 60
 	path = /obj/item/rig_module/mounted/egun
 
 /datum/uplink_item/item/hardsuit_modules/power_sink
 	name = "Power Sink"
-	item_cost = 6
+	item_cost = 60
 	path = /obj/item/rig_module/power_sink
 
 /datum/uplink_item/item/hardsuit_modules/laser_canon
 	name = "Mounted Laser Cannon"
-	item_cost = 8
+	item_cost = 80
 	path = /obj/item/rig_module/mounted

code/datums/uplink/implants.dm

@@ -6,20 +6,20 @@
 
 /datum/uplink_item/item/implants/imp_freedom
 	name = "Freedom Implant"
-	item_cost = 3
+	item_cost = 30
 	path = /obj/item/weapon/storage/box/syndie_kit/imp_freedom
 
 /datum/uplink_item/item/implants/imp_compress
 	name = "Compressed Matter Implant"
-	item_cost = 4
+	item_cost = 40
 	path = /obj/item/weapon/storage/box/syndie_kit/imp_compress
 
 /datum/uplink_item/item/implants/imp_explosive
 	name = "Explosive Implant (DANGER!)"
-	item_cost = 6
+	item_cost = 60
 	path = /obj/item/weapon/storage/box/syndie_kit/imp_explosive
 
 /datum/uplink_item/item/implants/imp_uplink
 	name = "Uplink Implant" //Original name: "Uplink Implant (Contains 5 Telecrystals)"
-	item_cost = 5 //Original cost: 10
+	item_cost = 50 //Original cost: 10
 	path = /obj/item/weapon/storage/box/syndie_kit/imp_uplink

code/datums/uplink/medical.dm

@@ -6,31 +6,31 @@
 
 /datum/uplink_item/item/medical/sinpockets
 	name = "Box of Sin-Pockets"
-	item_cost = 1
+	item_cost = 10
 	path = /obj/item/weapon/storage/box/sinpockets
 
 /datum/uplink_item/item/medical/surgery
 	name = "Surgery kit"
-	item_cost = 6
+	item_cost = 60
 	path = /obj/item/weapon/storage/firstaid/surgery
 
 /datum/uplink_item/item/medical/combat
 	name = "Combat medical kit"
-	item_cost = 6
+	item_cost = 60
 	path = /obj/item/weapon/storage/firstaid/combat
 
 /datum/uplink_item/item/medical/freezer
 	name = "Portable Freezer"
-	item_cost = 2
+	item_cost = 20
 	path = /obj/item/weapon/storage/box/freezer
 
 /datum/uplink_item/item/medical/ambrosiaseeds
 	name = "Box of 7x ambrosia seed packets"
-	item_cost = 1
+	item_cost = 10
 	path = /obj/item/weapon/storage/box/ambrosia
 
 /datum/uplink_item/item/medical/ambrosiadeusseeds
 	name = "Box of 7x ambrosia deus seed packets"
-	item_cost = 2
+	item_cost = 20
 	path = /obj/item/weapon/storage/box/ambrosiadeus
 

code/datums/uplink/stealth_items.dm

@@ -6,40 +6,40 @@
 
 /datum/uplink_item/item/stealth_items/id
 	name = "Agent ID card"
-	item_cost = 2
+	item_cost = 20
 	path = /obj/item/weapon/card/id/syndicate
 
 /datum/uplink_item/item/stealth_items/syndigaloshes
 	name = "No-Slip Shoes"
-	item_cost = 2
+	item_cost = 20
 	path = /obj/item/clothing/shoes/syndigaloshes
 
 /datum/uplink_item/item/stealth_items/spy
 	name = "Bug Kit"
-	item_cost = 2
+	item_cost = 20
 	path = /obj/item/weapon/storage/box/syndie_kit/spy
 
 /datum/uplink_item/item/stealth_items/chameleon_kit
 	name = "Chameleon Kit"
-	item_cost = 3
+	item_cost = 30
 	path = /obj/item/weapon/storage/box/syndie_kit/chameleon
 
 /datum/uplink_item/item/stealth_items/chameleon_projector
 	name = "Chameleon-Projector"
-	item_cost = 4
+	item_cost = 40
 	path = /obj/item/device/chameleon
 
 /datum/uplink_item/item/stealth_items/chameleon_projector
 	name = "Chameleon-Projector"
-	item_cost = 4
+	item_cost = 40
 	path = /obj/item/device/chameleon
 
 /datum/uplink_item/item/stealth_items/voice
 	name = "Voice Changer"
-	item_cost = 4
+	item_cost = 40
 	path = /obj/item/clothing/mask/gas/voice
 
 /datum/uplink_item/item/stealth_items/camera_floppy
 	name = "Camera Network Access - Floppy"
-	item_cost = 6
+	item_cost = 60
 	path = /obj/item/weapon/disk/file/cameras/syndicate

code/datums/uplink/stealthy_weapons.dm

@@ -6,30 +6,30 @@
 
 /datum/uplink_item/item/stealthy_weapons/soap
 	name = "Subversive Soap"
-	item_cost = 1
+	item_cost = 10
 	path = /obj/item/weapon/soap/syndie
 
 /datum/uplink_item/item/stealthy_weapons/concealed_cane
 	name = "Concealed Cane Sword"
-	item_cost = 1
+	item_cost = 10
 	path = /obj/item/weapon/cane/concealed
 
 /datum/uplink_item/item/stealthy_weapons/detomatix
 	name = "Detomatix PDA Cartridge"
-	item_cost = 3
+	item_cost = 30
 	path = /obj/item/weapon/cartridge/syndicate
 
 /datum/uplink_item/item/stealthy_weapons/parapen
 	name = "Paralysis Pen"
-	item_cost = 3
+	item_cost = 30
 	path = /obj/item/weapon/pen/reagent/paralysis
 
 /datum/uplink_item/item/stealthy_weapons/cigarette_kit
 	name = "Cigarette Kit"
-	item_cost = 3
+	item_cost = 30
 	path = /obj/item/weapon/storage/box/syndie_kit/cigarette
 
 /datum/uplink_item/item/stealthy_weapons/random_toxin
 	name = "Random Toxin - Beaker"
-	item_cost = 3
+	item_cost = 30
 	path = /obj/item/weapon/storage/box/syndie_kit/toxin

code/datums/uplink/telecrystals.dm

@@ -0,0 +1,38 @@
+/***************
+* Telecrystals *
+***************/
+/datum/uplink_item/item/telecrystal
+	category = /datum/uplink_category/telecrystals
+
+/datum/uplink_item/item/telecrystal/get_goods(var/obj/item/device/uplink/U, var/loc)
+	return new /obj/item/stack/telecrystal(loc, cost(U.uses))
+
+/datum/uplink_item/item/telecrystal/one
+	name = "Telecrystal - 01"
+	item_cost = 1
+
+/datum/uplink_item/item/telecrystal/five
+	name = "Telecrystals - 05"
+	item_cost = 5
+
+/datum/uplink_item/item/telecrystal/ten
+	name = "Telecrystals - 10"
+	item_cost = 10
+
+/datum/uplink_item/item/telecrystal/twentyfive
+	name = "Telecrystals - 25"
+	item_cost = 25
+
+/datum/uplink_item/item/telecrystal/fifty
+	name = "Telecrystals - 50"
+	item_cost = 50
+
+/datum/uplink_item/item/telecrystal/onehundred
+	name = "Telecrystals - 100"
+	item_cost = 100
+
+/datum/uplink_item/item/telecrystal/all
+	name = "Telecrystals - Empty Uplink"
+
+/datum/uplink_item/item/telecrystal/all/cost(var/telecrystals)
+	return max(1, telecrystals)

code/datums/uplink/tools.dm

@@ -6,80 +6,74 @@
 
 /datum/uplink_item/item/tools/toolbox
 	name = "Fully Loaded Toolbox"
-	item_cost = 1
+	item_cost = 10
 	path = /obj/item/weapon/storage/toolbox/syndicate
 
 /datum/uplink_item/item/tools/plastique
 	name = "C-4 (Destroys walls)"
-	item_cost = 2
+	item_cost = 20
 	path = /obj/item/weapon/plastique
 
 /datum/uplink_item/item/tools/encryptionkey_radio
 	name = "Encrypted Radio Channel Key"
-	item_cost = 2
+	item_cost = 20
 	path = /obj/item/device/encryptionkey/syndicate
 
+/datum/uplink_item/item/tools/hacking_tool
+	name = "Door Hacking Tool"
+	item_cost = 20
+	path = /obj/item/device/multitool/hacktool
+	desc = "Appears and functions as a standard multitool until the mode is toggled by applying a screwdriver appropriately. \
+			When in hacking mode this device will grant full access to any standard airlock within 20 to 40 seconds. \
+			This device will also be able to immediately access the last 6 to 8 hacked airlocks."
+
 /datum/uplink_item/item/tools/encryptionkey_binary
 	name = "Binary Translator Key"
-	item_cost = 3
+	item_cost = 30
 	path = /obj/item/device/encryptionkey/binary
 
 /datum/uplink_item/item/tools/emag
 	name = "Cryptographic Sequencer"
-	item_cost = 3
+	item_cost = 30
 	path = /obj/item/weapon/card/emag
 
 /datum/uplink_item/item/tools/clerical
 	name = "Morphic Clerical Kit"
-	item_cost = 3
+	item_cost = 30
 	path = /obj/item/weapon/storage/box/syndie_kit/clerical
 
+/datum/uplink_item/item/tools/money
+	name = "Operations Funding"
+	item_cost = 30
+	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 = 3
+	item_cost = 30
 	path = /obj/item/weapon/storage/box/syndie_kit/space
 
 /datum/uplink_item/item/tools/thermal
 	name = "Thermal Imaging Glasses"
-	item_cost = 3
+	item_cost = 30
 	path = /obj/item/clothing/glasses/thermal/syndi
 
 /datum/uplink_item/item/tools/powersink
 	name = "Powersink (DANGER!)"
-	item_cost = 5
+	item_cost = 50
 	path = /obj/item/device/powersink
 
 /datum/uplink_item/item/tools/ai_module
 	name = "Hacked AI Upload Module"
-	item_cost = 7
+	item_cost = 70
 	path = /obj/item/weapon/aiModule/syndicate
 
 /datum/uplink_item/item/tools/supply_beacon
 	name = "Hacked Supply Beacon (DANGER!)"
-	item_cost = 7
+	item_cost = 70
 	path = /obj/item/supply_beacon
 
 /datum/uplink_item/item/tools/teleporter
 	name = "Teleporter Circuit Board"
-	item_cost = 20
+	item_cost = 200
-	path = /obj/item/weapon/circuitboard/teleporter
+	path = /obj/item/weapon/circuitboard/teleporter
-
-/datum/uplink_item/item/tools/money
-	name = "Operations Funding"
-	item_cost = 3
-	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/crystal
-	name = "Tradable Crystal"
-	item_cost = 1
-	path = /obj/item/device/telecrystal
-	desc = "A telecrystal that can be transferred from one user to another. Be sure not to give it to just anyone."
-
-/datum/uplink_item/item/tools/hacking_tool
-	name = "Door Hacking Tool"
-	item_cost = 2
-	path = /obj/item/device/multitool/hacktool
-	desc = "Appears and functions as a standard multitool until the mode is toggled by applying a screwdriver appropriately. \
-			When in hacking mode this device will grant full access to any standard airlock within 20 to 40 seconds. \
-			This device will also be able to immediately access the last 6 to 8 hacked airlocks."

code/datums/uplink/uplink_categories.dm

@@ -46,4 +46,7 @@ datum/uplink_category/ammunition
 	name = "Devices and Tools"
 
 /datum/uplink_category/visible_weapons
-	name = "Highly Visible and Dangerous Weapons"
+	name = "Highly Visible and Dangerous Weapons"
+
+/datum/uplink_category/telecrystals
+	name = "Telecrystals"

code/datums/uplink/visible_weapons.dm

@@ -4,39 +4,49 @@
 /datum/uplink_item/item/visible_weapons
 	category = /datum/uplink_category/visible_weapons
 
+/datum/uplink_item/item/visible_weapons/tactknife
+	name = "Tactical Knife"
+	item_cost = 10
+	path = /obj/item/weapon/material/hatchet/tacknife
+
+/datum/uplink_item/item/visible_weapons/combatknife
+	name = "Combat Knife"
+	item_cost = 30
+	path = /obj/item/weapon/material/hatchet/tacknife/combatknife
+
 /datum/uplink_item/item/visible_weapons/energy_sword
 	name = "Energy Sword"
-	item_cost = 4
+	item_cost = 40
 	path = /obj/item/weapon/melee/energy/sword
 
 /datum/uplink_item/item/visible_weapons/dartgun
 	name = "Dart Gun"
-	item_cost = 5
+	item_cost = 50
 	path = /obj/item/weapon/gun/projectile/dartgun
 
 /datum/uplink_item/item/visible_weapons/crossbow
 	name = "Energy Crossbow"
-	item_cost = 5
+	item_cost = 50
 	path = /obj/item/weapon/gun/energy/crossbow
 
 /datum/uplink_item/item/visible_weapons/silenced_45
 	name = "Silenced .45"
-	item_cost = 5
+	item_cost = 50
 	path = /obj/item/weapon/gun/projectile/silenced
 
 /datum/uplink_item/item/visible_weapons/riggedlaser
 	name = "Exosuit Rigged Laser"
-	item_cost = 6
+	item_cost = 60
 	path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser
 
 /datum/uplink_item/item/visible_weapons/revolver
 	name = "Revolver"
-	item_cost = 6
+	item_cost = 60
 	path = /obj/item/weapon/gun/projectile/revolver
 
 /datum/uplink_item/item/visible_weapons/Derringer
 	name = ".357 Derringer Pistol"
-	item_cost = 5
+	item_cost = 50
 	path = /obj/item/weapon/gun/projectile/derringer
 
 /datum/uplink_item/item/visible_weapons/heavysniper
@@ -46,18 +56,18 @@
 
 /datum/uplink_item/item/visible_weapons/tommygun
 	name = "Tommygun (.45)" // We're keeping this because it's CLASSY. -Spades
-	item_cost = 7
+	item_cost = 70
 	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.
 /datum/uplink_item/item/visible_weapons/submachinegun
 	name = "Submachine Gun (10mm)"
-	item_cost = 6
+	item_cost = 60
 	path = /obj/item/weapon/gun/projectile/automatic/c20r
 
 /datum/uplink_item/item/visible_weapons/assaultrifle
 	name = "Assault Rifle (7.62mm)"
-	item_cost = 7
+	item_cost = 70
 	path = /obj/item/weapon/gun/projectile/automatic/sts35
 
 /*/datum/uplink_item/item/visible_weapons/bullpuprifle
@@ -67,40 +77,30 @@
 */
 /datum/uplink_item/item/visible_weapons/combatshotgun
 	name = "Combat Shotgun"
-	item_cost = 7
+	item_cost = 70
 	path = /obj/item/weapon/gun/projectile/shotgun/pump/combat
 
 /datum/uplink_item/item/visible_weapons/egun
 	name = "Energy Gun"
-	item_cost = 5
+	item_cost = 50
 	path = /obj/item/weapon/gun/energy/gun
 
 /datum/uplink_item/item/visible_weapons/lasercannon
 	name = "Laser Cannon"
-	item_cost = 6
+	item_cost = 60
 	path = /obj/item/weapon/gun/energy/lasercannon
 
 /datum/uplink_item/item/visible_weapons/lasercarbine
 	name = "Laser Carbine"
-	item_cost = 7
+	item_cost = 70
 	path = /obj/item/weapon/gun/energy/laser
 
 /datum/uplink_item/item/visible_weapons/ionrifle
 	name = "Ion Rifle"
-	item_cost = 5
+	item_cost = 50
 	path = /obj/item/weapon/gun/energy/ionrifle
 
 /datum/uplink_item/item/visible_weapons/xray
 	name = "Xray Gun"
-	item_cost = 7
+	item_cost = 70
-	path = /obj/item/weapon/gun/energy/xray
+	path = /obj/item/weapon/gun/energy/xray
-
-/datum/uplink_item/item/visible_weapons/tactknife
-	name = "Tactical Knife"
-	item_cost = 1
-	path = /obj/item/weapon/material/hatchet/tacknife
-
-/datum/uplink_item/item/visible_weapons/combatknife
-	name = "Combat Knife"
-	item_cost = 3
-	path = /obj/item/weapon/material/hatchet/tacknife/combatknife

code/game/objects/items/devices/telecrystal.dm

@@ -1,21 +0,0 @@
-/* 
-Telecrystal item
-Does nothing if not suitable antag type, checks for accept_tcrystals = 1 in a mob's mind.
-For new antags, make sure to add "player.mind.accept_tcrystals = 1" if you want tradable tcrystals.
-*/
-/obj/item/device/telecrystal
-	name = "red crystal"
-	desc = "A strange, red, glowing crystal."
-	icon = 'icons/obj/stock_parts.dmi'
-	icon_state = "telecrystal"
-	item_state = "telecrystal"
-	force = 5
-	origin_tech = list(TECH_MATERIAL = 2, TECH_BLUESPACE = 1, TECH_ILLEGAL = 1)
-	
-/obj/item/device/telecrystal/attack_self(mob/user as mob)
-	if(user.mind.accept_tcrystals) //Checks to see if antag type allows for tcrystals
-		user.mind.tcrystals += 1
-		user.drop_from_inventory(src)
-		qdel(src)
-	return
-	

code/game/objects/items/stacks/telecrystal.dm

@@ -0,0 +1,29 @@
+/obj/item/stack/telecrystal
+	name = "telecrystal"
+	desc = "It seems to be pulsing with suspiciously enticing energies."
+	description_antag = "Telecrystals can be activated by utilizing them on devices with an actively running uplink. They will not activate on unactivated uplinks."
+	singular_name = "telecrystal"
+	icon = 'icons/obj/stock_parts.dmi'
+	icon_state = "telecrystal"
+	w_class = 1
+	max_amount = 240
+	flags = NOBLUDGEON
+	origin_tech = list(TECH_MATERIAL = 6, TECH_BLUESPACE = 4)
+
+/obj/item/stack/telecrystal/afterattack(var/obj/item/I as obj, mob/user as mob, proximity)
+	if(!proximity)
+		return
+	if(istype(I, /obj/item))
+		if(I.hidden_uplink && I.hidden_uplink.active) //No metagaming by using this on every PDA around just to see if it gets used up.
+			I.hidden_uplink.uses += amount
+			I.hidden_uplink.update_nano_data()
+			nanomanager.update_uis(I.hidden_uplink)
+			use(amount)
+			user << "<span class='notice'>You slot \the [src] into \the [I] and charge its internal uplink.</span>"
+
+/obj/item/stack/telecrystal/attack_self(mob/user as mob)
+	if(user.mind.accept_tcrystals) //Checks to see if antag type allows for tcrystals
+		user << "<span class='notice'>You use \the [src], adding [src.amount] to your balance.</span>"
+		user.mind.tcrystals += amount
+		use(amount)
+	return

code/game/objects/items/weapons/cards_ids.dm

@@ -69,7 +69,6 @@
 	icon_state = "emag"
 	item_state = "card-id"
 	origin_tech = list(TECH_MAGNET = 2, TECH_ILLEGAL = 2)
-	var/default_uses = 10
 	var/uses = 10
 
 /obj/item/weapon/card/emag/resolve_attackby(atom/A, mob/user)
@@ -90,8 +89,12 @@
 
 	return 1
 /obj/item/weapon/card/emag/attackby(obj/item/O as obj, mob/user as mob)
-	if(istype(O, /obj/item/device/telecrystal))
+	if(istype(O, /obj/item/stack/telecrystal))
-		src.uses += default_uses/2 //Adds half the default amount of uses which is more than you get per TC when buying, as to balance the utility of having multiple emags vs one heavily usable one
+		var/obj/item/stack/telecrystal/T = O
+		if(T.amount/2 < 0)
+			usr << "<span class='notice'>You are not adding enough telecrystals to fuel \the [src].</span>"
+			return
+		src.uses += T.amount/2 //Gives 5 uses per 10 TC
 		usr << "<span class='notice'>You add \the [O] to \the [src]. Increasing the uses of \the [src] to [uses].</span>"
 		qdel(O)
 

maps/polaris-2.dmm

@@ -2630,7 +2630,7 @@
 "aYD" = (/obj/structure/sign/double/map/right{pixel_y = 32},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station)
 "aYE" = (/obj/machinery/computer/message_monitor,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station)
 "aYF" = (/obj/machinery/computer/security,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station)
-"aYG" = (/obj/structure/table/steel_reinforced,/obj/item/device/telecrystal,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station)
+"aYG" = (/obj/structure/table/steel_reinforced,/obj/item/stack/telecrystal,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station)
 "aYH" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station)
 "aYI" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/head/philosopher_wig,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station)
 "aYJ" = (/obj/structure/flora/pottedplant{tag = "icon-plant-04"; icon_state = "plant-04"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station)
@@ -2745,7 +2745,7 @@
 "baO" = (/obj/machinery/computer/teleporter,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station)
 "baP" = (/obj/machinery/teleport/station,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station)
 "baQ" = (/obj/machinery/teleport/hub,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station)
-
+
 (1,1,1) = {"
 aaaaabaacaadaaeaafaagaahaaaaaiaajaakaalaamaanaaoaagaafaajaacaadaahaakaaeaamaaiaaoaalaahaajaapaaqaaraasaataauaavaawaaxaayaaaaabaacaadaaeaafaagaahaaaaaiaajaakaalaamaanaaoaagaafaajaacaadaahaakaazaaAaaBaaCaaDaaEaaFaaGaaHaaIaaJaaKaaLaaMaaNaaOaaAaaBaaCaaDaaEaaFaaGaaHaaIaaJaazaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaQaaQaaQaaQaaQaaQaaQaaQaaQaaQaaQaaQaaQaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaRaaSaaSaaSaaSaaSaaSaaSaaSaaSaaSaaRaaSaaSaaSaaSaaSaaSaaSaaSaaSaaSaaRaaSaaSaaSaaSaaSaaSaaSaaSaaSaaSaaRaaSaaSaaSaaSaaSaaSaaSaaSaaSaaSaaRaaSaaSaaSaaSaaSaaSaaSaaSaaSaaSaaRaaSaaSaaSaaSaaSaaSaaSaaSaaSaaSaaRaaSaaSaaSaaSaaSaaSaaSaaSaaSaaSaaR
 aajaaTaaUaaVaaWaaXaaYaaZabaabbabcabdabeabfabgabhaaYaaXabcaaUaaVaaZabdaaWabfabbabhabeaaZabcaabaauaavaawabiabjabkablabmabeaaXabfaaZabcabbabhabeaaXabfaaZabcabbabhabhabeaaXabfaaZabcabbabhabhabmaazaaEabnaboabpaaqaaraasaataauaavaawabiabjabkablabqabnaboabpaaqaaraasaataauaaNaazaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaQabrabsaaQabrabsaaQabrabsaaQabrabsaaQaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPabtabuabuabuabvabuabuabuabuabuabuabwabxabyabxabyabxabxabyabxabyabxabwabzabAabAabAabAabAabAabAabAabAabwabBabCabDabDabDabDabDabDabDabDabwabEabEabEabEabEabEabEabEabEabEabwabFabFabFabFabFabFabFabFabFabFabwabGabHabIabJabKabKabKabKabKabLabM
@@ -3003,3 +3003,4 @@ aquaquaquaquaquaquaquaquaquaquaquaquaquaquaquaquaquaquaquaquaquaquaquaquaquaquaq
 aaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaP
 aaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaP
 "}
+

polaris.dme

@@ -230,6 +230,7 @@
 #include "code\datums\uplink\medical.dm"
 #include "code\datums\uplink\stealth_items.dm"
 #include "code\datums\uplink\stealthy_weapons.dm"
+#include "code\datums\uplink\telecrystals.dm"
 #include "code\datums\uplink\tools.dm"
 #include "code\datums\uplink\uplink_categories.dm"
 #include "code\datums\uplink\uplink_items.dm"
@@ -761,7 +762,6 @@
 #include "code\game\objects\items\devices\suit_cooling.dm"
 #include "code\game\objects\items\devices\t_scanner.dm"
 #include "code\game\objects\items\devices\taperecorder.dm"
-#include "code\game\objects\items\devices\telecrystal.dm"
 #include "code\game\objects\items\devices\traitordevices.dm"
 #include "code\game\objects\items\devices\transfer_valve.dm"
 #include "code\game\objects\items\devices\uplink.dm"
@@ -787,6 +787,7 @@
 #include "code\game\objects\items\stacks\nanopaste.dm"
 #include "code\game\objects\items\stacks\rods.dm"
 #include "code\game\objects\items\stacks\stack.dm"
+#include "code\game\objects\items\stacks\telecrystal.dm"
 #include "code\game\objects\items\stacks\sheets\leather.dm"
 #include "code\game\objects\items\stacks\tiles\tile_types.dm"
 #include "code\game\objects\items\weapons\AI_modules.dm"