Merge branch 'master' of github.com:Baystation12/Baystation12 into feature

code/game/dna.dm

@@ -188,7 +188,9 @@
 	return result
 
 /proc/setblock(istring, blocknumber, replacement, blocksize)
-	if(!istring || !blocknumber || !replacement || !blocksize)	return 0
+	if(!blocknumber)
+		return istring
+	if(!istring || !replacement || !blocksize)	return 0
 	var/result = getleftblocks(istring, blocknumber, blocksize) + replacement + getrightblocks(istring, blocknumber, blocksize)
 	return result
 

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

@@ -10,6 +10,8 @@
 	w_class = 3
 	var/charges = 10
 	var/status = 0
+	var/mob/foundmob = "" //Used in throwing proc.
+
 	origin_tech = "combat=2"
 
 
@@ -99,7 +101,12 @@
 				H.apply_effect(10, STUTTER, 0)
 				charges--
 
-				H.visible_message("<span class='danger'>[src], thrown by ([src.fingerprintslast]) hits [H] with stunning end!</span>")
+				for(var/mob/M in player_list) if(M.key == src.fingerprintslast)
+					foundmob = M
+					break
+
+				H.visible_message("<span class='danger'>[src], thrown by [foundmob.name], strikes [H] and stuns them!</span>")
+
 				H.attack_log += "\[[time_stamp()]\]<font color='orange'> Stunned by thrown [src.name] (([src.fingerprintslast]))</font>"
 				log_attack("<font color='red'>Flying [src.name], thrown by ([src.fingerprintslast]) stunned [H.name] ([H.ckey])</font>" )
 

code/modules/awaymissions/zlevel.dm

@@ -28,10 +28,12 @@ proc/createRandomZlevel()
 	//	var/value = null
 
 		if (pos)
-			name = lowertext(copytext(t, 1, pos))
+            // No, don't do lowertext here, that breaks paths on linux
+			name = copytext(t, 1, pos)
 		//	value = copytext(t, pos + 1)
 		else
-			name = lowertext(t)
+            // No, don't do lowertext here, that breaks paths on linux
+			name = t
 
 		if (!name)
 			continue
@@ -56,4 +58,4 @@ proc/createRandomZlevel()
 
 	else
 		world << "\red \b No away missions found."
-		return
+		return

code/modules/recycling/disposal.dm

@@ -1047,21 +1047,6 @@
 		update()
 		return
 
-	New()
-		..()
-		posdir = dir
-		if(icon_state == "pipe-j1s")
-			sortdir = turn(posdir, -90)
-			negdir = turn(posdir, 180)
-		else
-			icon_state = "pipe-j2s"
-			sortdir = turn(posdir, 90)
-			negdir = turn(posdir, 180)
-		dpdir = sortdir | posdir | negdir
-
-		update()
-		return
-
 
 	// next direction to move
 	// if coming in from negdir, then next is primary dir or sortdir

code/modules/recycling/sortingmachinery.dm

@@ -39,8 +39,8 @@
 		return
 
 /obj/item/smallDelivery
-	desc = "A small wrapped package."
-	name = "small parcel"
+	desc = "A wrapped package."
+	name = "parcel"
 	icon = 'icons/obj/storage.dmi'
 	icon_state = "deliverycrateSmall"
 	var/obj/item/wrapped = null

code/modules/research/designs.dm

@@ -547,7 +547,7 @@ datum/design/telecomms_processor
 	build_path = "/obj/item/weapon/circuitboard/telecomms/processor"
 
 datum/design/telecomms_server
-	name = "Circuit Design (Subspace Receiver)"
+	name = "Circuit Design (Telecommunication Server)"
 	desc = "Allows for the construction of Telecommunications Servers."
 	id = "s-server"
 	req_tech = list("programming" = 4, "engineering" = 4)