Merge branch 'master' of git://github.com/Baystation12/Baystation12

code/WorkInProgress/Ported/Abi79/uplinks.dm

@@ -175,9 +175,9 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 			if(text2num(href_list["cost"]) > uses) // Not enough crystals for the item
 				return 0
 
-			//if(usr:mind && ticker.mode.traitors[usr:mind])
-				//var/datum/traitorinfo/info = ticker.mode.traitors[usr:mind]
-				//info.spawnlist += href_list["buy_item"]
+			if(usr:mind && ticker.mode.traitors[usr:mind])
+				var/datum/traitorinfo/info = ticker.mode.traitors[usr:mind]
+				info.spawnlist += href_list["buy_item"]
 
 			uses -= text2num(href_list["cost"])
 
@@ -268,7 +268,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 			else
 				item:loc = get_turf(A)
 			usr.update_clothing()
-	//		usr.client.onBought("[item:name]")	When we have the stats again, uncomment.
+			usr.client.onBought("[item:name]")
 	/*		if(istype(item, /obj/spawner)) // Spawners need to have del called on them to avoid leaving a marker behind
 				del item*/
 	//HEADFINDBACK
@@ -371,7 +371,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 						item:loc = get_turf(A)
 	/*				if(istype(item, /obj/spawner)) // Spawners need to have del called on them to avoid leaving a marker behind
 						del item*/
-	//				usr.client.onBought("[item:name]")	When we have the stats again, uncomment.
+					usr.client.onBought("[item:name]")
 				src.attack_self(usr)
 				return
 

code/WorkInProgress/Ported/policetape.dm

@@ -49,11 +49,19 @@
 			end = get_turf(locate(end.x+d,end.y,end.z))
 			dir = "h"
 
-		while (cur!=end)
+		var/can_place = 1
+		while (cur!=end && can_place)
 			if(cur.density == 1)
-				usr << "\blue You can't run [src] through a wall!"
-				return
+				can_place = 0
+			else
+				for(var/obj/O in cur)
+					if(O.density)
+						can_place = 0
+						break
 			cur = get_step_towards(cur,end)
+		if (!can_place)
+			usr << "\blue You can't run \the [src] through that!"
+			return
 
 		cur = start
 		var/tapetest = 0

code/WorkInProgress/Ported/sql.dm

@@ -1,48 +1,65 @@
-//This looks to be the traitor win tracker code.  Gonna comment it out as we lack it currently.
-/*
+//This looks to be the traitor win tracker code.
 client/proc/add_roundsjoined()
 	if(!makejson)
 		return
+	var/DBConnection/dbcon = new()
+
+	dbcon.Connect("dbi:mysql:[sqldb]:[sqladdress]:[sqlport]","[sqllogin]","[sqlpass]")
+	if(!dbcon.IsConnected()) return
+
 	var/DBQuery/cquery = dbcon.NewQuery("INSERT INTO `roundsjoined` (`ckey`) VALUES ('[ckey(src.key)]')")
 	if(!cquery.Execute()) message_admins(cquery.ErrorMsg())
+
 client/proc/add_roundssurvived()
 	if(!makejson)
 		return
+	var/DBConnection/dbcon = new()
+
+	dbcon.Connect("dbi:mysql:[sqldb]:[sqladdress]:[sqlport]","[sqllogin]","[sqlpass]")
+	if(!dbcon.IsConnected()) return
+
 	var/DBQuery/cquery = dbcon.NewQuery("INSERT INTO `roundsurvived` (`ckey`) VALUES ('[ckey(src.key)]')")
 	if(!cquery.Execute()) message_admins(cquery.ErrorMsg())
-client/proc/onDeath(var/mob/A = src.mob)
+
+client/proc/onDeath()
 	if(!makejson)
 		return
 	roundinfo.deaths++
-	if(!ismob(A))
+	if(!ismob(mob))
 		return
-	var/ckey = src.ckey
-	var/area
+	var/area = get_area(mob)
 	var/attacker
 	var/tod = time2text(world.realtime)
 	var/health
 	var/last
-	if(isturf(A.loc))
-		area = A.loc:loc:name
-	else
-		area = A.loc:name
-	if(ishuman(A.lastattacker))
-		attacker = A.lastattacker:name
+	if(ishuman(mob.lastattacker))
+		attacker = mob.lastattacker:name
 	else
 		attacker = "None"
-	health = "Oxy:[A.oxyloss]Brute:[A.bruteloss]Burn:[A.fireloss]Toxins:[A.toxloss]"
-	if(A.logs.len >= 1)
-		last = A.logs[A.logs.len]
+	health = "Oxy:[mob.oxyloss]Brute:[mob.bruteloss]Burn:[mob.fireloss]Toxins:[mob.toxloss]Brain:[mob.brainloss]"
+	if(mob.attack_log.len >= 1)
+		last = mob.attack_log[mob.attack_log.len]
 	else
 		last = "None"
+
+	var/DBConnection/dbcon = new()
+
+	dbcon.Connect("dbi:mysql:[sqldb]:[sqladdress]:[sqlport]","[sqllogin]","[sqlpass]")
+	if(!dbcon.IsConnected()) return
+
 	var/DBQuery/cquery = dbcon.NewQuery("INSERT INTO `deathlog` (`ckey`,`location`,`lastattacker`,`ToD`,`health`,`lasthit`) VALUES ('[ckey]',[dbcon.Quote(area)],[dbcon.Quote(attacker)],'[tod]','[health]',[dbcon.Quote(last)])")
 	if(!cquery.Execute()) message_admins(cquery.ErrorMsg())
+
 client/proc/onBought(names)
 	if(!makejson) return
 	if(!names) return
+	var/DBConnection/dbcon = new()
+
+	dbcon.Connect("dbi:mysql:[sqldb]:[sqladdress]:[sqlport]","[sqllogin]","[sqlpass]")
+	if(!dbcon.IsConnected()) return
+
 	var/DBQuery/cquery = dbcon.NewQuery("INSERT INTO `traitorbuy` (`type`) VALUES ([dbcon.Quote(names)])")
 	if(!cquery.Execute()) message_admins(cquery.ErrorMsg())
-*/
 
 datum/roundinfo
 	var/core = 0