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

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/game/objects/random/random.dm

@@ -0,0 +1,104 @@
+/obj/random
+	name = "Random Object"
+	desc = "This item type is used to spawn random objects at round-start"
+	icon = 'icons/misc/mark.dmi'
+	icon_state = "rup"
+	var/spawn_nothing_percentage = 0 // this variable determines the likelyhood that this random object will not spawn anything
+
+	
+// creates a new object and deletes itself
+/obj/random/New()
+	..()
+	if (!prob(spawn_nothing_percentage))
+		spawn_item()
+	del src
+
+
+// this function should return a specific item to spawn
+/obj/random/proc/item_to_spawn()
+	return 0
+
+
+// creates the random item
+/obj/random/proc/spawn_item()
+	var/build_path = item_to_spawn()
+	return (new build_path(src.loc))
+
+
+/obj/random/tool
+	name = "Random Tool"
+	desc = "This is a random tool"
+	icon = 'icons/obj/items.dmi'
+	icon_state = "welder"
+	item_to_spawn()
+		return pick(/obj/item/weapon/screwdriver,\
+					/obj/item/weapon/wirecutters,\
+					/obj/item/weapon/weldingtool,\
+					/obj/item/weapon/crowbar,\
+					/obj/item/weapon/wrench,\
+					/obj/item/device/flashlight)
+					
+					
+/obj/random/technology_scanner
+	name = "Random Scanner"
+	desc = "This is a random technology scanner."
+	icon = 'icons/obj/device.dmi'
+	icon_state = "atmos"
+	item_to_spawn()
+		return pick(prob(5);/obj/item/device/t_scanner,\
+					prob(2);/obj/item/device/radio/intercom,\
+					prob(5);/obj/item/device/analyzer)
+		
+	
+/obj/random/powercell
+	name = "Random Powercell"
+	desc = "This is a random powercell."
+	icon = 'icons/obj/power.dmi'
+	icon_state = "cell"
+	item_to_spawn()
+		return pick(prob(10);/obj/item/weapon/cell/crap,\
+					prob(40);/obj/item/weapon/cell,\
+					prob(40);/obj/item/weapon/cell/high,\
+					prob(9);/obj/item/weapon/cell/super,\
+					prob(1);/obj/item/weapon/cell/hyper)
+					
+					
+/obj/random/bomb_supply
+	name = "Bomb Supply"
+	desc = "This is a random bomb supply."
+	icon = 'icons/obj/assemblies/new_assemblies.dmi'
+	icon_state = "signaller"
+	item_to_spawn()
+		return pick(/obj/item/device/assembly/igniter,\
+					/obj/item/device/assembly/prox_sensor,\
+					/obj/item/device/assembly/signaler)
+
+
+/obj/random/toolbox
+	name = "Random Toolbox"
+	desc = "This is a random toolbox."
+	icon = 'icons/obj/storage.dmi'
+	icon_state = "red"
+	item_to_spawn()
+		return pick(prob(3);/obj/item/weapon/storage/toolbox/mechanical,\
+					prob(2);/obj/item/weapon/storage/toolbox/electrical,\
+					prob(1);/obj/item/weapon/storage/toolbox/emergency)
+					
+					
+/obj/random/tech_supply
+	name = "Random Tech Supply"
+	desc = "This is a random piece of technology supplies."
+	icon = 'icons/obj/power.dmi'
+	icon_state = "cell"
+	spawn_nothing_percentage = 50
+	item_to_spawn()
+		return pick(prob(3);/obj/random/powercell,\
+					prob(2);/obj/random/technology_scanner,\
+					prob(1);/obj/item/weapon/packageWrap,\
+					prob(2);/obj/random/bomb_supply,\
+					prob(1);/obj/item/weapon/extinguisher,\
+					prob(1);/obj/item/clothing/gloves/fyellow,\
+					prob(3);/obj/item/weapon/cable_coil,\
+					prob(2);/obj/random/toolbox,\
+					prob(2);/obj/item/weapon/storage/belt/utility,\
+					prob(5);/obj/random/tool)