Nuke Ops Rework Phase 2

code/game/gamemodes/changeling/changeling.dm

@@ -15,7 +15,7 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
 	recommended_enemies = 2
 
 	uplink_welcome = "Syndicate Uplink Console:"
-	uplink_uses = 10
+	uplink_uses = 20
 
 	var/const/prob_int_murder_target = 50 // intercept names the assassination target half the time
 	var/const/prob_right_murder_target_l = 25 // lower bound on probability of naming right assassination target

code/game/gamemodes/cult/cult.dm

@@ -29,7 +29,7 @@
 	recommended_enemies = 4
 
 	uplink_welcome = "Nar-Sie Uplink Console:"
-	uplink_uses = 10
+	uplink_uses = 20
 
 	var/datum/mind/sacrifice_target = null
 	var/finished = 0

code/game/gamemodes/extended/extended.dm

@@ -4,7 +4,7 @@
 	required_players = 0
 
 	uplink_welcome = "Syndicate Uplink Console:"
-	uplink_uses = 10
+	uplink_uses = 20
 
 	var/const/waittime_l = 600 //lower bound on time before intercept arrives (in tenths of seconds)
 	var/const/waittime_h = 1800

code/game/gamemodes/game_mode.dm

@@ -295,9 +295,9 @@ Implants;
 			// If they're a traitor or likewise, give them extra TC in exchange.
 			var/obj/item/device/uplink/hidden/suplink = man.mind.find_syndicate_uplink()
 			if(suplink)
-				var/extra = 4
+				var/extra = 0 //was 4; with the TC rebalance, this isn't really needed, anymore
 				suplink.uses += extra
-				man << "\red We have received notice that enemy intelligence suspects you to be linked with us. We have thus invested significant resources to increase your uplink's capacity."
+				man << "\red We have received notice that enemy intelligence suspects you to be linked with us. We recommend adjusting your plans and equipment accordingly."
 			else
 				// Give them a warning!
 				man << "\red They are on to you!"

code/game/gamemodes/nuclear/nuclear.dm

@@ -8,12 +8,12 @@ proc/issyndicate(mob/living/M as mob)
 	name = "nuclear emergency"
 	config_tag = "nuclear"
 	required_players = 6
-	required_players_secret = 15 // 25 players - 5 players to be the nuke ops = 20 players remaining
-	required_enemies = 3
-	recommended_enemies = 4
+	required_players_secret = 20 // 20 players - 5 players to be the nuke ops = 15 players remaining
+	required_enemies = 5
+	recommended_enemies = 5
 
 	uplink_welcome = "Corporate Backed Uplink Console:"
-	uplink_uses = 55
+	uplink_uses = 120
 
 	var/const/agents_possible = 5 //If we ever need more syndicate agents.
 	var/const/waittime_l = 600 //lower bound on time before intercept arrives (in tenths of seconds)

code/game/gamemodes/revolution/revolution.dm

@@ -23,7 +23,7 @@
 
 
 	uplink_welcome = "Revolutionary Uplink Console:"
-	uplink_uses = 10
+	uplink_uses = 20
 
 	var/finished = 0
 	var/checkwin_counter = 0

code/game/gamemodes/revolution/rp_revolution.dm

@@ -9,7 +9,7 @@
 	recommended_enemies = 3
 
 	uplink_welcome = "Revolutionary Uplink Console:"
-	uplink_uses = 5
+	uplink_uses = 10
 
 	newscaster_announcements = /datum/news_announcement/revolution_inciting_event
 

code/game/gamemodes/traitor/traitor.dm

@@ -15,7 +15,7 @@
 
 
 	uplink_welcome = "Syndicate Uplink Console:"
-	uplink_uses = 10
+	uplink_uses = 20
 
 	var/const/waittime_l = 600 //lower bound on time before intercept arrives (in tenths of seconds)
 	var/const/waittime_h = 1800 //upper bound on time before intercept arrives (in tenths of seconds)

code/game/gamemodes/vampire/vampire.dm

@@ -15,7 +15,7 @@
 	recommended_enemies = 2
 
 	uplink_welcome = "Syndicate Uplink Console:"
-	uplink_uses = 10
+	uplink_uses = 20
 
 	var/const/prob_int_murder_target = 50 // intercept names the assassination target half the time
 	var/const/prob_right_murder_target_l = 25 // lower bound on probability of naming right assassination target

code/game/gamemodes/wizard/wizard.dm

@@ -10,7 +10,7 @@
 	recommended_enemies = 1
 
 	uplink_welcome = "Wizardly Uplink Console:"
-	uplink_uses = 10
+	uplink_uses = 20
 
 	var/finished = 0
 

code/game/machinery/computer/telecrystalconsoles.dm

