Merge remote-tracking branch 'upstream/dev' into CanHasNano

Conflicts:
	code/setup.dm

code/game/objects/effects/chemsmoke.dm

@@ -165,7 +165,7 @@
 			continue
 
 		var/offset = 0
-		var/points = round((radius * 2 * PI) / arcLength)
+		var/points = round((radius * 2 * M_PI) / arcLength)
 		var/angle = round(ToDegrees(arcLength / radius), 1)
 
 		if(!IsInteger(radius))

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

@@ -47,7 +47,7 @@
 						affected.implants += src.imp
 						imp.part = affected
 
-						H.hud_updateflag |= 1 << IMPLOYAL_HUD
+						BITSET(H.hud_updateflag, IMPLOYAL_HUD)
 
 				src.imp = null
 				update()