Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12

code/modules/research/designs.dm

@@ -748,6 +748,15 @@ datum/design/mech_grenade_launcher
 	build_path = "/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang"
 	category = "Exosuit Equipment"
 
+datum/design/clusterbang_launcher
+	name = "Exosuit Module Design (SOP-6 Clusterbang Launcher)"
+	desc = "A weapon that violates the Geneva Convention at 6 rounds per minute"
+	id = "clusterbang_launcher"
+	build_type = MECHFAB
+	req_tech = list("combat"= 5, "materials" = 5, "syndicate" = 3)
+	build_path = "/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang/clusterbang/limited"
+	category = "Exosuit Equipment"
+
 datum/design/mech_wormhole_gen
 	name = "Exosuit Module Design (Localized Wormhole Generator)"
 	desc = "An exosuit module that allows generating of small quasi-stable wormholes."
@@ -807,7 +816,7 @@ datum/design/mech_energy_relay
 	desc = "Tesla Energy Relay"
 	id = "mech_energy_relay"
 	build_type = MECHFAB
-	req_tech = list("magnets" = 4, "syndicate" = 3)
+	req_tech = list("magnets" = 4, "powerstorage" = 3)
 	build_path = "/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay"
 	category = "Exosuit Equipment"
 
@@ -1571,3 +1580,14 @@ datum/design/security_hud
 	src.pixel_y = rand(-5.0, 5)
 
 
+/////////////////////////////////////////
+//////////////Borg Upgrades//////////////
+/////////////////////////////////////////
+datum/design/borg_syndicate_module
+	name = "Borg Illegal Weapons Upgrade"
+	desc = "Allows for the construction of illegal upgrades for cyborgs"
+	id = "borg_syndicate_module"
+	build_type = MECHFAB
+	req_tech = list("combat" = 4, "syndicate" = 3)
+	build_path = "/obj/item/borg/upgrade/syndicate"
+	category = "Cyborg Upgrade Modules"

code/modules/research/message_server.dm

@@ -272,16 +272,7 @@ var/obj/machinery/blackbox_recorder/blackbox
 	if(!feedback) return
 
 	round_end_data_gathering() //round_end time logging and some other data processing
-
-	var/user = sqlfdbklogin
-	var/pass = sqlfdbkpass
-	var/db = sqlfdbkdb
-	var/address = sqladdress
-	var/port = sqlport
-
-	var/DBConnection/dbcon = new()
-
-	dbcon.Connect("dbi:mysql:[db]:[address]:[port]","[user]","[pass]")
+	establish_db_connection()
 	if(!dbcon.IsConnected()) return
 	var/round_id
 
@@ -299,13 +290,11 @@ var/obj/machinery/blackbox_recorder/blackbox
 		var/DBQuery/query_insert = dbcon.NewQuery(sql)
 		query_insert.Execute()
 
-	dbcon.Disconnect()
-
 // Sanitize inputs to avoid SQL injection attacks
 proc/sql_sanitize_text(var/text)
-	text = dd_replacetext(text, "'", "''")
-	text = dd_replacetext(text, ";", "")
-	text = dd_replacetext(text, "&", "")
+	text = replacetext(text, "'", "''")
+	text = replacetext(text, ";", "")
+	text = replacetext(text, "&", "")
 	return text
 
 proc/feedback_set(var/variable,var/value)

code/modules/research/rdconsole.dm

@@ -195,7 +195,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 
 	add_fingerprint(usr)
 
-	usr.machine = src
+	usr.set_machine(src)
 	if(href_list["menu"]) //Switches menu screens. Converts a sent text string into a number. Saves a LOT of code.
 		var/temp_screen = text2num(href_list["menu"])
 		if(temp_screen <= 1.1 || (3 <= temp_screen && 4.9 >= temp_screen) || src.allowed(usr) || emagged) //Unless you are making something, you need access.
@@ -548,7 +548,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 			call(/obj/item/clothing/gloves/space_ninja/proc/drain)("RESEARCH",src,user:wear_suit)
 			return
 
-	user.machine = src
+	user.set_machine(src)
 	var/dat = ""
 	files.RefreshResearch()
 	switch(screen) //A quick check to make sure you get the right screen when a device is disconnected.

code/modules/research/rdmachines.dm

@@ -69,7 +69,7 @@
 /obj/machinery/r_n_d/Topic(href, href_list)
 	if(..())
 		return