@@ -0,0 +1,221 @@
+#define NUKESCALINGMODIFIER 1
+
+var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","Foxtrot","Zero", "Niner")
+
+
+/obj/machinery/computer/telecrystals
+	name = "\improper Telecrystal assignment station"
+	desc = "A device used to manage telecrystals during group operations. You shouldn't be looking at this particular one..."
+	icon_state = "tcstation"
+
+/////////////////////////////////////////////
+/obj/machinery/computer/telecrystals/uplinker
+	name = "\improper Telecrystal upload/recieve station"
+	desc = "A device used to manage telecrystals during group operations. To use, simply insert your uplink. With your uplink installed \
+	you can upload your telecrystals to the group's pool using the console, or be assigned additional telecrystals by your lieutenant."
+	icon_state = "tcstation"
+	var/obj/item/uplinkholder = null
+	var/obj/machinery/computer/telecrystals/boss/linkedboss = null
+
+/obj/machinery/computer/telecrystals/uplinker/New()
+	..()
+
+	var/ID
+	if(possible_uplinker_IDs.len)
+		ID = pick(possible_uplinker_IDs)
+		possible_uplinker_IDs -= ID
+		name = "[name] [ID]"
+	else
+		name = "[name] [rand(1,999)]"
+
+
+/obj/machinery/computer/telecrystals/uplinker/attackby(var/obj/item/O as obj, var/mob/user as mob)
+	if(istype(O, /obj/item))
+
+		if(uplinkholder)
+			user << "<span class='notice'>The [src] already has an uplink in it.</span>"
+			return
+
+		if(O.hidden_uplink)
+			var/obj/item/P = user.get_active_hand()
+			user.drop_item()
+			uplinkholder = P
+			P.loc = src
+			P.add_fingerprint(user)
+			update_icon()
+			updateUsrDialog()
+		else
+			user << "<span class='notice'>The [O] doesn't appear to be an uplink...</span>"
+
+
+
+/obj/machinery/computer/telecrystals/uplinker/update_icon()
+	overlays.Cut()
+	if(uplinkholder)
+		overlays += "[initial(icon_state)]-closed"
+
+
+/obj/machinery/computer/telecrystals/uplinker/proc/ejectuplink()
+	if(uplinkholder)
+		uplinkholder.loc = get_turf(src.loc)
+		uplinkholder = null
+		update_icon()
+
+/obj/machinery/computer/telecrystals/uplinker/proc/donateTC(var/amt, var/addLog = 1)
+	if(uplinkholder && linkedboss)
+		if(amt <= uplinkholder.hidden_uplink.uses)
+			uplinkholder.hidden_uplink.uses -= amt
+			linkedboss.storedcrystals += amt
+			if(addLog)
+				linkedboss.logTransfer("[src] donated [amt] telecrystals to [linkedboss].")
+
+/obj/machinery/computer/telecrystals/uplinker/proc/giveTC(var/amt, var/addLog = 1)
+	if(uplinkholder && linkedboss)
+		if(amt <= linkedboss.storedcrystals)
+			uplinkholder.hidden_uplink.uses += amt
+			linkedboss.storedcrystals -= amt
+			if(addLog)
+				linkedboss.logTransfer("[src] recieved [amt] telecrystals from [linkedboss].")
+
+///////
+
+/obj/machinery/computer/telecrystals/uplinker/attack_hand(mob/user as mob)
+	if(..())
+		return
+	src.add_fingerprint(user)
+	user.set_machine(src)
+
+	var/dat = ""
+	if(linkedboss)
+		dat += "[linkedboss] has [linkedboss.storedcrystals] telecrystals available for distribution. <BR><BR>"
+	else
+		dat += "No linked management consoles detected. Scan for uplink stations using the management console.<BR><BR>"
+
+	if(uplinkholder)
+		dat += "[uplinkholder.hidden_uplink.uses] telecrystals remain in this uplink.<BR>"
+		if(linkedboss)
+			dat += "Donate TC: <a href='byond://?src=\ref[src];donate1=1'>1</a> | <a href='byond://?src=\ref[src];donate5=1'>5</a>"
+		dat += "<br><a href='byond://?src=\ref[src];eject=1'>Eject Uplink</a>"
+
+
+	var/datum/browser/popup = new(user, "computer", "Telecrystal Upload/Recieve Station", 700, 500)
+	popup.set_content(dat)
+	popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
+	popup.open()
+	return
+
+/obj/machinery/computer/telecrystals/uplinker/Topic(href, href_list)
+	if(..())
+		return
+
+	if(href_list["donate1"])
+		donateTC(1)
+
+	if(href_list["donate5"])
+		donateTC(5)
+
+	if(href_list["eject"])
+		ejectuplink()
+
+	src.updateUsrDialog()
+
+
+/////////////////////////////////////////
+/obj/machinery/computer/telecrystals/boss
+	name = "team Telecrystal management console"
+	desc = "A device used to manage telecrystals during group operations. To use, simply initialize the machine by scanning for nearby uplink stations. \
+	Once the consoles are linked up, you can assign any telecrystals amongst your operatives; be they donated by your agents or rationed to the squad \
+	based on the danger rating of the mission."
+	icon_state = "tcboss"
+	var/virgin = 1
+	var/scanrange = 10
+	var/storedcrystals = 0
+	var/list/TCstations = list()
+	var/list/transferlog = list()
+
+/obj/machinery/computer/telecrystals/boss/proc/logTransfer(var/logmessage)
+	transferlog += ("<b>[worldtime2text()]</b> [logmessage]")
+
+/obj/machinery/computer/telecrystals/boss/proc/scanUplinkers()
+	for(var/obj/machinery/computer/telecrystals/uplinker/A in range(scanrange, src.loc))
+		if(!A.linkedboss)
+			TCstations += A
+			A.linkedboss = src
+	if(virgin)
+		getDangerous()
+		virgin = 0
+
+/obj/machinery/computer/telecrystals/boss/proc/getDangerous()//This scales the TC assigned with the round population.
+	..()
+	var/danger
+	danger = player_list.len
+	while(!IsMultiple(++danger,10))//Just round up to the nearest multiple of ten.
+	scaleTC(danger)
+
+/obj/machinery/computer/telecrystals/boss/proc/scaleTC(var/amt)//Its own proc, since it'll probably need a lot of tweaks for balance, use a fancier algorhithm, etc.
+	storedcrystals += amt * NUKESCALINGMODIFIER
+
+/////////
+
+/obj/machinery/computer/telecrystals/boss/attack_hand(var/mob/user as mob)
+	if(..())
+		return
+	src.add_fingerprint(user)
+	user.set_machine(src)
+
+
+	var/dat = ""
+	dat += "<a href='byond://?src=\ref[src];scan=1'>Scan for TC stations.</a><BR>"
+	dat += "This [src] has [storedcrystals] telecrystals available for distribution. <BR>"
+	dat += "<BR><BR>"
+
+
+	for(var/obj/machinery/computer/telecrystals/uplinker/A in TCstations)
+		dat += "[A.name] | "
+		if(A.uplinkholder)
+			dat += "[A.uplinkholder.hidden_uplink.uses] telecrystals."
+		if(storedcrystals)
+			dat+= "<BR>Add TC: <a href ='?src=\ref[src];give1=\ref[A]'>1</a> | <a href ='?src=\ref[src];give5=\ref[A]'>5</a>"
+		dat += "<BR>"
+
+	if(TCstations.len)
+		dat += "<BR><BR><a href='byond://?src=\ref[src];distrib=1'>Evenly distribute remaining TC.</a><BR><BR>"
+
+
+	for(var/entry in transferlog)
+		dat += "<small>[entry]</small><BR>"
+
+
+	var/datum/browser/popup = new(user, "computer", "Team Telecrystal Management Console", 700, 500)
+	popup.set_content(dat)
+	popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
+	popup.open()
+	return
+
+/obj/machinery/computer/telecrystals/boss/Topic(href, href_list)
+	if(..())
+		return
+
+	if(href_list["scan"])
+		scanUplinkers()
+
+	if(href_list["give1"])
+		var/obj/machinery/computer/telecrystals/uplinker/A = locate(href_list["give1"])
+		A.giveTC(1)
+
+	if(href_list["give5"])
+		var/obj/machinery/computer/telecrystals/uplinker/A = locate(href_list["give5"])
+		A.giveTC(5)
+
+	if(href_list["distrib"])
+		var/sanity = 0
+		while(storedcrystals && sanity < 100)
+			for(var/obj/machinery/computer/telecrystals/uplinker/A in TCstations)
+				A.giveTC(1,0)
+			sanity++
+		logTransfer("[src] evenly distributed telecrystals.")
+
+	src.updateUsrDialog()
+	return
+
+#undef NUKESCALINGMODIFIER

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

