Merge pull request #3040 from Baystation12/master

hurka durka master update

code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dm

@@ -37,6 +37,9 @@
 		var/list/waypoints = list()
 		for(var/obj/effect/landmark/temple/destination/T in world)
 			waypoints.Add(T)
+			if(!T)
+				return
+			else continue
 		var/obj/effect/landmark/temple/destination/dest_temple = pick(waypoints)
 		dest_temple.init()
 

code/ZAS/Connection.dm

@@ -163,7 +163,7 @@ connection
 
 			//If there are more than one connection, decrement the number of connections
 			//Otherwise, remove all connections between the zones.
-			if(zone_1 in zone_2.connected_zones)
+			if(zone_2 in zone_1.connected_zones)
 				if(zone_1.connected_zones[zone_2] > 1)
 					zone_1.connected_zones[zone_2]--
 				else
@@ -173,7 +173,7 @@ connection
 						zone_1.connected_zones = null
 
 			//Then do the same for the other zone.
-			if(zone_2 in zone_1.connected_zones)
+			if(zone_1 in zone_2.connected_zones)
 				if(zone_2.connected_zones[zone_1] > 1)
 					zone_2.connected_zones[zone_1]--
 				else
@@ -186,7 +186,7 @@ connection
 
 			//If there are more than one connection, decrement the number of connections
 			//Otherwise, remove all connections between the zones.
-			if(zone_1 in zone_2.connected_zones)
+			if(zone_2 in zone_1.connected_zones)
 				if(zone_1.closed_connection_zones[zone_2] > 1)
 					zone_1.closed_connection_zones[zone_2]--
 				else
@@ -196,7 +196,7 @@ connection
 						zone_1.closed_connection_zones = null
 
 			//Then do the same for the other zone.
-			if(zone_2 in zone_1.connected_zones)
+			if(zone_1 in zone_2.connected_zones)
 				if(zone_2.closed_connection_zones[zone_1] > 1)
 					zone_2.closed_connection_zones[zone_1]--
 				else

code/defines/obj/weapon.dm

@@ -319,7 +319,7 @@
 	attack_verb = list("stabbed", "slashed", "sliced", "cut")
 
 	suicide_act(mob/user)
-		viewers(user) << pick("/red <b>[user] is slitting \his wrists with the shard of glass! It looks like \he's trying to commit suicide.</b>", \
+		viewers(user) << pick("\red <b>[user] is slitting \his wrists with the shard of glass! It looks like \he's trying to commit suicide.</b>", \
 							"\red <b>[user] is slitting \his throat with the shard of glass! It looks like \he's trying to commit suicide.</b>")
 		return (BRUTELOSS)
 

code/game/machinery/autolathe.dm

@@ -37,7 +37,7 @@ var/global/list/autolathe_recipes = list( \
 		new /obj/item/device/assembly/igniter(), \
 		new /obj/item/device/assembly/signaler(), \
 		new /obj/item/device/radio/headset(), \
-		new /obj/item/device/radio(), \
+		new /obj/item/device/radio/off(), \
 		new /obj/item/device/assembly/infra(), \
 		new /obj/item/device/assembly/timer(), \
 		new /obj/item/weapon/light/tube(), \

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

@@ -808,4 +808,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 	if(radio_controller)
 		for (var/ch_name in op)
 			secure_radio_connections[ch_name] = radio_controller.add_object(src, radiochannels[ch_name],  RADIO_CHAT)
-	return
+	return
+
+/obj/item/device/radio/off
+	listening = 0

code/game/objects/items/robot/robot_upgrades.dm

@@ -14,7 +14,7 @@
 
 /obj/item/borg/upgrade/proc/action(var/mob/living/silicon/robot/R)
 	if(R.stat == DEAD)
-		usr << "/red The [src] will not function on a deceased robot."
+		usr << "\red The [src] will not function on a deceased robot."
 		return 1
 	return 0
 

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

@@ -365,8 +365,8 @@ LOOK FOR SURGERY.DM*/
 	attack_verb = list("drilled")
 
 	suicide_act(mob/user)
-		viewers(user) << pick("/red <b>[user] is pressing the [src.name] to \his temple and activating it! It looks like \he's trying to commit suicide.</b>", \
-							"/red <b>[user] is pressing [src.name] to \his chest and activating it! It looks like \he's trying to commit suicide.</b>")
+		viewers(user) << pick("\red <b>[user] is pressing the [src.name] to \his temple and activating it! It looks like \he's trying to commit suicide.</b>", \
+							"\red <b>[user] is pressing [src.name] to \his chest and activating it! It looks like \he's trying to commit suicide.</b>")
 		return (BRUTELOSS)
 
 /*

code/modules/mob/living/simple_animal/constructs.dm

@@ -290,4 +290,4 @@
 			if (cultist == usr) //just to be sure.
 				return
 			cultist.loc = usr.loc
-			usr.visible_message("/red [cultist] appears in a flash of red light as [usr] glows with power")*/
+			usr.visible_message("\red [cultist] appears in a flash of red light as [usr] glows with power")*/

code/modules/research/xenoarchaeology/finds/finds.dm

@@ -143,7 +143,7 @@
 			icon_state = "statuette"
 			additional_desc = "It depicts a [pick("small","ferocious","wild","pleasing","hulking")] \
 			[pick("alien figure","rodent-like creature","reptilian alien","primate","unidentifiable object")] \
-			[pick("performing unspeakable acts","posing heroically","in a feotal position","cheering","sobbing","making a plaintive gesture","making a rude gesture")]."
+			[pick("performing unspeakable acts","posing heroically","in a fetal position","cheering","sobbing","making a plaintive gesture","making a rude gesture")]."
 		if(5)
 			item_type = "instrument"
 			icon_state = "instrument"