-	usr.machine = src
+	usr.set_machine(src)
 	src.add_fingerprint(usr)
 	if(href_list["pulse"])
 		var/temp_wire = href_list["wire"]

code/modules/research/server.dm

@@ -39,12 +39,12 @@
 	var/list/temp_list
 	if(!id_with_upload.len)
 		temp_list = list()
-		temp_list = dd_text2list(id_with_upload_string, ";")
+		temp_list = text2list(id_with_upload_string, ";")
 		for(var/N in temp_list)
 			id_with_upload += text2num(N)
 	if(!id_with_download.len)
 		temp_list = list()
-		temp_list = dd_text2list(id_with_download_string, ";")
+		temp_list = text2list(id_with_download_string, ";")
 		for(var/N in temp_list)
 			id_with_download += text2num(N)
 
@@ -207,7 +207,7 @@
 		return
 
 	add_fingerprint(usr)
-	usr.machine = src
+	usr.set_machine(src)
 	if(!src.allowed(usr) && !emagged)
 		usr << "\red You do not have the required access level"
 		return
@@ -276,7 +276,7 @@
 /obj/machinery/computer/rdservercontrol/attack_hand(mob/user as mob)
 	if(stat & (BROKEN|NOPOWER))
 		return
-	user.machine = src
+	user.set_machine(src)
 	var/dat = ""
 
 	switch(screen)

code/modules/research/xenoarchaeology/artifact_db.dm

@@ -15,15 +15,6 @@
 	..()
 	catalogued_artifacts = new/list
 
-/obj/machinery/computer/artifact_database/attack_ai(mob/user)
-	attack_hand(user)
-
-/obj/machinery/computer/artifact_database/attack_hand(mob/user)
-	add_fingerprint(user)
-	if(stat & (BROKEN|NOPOWER))
-		return
-	interact(user)
-
 /obj/machinery/computer/artifact_database/Topic(href, href_list)
 	..()
 	if( href_list["close"] )
@@ -35,7 +26,7 @@
 	..()
 	updateDialog()
 
-/obj/machinery/computer/artifact_database/proc/interact(mob/user)
+/obj/machinery/computer/artifact_database/interact(mob/user)
 	if ( (get_dist(src, user) > 1 ) || (stat & (BROKEN|NOPOWER)) )
 		if (!istype(user, /mob/living/silicon))
 			user.machine = null

code/modules/research/xenoarchaeology/artifact_harvester.dm

@@ -26,15 +26,6 @@
 	else
 		return..()
 
-/obj/machinery/artifact_harvester/attack_ai(var/mob/user as mob)
-	return src.attack_hand(user)
-
-/obj/machinery/artifact_harvester/attack_paw(var/mob/user as mob)
-	return src.attack_hand(user)
-
-/obj/machinery/artifact_harvester/attack_hand(var/mob/user as mob)
-	interact(user)
-
 /obj/machinery/artifact_harvester/process()
 	if(stat & (NOPOWER|BROKEN))
 		return
@@ -52,7 +43,7 @@
 			icon_state = "incubator"
 	return
 
-/obj/machinery/artifact_harvester/proc/interact(var/mob/user as mob)
+/obj/machinery/artifact_harvester/interact(var/mob/user as mob)
 	if(stat & (NOPOWER|BROKEN))
 		return
 	user.machine = src

code/modules/research/xenoarchaeology/artifact_synthetic.dm

@@ -35,7 +35,7 @@
 	var/s = round(p,25)
 	icon_state = "anodev[s]"
 
-/obj/item/weapon/anodevice/proc/interact(var/mob/user)
+/obj/item/weapon/anodevice/interact(var/mob/user)
 	user.machine = src
 	var/dat = "<b>Anomalous Materials Energy Utiliser</b><br>"
 	if(activated)
@@ -74,18 +74,9 @@
 	else
 		return ..()
 
-/obj/item/weapon/anodevice/attack_ai(var/mob/user as mob)
-	return src.interact(user)
-
-/*/obj/item/weapon/anodevice/attack_paw(var/mob/user as mob)
-	return src.interact(user)*/
-
 /obj/item/weapon/anodevice/attack_self(var/mob/user as mob)
 	return src.interact(user)
 
-/*obj/item/weapon/anodevice/attack_hand(var/mob/user as mob)
-	return src.interact(user)*/
-
 /obj/item/weapon/anodevice/proc/pulse()
 	if(activated)
 		if(time <= 0 || !inserted_battery)