@@ -18,4 +18,44 @@
 	m_amt = 50
 	g_amt = 20
 	origin_tech = "magnets=1;engineering=1"
-	var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage
+	var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage
+
+// Syndicate device disguised as a multitool; it will turn red when an AI camera is nearby.
+
+
+/obj/item/device/multitool/ai_detect
+	var/track_delay = 0
+
+/obj/item/device/multitool/ai_detect/New()
+	..()
+	processing_objects += src
+
+
+/obj/item/device/multitool/ai_detect/Del()
+	processing_objects -= src
+	..()
+
+/obj/item/device/multitool/ai_detect/process()
+
+	if(track_delay > world.time)
+		return
+
+	var/found_eye = 0
+
+	for(var/mob/aiEye/A in living_mob_list)
+
+		var/turf/our_turf = get_turf(src)
+		var/turf/eye_turf = get_turf(A)
+
+		if(get_dist(our_turf, eye_turf) < 9)
+			found_eye = 1
+			break
+
+	if(found_eye)
+		icon_state = "[initial(icon_state)]_red"
+	else
+		icon_state = initial(icon_state)
+
+	track_delay = world.time + 10 // 1 second
+	return
+

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

@@ -277,4 +277,4 @@ var/list/world_uplinks = list()
 /obj/item/device/radio/headset/uplink/New()
 	..()
 	hidden_uplink = new(src)
-	hidden_uplink.uses = 10
+	hidden_uplink.uses = 20

code/game/objects/items/weapons/implants/implantuplink.dm

@@ -6,7 +6,7 @@
 /obj/item/weapon/implant/uplink/New()
 	activation_emote = pick("blink", "blink_r", "eyebrow", "chuckle", "twitch_s", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink")
 	hidden_uplink = new(src)
-	hidden_uplink.uses = 5
+	hidden_uplink.uses = 10
 	..()
 	return
 

code/game/objects/items/weapons/storage/backpack.dm

@@ -180,4 +180,29 @@
 	name = "captain's satchel"
 	desc = "An exclusive satchel for Nanotrasen officers."
 	icon_state = "satchel-cap"
-	item_state = "captainpack"
+	item_state = "captainpack"
+
+/obj/item/weapon/storage/backpack/satchel_flat
+	name = "smuggler's satchel"
+	desc = "A very slim satchel that can easily fit into tight spaces."
+	icon_state = "satchel-flat"
+	w_class = 3 //Can fit in backpacks itself.
+	storage_slots = 5
+	max_combined_w_class = 15
+	level = 1
+	cant_hold = list(/obj/item/weapon/storage/backpack/satchel_flat) //muh recursive backpacks
+
+/obj/item/weapon/storage/backpack/satchel_flat/hide(var/intact)
+	if(intact)
+		invisibility = 101
+		anchored = 1 //otherwise you can start pulling, cover it, and drag around an invisible backpack.
+		icon_state = "[initial(icon_state)]2"
+	else
+		invisibility = initial(invisibility)
+		anchored = 0
+		icon_state = initial(icon_state)
+
+/obj/item/weapon/storage/backpack/satchel_flat/New()
+	..()
+	new /obj/item/stack/tile/plasteel(src)
+	new /obj/item/weapon/crowbar(src)

code/game/objects/items/weapons/storage/belt.dm

@@ -158,3 +158,9 @@
 	can_hold = list(
 		"/obj/item/clothing/mask/luchador"
 		)
+
+/obj/item/weapon/storage/belt/military
+	name = "military belt"
+	desc = "A syndicate belt designed to be used by boarding parties.  Its style is modeled after the hardsuits they wear."
+	icon_state = "militarybelt"
+	item_state = "military"

code/game/objects/items/weapons/storage/firstaid.dm

@@ -110,6 +110,25 @@
 	new /obj/item/stack/medical/advanced/ointment(src)
 	new /obj/item/stack/medical/splint(src)
 	return
+
+/obj/item/weapon/storage/firstaid/tactical
+	name = "first-aid kit"
+	icon_state = "bezerk"
+	desc = "I hope you've got insurance."
+	max_w_class = 3
+
+/obj/item/weapon/storage/firstaid/tactical/New()
+	..()
+	if (empty) return
+	new /obj/item/clothing/tie/stethoscope( src )
+	new /obj/item/weapon/surgicaldrill(src)
+	new /obj/item/weapon/reagent_containers/hypospray/combat(src)
+	new /obj/item/weapon/reagent_containers/pill/bicaridine(src)
+	new /obj/item/weapon/reagent_containers/pill/dermaline(src)
+	new /obj/item/weapon/reagent_containers/ld50_syringe(src)
+	new /obj/item/clothing/glasses/hud/health/night(src)
+	return
+
 /*
  * Pill Bottles
  */

code/game/objects/structures/crates_lockers/closets/syndicate.dm

@@ -47,7 +47,7 @@
 	new /obj/item/weapon/pinpointer/nukeop(src)
 	new /obj/item/device/pda/syndicate(src)
 	var/obj/item/device/radio/uplink/U = new(src)
-	U.hidden_uplink.uses = 55
+	U.hidden_uplink.uses = 120
 	return
 
 /obj/structure/closet/syndicate/resources/